Procházet zdrojové kódy

输变电材料库功能修改,质量复核功能修改

user5 před 3 roky
rodič
revize
3903658ecd
15 změnil soubory, kde provedl 673 přidání a 98 odebrání
  1. 8 8
      src/main/java/com/jeeplus/modules/pojectMaterialsWarehouse/service/ProjectMaterialCollectService.java
  2. 128 0
      src/main/java/com/jeeplus/modules/pojectMaterialsWarehouse/web/PojectMaterialsWarehouseAllController.java
  3. 6 6
      src/main/java/com/jeeplus/modules/pojectMaterialsWarehouse/web/PojectMaterialsWarehouseController.java
  4. 34 0
      src/main/java/com/jeeplus/modules/projectrecord/service/ProjectRecordsService.java
  5. 15 0
      src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectMessageNewController.java
  6. 19 4
      src/main/resources/mappings/modules/pojectMaterialsWarehouse/ProjectMaterialsWarehouseDao.xml
  7. binární
      src/main/webapp/dot/审定单模板.xls
  8. 31 28
      src/main/webapp/webpage/modules/pojectMaterialsWarehouse/projectMaterialCollectForm.jsp
  9. 17 14
      src/main/webapp/webpage/modules/pojectMaterialsWarehouse/projectMaterialCollectInfoList.jsp
  10. 17 14
      src/main/webapp/webpage/modules/pojectMaterialsWarehouse/projectMaterialCollectInfoView.jsp
  11. 375 0
      src/main/webapp/webpage/modules/pojectMaterialsWarehouse/projectMaterialsWarehouseAllList.jsp
  12. 12 10
      src/main/webapp/webpage/modules/pojectMaterialsWarehouse/projectMaterialsWarehouseForm.jsp
  13. 7 11
      src/main/webapp/webpage/modules/pojectMaterialsWarehouse/projectMaterialsWarehouseList.jsp
  14. 1 0
      src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/new/reportForm.jsp
  15. 3 3
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/judgementReport/projectRecordsJudgementMessageAudit.jsp

+ 8 - 8
src/main/java/com/jeeplus/modules/pojectMaterialsWarehouse/service/ProjectMaterialCollectService.java

@@ -27,10 +27,10 @@ public class ProjectMaterialCollectService extends CrudService<ProjectMaterialCo
         page.setCountFlag(false);
         projectMaterialCollectInfo.setPage(page);
         List<ProjectMaterialCollectInfo> list = dao.findList(projectMaterialCollectInfo);
-        for (ProjectMaterialCollectInfo info : list) {
+        /*for (ProjectMaterialCollectInfo info : list) {
             info.setProjectType(DictUtils.getMainDictLabel(info.getProjectType(), "work_material_engineer_type", ""));
             info.setProjectPart(DictUtils.getMainDictLabel(info.getProjectPart(), "work_material_engineer_part1", ""));
-        }
+        }*/
         page.setList(list);
         return page;
     }
@@ -45,16 +45,16 @@ public class ProjectMaterialCollectService extends CrudService<ProjectMaterialCo
         //根据项目id查询项目信息
         for (ProjectMaterialCollectInfo info: materialCollects) {
             if(StringUtils.isNotBlank(info.getMaterialName())
-                    && StringUtils.isNotBlank(info.getMaterialName())
+                    /*&& StringUtils.isNotBlank(info.getMaterialName())
                     && StringUtils.isNotBlank(info.getSpecifications())
                     && StringUtils.isNotBlank(info.getUnit())
                     && StringUtils.isNotBlank(info.getUserTheParts())
-                    && StringUtils.isNotBlank(info.getExcludingTax())){
+                    && StringUtils.isNotBlank(info.getExcludingTax())*/){
                 info.setProjectType(workMaterialCollectType.getProjectType());
                 info.setProjectPart(workMaterialCollectType.getProjectPart());
                 info.setProjectId(workMaterialCollectType.getProjectId());
-                info.setStartDate(workMaterialCollectType.getStartDate());
-                info.setEndDate(workMaterialCollectType.getEndDate());
+                /*info.setStartDate(workMaterialCollectType.getStartDate());
+                info.setEndDate(workMaterialCollectType.getEndDate());*/
                 info.preInsert();
             }else {
                 return "输变电项目材料文件数据填写不正确";
@@ -72,11 +72,11 @@ public class ProjectMaterialCollectService extends CrudService<ProjectMaterialCo
     public String singleSave(ProjectMaterialCollectInfo info){
         //根据项目id查询项目信息
         if(StringUtils.isNotBlank(info.getMaterialName())
-                && StringUtils.isNotBlank(info.getMaterialName())
+                /*&& StringUtils.isNotBlank(info.getMaterialName())
                 && StringUtils.isNotBlank(info.getSpecifications())
                 && StringUtils.isNotBlank(info.getUnit())
                 && StringUtils.isNotBlank(info.getUserTheParts())
-                && StringUtils.isNotBlank(info.getExcludingTax())){
+                && StringUtils.isNotBlank(info.getExcludingTax())*/){
             if(StringUtils.isBlank(info.getId())){
                 info.preInsert();
                 dao.insert(info);

+ 128 - 0
src/main/java/com/jeeplus/modules/pojectMaterialsWarehouse/web/PojectMaterialsWarehouseAllController.java

@@ -0,0 +1,128 @@
+package com.jeeplus.modules.pojectMaterialsWarehouse.web;
+
+import com.jeeplus.common.persistence.Page;
+import com.jeeplus.common.web.BaseController;
+import com.jeeplus.modules.pojectMaterialsWarehouse.entity.ProjectMaterialCollectInfo;
+import com.jeeplus.modules.pojectMaterialsWarehouse.service.ProjectMaterialCollectService;
+import com.jeeplus.modules.projectcontentinfo.entity.Projectcontentinfo;
+import com.jeeplus.modules.projectcontentinfo.service.ProjectcontentinfoService;
+import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
+import com.jeeplus.modules.projectrecord.service.ProjectRecordsService;
+import com.jeeplus.modules.sys.utils.UserUtils;
+import com.jeeplus.modules.workclientinfo.entity.WorkClientLinkman;
+import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
+import org.activiti.engine.HistoryService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * @author: 徐滕
+ * @create: 2021-11-22 09:12
+ **/
+@Controller
+@RequestMapping(value = "${adminPath}/project/projectMaterialsWarehouseAll")
+public class PojectMaterialsWarehouseAllController extends BaseController {
+
+    @Autowired
+    private ProjectRecordsService projectRecordsService;
+    @Autowired
+    protected HistoryService historyService;
+    @Autowired
+    private ProjectcontentinfoService projectcontentinfoService;
+    @Autowired
+    private ProjectMaterialCollectService projectMaterialCollectService;
+
+
+    /**
+     * 项目列表页面
+     * @param projectRecords
+     * @param request
+     * @param response
+     * @param model
+     * @return
+     */
+    @RequiresPermissions("project:projectMaterialsWarehouseAll:list")
+    @RequestMapping(value = {"list", ""})
+    public String list(ProjectRecords projectRecords, HttpServletRequest request, HttpServletResponse response, Model model) {
+        if(UserUtils.isManager()){
+            model.addAttribute("flag","1");
+        }
+        projectRecords.setProjectStatus(5);
+        Page<ProjectRecords> page = projectRecordsService.findAllPage(new Page<ProjectRecords>(request, response), projectRecords);
+        //无合同状态下,获取委托方的名称
+        List<ProjectRecords> list = page.getList();
+        for (int i = 0; i < list.size(); i++) {
+            ProjectRecords records1 = list.get(i);
+            if (records1.getWorkContractInfo() == null) {
+                projectRecordsService.queryLinkmanInfos(records1);
+                if (records1.getWorkClientLinkmanList() != null && records1.getWorkClientLinkmanList().size() > 0) {
+                    WorkClientLinkman linkman = records1.getWorkClientLinkmanList().get(0);
+                    WorkContractInfo contractInfo = new WorkContractInfo();
+                    contractInfo.setClient(linkman.getClientId());
+                    records1.setWorkContractInfo(contractInfo);
+                }
+            }
+        }
+        for (ProjectRecords record : list) {
+            Projectcontentinfo select = new Projectcontentinfo();
+            ProjectRecords project = new ProjectRecords();
+            project.setId(record.getId());
+            select.setParentIds("0,");
+            select.setProject(project);
+            List<Projectcontentinfo> p = projectcontentinfoService.findListByProject(select);
+            //添加工作内容id
+            if(p.size()>0){
+                record.setContentPId(p.get(0).getId());
+                record.setParentIds("0,");
+                record.setDictType("");
+            }
+        }
+        model.addAttribute("page", page);
+        return "modules/pojectMaterialsWarehouse/projectMaterialsWarehouseAllList";
+    }
+
+    /**
+     * 子项目信息查看
+     * @param projectMaterialCollectInfo
+     * @param request
+     * @param response
+     * @param model
+     * @return
+     */
+    @RequestMapping(value = "particularsList")
+    public String particularsList(ProjectMaterialCollectInfo projectMaterialCollectInfo, HttpServletRequest request, HttpServletResponse response, Model model) {
+        Page<ProjectMaterialCollectInfo> page = projectMaterialCollectService.findPage(new Page<ProjectMaterialCollectInfo>(request, response), projectMaterialCollectInfo);
+
+        model.addAttribute("page", page);
+        model.addAttribute("projectId", projectMaterialCollectInfo.getProjectId());
+        model.addAttribute("startDate", projectMaterialCollectInfo.getStartDate());
+        model.addAttribute("endDate", projectMaterialCollectInfo.getEndDate());
+        return "modules/pojectMaterialsWarehouse/projectMaterialCollectInfoList";
+    }
+
+    /**
+     * 子项目信息查看
+     * @param projectMaterialCollectInfo
+     * @param request
+     * @param response
+     * @param model
+     * @return
+     */
+    @RequestMapping(value = "particularsListView")
+    public String particularsListView(ProjectMaterialCollectInfo projectMaterialCollectInfo, HttpServletRequest request, HttpServletResponse response, Model model) {
+        Page<ProjectMaterialCollectInfo> page = projectMaterialCollectService.findPage(new Page<ProjectMaterialCollectInfo>(request, response), projectMaterialCollectInfo);
+
+        model.addAttribute("page", page);
+        model.addAttribute("projectId", projectMaterialCollectInfo.getProjectId());
+        model.addAttribute("startDate", projectMaterialCollectInfo.getStartDate());
+        model.addAttribute("endDate", projectMaterialCollectInfo.getEndDate());
+        return "modules/pojectMaterialsWarehouse/projectMaterialCollectInfoView";
+    }
+}

+ 6 - 6
src/main/java/com/jeeplus/modules/pojectMaterialsWarehouse/web/PojectMaterialsWarehouseController.java

@@ -181,7 +181,7 @@ public class PojectMaterialsWarehouseController extends BaseController {
                 map.put("str","没有找到关联项目信息");
                 return map;
             }
-            if(StringUtils.isBlank(workMaterialCollectType.getProjectType())){
+            /*if(StringUtils.isBlank(workMaterialCollectType.getProjectType())){
                 map.put("str","工程类型未选择");
                 return map;
             }
@@ -192,7 +192,7 @@ public class PojectMaterialsWarehouseController extends BaseController {
             if(null == workMaterialCollectType.getStartDate() || null == workMaterialCollectType.getEndDate()){
                 map.put("str","工程日期未填写");
                 return map;
-            }
+            }*/
             ImportExcel ei = new ImportExcel(file, 1, 0);
             List<ProjectMaterialCollectInfo> materialCollects = ei.getDataList(ProjectMaterialCollectInfo.class);
             String saveResult = projectMaterialCollectService.save(workMaterialCollectType, materialCollects);
@@ -216,18 +216,18 @@ public class PojectMaterialsWarehouseController extends BaseController {
                 map.put("str","没有找到关联项目信息");
                 return map;
             }
-            if(StringUtils.isBlank(projectMaterialCollectInfo.getProjectType())){
+            /*if(StringUtils.isBlank(projectMaterialCollectInfo.getProjectType())){
                 map.put("str","工程类型未选择");
                 return map;
             }
             if(StringUtils.isBlank(projectMaterialCollectInfo.getProjectPart())){
                 map.put("str","工程部位未选择");
                 return map;
-            }
-            if(null == projectMaterialCollectInfo.getStartDate() || null == projectMaterialCollectInfo.getEndDate()){
+            }*/
+            /*if(null == projectMaterialCollectInfo.getStartDate() || null == projectMaterialCollectInfo.getEndDate()){
                 map.put("str","工程日期未填写");
                 return map;
-            }
+            }*/
             String saveResult = projectMaterialCollectService.singleSave(projectMaterialCollectInfo);
             map.put("str",saveResult);
             map.put("success",true);

+ 34 - 0
src/main/java/com/jeeplus/modules/projectrecord/service/ProjectRecordsService.java

@@ -251,6 +251,40 @@ public class ProjectRecordsService extends CrudService<ProjectRecordsDao, Projec
 		return page;
 	}
 
+	public Page<ProjectRecords> findAllPage(Page<ProjectRecords> page, ProjectRecords projectRecords) {
+		//设置数据权限
+        /*if(!UserUtils.getUser().isAdmin()) {
+            String dataScopeSql = dataScopeFilterOR(projectRecords.getCurrentUser(), "o", "u", "s", MenuStatusEnum.WORK_RECORDS.getValue());
+            if(StringUtils.isBlank(dataScopeSql)){
+				dataScopeSql = dataScopeFilterOR(projectRecords.getCurrentUser(), "o", "u", "s", MenuStatusEnum.OVERALL_WORK_RECORDS.getValue());
+			}
+            projectRecords.getSqlMap().put("dsf", dataScopeSql);
+        }*/
+        //添加全过程项目类型标识
+		projectRecords.setProjectType("3");
+		String lockProjectIds = JedisUtils.get(UserUtils.getUser().getId() + "overAllLockProject");
+		if(com.jeeplus.common.utils.StringUtils.isNotBlank(lockProjectIds)){
+			List<String> idList = Arrays.asList(lockProjectIds.split(","));
+			projectRecords.setIdList(idList);
+		}
+        //查询数据条数
+        int count = dao.queryCount(projectRecords);
+        page.setCount(count);
+        page.setCountFlag(false);
+        projectRecords.setPage(page);
+		List<ProjectRecords> recordsList = findList(projectRecords);
+		//查询负责人信息
+		for (ProjectRecords records : recordsList) {
+			this.queryContractInfos(records);
+			List<User> users = workProjectUserDao.queryProjectUsers(records.getId(), "1");
+			records.setProjectLeaders(users);
+			records.setLeaderNameStr(Collections3.extractToString(users, "name", ","));
+			records.setLeaderIds(Collections3.extractToString(users, "id", ","));
+		}
+		page.setList(recordsList);
+		return page;
+	}
+
 	public Page<ProjectRecords> processProjectPlanPage(Page<ProjectRecords> page, ProjectRecords projectRecords) {
 		//设置数据权限
         if(!UserUtils.getUser().isAdmin()) {

+ 15 - 0
src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectMessageNewController.java

@@ -2,8 +2,10 @@ package com.jeeplus.modules.ruralprojectrecords.web;
 
 import com.google.common.collect.Lists;
 import com.jeeplus.common.config.Global;
+import com.jeeplus.common.oss.OSSClientUtil;
 import com.jeeplus.common.utils.MyBeanUtils;
 import com.jeeplus.common.utils.StringUtils;
+import com.jeeplus.common.utils.ThisLocalityDownloadUtil;
 import com.jeeplus.common.web.BaseController;
 import com.jeeplus.modules.act.entity.Act;
 import com.jeeplus.modules.act.service.ActTaskService;
@@ -2198,4 +2200,17 @@ public class RuralCostProjectMessageNewController extends BaseController {
         }
         return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
     }
+
+    /**
+     * 下载导入项目数据模板
+     */
+    @RequestMapping(value = "downloadTemplate")
+    public void downloadTemplate(HttpServletRequest request,HttpServletResponse response) {
+        try {
+            ThisLocalityDownloadUtil download = new ThisLocalityDownloadUtil();
+            download.download("审定单模板.xls",request,response);
+        } catch (Exception e) {
+            logger.error("审定单模板下载失败!",e);
+        }
+    }
 }

+ 19 - 4
src/main/resources/mappings/modules/pojectMaterialsWarehouse/ProjectMaterialsWarehouseDao.xml

@@ -46,10 +46,18 @@
 				<if test="dbName == 'mysql'">concat('%',#{materialName},'%')</if>
 			</if>
 			<if test="projectType != null and projectType != ''">
-				AND a.projectType = #{projectType}
+				AND a.projectType LIKE
+				<if test="dbName == 'oracle'">'%'||#{projectType}||'%'</if>
+				<if test="dbName == 'mssql'">'%'+#{projectType}+'%'</if>
+				<if test="dbName == 'mysql'">concat('%',#{projectType},'%')</if>
+
 			</if>
 			<if test="projectPart != null and projectPart != ''">
-				AND a.projectPart = #{projectPart}
+				AND a.projectPart LIKE
+				<if test="dbName == 'oracle'">'%'||#{projectPart}||'%'</if>
+				<if test="dbName == 'mssql'">'%'+#{projectPart}+'%'</if>
+				<if test="dbName == 'mysql'">concat('%',#{projectPart},'%')</if>
+
 			</if>
 			<if test="projectId != null and projectId != ''">
 				AND a.projectId = #{projectId}
@@ -92,10 +100,17 @@
 				<if test="dbName == 'mysql'">concat('%',#{materialName},'%')</if>
 			</if>
 			<if test="projectType != null and projectType != ''">
-				AND a.projectType = #{projectType}
+				AND a.projectType LIKE
+				<if test="dbName == 'oracle'">'%'||#{projectType}||'%'</if>
+				<if test="dbName == 'mssql'">'%'+#{projectType}+'%'</if>
+				<if test="dbName == 'mysql'">concat('%',#{projectType},'%')</if>
+
 			</if>
 			<if test="projectPart != null and projectPart != ''">
-				AND a.projectPart = #{projectPart}
+				AND a.projectPart LIKE
+				<if test="dbName == 'oracle'">'%'||#{projectPart}||'%'</if>
+				<if test="dbName == 'mssql'">'%'+#{projectPart}+'%'</if>
+				<if test="dbName == 'mysql'">concat('%',#{projectPart},'%')</if>
 			</if>
 			<if test="projectId != null and projectId != ''">
 				AND a.projectId = #{projectId}

binární
src/main/webapp/dot/审定单模板.xls


+ 31 - 28
src/main/webapp/webpage/modules/pojectMaterialsWarehouse/projectMaterialCollectForm.jsp

@@ -87,25 +87,8 @@
             <input type="hidden" id="projectId" name="projectId" value="${projectMaterialCollectInfo.projectId}">
             <div class="form-group layui-row">
                 <div class="form-group-label"><h2>基础信息</h2></div>
-                <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label"><span class="require-item">*</span>工程类型:</label>
-                    <div class="layui-input-block">
-                        <form:select id="projectType" path="projectType" class="form-control simple-select required">
-                            <form:option value="" label=""/>
-                            <form:options id="test" items="${fns:getMainDictList('work_material_engineer_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-                        </form:select>
-                    </div>
-                </div>
-                <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label"><span class="require-item">*</span>工程部位:</label>
-                    <div class="layui-input-block">
-                        <form:select path="projectPart" id="projectPart" class="form-control simple-select required">
-                            <form:option value="" label=""/>
-                            <form:options items="${fns:getMainDictList('work_material_engineer_part1')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-                        </form:select>
-                    </div>
-                </div>
-                <div class="layui-item layui-col-sm6 lw7">
+
+                <%--<div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>工程日期:</label>
                     <div class="layui-input-block readOnlyFFF">
                         <input id="startDate" name="startDate" placeholder="开始时间" type="text" readonly="readonly" maxlength="20" value="<fmt:formatDate value="${projectMaterialCollectInfo.startDate}" pattern="yyyy-MM-dd"/>" class="laydate-icondate required form-control layer-date layui-input laydate-icon query-group"
@@ -116,7 +99,7 @@
                         />
                         </input>
                     </div>
-                </div>
+                </div>--%>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>材料名称:</label>
                     <div class="layui-input-block">
@@ -124,27 +107,47 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label"><span class="require-item">*</span>规格:</label>
+                    <label class="layui-form-label">规格:</label>
                     <div class="layui-input-block">
-                        <form:input path="specifications" placeholder="请输入材料规格" htmlEscape="false" maxlength="64"  class="form-control layui-input required"/>
+                        <form:input path="specifications" placeholder="请输入材料规格" htmlEscape="false" maxlength="64"  class="form-control layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label"><span class="require-item">*</span>单位:</label>
+                    <label class="layui-form-label">单位:</label>
                     <div class="layui-input-block">
-                        <form:input path="unit" placeholder="请输入材料单位" htmlEscape="false" maxlength="64" class="form-control layui-input required"/>
+                        <form:input path="unit" placeholder="请输入材料单位" htmlEscape="false" maxlength="64" class="form-control layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label"><span class="require-item">*</span>除税市场价:</label>
+                    <label class="layui-form-label">除税市场价:</label>
                     <div class="layui-input-block">
-                        <form:input path="excludingTax" placeholder="请输入材料除税市场价" htmlEscape="false" onkeyup="wirteNum(this)" maxlength="64" class="form-control layui-input required"/>
+                        <form:input path="excludingTax" placeholder="请输入材料除税市场价" htmlEscape="false" onkeyup="wirteNum(this)" maxlength="64" class="form-control layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label"><span class="require-item">*</span>使用部位:</label>
+                    <label class="layui-form-label">使用部位:</label>
                     <div class="layui-input-block">
-                        <form:input path="userTheParts" placeholder="请输入材料使用部位" htmlEscape="false" maxlength="64" class="form-control layui-input required"/>
+                        <form:input path="userTheParts" placeholder="请输入材料使用部位" htmlEscape="false" maxlength="64" class="form-control layui-input"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">工程类型:</label>
+                    <div class="layui-input-block">
+                        <form:input path="projectType" placeholder="请输入工程类型" htmlEscape="false" maxlength="64" class="form-control layui-input"/>
+                        <%--<form:select id="projectType" path="projectType" class="form-control simple-select required">
+                            <form:option value="" label=""/>
+                            <form:options id="test" items="${fns:getMainDictList('work_material_engineer_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+                        </form:select>--%>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">工程部位:</label>
+                    <div class="layui-input-block">
+                        <form:input path="projectPart" placeholder="请输入工程部位" htmlEscape="false" maxlength="64" class="form-control layui-input"/>
+                        <%--<form:select path="projectPart" id="projectPart" class="form-control simple-select required">
+                            <form:option value="" label=""/>
+                            <form:options items="${fns:getMainDictList('work_material_engineer_part1')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+                        </form:select>--%>
                     </div>
                 </div>
 

+ 17 - 14
src/main/webapp/webpage/modules/pojectMaterialsWarehouse/projectMaterialCollectInfoList.jsp

@@ -284,7 +284,17 @@
 								<form:input path="materialName" htmlEscape="false" maxlength="64"  class=" form-control  layui-input"/>
 							</div>
 						</div>
-						<div class="layui-item query athird ">
+						<div class="layui-item query athird">
+							<label class="layui-form-label">工程类型:</label>
+							<div class="layui-input-block with-icon">
+								<form:input path="projectType" htmlEscape="false" maxlength="64" class="form-control layui-input"/>
+									<%--<form:select path="projectType" class="form-control simple-select">
+                                        <form:option value="" label=""/>
+                                        <form:options items="${fns:getMainDictList('work_material_engineer_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+                                    </form:select>--%>
+							</div>
+						</div>
+						<%--<div class="layui-item query athird ">
 							<label class="layui-form-label">工程日期:</label>
 							<div class="layui-input-block">
 								<input id="beginDate" name="beginDate" placeholder="开始时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
@@ -295,7 +305,7 @@
 									   value="<fmt:formatDate value="${endDate}" pattern="yyyy-MM-dd"/>"/>
 								</input>
 							</div>
-						</div>
+						</div>--%>
 						<div class="layui-item fr">
 							<div class="input-group">
 								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
@@ -309,22 +319,15 @@
 					</div>
 					<div id="moresees" style="clear:both;display:none;" class="lw6">
 
-						<div class="layui-item query athird">
-							<label class="layui-form-label">工程类型:</label>
-							<div class="layui-input-block with-icon">
-								<form:select path="projectType" class="form-control simple-select">
-									<form:option value="" label=""/>
-									<form:options items="${fns:getMainDictList('work_material_engineer_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-								</form:select>
-							</div>
-						</div>
+
 						<div class="layui-item query athird">
 							<label class="layui-form-label">工程部位:</label>
 							<div class="layui-input-block with-icon">
-								<form:select path="projectPart" class="form-control simple-select">
+								<form:input path="projectType" htmlEscape="false" maxlength="64" class="form-control layui-input"/>
+								<%--<form:select path="projectPart" class="form-control simple-select">
 									<form:option value="" label=""/>
 									<form:options items="${fns:getMainDictList('work_material_engineer_part1')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-								</form:select>
+								</form:select>--%>
 							</div>
 						</div>
 
@@ -389,7 +392,7 @@
                         return "<span title=\"" + d.excludingTax + "\">" + d.excludingTax + "</span>";
                     }}
                 ,{field:'userTheParts',align:'center', title: '使用部位', width:100}
-                ,{field:'projectDate',align:'center', title: '工程日期', width:180}
+                //,{field:'projectDate',align:'center', title: '工程日期', width:180}
                 ,{field:'projectType',align:'center', title: '工程类型', width:100}
                 ,{field:'projectSite',align:'center', title: '工程地点', width:100}
                 ,{field:'projectPart',align:'center', title: '工程部位', width:100}

+ 17 - 14
src/main/webapp/webpage/modules/pojectMaterialsWarehouse/projectMaterialCollectInfoView.jsp

@@ -208,7 +208,17 @@
 								<form:input path="materialName" htmlEscape="false" maxlength="64"  class=" form-control  layui-input"/>
 							</div>
 						</div>
-						<div class="layui-item query athird ">
+						<div class="layui-item query athird">
+							<label class="layui-form-label">工程类型:</label>
+							<div class="layui-input-block with-icon">
+								<form:input path="projectType" htmlEscape="false" maxlength="64" class="form-control layui-input"/>
+									<%--<form:select path="projectType" class="form-control simple-select">
+                                        <form:option value="" label=""/>
+                                        <form:options items="${fns:getMainDictList('work_material_engineer_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+                                    </form:select>--%>
+							</div>
+						</div>
+						<%--<div class="layui-item query athird ">
 							<label class="layui-form-label">工程日期:</label>
 							<div class="layui-input-block">
 								<input id="beginDate" name="beginDate" placeholder="开始时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
@@ -219,7 +229,7 @@
 									   value="<fmt:formatDate value="${endDate}" pattern="yyyy-MM-dd"/>"/>
 								</input>
 							</div>
-						</div>
+						</div>--%>
 						<div class="layui-item fr">
 							<div class="input-group">
 								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
@@ -233,22 +243,15 @@
 					</div>
 					<div id="moresees" style="clear:both;display:none;" class="lw6">
 
-						<div class="layui-item query athird">
-							<label class="layui-form-label">工程类型:</label>
-							<div class="layui-input-block with-icon">
-								<form:select path="projectType" class="form-control simple-select">
-									<form:option value="" label=""/>
-									<form:options items="${fns:getMainDictList('work_material_engineer_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-								</form:select>
-							</div>
-						</div>
+
 						<div class="layui-item query athird">
 							<label class="layui-form-label">工程部位:</label>
 							<div class="layui-input-block with-icon">
-								<form:select path="projectPart" class="form-control simple-select">
+								<form:input path="projectPart" htmlEscape="false" maxlength="64" class="form-control layui-input"/>
+								<%--<form:select path="projectPart" class="form-control simple-select">
 									<form:option value="" label=""/>
 									<form:options items="${fns:getMainDictList('work_material_engineer_part1')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-								</form:select>
+								</form:select>--%>
 							</div>
 						</div>
 
@@ -310,7 +313,7 @@
                         return "<span title=\"" + d.excludingTax + "\">" + d.excludingTax + "</span>";
                     }}
                 ,{field:'userTheParts',align:'center', title: '使用部位', width:100}
-                ,{field:'projectDate',align:'center', title: '工程日期', width:180}
+                //,{field:'projectDate',align:'center', title: '工程日期', width:180}
                 ,{field:'projectType',align:'center', title: '工程类型', width:100}
                 ,{field:'projectSite',align:'center', title: '工程地点', width:100}
                 ,{field:'projectPart',align:'center', title: '工程部位', width:100}

+ 375 - 0
src/main/webapp/webpage/modules/pojectMaterialsWarehouse/projectMaterialsWarehouseAllList.jsp

@@ -0,0 +1,375 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>项目登记</title>
+	<meta name="decorator" content="default"/>
+    <link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />
+	<%--<script src="${ctxStatic}/layer-v2.3/laydate/laydate.js"></script>--%>
+    <style>
+        .layui-table th{
+            font-size: 14px;
+            /*表头内容居中显示*/
+            text-align: center;
+        }
+		.pid{
+			font-size:14px;
+			font-weight:400;
+		}
+    </style>
+	<script type="text/javascript">
+        $(document).ready(function() {
+
+            //搜索框收放
+            $('#moresee').click(function(){
+                if($('#moresees').is(':visible'))
+                {
+                    $('#moresees').slideUp(0,resizeListWindow2);
+                    $('#moresee i').removeClass("glyphicon glyphicon-menu-up").addClass("glyphicon glyphicon-menu-down");
+                }else{
+                    $('#moresees').slideDown(0,resizeListWindow2);
+                    $('#moresee i').removeClass("glyphicon glyphicon-menu-down").addClass("glyphicon glyphicon-menu-up");
+                }
+            });
+            laydate.render({
+                elem: '#beginDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎,因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
+                event: 'focus', //响应事件。如果没有传入event,则按照默认的click
+                type : 'date'
+, trigger: 'click'
+            });
+            laydate.render({
+                elem: '#endDate', //目标元素。由于laydate.js封装了一个轻量级的选择器引擎,因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
+                event: 'focus', //响应事件。如果没有传入event,则按照默认的click
+                type : 'date'
+, trigger: 'click'
+            });
+        });
+
+        function reset() {
+            $("#searchForm").resetForm();
+        }
+
+        function openDialog(title,url,width,height,target) {
+
+            if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端,就使用自适应大小弹窗
+                width = 'auto';
+                height = 'auto';
+            } else {//如果是PC端,根据用户设置的width和height显示。
+
+            }
+
+            top.layer.open({
+                type: 2,
+                area: [width, height],
+                title: title,
+                maxmin: true, //开启最大化最小化按钮
+                content: url,
+                skin: 'three-btns',
+                btn: ['提交', '关闭'],
+                btn1: function(index, layero){
+                    var body = top.layer.getChildFrame('body', index);
+                    var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象,执行iframe页的方法:iframeWin.method();
+                    var inputForm = body.find('#inputForm');
+                    var top_iframe;
+                    if(target){
+                        top_iframe = target;//如果指定了iframe,则在改frame中跳转
+                    }else{
+                        top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+                    }
+                    inputForm.attr("target",top_iframe);//表单提交成功后,从服务器返回的url在当前tab中展示
+                    if(iframeWin.contentWindow.doSubmit(1) ){
+                        // top.layer.close(index);//关闭对话框。
+                        setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒,对应360 7.1版本bug
+                    }
+                },
+                btn2: function (index) {
+                }
+            });
+        }
+
+        function openDialogre(title,url,width,height,target,buttons) {
+
+            if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端,就使用自适应大小弹窗
+                width = 'auto';
+                height = 'auto';
+            } else {//如果是PC端,根据用户设置的width和height显示。
+
+            }
+            var split = buttons.split(",");
+            top.layer.open({
+                type: 2,
+                area: [width, height],
+                title: title,
+                maxmin: true, //开启最大化最小化按钮
+                skin: 'three-btns',
+                content: url,
+                btn: split,
+                btn1: function(index, layero){
+                    var body = top.layer.getChildFrame('body', index);
+                    var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象,执行iframe页的方法:iframeWin.method();
+                    var inputForm = body.find('#inputForm');
+                    var top_iframe;
+                    if(target){
+                        top_iframe = target;//如果指定了iframe,则在改frame中跳转
+                    }else{
+                        top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+                    }
+                    inputForm.attr("target",top_iframe);//表单提交成功后,从服务器返回的url在当前tab中展示
+                    if(iframeWin.contentWindow.doSubmit(1) ){
+                        // top.layer.close(index);//关闭对话框。
+                        setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒,对应360 7.1版本bug
+                    }
+                },
+                btn2:function(index,layero){
+                    if(split.length==2){return}
+                    var body = top.layer.getChildFrame('body', index);
+                    var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象,执行iframe页的方法:iframeWin.method();
+                    var inputForm = body.find('#inputForm');
+                    var top_iframe;
+                    if(target){
+                        top_iframe = target;//如果指定了iframe,则在改frame中跳转
+                    }else{
+                        top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+                    }
+                    inputForm.attr("target",top_iframe);//表单提交成功后,从服务器返回的url在当前tab中展示
+                    if(iframeWin.contentWindow.doSubmit(2) ){
+                        // top.layer.close(index);//关闭对话框。
+                        setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒,对应360 7.1版本bug
+                    }else {
+                        return false;
+                    }
+                },
+                btn3: function (index) {
+                }
+            });
+        }
+
+		function uploadFile(id){
+			$("#projectTypeId").val(id);
+			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='${ctx}/project/projectMaterialsWarehouse/import/template';
+				},
+				btn2: function(index, layero){
+					$.ajax({
+						url : '${ctx}/project/projectMaterialsWarehouse/import',
+						type : "post",
+						async:false,
+						cache: false,        // 不缓存数据
+						processData: false,  // 不处理数据
+						contentType: false,   // 不设置内容类型
+						data : new FormData(top.$("#importForm")[0]),
+						success : function(data) {
+							if (data.success){
+								parent.layer.msg(data.msg, {icon: 1});
+							}else {
+								parent.layer.msg(data.msg, {icon: 2});
+							}
+						}
+					});
+				},
+
+				btn3: function(index){
+					top.layer.close(index);
+				}
+
+			});
+		}
+
+
+	</script>
+	<style>
+		body{
+			background-color:transparent;
+			filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#26FFFFFF, endColorstr=#26FFFFFF);
+			color:#ffffff;
+			background-color:rgba(255,255,255,0);
+			height:100%;
+		}
+	</style>
+</head>
+<body>
+<div id="importBox" class="hide">
+	<form id="importForm" style="padding-left:20px;text-align:center;" method="post" enctype="multipart/form-data"><br/>
+		<input  value="" id="file" name="file"  type="file"  style="width:330px"/>导入文件不能超过5M,仅允许导入“xls”或“xlsx”格式文件!<br/>  
+		<div>
+			<input type="hidden"  name ="id" id="id"/>
+		</div>
+	</form>
+</div>
+<div class="wrapper wrapper-content">
+	<sys:message content="${message}"/>
+	<div class="layui-row">
+		<div class="full-width fl">
+			<div class="layui-row contentShadow shadowLR" id="queryDiv">
+				<form:form id="searchForm" modelAttribute="projectRecords" action="${ctx}/project/projectMaterialsWarehouseAll" method="post" class="form-inline">
+					<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
+					<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+					<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
+					<div class="commonQuery lw6">
+						<div class="layui-item query athird">
+							<label class="layui-form-label">项目名称:</label>
+							<div class="layui-input-block">
+								<form:input path="projectName" htmlEscape="false" maxlength="64"  class=" form-control  layui-input"/>
+							</div>
+						</div>
+						<div class="layui-item query athird ">
+							<label class="layui-form-label">项目负责人:</label>
+							<div class="layui-input-block">
+								<form:input path="leaderNameStr" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
+							</div>
+						</div>
+						<div class="layui-item athird">
+							<div class="input-group">
+								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
+								<div class="layui-btn-group search-spacing">
+									<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn layui-btn-sm " onclick="resetSearch()">重置</button>
+								</div>
+							</div>
+						</div>
+						<div style="    clear:both;"></div>
+					</div>
+					<div id="moresees" style="clear:both;display:none;" class="lw6">
+						<div class="layui-item query athird ">
+							<label class="layui-form-label">合同名称:</label>
+							<div class="layui-input-block">
+								<input type="text" input="workContractInfoName" name="workContractInfo.name" value="" htmlEscape="false" maxlength="255"  class=" form-control layui-input">
+							</div>
+						</div>
+						<div class="layui-item query athird ">
+							<label class="layui-form-label">委托方:</label>
+							<div class="layui-input-block">
+								<input type="text" input="workContractInfoClientName" name="workContractInfo.client.name" value="" htmlEscape="false" maxlength="255"  class=" form-control layui-input">
+							</div>
+						</div>
+						<div class="layui-item query athird ">
+							<label class="layui-form-label">创建时间:</label>
+							<div class="layui-input-block readOnlyFFF">
+								<input id="beginDate" name="beginDate" placeholder="开始时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
+									   value="<fmt:formatDate value="${projectRecords.beginDate}" pattern="yyyy-MM-dd"/>"/>
+								</input>
+                                <span class="group-sep">-</span>
+                                <input id="endDate" name="endDate" placeholder="结束时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
+                                       value="<fmt:formatDate value="${projectRecords.endDate}" pattern="yyyy-MM-dd"/>"/>
+                                </input>
+							</div>
+						</div>
+						<div style="clear:both;"></div>
+					</div>
+				</form:form>
+			</div>
+		</div>
+		<div class="full-width fl">
+			<div class="layui-form contentDetails contentShadow shadowLBR">
+				<div class="nav-btns">
+					<div class="layui-btn-group">
+						<button class="layui-btn layui-btn-sm" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					</div>
+				</div>
+				<table class="oa-table layui-table" id="contentTable1"></table>
+				<table:page page="${page}"></table:page>
+				<div style="clear: both;"></div>
+			</div>
+		</div>
+	</div>
+	<div id="changewidth"></div>
+</div>
+
+<script src="${ctxStatic}/layer-v2.3/layui/layui.all.js" charset="utf-8"></script>
+<script>
+
+    layui.use('table', function(){
+        layui.table.render({
+            limit:${ page.pageSize }
+            ,elem: '#contentTable1'
+            ,page: false
+            ,cols: [[
+                {field:'index',align:'center', title: '序号',width:40}
+                ,{field:'projName',align:'center', title: '项目名称',minWidth:200,templet:function(d){
+                        return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/project/projectRecords/view?id=" + d.id +"','95%', '95%')\">" + d.projName + "</a>";
+                    }}
+                ,{field:'projId',align:'center', title: '项目编号',minWidth:150,templet:function(d){
+                        return "<a class=\"attention-info\" title=\"" + d.projId + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看工程进度款信息', '${ctx}/project/interimPaymentSummarizing/form?view=contentView&condition=interim&type=420&infoId="+d.id+"&id="+d.contentPId+"','95%', '95%')\">" + d.projId + "</a>";
+                    }}
+                ,{field:'contract', align:'center',title: '合同名称',minWidth:150,templet:function(d){
+						if(null == d.contract || '' == d.contract){
+							return "<span style=\"color:red\" title='无合同'>无合同</span>";
+						}else{
+							return "<span title='"+ d.contract +"'>" + d.contract + "</span>";
+						}
+					}}
+                ,{field:'projMaster', align:'center',title: '负责人', width:85,templet:function(d){
+                        return "<span title=\"" + d.projMaster + "\">" + d.projMaster + "</span>";
+                    }}
+                ,{field:'client',align:'center', title: '委托方',  width:150,templet:function(d){
+                        return "<span title=\"" + d.client + "\">" + d.client + "</span>";
+                    }}
+                ,{field:'createDate',align:'center', title: '创建日期',  width:80}
+                ,{field:'op',align:'center',title:"操作",width:130,templet:function(d){
+                        ////对操作进行初始化
+                        var xml="<div class=\"layui-btn-group\">";
+						<shiro:hasPermission name="project:projectMaterialsWarehouse:view">
+							xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogView('查看输变电项目材料信息', '${ctx}/project/projectMaterialsWarehouse/particularsListView?projectId="+d.id+"','95%','95%')\" style=\"color: white;background: #1E9FFF\" class=\"layui-btn layui-btn-xs \" >查看</a>"
+						</shiro:hasPermission>
+
+
+						xml+="</div>";
+                        return xml;
+
+                    }}
+            ]]
+            ,data: [
+                <c:if test="${ not empty page.list}">
+                <c:forEach items="${page.list}" var="projectRecords" varStatus="index">
+                <c:if test="${index.index != 0}">,</c:if>
+                {
+                    "index":"${index.index+1}"
+                    ,"id":"${projectRecords.id}"
+                    ,"projId":"${projectRecords.projectId}"
+                    ,"projName":"<c:out value="${projectRecords.projectName}" escapeXml="true"/>"
+                    ,"projMaster":"<c:forEach items="${projectRecords.projectLeaders}" var="leader" varStatus="status"><c:choose><c:when test="${status.last}">${leader.name}</c:when><c:otherwise>${leader.name},</c:otherwise></c:choose></c:forEach>"
+                    ,"contract":"${projectRecords.workContractInfo.name}"
+                    ,"client":"${projectRecords.workContractInfo.client.name}"
+                    ,"createDate":"<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"
+                    ,"projectStatus":"${projectRecords.projectStatus}"
+                    ,"procId":"${projectRecords.processInstanceId}"
+                    ,"contentPId":"${projectRecords.contentPId}"
+                    ,"dictType":"${projectRecords.dictType}"
+                    <c:choose><c:when test="${flag == '1' or fns:getUser().id == projectRecords.createBy.id}">
+                    </c:when>
+                    <c:otherwise>
+                    ,"candel":"0"
+                    ,"canedit1":"0"
+                    ,"canedit2":"0"
+                    ,"canrecall":"0"
+                    ,"cancancel":"0"
+                    </c:otherwise>
+                    </c:choose>
+
+                }
+                </c:forEach>
+                </c:if>
+            ]
+        });
+    })
+
+    resizeListTable();
+    $("a").on("click",addLinkVisied);
+</script>
+<script>
+    resizeListWindow2();
+    $(window).resize(function(){
+        resizeListWindow2();
+    });
+</script>
+<script src="${ctxStatic}/layer-v2.3/layui/layui.all.js" charset="utf-8"></script>
+<script src="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.js" charset="utf-8"></script>
+</body>
+</html>

+ 12 - 10
src/main/webapp/webpage/modules/pojectMaterialsWarehouse/projectMaterialsWarehouseForm.jsp

@@ -111,24 +111,26 @@
 			<input type="hidden" id="projectId" name="projectId" value="${workMaterialCollectType.projectId}">
 			<div class="form-group-label"><h2>基础信息</h2></div>
 			<div class="layui-item layui-col-sm12">
-				<label class="layui-form-label"><span class="require-item">*</span>工程类型:</label>
+				<label class="layui-form-label">工程类型:</label>
 				<div class="layui-input-block">
-					<form:select id="projectType" path="projectType" class="form-control simple-select required">
-						<%--<form:option value="" label=""/>--%>
+					<form:input path="projectType" placeholder="请输入工程类型" htmlEscape="false" maxlength="64" class="form-control layui-input"/>
+					<%--<form:select id="projectType" path="projectType" class="form-control simple-select required">
+						&lt;%&ndash;<form:option value="" label=""/>&ndash;%&gt;
 						<form:options id="test" items="${fns:getMainDictList('work_material_engineer_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-					</form:select>
+					</form:select>--%>
 				</div>
 			</div>
 			<div class="layui-item layui-col-sm12">
-				<label class="layui-form-label"><span class="require-item">*</span>工程部位:</label>
+				<label class="layui-form-label">工程部位:</label>
 				<div class="layui-input-block">
-					<form:select path="projectPart" id="projectPart" class="form-control simple-select required">
-						<%--<form:option value="" label=""/>--%>
+					<form:input path="projectPart" placeholder="请输入工程部位" htmlEscape="false" maxlength="64" class="form-control layui-input"/>
+					<%--<form:select path="projectPart" id="projectPart" class="form-control simple-select required">
+						&lt;%&ndash;<form:option value="" label=""/>&ndash;%&gt;
 						<form:options items="${fns:getMainDictList('work_material_engineer_part1')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-					</form:select>
+					</form:select>--%>
 				</div>
 			</div>
-			<div class="layui-item layui-col-sm12">
+			<%--<div class="layui-item layui-col-sm12">
 				<label class="layui-form-label"><span class="require-item">*</span>工程日期:</label>
 				<div class="layui-input-block readOnlyFFF">
 					<input id="startDate" name="startDate" placeholder="开始时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate required form-control layer-date layui-input laydate-icon query-group"
@@ -139,7 +141,7 @@
 					/>
 					</input>
 				</div>
-			</div>
+			</div>--%>
 			<div class="layui-item layui-col-sm12">
 				<div class="form-group-label"><h2><span class="require-item">*</span>输变电项目材料文件上传</h2></div>
 				<div class="layui-item nav-btns">

+ 7 - 11
src/main/webapp/webpage/modules/pojectMaterialsWarehouse/projectMaterialsWarehouseList.jsp

@@ -315,11 +315,13 @@
                 ,{field:'op',align:'center',title:"操作",width:130,templet:function(d){
                         ////对操作进行初始化
                         var xml="<div class=\"layui-btn-group\">";
-                        /*if(d.canedit3 != undefined && d.canedit3 =="1")
-                        {*/
-							xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogView('编辑输变电项目材料信息', '${ctx}/project/projectMaterialsWarehouse/particularsList?projectId="+d.id+"','95%','95%')\" style=\"color: white;background: darkseagreen\" class=\"layui-btn layui-btn-xs \" >编辑</a>",
+                        if(d.exit != undefined && d.exit =="1")
+                        {
+							xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogView('编辑输变电项目材料信息', '${ctx}/project/projectMaterialsWarehouse/particularsList?projectId="+d.id+"','95%','95%')\" style=\"color: white;background: darkseagreen\" class=\"layui-btn layui-btn-xs \" >编辑</a>"
+						}
+						<shiro:hasPermission name="project:projectMaterialsWarehouse:view">
 							xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogView('查看输变电项目材料信息', '${ctx}/project/projectMaterialsWarehouse/particularsListView?projectId="+d.id+"','95%','95%')\" style=\"color: white;background: #1E9FFF\" class=\"layui-btn layui-btn-xs \" >查看</a>"
-						/*}*/
+						</shiro:hasPermission>
 						xml+="</div>";
                         return xml;
 
@@ -343,12 +345,6 @@
                     ,"contentPId":"${projectRecords.contentPId}"
                     ,"dictType":"${projectRecords.dictType}"
                     <c:choose><c:when test="${flag == '1' or fns:getUser().id == projectRecords.createBy.id}">
-                    <shiro:hasPermission name="project:projectRecords:del">,"candel":	<c:choose><c:when test="${projectRecords.projectStatus == 1 or projectRecords.projectStatus == 3 or projectRecords.projectStatus == 4}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose></shiro:hasPermission>
-                    <shiro:hasPermission name="project:projectRecords:edit">,"canedit1":	<c:choose><c:when test="${projectRecords.projectStatus == 1 }">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
-                    ,"canedit2":<c:choose><c:when test="${projectRecords.projectStatus == 4}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
-                    ,"canrecall":<c:choose><c:when test="${projectRecords.projectStatus == 3}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
-                    </shiro:hasPermission>
-                    ,"cancancel":<c:choose><c:when test="${projectRecords.projectStatus == 2 && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
                     </c:when>
                     <c:otherwise>
                     ,"candel":"0"
@@ -358,7 +354,7 @@
                     ,"cancancel":"0"
                     </c:otherwise>
                     </c:choose>
-                    <shiro:hasPermission name="project:projectRecords:edit">,"canedit3":<c:choose><c:when test="${projectRecords.projectStatus == 5 && fn:contains(projectRecords.leaderIds,fns:getUser().id)}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose></shiro:hasPermission>
+                    <shiro:hasPermission name="project:projectMaterialsWarehouse:exit">,"exit":<c:choose><c:when test="${projectRecords.projectStatus == 5 && fn:contains(projectRecords.leaderIds,fns:getUser().id)}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose></shiro:hasPermission>
                 }
                 </c:forEach>
                 </c:if>

+ 1 - 0
src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/new/reportForm.jsp

@@ -1344,6 +1344,7 @@
 					<div class="form-group-label"><h2>审定单签章附件信息</h2></div>
 					<div class="layui-item nav-btns">
 						<a id="attachment_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>
+						<a class="nav-btn nav-btn-export" title="下载模板"  onclick="window.location.href='${ctx}/ruralProject/ruralCostProjectMessageNew/downloadTemplate';"><i class="fa fa-download"></i>&nbsp;下载模板</a>
 					</div>
 					<div id="addFile_attachment_judgement" style="display: none" class="upload-progress">
 						<span id="fileName_attachment_judgement" ></span>

+ 3 - 3
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/judgementReport/projectRecordsJudgementMessageAudit.jsp

@@ -1290,7 +1290,7 @@
 										<th >注册/资格证号</th>
 										<th >专业</th>
 										<th >本人负责内容</th>
-										<th ><span class="require-item">*</span>审核意见</th>
+										<th >审核意见</th>
 											<%--								<th width="100px">操作</th>--%>
 									</tr>
 									</thead>
@@ -1322,10 +1322,10 @@
 											<td>
 												<c:choose>
 													<c:when test="${consultantCount == status.index+1}">
-														<input id="reportedConsultantList${status.index+1}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[${status.index+1}].auditOpinion" value="${info.auditOpinion}" onclick="openInfo('reportedConsultantList${status.index+1}',this.value)" class="form-control judgment"/>
+														<input id="reportedConsultantList${status.index+1}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[${status.index+1}].auditOpinion" value="${info.auditOpinion}" onclick="openInfo('reportedConsultantList${status.index+1}',this.value)" class="form-control"/>
 													</c:when>
 													<c:otherwise>
-														<input id="reportedConsultantList${status.index+1}_auditOpinion" title="${info.auditOpinion}"  placeholder="请输入审核意见" readonly="true" name="reportedConsultantList[${status.index+1}].auditOpinion" value="${info.auditOpinion}" onclick="readOpenInfo(this.value)" class="form-control judgment"/>
+														<input id="reportedConsultantList${status.index+1}_auditOpinion" title="${info.auditOpinion}"  placeholder="请输入审核意见" readonly="true" name="reportedConsultantList[${status.index+1}].auditOpinion" value="${info.auditOpinion}" onclick="readOpenInfo(this.value)" class="form-control"/>
 													</c:otherwise>
 												</c:choose>