提示修改

src/main/java/com/jeeplus/modules/workmaterialcollect/dao/WorkMaterialCollectEngineerDao.java

@@ -4,6 +4,8 @@ import com.jeeplus.common.persistence.CrudDao;
 import com.jeeplus.common.persistence.annotation.MyBatisDao;
 import com.jeeplus.modules.workmaterialcollect.entity.WorkMaterialCollectEngineer;
 
+import java.util.List;
+
 /**
  * 项目 列表 dao接口
  */
@@ -14,4 +16,7 @@ public interface WorkMaterialCollectEngineerDao extends CrudDao<WorkMaterialColl
 
     //修改状态
     void updateProjectStatus(WorkMaterialCollectEngineer workMaterialCollectEngineer);
+
+    //移动端查找
+    List<WorkMaterialCollectEngineer> findListModel(WorkMaterialCollectEngineer workMaterialCollectEngineer);
 }

src/main/java/com/jeeplus/modules/workmaterialcollect/dao/WorkMaterialCollectTotalDao.java

@@ -26,4 +26,7 @@ public interface WorkMaterialCollectTotalDao extends CrudDao<WorkMaterialCollect
 
     //多条件查询
     List<WorkMaterialCollectTotal> findAllTypeTotal(@Param("list") List<WorkMaterialCollectType> list);
+
+    //手机端list
+    List<WorkMaterialCollectTotal> findListModel(WorkMaterialCollectTotal workMaterialCollectTotal);
 }

src/main/java/com/jeeplus/modules/workmaterialcollect/entity/WorkMaterialCollectEngineer.java

@@ -26,6 +26,25 @@ public class WorkMaterialCollectEngineer extends DataEntity<WorkMaterialCollectE
 
     private String copyStatusAdd;//
 
+    private String modelStartDate;
+    private String modelEndDate;
+
+    public String getModelStartDate() {
+        return modelStartDate;
+    }
+
+    public void setModelStartDate(String modelStartDate) {
+        this.modelStartDate = modelStartDate;
+    }
+
+    public String getModelEndDate() {
+        return modelEndDate;
+    }
+
+    public void setModelEndDate(String modelEndDate) {
+        this.modelEndDate = modelEndDate;
+    }
+
     public String getCopyStatusAdd() {
         return copyStatusAdd;
     }

src/main/java/com/jeeplus/modules/workmaterialcollect/entity/WorkMaterialCollectTotal.java

@@ -23,6 +23,25 @@ public class WorkMaterialCollectTotal extends DataEntity<WorkMaterialCollectTota
     private String projectName;  //工程名称
     private String projectTypeId;//工程id
 
+    private String modelStartDate;//开始时间
+    private String modelEndDate;//结束时间
+
+    public String getModelStartDate() {
+        return modelStartDate;
+    }
+
+    public void setModelStartDate(String modelStartDate) {
+        this.modelStartDate = modelStartDate;
+    }
+
+    public String getModelEndDate() {
+        return modelEndDate;
+    }
+
+    public void setModelEndDate(String modelEndDate) {
+        this.modelEndDate = modelEndDate;
+    }
+
     public String getProjectTypeId() {
         return projectTypeId;
     }

src/main/java/com/jeeplus/modules/workmaterialcollect/service/WorkMaterialCollectEngineerService.java

@@ -229,4 +229,8 @@ public class WorkMaterialCollectEngineerService extends CrudService<WorkMaterial
         //删除类型表
         workMaterialCollectTypeDao.updateEngId(workEngineer.getId());
     }
+
+    public List<WorkMaterialCollectEngineer> findListModel(WorkMaterialCollectEngineer workMaterialCollectEngineer){
+        return workMaterialCollectEngineerDao.findListModel(workMaterialCollectEngineer);
+    }
 }

src/main/java/com/jeeplus/modules/workmaterialcollect/service/WorkMaterialCollectTotalService.java

@@ -43,6 +43,11 @@ public class WorkMaterialCollectTotalService extends CrudService<WorkMaterialCol
     }
 
 
+    //手机端查找
+    public List<WorkMaterialCollectTotal> findListModel(WorkMaterialCollectTotal workMaterialCollectTotal){
+        return workMaterialCollectTotalDao.findListModel(workMaterialCollectTotal);
+    }
+
     //多条件查询
     public List<WorkMaterialCollectTotal> findListTypesId(List<WorkMaterialCollectType> list){
        return workMaterialCollectTotalDao.findAllTypeTotal(list);

src/main/java/com/jeeplus/modules/workmaterialcollect/web/WorkMaterialModelListController.java

@@ -14,8 +14,11 @@ import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
 
 @Controller
@@ -34,19 +37,27 @@ public class WorkMaterialModelListController {
 
     @ResponseBody
     @RequestMapping(value = "list.do")
-    public List<WorkMaterialCollectTotal> list(String itemName,WorkMaterialCollectTotal workMaterialCollectTotal, Model model){
-//        if (null==workMaterialCollectTotal){
-//            workMaterialCollectTotal = workMaterialModelListService.getDefaultWorkService(workMaterialCollectTotal,itemName);
-//        }
-//        List<WorkMaterialCollectTotal> workMaterialCollectTotals = new ArrayList<WorkMaterialCollectTotal>();
+    public List<WorkMaterialCollectTotal> list(String itemName,String time,WorkMaterialCollectTotal workMaterialCollectTotal, Model model){
+//        workMaterialCollectTotal.setProjectSite("南京");
         List<WorkMaterialCollectTotal> list = workMaterialCollectTotalService.findList(workMaterialCollectTotal);
         return list;
     }
 
     @ResponseBody
+    @RequestMapping(value = "listOn.do")
+    public List<WorkMaterialCollectTotal> list1(String itemName,String time,WorkMaterialCollectTotal workMaterialCollectTotal, Model model){
+        getTime(time,workMaterialCollectTotal);
+        List<WorkMaterialCollectTotal> list = workMaterialCollectTotalService.findListModel(workMaterialCollectTotal);
+        return list;
+    }
+
+
+    @ResponseBody
     @RequestMapping(value = "project.list.do")
-    public List<WorkMaterialCollectEngineer> listProject(String itemName,WorkMaterialCollectEngineer workMaterialCollectEngineer,Model mode){
-        List<WorkMaterialCollectEngineer> list = workMaterialCollectEngineerService.findList(workMaterialCollectEngineer);
+    public List<WorkMaterialCollectEngineer> listProject(String itemName,String time,WorkMaterialCollectEngineer workMaterialCollectEngineer,Model mode){
+        getTime(time,workMaterialCollectEngineer);
+        List<WorkMaterialCollectEngineer> list = workMaterialCollectEngineerService.findListModel(workMaterialCollectEngineer);
+//        List<WorkMaterialCollectEngineer> list = workMaterialCollectEngineerService.findList(workMaterialCollectEngineer);
         WorkMaterialCollectType workMaterialCollectType = new WorkMaterialCollectType();
         for (WorkMaterialCollectEngineer workEng : list){
             workMaterialCollectType = new WorkMaterialCollectType();
@@ -111,6 +122,7 @@ public class WorkMaterialModelListController {
     public String collectViewList(WorkMaterialCollectTotal workMaterialCollectTotal,String itemId,Model model){
         WorkMaterialCollectType workMaterialCollectType = workMaterialCollectTypeService.get(workMaterialCollectTotal.getProjectTypeId());
         WorkMaterialCollectEngineer workMaterialCollectEngineer = workMaterialCollectEngineerService.get(itemId);
+        getEndTimeString(workMaterialCollectEngineer);
         List<WorkMaterialCollectTotal> list = workMaterialCollectTotalService.findList(workMaterialCollectTotal);
         model.addAttribute("workTotal",list);
         model.addAttribute("itemId",itemId);
@@ -171,4 +183,50 @@ public class WorkMaterialModelListController {
         model.addAttribute("workCollect",workMaterialCollectTotal);
         return "modules/workmaterialcollect/modelCollect/workMaterialCollectModelView";
     }
+
+    //转换时间
+    public void getTime(String time,WorkMaterialCollectTotal workMaterialCollectTotal){
+        DateFormat dateFormat = new SimpleDateFormat("yyyy");
+        try{
+            workMaterialCollectTotal.setEndDate(dateFormat.parse(time));
+        }catch (Exception e){
+            workMaterialCollectTotal.setEndDate(null);
+        }
+    }
+
+    //转换时间
+    public void getTime(String time,WorkMaterialCollectEngineer workMaterialCollectEngineer){
+        DateFormat dateFormat = new SimpleDateFormat("yyyy");
+        try{
+            workMaterialCollectEngineer.setProjectEndDate(dateFormat.parse(time));
+        }catch (Exception e){
+            workMaterialCollectEngineer.setProjectEndDate(null);
+        }
+    }
+
+    //查看项目
+    @RequestMapping(value = "item_op")
+    public String getItem(String id,Model model){
+        DateFormat dateFormat = new SimpleDateFormat("yyyy");
+        WorkMaterialCollectTotal workMaterialCollectTotal = workMaterialCollectTotalService.get(id);
+        if (null!=workMaterialCollectTotal.getStartDate()){
+            workMaterialCollectTotal.setModelStartDate(dateFormat.format(workMaterialCollectTotal.getStartDate()));
+        }
+        if (null!=workMaterialCollectTotal.getEndDate()){
+            workMaterialCollectTotal.setModelEndDate(dateFormat.format(workMaterialCollectTotal.getEndDate()));
+        }
+        model.addAttribute("workEng",workMaterialCollectTotal);
+        return "modules/workmaterialcollect/modelCollect/workMaterialCollectModelitemView";
+    }
+
+
+    public void getEndTimeString(WorkMaterialCollectEngineer workMaterialCollectEngineer){
+        DateFormat dateFormat = new SimpleDateFormat("yyyy");
+        if (null!=workMaterialCollectEngineer.getProjectStartDate()){
+            workMaterialCollectEngineer.setModelStartDate(dateFormat.format(workMaterialCollectEngineer.getProjectStartDate()));
+        }
+        if (null!=workMaterialCollectEngineer.getProjectEndDate()){
+            workMaterialCollectEngineer.setModelEndDate(dateFormat.format(workMaterialCollectEngineer.getProjectEndDate()));
+        }
+    }
 }

src/main/resources/mappings/modules/workmaterialcollect/WorkMaterialCollectEngineerDao.xml

@@ -64,6 +64,35 @@
 		</choose>
 	</select>
 
+	<select id="findListModel" resultType="com.jeeplus.modules.workmaterialcollect.entity.WorkMaterialCollectEngineer" >
+		SELECT
+		<include refid="workMaterialCollect"/>
+		FROM work_material_collect_engineer a
+		<where>
+			a.del_flag = #{DEL_FLAG_NORMAL}
+			<if test="projectName != null and projectName != ''">
+				AND a.projectName = #{projectName}
+			</if>
+			<if test="projectSite != null and projectSite !=''">
+				AND a.projectSite = #{projectSite}
+			</if>
+			<if test="projectStartDate != null and projectStartDate != ''">
+				AND a.projectStatusDate = #{projectStatusDate}
+			</if>
+			<if test="projectEndDate != null and projectEndDate != ''">
+				AND YEAR(a.projectEndDate) = #{projectEndDate}
+			</if>
+		</where>
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+				ORDER BY a.update_date DESC
+			</otherwise>
+		</choose>
+	</select>
+
 	<select id="findAllList" resultType="com.jeeplus.modules.workmaterialcollect.entity.WorkMaterialCollectEngineer" >
 		SELECT 
 			<include refid="workMaterialCollect"/>

src/main/resources/mappings/modules/workmaterialcollect/WorkMaterialCollectTotalDao.xml

@@ -68,6 +68,9 @@
 			<if test="projectTypeId != null and projectTypeId != ''">
 				AND a.projectTypeId = #{projectTypeId}
 			</if>
+			<if test="endDate != null and endDate != ''">
+				AND a.endDate LIKE concat('%',#{endDate},'%')
+			</if>
 		</where>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
@@ -79,6 +82,44 @@
 		</choose>
 	</select>
 
+	<select id="findListModel" resultType="com.jeeplus.modules.workmaterialcollect.entity.WorkMaterialCollectTotal" >
+		SELECT
+		<include refid="workMaterialCollectTotal"/>
+		FROM work_material_collect_total a
+		<where>
+			a.del_flag = #{DEL_FLAG_NORMAL}
+			<if test="materialName != null and materialName != ''">
+				AND a.materialName = #{materialName}
+			</if>
+			<if test="projectType != null and projectType != ''">
+				AND a.projectType = #{projectType}
+			</if>
+			<if test="projectPart != null and projectPart != ''">
+				AND a.projectPart = #{projectPart}
+			</if>
+			<if test="projectName != null and projectName != ''">
+				AND a.projectName = #{projectName}
+			</if>
+			<if test="projectSite != null and projectSite != ''">
+				AND a.projectSite = #{projectSite}
+			</if>
+			<if test="projectTypeId != null and projectTypeId != ''">
+				AND a.projectTypeId = #{projectTypeId}
+			</if>
+			<if test="endDate != null and endDate != ''">
+				AND YEAR(a.endDate) = #{endDate}
+			</if>
+		</where>
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+				ORDER BY a.endDate DESC
+			</otherwise>
+		</choose>
+	</select>
+
 	<select id="findListExcel" resultType="com.jeeplus.modules.workmaterialcollect.entity.WorkMaterialCollectExportTotal" >
 		SELECT
 		<include refid="workMaterialCollectTotal"/>

src/main/resources/spring-context-shiro.xml

@@ -16,6 +16,7 @@
             <value>
                 /static/** = anon
                 /userfiles/** = anon
+                ${adminPath}/workMaterialCollect/total/** = anon
                 ${adminPath}/weChatCallBack/** = anon
                 ${adminPath}/weXin/theOrder/** = anon
                 ${adminPath}/webpage/weixin/orderMeal.jsp = anon

src/main/webapp/WEB-INF/tags/sys/gridselectCataWork.tag

@@ -33,7 +33,7 @@ function searchGrid${id}(){
             var item = iframeWin.doSubmit();
             if (item){
                 var item = iframeWin.getSelectedItem();
-                console.info(item);
+                // console.info(item);
                 if(item == "-1"){
                     return;
                 }

src/main/webapp/WEB-INF/tags/table/importExcelEng.tag

@@ -0,0 +1,44 @@
+<%@ tag language="java" pageEncoding="UTF-8"%>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<%@ attribute name="url" type="java.lang.String" required="true"%>
+<%-- 使用方法： 1.将本tag写在查询的form之前；2.传入controller的url --%>
+<button id="btnImport" class="op-btn op-btn-add" data-toggle="tooltip" data-placement="left" title="上传"><i class="fa fa-folder-open-o"></i> 上传</button>
+<div id="importBox" class="hide">
+		<form id="importForm" action="${url}" method="post" enctype="multipart/form-data"
+style="padding-left:20px;text-align:center;" onsubmit="loading('正在上传，请稍等...');"><br/>
+<input id="uploadFile" name="file" type="file" style="width:330px"/>导入文件不能超过5M，仅允许导入“xls”或“xlsx”格式文件！<br/>　　
+
+
+</form>
+</div>
+<script type="text/javascript">
+$(document).ready(function() {
+	$("#btnImport").click(function(){
+	    alert("1");
+		top.layer.open({
+		    type: 1, 
+		    area: [500, 300],
+		    title:"上传数据",
+            skin: 'three-btns with-demo',
+		    content:$("#importBox").html() ,
+		    btn: ['下载模板','确定', '关闭'],
+			    btn1: function(index, layero){
+				  window.location.href='${url}/template';
+			  },
+		    btn2: function(index, layero){
+			        var inputForm =top.$("#importForm");
+			        var top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe 
+			        inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+    	       		top.$("#importForm").submit();
+				    top.layer.close(index);
+			  },
+			 
+			  btn3: function(index){ 
+				  top.layer.close(index);
+    	       }
+		}); 
+	});
+    
+});
+
+</script>

src/main/webapp/webpage/modules/workmaterialcollect/modelCollect/workMaterialCollectModelList.jsp

@@ -11,6 +11,7 @@
     <link rel="stylesheet" href="https://res.wx.qq.com/open/libs/weui/1.1.2/weui-for-work.min.css"/>
     <script src="/static/jquery/jquery-2.1.1.min.js"></script>
     <script src="/static/weixin/js/jquery-weui.min.js"></script>
+    <script src="https://cdn.bootcss.com/jquery-weui/1.2.1/js/city-picker.min.js"></script>
     <link rel="stylesheet" href="/static/weixin/css/jquery-weui.min.css"/>
     <link rel="stylesheet" href="${ctx}/static/weixin/example/example.css"/>
     <link rel="stylesheet" href="/static/wechat/wechat-btn.css"/>
@@ -22,136 +23,102 @@
     .model_top{
         margin-top: 0px;
     }
+    .model_heg{
+        line-height: 20%;
+    }
+    .model_fonz_pro{
+        font-size: 13px
+    }
+    .model_fex_height{
+        height: 10%;
+    }
+    .model_fex_font-size{
+        text-align: center;
+    }
+    .model_fex_submit{
+        width:100%;
+        height:30px;
+        line-height: 30px;
+    }
+    .model_list1{
+        height: 41px;width: 100%; border-radius:15px;border: 1px solid #dd514c
+    }
+    .model_list2{
+        float:left;width: 20%;height: 41px;border-radius:15px 0px 0px 15px;text-align: center
+    }
+    .model_list3{
+        text-align: center;width: 100%;height: 41px;font-size:80%" type="text" name="marterialName" onchange="materialNameUpdate()
+    }
+    .model_list4{
+        float:left;background-color: yellow;width: 65%;height: 41px
+    }
+    .model_list5{
+        height: 41px;width: 100%;border: 0;outline: none;font-size: 15px
+    }
+    .model_list6{
+        float:left;width: 14%;height: 41px;border-radius:0px 15px 15px 0px;text-align: center
+    }
+    .model_list7{
+        width: 50%;height:50%;margin-top:17%;margin-left:8%;text-align: center;
+    }
 </style>
 <script>
     $(function () {
-        // loadlistProject();
-        loadlist();
+        materialSolr('','','','',"/workMaterialCollect/total/list.do");
     })
-    function loadlist() {
-        var html = "";
-        $.ajax({
-            type: "POST",
-            url: "/workMaterialCollect/total/list.do",
-            // data: { 'page': pages, 'size': sizes },
-            dataType: "json",
-            success: function (data) {
-                // alert(data);
-                if (data.length > 0) {
-                    html +='<div class="weui-flex" style="background-color: #f9f9f9">\n' +
-                        '            <div class="weui-flex__item model_fex">名称</div>\n' +
-                        '            <div class="weui-flex__item">型号</div>\n' +
-                        '            <div class="weui-flex__item">单位</div>\n' +
-                        '            <div class="weui-flex__item">含税价</div>\n' +
-                        '            <div class="weui-flex__item">除税价</div>\n' +
-                        '            <div class="weui-flex__item">分析</div>\n' +
-                        '       </div>';
-                    for (var i = 0; i < data.length; i++) {
-                        // alert(data[i].id)
-                        // alert(data[i].materialName);
-                        html+="<div class='weui-flex' style=''>" +
-                            "<div class='weui-flex__item model_fex'>"+data[i].materialName+"</div>" +
-                            "<div class='weui-flex__item'>"+data[i].specifications+"</div>" +
-                            "<div class='weui-flex__item'>"+data[i].unit+"</div>" +
-                            "<div class='weui-flex__item'>/</div>" +
-                            "<div class='weui-flex__item'>"+data[i].excludingTax+"</div>" +
-                            "<div class='weui-flex__item'><a href='/workMaterialCollect/total/view?id="+data[i].id+"'>查看</a></div>" +
-                            "</div>";
-                        html+="<div class='weui-flex' style=''>" +
-                                "<div class='weui-flex__item model_fex' style='font-size: 5px'>" +
-                                "来源:<span>"+data[i].projectName+"</span>项目;分类:<span>"+data[i].projectType+"</span>;工程时间<span>"+data[i].startDate+"/"+data[i].endDate+"</span>" +
-                                "</div>" +
-                            "</div>";
-                    }
-                    $("#toList").html(html);
-                }
-            }
-        });
-    }
     function loadlistProject() {
-        var html = "";
-        $.ajax({
-            type: "POST",
-            url: "/workMaterialCollect/total/project.list.do",
-            // data: { 'page': pages, 'size': sizes },
-            dataType: "json",
-            success: function (data) {
-                if (data.length > 0) {
-                    html +='<div class="weui-flex" style="background-color: ">\n' +
-                        '            <div class="weui-flex__item">项目名称</div>\n' +
-                        '            <div class="weui-flex__item">地区</div>\n' +
-                        '            <div class="weui-flex__item">分类</div>\n' +
-                        '            <div class="weui-flex__item">工程时间</div>\n' +
-                        '            <div class="weui-flex__item">详情</div>\n' +
-                        '        </div>';
-                    for (var k = 0; k < data.length; k++) {
-                        for (var i = 0; i < data[k].workMaterialCollectTypes.length; i++) {
-                            // alert(data[i].id)
-                            // alert(data[i].materialName);
-                            html+= "<div class='weui-flex' style=''>" +
-                                "<div class='weui-flex__item'>"+data[k].projectName+"</div>" +
-                                "<div class='weui-flex__item'>"+data[k].projectSite+"</div>" +
-                                "<div class='weui-flex__item'>"+data[k].workMaterialCollectTypes[i].projectType+"</div>" +
-                                "<div class='weui-flex__item'>/</div>" +
-                                "<div class='weui-flex__item'><a href='/workMaterialCollect/total/project.view?itemId="+data[k].id+"&projectTypeId="+data[k].workMaterialCollectTypes[i].id+"'>查看</a></div>" +
-                                "</div>";
-                        }
-                    }
-                    $("#toList").html(html);
-                }
-            }
-        });
+
     }
 </script>
 <body>
-<div style="padding: 2px">
+<div style="">
     <div class="weui-cells model_top">
         <div class="weui-cell">
-            <div class="weui-cell__hd" style="width:20%">
-                <input class="weui-input" type="text" name="marterialName" onchange="materialNameUpdate()" id='marterialName' value="材料"/>
-            </div>
-            <div class="weui-cell__bd" style="width:100%">
-                <input id="projectName" name="projectName" type="text"  maxlength="64" class=" form-control  layui-input laydate-icon" value="" />
-            </div>
-            <div class="weui-cell__ft" style="width:20%">
-                <a href="javascript:;" onclick="solr()" class="">按钮</a>
+            <div class="model_list1">
+                <div class="model_list2">
+                    <input class="weui-input model_list3" onchange="materialNameUpdate()" id='marterialName' value="材料"/>
+                    <%--<img style="margin: auto;width: 100%;" src="/static/weixin/image/cj_xiala.png"/>--%>
+                </div>
+                <div class="model_list4">
+                    <input id="projectName" placeholder="请输入查找条件" class="model_list5" name="projectName" type="text"  maxlength="64"  value="" />
+                </div>
+                <div class="model_list6">
+                    <img onclick="solr()" class="model_list7" src="/static/weixin/image/dj_sousuo.png"/>
+                </div>
             </div>
         </div>
     </div>
-    <%--<div class='weui-cells model_top'>--%>
-        <%--<div class="weui-flex" style="height: 30px;width: 100%">--%>
-            <%--<div class="weui-flex__item" style="height: 30px;width: 100%;background-color: blue">--%>
-                <%--<div style="width: 20%;background-color: red">--%>
-                <%--</div>--%>
-            <%--</div>--%>
-        <%--</div>--%>
-    <%--</div>--%>
-    <div class="weui-cells model_top"  id="matarial">
-        <div class="weui-flex">
-            <div class="weui-flex__item">
-                <input class="weui-input" type="text" readonly="readonly" onchange="projectTypeUpdate()"  name="" id='projectType' value="分类"/>
-            </div>
-            <div class="weui-flex__item">
-                <input class="weui-input" type="text" name="specific1" id="" value="时间"/>
-            </div>
-            <div class="weui-flex__item">
-                <input class="weui-input" type="text" name="projectSize" id='projectSize' value="地址"/>
+    <div class="weui-cells model_top" id="matarial">
+        <div class="weui-cell">
+            <div class="weui-flex">
+                <div class="weui-flex__item">
+                    <input class="weui-input" type="text" readonly="readonly" style="background-color: white;text-align: center" onchange="projectTypeUpdate()"  name="" id='projectType' placeholder="分类"/>
+                </div>
+                <div class="weui-flex__item">
+                    <input  class="weui-input" type="text" style="background-color: white;text-align: center" readonly="readonly" id='datetime-picker' placeholder="时间" />
+                </div>
+                <div class="weui-flex__item">
+                    <input style="background-color: white;text-align: center" class="weui-input"  type="text" id='city-picker' placeholder="地址"/>
+                </div>
             </div>
         </div>
     </div>
-    <div class="weui-cells model_top" style="display: none"  id="project">
-        <div class="weui-flex">
-            <div class="weui-flex__item">
-                <input class="weui-input" type="text" name="specific1"  value="地区"/>
-            </div>
-            <div class="weui-flex__item">
-                <input class="weui-input" type="text" name="projectSize"  value="时间"/>
+    <div class="weui-cells model_top" style="display: none" id="project">
+        <div class="weui-cell">
+            <div class="weui-flex">
+                <div class="weui-flex__item">
+                    <input class="weui-input" type="text" style="background-color: white;text-align: center" id="projectArea" readonly="readonly" placeholder="地区"/>
+                </div>
+                <div class="weui-flex__item">
+                    <input class="weui-input" type="text" style="background-color: white;text-align: center" id="projectTime" readonly="readonly"  placeholder="时间"/>
+                </div>
             </div>
         </div>
     </div>
     <div class='weui-cells model_top' id="toList">
 
     </div>
+    <div id="loadDiv" style="display: none;" class="weui-toast weui_loading_toast weui-toast--visible"><div class="weui_loading"><i class="weui-loading weui-icon_toast"></i></div><p class="weui-toast_content">请稍后...</p></div>
 </div>
 
 </body>
@@ -162,64 +129,76 @@
     });
     $("#projectType").select({
         title: "选择分类",
-        items: ["土建工程", "安装工程", "装饰工程", "绿化工程"]
+        items: ["分类","土建工程", "安装工程", "装饰工程", "绿化工程"]
     });
-    
+    $("#city-picker").cityPicker({
+        title: "请选择地址",
+        onChange: function (picker, values, displayValues) {
+            $("#city-picker").val("");
+        },
+        onClose: function(picker) {
+            var s = $("#city-picker").val();
+            var index=s.lastIndexOf(' ');
+            var sub = s.substring(index+1,s.length);
+            $("#city-picker").val(sub);
+            $("#projectType").val("");
+            $("#datetime-picker").val("");
+            // if (projectType == "分类") {
+            //     projectType='';
+            // }
+            // var time = $("#datetime-picker").val();
+            // if (time == '时间'){
+            //     time  = '';
+            // }
+            materialSolr('','','',sub,"/workMaterialCollect/total/listOn.do");
+        }
+    });
+    $("#datetime-picker").datetimePicker({
+        times: function() {
+            return [];
+        },
+        onClose: function(picker) {
+            var value = picker.value[0];
+            // alert(value);
+            $("#projectName").val("");
+            $("#projectType").val("");
+            $("#city-picker").val("");
+            // if (projectType == "分类") {
+            //     projectType='';
+            // }
+            // var projectSize = $("#city-picker").val();
+            // if (projectSize == '地区'){
+            //     projectSize = '';
+            // }
+            $("#datetime-picker").val(value);
+            materialSolr('','',value,'',"/workMaterialCollect/total/listOn.do");
+        }
+    });
+
     function projectTypeUpdate() {
         $("#projectName").val("");
         var projectType = $("#projectType").val();
+        if (projectType=="分类"){
+            projectType ='';
+        }
         var html = "";
-        $.ajax({
-            type: "POST",
-            url: "/workMaterialCollect/total/list.do",
-            data: { 'projectType': projectType},
-            dataType: "json",
-            success: function (data) {
-                // alert(data);
-                if (data.length > 0) {
-                    html +='<div class="weui-flex" style="background-color: #f9f9f9">\n' +
-                        '            <div class="weui-flex__item model_fex">名称</div>\n' +
-                        '            <div class="weui-flex__item">型号</div>\n' +
-                        '            <div class="weui-flex__item">单位</div>\n' +
-                        '            <div class="weui-flex__item">含税价</div>\n' +
-                        '            <div class="weui-flex__item">除税价</div>\n' +
-                        '            <div class="weui-flex__item">分析</div>\n' +
-                        '       </div>';
-                    for (var i = 0; i < data.length; i++) {
-                        // alert(data[i].id)
-                        // alert(data[i].materialName);
-                        html+="<div class='weui-flex' style=''>" +
-                            "<div class='weui-flex__item model_fex'>"+data[i].materialName+"</div>" +
-                            "<div class='weui-flex__item'>"+data[i].specifications+"</div>" +
-                            "<div class='weui-flex__item'>"+data[i].unit+"</div>" +
-                            "<div class='weui-flex__item'>/</div>" +
-                            "<div class='weui-flex__item'>"+data[i].excludingTax+"</div>" +
-                            "<div class='weui-flex__item'><a href='/workMaterialCollect/total/view?id="+data[i].id+"'>查看</a></div>" +
-                            "</div>";
-                        html+="<div class='weui-flex' style=''>" +
-                            "<div class='weui-flex__item model_fex' style='font-size: 5px'>" +
-                            "来源:<span>"+data[i].projectName+"</span>项目;分类:<span>"+data[i].projectType+"</span>;工程时间<span>"+data[i].startDate+"/"+data[i].endDate+"</span>" +
-                            "</div>" +
-                            "</div>";
-                    }
-                }else {
-                    html+='';
-                }
-                $("#toList").html(html);
-            }
-        });
+        $("#datetime-picker").val("");
+        $("#city-picker").val("");
+        materialSolr('',projectType,'','',"/workMaterialCollect/total/listOn.do")
     }
     
     function materialNameUpdate() {
         var materialNameUpdate = $("#marterialName").val();
         if (materialNameUpdate=='材料'){
+            clear();
             $("#matarial").attr("style","");
             $("#project").attr("style","display: none");
-            loadlist()
+            materialSolr('','','','',"/workMaterialCollect/total/list.do");
         }else {
+            clear();
             $("#matarial").attr("style","display: none");
             $("#project").attr("style","");
-            loadlistProject();
+            projectSolr('','','',"/workMaterialCollect/total/project.list.do")
         }
 
     }
@@ -229,65 +208,134 @@
             $("#matarial").attr("style","");
             $("#project").attr("style","display: none");
             var projectName = $("#projectName").val();
-            var projectType = $("#projectType").val();
-            if (projectType == "分类") {
-                projectType='';
-            }
-            var times = $("#time").val();
-            if (times == '时间'){
-                times = '';
-            }
-            var projectSize = $("#projectSize").val();
-            if (projectSize == '地区'){
-                projectSize = '';
-            }
-            materialSolr(projectName,projectType,times,projectSize);
+            materialSolr(projectName,'','','',"/workMaterialCollect/total/listOn.do");
         }else {
             // $("#matarial").attr("style","display: none");
             // $("#project").attr("style","");
             // loadlistProject();
         }
     }
-    function materialSolr(materialName,projectType,time,projectSize) {
+    function materialSolr(materialName,projectType,time,projectSize,url) {
+        $("#loadDiv").show();
         var html = "";
-        alert(materialName);
         $.ajax({
             type: "POST",
-            url: "/workMaterialCollect/total/list.do",
-            data: {'materialName':materialName,'projectType':projectType,'time':time,'projectSize':projectSize},
+            url: url,
+            data: {'materialName':materialName,'projectType':projectType,'time':time,'projectSite':projectSize},
             dataType: "json",
             success: function (data) {
+                $("#loadDiv").hide();
                 // alert(data);
                 if (data.length > 0) {
-                    html +='<div class="weui-flex" style="background-color: #f9f9f9">\n' +
-                        '            <div class="weui-flex__item model_fex">名称</div>\n' +
-                        '            <div class="weui-flex__item">型号</div>\n' +
-                        '            <div class="weui-flex__item">单位</div>\n' +
-                        '            <div class="weui-flex__item">含税价</div>\n' +
-                        '            <div class="weui-flex__item">除税价</div>\n' +
-                        '            <div class="weui-flex__item">分析</div>\n' +
-                        '       </div>';
+                    html +='<div class="weui-cell" style="background-color: #f9f9f9;"><div class="weui-flex" style="width: 100%">\n' +
+                        '            <div class="weui-flex__item model_fex model_fex_font-size">名称</div>\n' +
+                        '            <div class="weui-flex__item model_fex_font-size">型号</div>\n' +
+                        '            <div class="weui-flex__item model_fex_font-size">单位</div>\n' +
+                        '            <div class="weui-flex__item model_fex_font-size">含税价</div>\n' +
+                        '            <div class="weui-flex__item model_fex_font-size">除税价</div>\n' +
+                        '            <div class="weui-flex__item model_fex_font-size">分析</div>\n' +
+                        '       </div></div>';
                     for (var i = 0; i < data.length; i++) {
-                        html+="<div class='weui-flex' style=''>" +
-                            "<div class='weui-flex__item model_fex'>"+data[i].materialName+"</div>" +
-                            "<div class='weui-flex__item'>"+data[i].specifications+"</div>" +
-                            "<div class='weui-flex__item'>"+data[i].unit+"</div>" +
-                            "<div class='weui-flex__item'>/</div>" +
-                            "<div class='weui-flex__item'>"+data[i].excludingTax+"</div>" +
-                            "<div class='weui-flex__item'><a href='/workMaterialCollect/total/view?id="+data[i].id+"'>查看</a></div>" +
-                            "</div>";
-                        html+="<div class='weui-flex' style=''>" +
-                            "<div class='weui-flex__item model_fex' style='font-size: 5px'>" +
-                            "来源:<span>"+data[i].projectName+"</span>项目;分类:<span>"+data[i].projectType+"</span>;工程时间<span>"+data[i].startDate+"/"+data[i].endDate+"</span>" +
-                            "</div>" +
+                        html+="<div class=\"weui-cell\"><div class='weui-flex' style='width: 100%'>" +
+                            "<div class='weui-flex__item model_fex model_fex_font-size'>"+data[i].materialName+"</div>" +
+                            "<div class='weui-flex__item model_fex_font-size'>"+data[i].specifications+"</div>" +
+                            "<div class='weui-flex__item model_fex_font-size'>"+data[i].unit+"</div>" +
+                            "<div class='weui-flex__item model_fex_font-size'>/</div>" +
+                            "<div class='weui-flex__item model_fex_font-size'>"+data[i].excludingTax+"</div>" +
+                            "<div class='weui-flex__item model_fex_font-size'><a href='/workMaterialCollect/total/view?id="+data[i].id+"'>查看</a></div>" +
+                            "</div></div>";
+                        html+="<div class=\"weui-cells__tips\" style='width: 100%'>" +
+                            "来源:<a href='/workMaterialCollect/total/item_op?id="+data[i].id+"'>"+data[i].projectName+"</a>项目;分类:<span>"+data[i].projectType+"</span>;工程时间:<span>"+judgeTime(data[i].startDate)+"/"+judgeTime(data[i].endDate)+"</span>" +
                             "</div>";
                     }
                 }else {
-                    html+="";
+                    html+="<div class='weui-cells__tips model_fex_font-size'>无数据</div>";
                 }
                 $("#toList").html(html);
             }
         });
     }
 </script>
+<script>
+    $("#projectArea").cityPicker({
+        title: "请选择地址",
+        onChange: function (picker, values, displayValues) {
+            $("#projectArea").val("");
+        },
+        onClose: function(picker) {
+            var s = $("#projectArea").val();
+            var index=s.lastIndexOf(' ');
+            var sub = s.substring(index+1,s.length);
+            $("#projectTime").val("");
+            $("#projectArea").val(sub);
+            projectSolr('',sub,'',"/workMaterialCollect/total/project.list.do");
+        }
+    });
+    $("#projectTime").datetimePicker({
+        times: function() {
+            return [];
+        },
+        onClose: function(picker) {
+            var value = picker.value[0];
+            // alert(value);
+            $("#projectName").val("");
+            $("#projectTime").val(value);
+            $("#projectArea").val("");
+            projectSolr('','',value,"/workMaterialCollect/total/project.list.do");
+        }
+    });
+    function projectSolr(projectName,projectSize,time,url) {
+        $("#loadDiv").show();
+        var html = "";
+        $.ajax({
+            type: "POST",
+            url: url,
+            data: {'projectName': projectName,'projectSite':projectSize,'time':time},
+            dataType: "json",
+            success: function (data) {
+                $("#loadDiv").hide();
+                if (data.length > 0) {
+                    html +='<div class="weui-cell" style="background-color: #f9f9f9;"><div class="weui-flex" style=\'width: 100%\'>\n' +
+                        '            <div class="weui-flex__item model_fex_font-size">项目名称</div>\n' +
+                        '            <div class="weui-flex__item model_fex_font-size">地区</div>\n' +
+                        '            <div class="weui-flex__item model_fex_font-size">分类</div>\n' +
+                        '            <div class="weui-flex__item model_fex_font-size">工程时间</div>\n' +
+                        '            <div class="weui-flex__item model_fex_font-size">详情</div>\n' +
+                        '        </div></div>';
+                    for (var k = 0; k < data.length; k++) {
+                        for (var i = 0; i < data[k].workMaterialCollectTypes.length; i++) {
+                            // alert(data[i].id)
+                            // alert(data[i].materialName);
+                            html+= "<div class=\"weui-cell\"><div class='weui-flex' style='width: 100%'>" +
+                                "<div class='weui-flex__item model_fex_font-size'>"+data[k].projectName+"</div>" +
+                                "<div class='weui-flex__item model_fex_font-size'>"+data[k].projectSite+"</div>" +
+                                "<div class='weui-flex__item model_fex_font-size'>"+data[k].workMaterialCollectTypes[i].projectType+"</div>" +
+                                "<div class='weui-flex__item model_fex_font-size'>/</div>" +
+                                "<div class='weui-flex__item model_fex_font-size'><a href='/workMaterialCollect/total/project.view?itemId="+data[k].id+"&projectTypeId="+data[k].workMaterialCollectTypes[i].id+"'>查看</a></div>" +
+                                "</div></div>";
+                        }
+                    }
+                }else {
+                    html+="<div class='weui-cells__tips model_fex_font-size'>无数据</div>";
+                }
+                $("#toList").html(html);
+            }
+        });
+    }
+
+    function judgeTime(time) {
+        var data = time.substring(0,4);
+        return data;
+    }
+    
+    function clear() {
+        $("#projectName").val("");
+        $("#projectType").val("");
+        $("#city-picker").val("");
+        $("#datetime-picker").val("");
+        $("#projectName").val("");
+        $("#projectArea").val("");
+        $("#projectAreaTime").val("");
+    }
+</script>
 </html>

src/main/webapp/webpage/modules/workmaterialcollect/modelCollect/workMaterialCollectModelProjectView.jsp

@@ -20,31 +20,38 @@
 <script>
 </script>
 <body>
-<div class='weui-cells'>
-    <div class="weui-flex" style="background-color: #999999">
-        <div class="weui-flex__item">项目</div>
-        <div class="weui-flex__item">地区</div>
-        <div class="weui-flex__item">分类</div>
-        <div class="weui-flex__item">时间</div>
+<div class='weui-cells' style="margin-top: 0px">
+    <div class="weui-cell" style="background-color: #f9f9f9;">
+        <div class="weui-flex" style="width: 100%">
+            <div class="weui-flex__item">项目</div>
+            <div class="weui-flex__item">地区</div>
+            <div class="weui-flex__item">分类</div>
+            <div class="weui-flex__item">时间</div>
+        </div>
     </div>
-    <div class="weui-flex" style="">
-        <div class="weui-flex__item">${workEng.projectName}</div>
-        <div class="weui-flex__item">${workEng.projectSite}</div>
-        <div class="weui-flex__item">${workType.projectType}</div>
-        <div class="weui-flex__item">${workEng.projectStartDate}/${workEng.projectEndDate}</div>
+    <div class="weui-cell" style="background-color: #f9f9f9;">
+        <div class="weui-flex" style="width: 100%">
+            <div class="weui-flex__item">${workEng.projectName}</div>
+            <div class="weui-flex__item">${workEng.projectSite}</div>
+            <div class="weui-flex__item">${workType.projectType}</div>
+            <div class="weui-flex__item">${workEng.modelStartDate}/${workEng.modelEndDate}</div>
+        </div>
     </div>
 </div>
 <div class='weui-cells'>
-    <div class="weui-flex" style="background-color: #999999">
-        <div class="weui-flex__item">名称</div>
-        <div class="weui-flex__item">型号</div>
-        <div class="weui-flex__item">单位</div>
-        <div class="weui-flex__item">含税价</div>
-        <div class="weui-flex__item">除税价</div>
-        <div class="weui-flex__item">分析</div>
+    <div class="weui-cell" style="background-color: #f9f9f9;">
+        <div class="weui-flex" style="width: 100%">
+            <div class="weui-flex__item">名称</div>
+            <div class="weui-flex__item">型号</div>
+            <div class="weui-flex__item">单位</div>
+            <div class="weui-flex__item">含税价</div>
+            <div class="weui-flex__item">除税价</div>
+            <div class="weui-flex__item">分析</div>
+        </div>
     </div>
     <c:forEach items="${workTotal}" var="w">
-        <div class="weui-flex" style="">
+    <div class="weui-cell" style="background-color: #f9f9f9;">
+        <div class="weui-flex" style="width: 100%">
             <div class="weui-flex__item">${w.materialName}</div>
             <div class="weui-flex__item">${w.specifications}</div>
             <div class="weui-flex__item">${w.unit}</div>
@@ -52,6 +59,7 @@
             <div class="weui-flex__item">${w.excludingTax}</div>
             <div class="weui-flex__item"><a href="/workMaterialCollect/total/project.view.do?id=${w.id}&itemId=${itemId}">查看</a></div>
         </div>
+    </div>
     </c:forEach>
 </div>
 

src/main/webapp/webpage/modules/workmaterialcollect/modelCollect/workMaterialCollectModelView.jsp

@@ -20,29 +20,37 @@
 <script>
 </script>
 <body>
-<div class='weui-cells'>
-    <div class="weui-flex" style="background-color: #999999">
-        <div class="weui-flex__item">名称</div>
-        <div class="weui-flex__item">型号</div>
-        <div class="weui-flex__item">单位</div>
+<div class='weui-cells' style="margin-top: 0px">
+    <div class="weui-cell" style="background-color: #f9f9f9;">
+        <div class="weui-flex" style="width: 100%">
+            <div class="weui-flex__item">名称</div>
+            <div class="weui-flex__item">型号</div>
+            <div class="weui-flex__item">单位</div>
+        </div>
     </div>
-    <div class="weui-flex" style="">
-        <div class="weui-flex__item">${workCollect.materialName}</div>
-        <div class="weui-flex__item">${workCollect.specifications}</div>
-        <div class="weui-flex__item">${workCollect.unit}</div>
+    <div class="weui-cell" style="background-color: #f9f9f9;">
+        <div class="weui-flex" style="width: 100%">
+            <div class="weui-flex__item">${workCollect.materialName}</div>
+            <div class="weui-flex__item">${workCollect.specifications}</div>
+            <div class="weui-flex__item">${workCollect.unit}</div>
+        </div>
     </div>
 </div>
 
 <div class='weui-cells'>
-    <div class="weui-flex" style="background-color: #999999">
-        <div class="weui-flex__item">最高除税价</div>
-        <div class="weui-flex__item">最低除税价</div>
-        <div class="weui-flex__item">平均价</div>
+    <div class="weui-cell" style="background-color: #f9f9f9;">
+        <div class="weui-flex" style="width: 100%">
+            <div class="weui-flex__item">最高除税价</div>
+            <div class="weui-flex__item">最低除税价</div>
+            <div class="weui-flex__item">平均价</div>
+        </div>
     </div>
-    <div class="weui-flex" style="">
-        <div class="weui-flex__item">${taxMax}</div>
-        <div class="weui-flex__item">${taxMin}</div>
-        <div class="weui-flex__item">${taxAvg}</div>
+    <div class="weui-cell" style="background-color: #f9f9f9;">
+        <div class="weui-flex" style="width: 100%">
+            <div class="weui-flex__item">${taxMax}</div>
+            <div class="weui-flex__item">${taxMin}</div>
+            <div class="weui-flex__item">${taxAvg}</div>
+        </div>
     </div>
 </div>
 

src/main/webapp/webpage/modules/workmaterialcollect/modelCollect/workMaterialCollectModelitemView.jsp

@@ -0,0 +1,45 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+    <title>材料价格</title>
+    <meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=0,viewport-fit=cover">
+    <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport" />
+    <meta content="yes" name="apple-mobile-web-app-capable">
+    <meta content="black" name="apple-mobile-web-app-status-bar-style">
+    <meta content="telephone=no" name="format-detection">
+    <link rel="stylesheet" href="https://res.wx.qq.com/open/libs/weui/1.1.2/weui-for-work.min.css"/>
+    <script src="/static/jquery/jquery-2.1.1.min.js"></script>
+    <script src="/static/weixin/js/jquery-weui.min.js"></script>
+    <link rel="stylesheet" href="/static/weixin/css/jquery-weui.min.css"/>
+    <link rel="stylesheet" href="${ctx}/static/weixin/example/example.css"/>
+    <link rel="stylesheet" href="/static/wechat/wechat-btn.css"/>
+</head>
+<style>
+</style>
+<script>
+</script>
+<body>
+<div class='weui-cells' style="margin-top: 0px">
+    <div class="weui-cell" style="background-color: #f9f9f9;">
+        <div class="weui-flex" style="width: 100%">
+            <div class="weui-flex__item">项目</div>
+            <div class="weui-flex__item">地区</div>
+            <div class="weui-flex__item">分类</div>
+            <div class="weui-flex__item">时间</div>
+        </div>
+    </div>
+    <div class="weui-cell" style="background-color: #f9f9f9;">
+        <div class="weui-flex" style="width: 100%">
+            <div class="weui-flex__item">${workEng.projectName}</div>
+            <div class="weui-flex__item">${workEng.projectSite}</div>
+            <div class="weui-flex__item">${workEng.projectType}</div>
+            <div class="weui-flex__item">${workEng.modelStartDate}/${workEng.modelEndDate}</div>
+        </div>
+    </div>
+</div>
+</body>
+<script type="text/javascript">
+
+</script>
+</html>