فهرست منبع

管理员修改(修改上报)

[user3] 4 سال پیش
والد
کامیت
0145eac433
18فایلهای تغییر یافته به همراه1936 افزوده شده و 96 حذف شده
  1. 11 0
      src/main/java/com/jeeplus/modules/projectcontentinfo/entity/Projectcontentinfo.java
  2. 55 2
      src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectMessageService.java
  3. 45 14
      src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectMessageController.java
  4. 175 0
      src/main/webapp/static/oss/ossupload.js
  5. 9 1
      src/main/webapp/webpage/modules/ruralprojectrecords/cost/newReportedForm.jsp
  6. 4 1
      src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/new/reportForm.jsp
  7. 3 0
      src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/new/reportModify.jsp
  8. 3 0
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsView.jsp
  9. 1580 74
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/adminReportEditForms.jsp
  10. 3 0
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/projectRecordsMessageAudit.jsp
  11. 3 0
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/reportForm.jsp
  12. 3 0
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/projectRecordsMessageView.jsp
  13. 3 0
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/reportView.jsp
  14. 9 1
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/reportedAudit.jsp
  15. 9 1
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/reportedForm.jsp
  16. 9 1
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/reportedModify.jsp
  17. 9 1
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/reportedView.jsp
  18. 3 0
      src/main/webapp/webpage/modules/ruralprojectrecords/view/ruralProjectRecordsView.jsp

+ 11 - 0
src/main/java/com/jeeplus/modules/projectcontentinfo/entity/Projectcontentinfo.java

@@ -11,6 +11,7 @@ import com.jeeplus.modules.projectAccessory.entity.ProjectTemplateInfo;
 import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
 import com.jeeplus.modules.ruralprojectrecords.entity.ReportedConsultant;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
+import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecordsReported;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralReportConsultant;
 import com.jeeplus.modules.sys.entity.Workattachment;
 
@@ -64,6 +65,8 @@ public class Projectcontentinfo extends TreeEntity<Projectcontentinfo> {
 
 	private List<String> chargeCriterionList;	//合同收费标准
 
+	private RuralProjectRecordsReported recordsReported;	//上报
+
 
 	public RuralProjectRecords getProjectOnRural() {
 		return projectOnRural;
@@ -342,4 +345,12 @@ public class Projectcontentinfo extends TreeEntity<Projectcontentinfo> {
 	public void setChargeCriterionList(List<String> chargeCriterionList) {
 		this.chargeCriterionList = chargeCriterionList;
 	}
+
+	public RuralProjectRecordsReported getRecordsReported() {
+		return recordsReported;
+	}
+
+	public void setRecordsReported(RuralProjectRecordsReported recordsReported) {
+		this.recordsReported = recordsReported;
+	}
 }

+ 55 - 2
src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectMessageService.java

@@ -774,7 +774,7 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
 
 
     @Transactional(readOnly = false)
-    public String adminModifyReport(Projectcontentinfo projectcontentinfo,HistoricalData historicalData) {
+    public String adminModifyReport(Projectcontentinfo projectcontentinfo,HistoricalData historicalData) throws Exception {
         Projectcontentinfo s = new Projectcontentinfo();
         s.setParentIds("0,");
         ProjectRecords projectRecords=new ProjectRecords();
@@ -848,9 +848,62 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
 //            projectcontentinfoDao.updateInfoId(contentinfo);
         }
         historicalService.save(historicalData);
+        //上报修改
+        if (null!=projectcontentinfo.getRecordsReported()){
+            this.disposeList(projectcontentinfo.getRecordsReported());
+            RuralProjectRecordsReported reported = this.getRuralProjectRecordsReportedById(projectcontentinfo.getRecordsReported().getId());;//从数据库取出记录的值
+            MyBeanUtils.copyBeanNotNull2Bean(projectcontentinfo.getRecordsReported(), reported);//将编辑表单中的非NULL值覆盖数据库记录中的值
+            this.disposeList(reported);
+            reported.setS3(reported.getS3().replaceAll(",",""));
+            //查询是否已经上报项目信息
+            if (StringUtils.isBlank(reported.getId())){
+                reported.setCompany(UserUtils.getSelectCompany());
+                reported.setOffice(UserUtils.getSelectOffice());
+                reported.preInsert();
+                //将项目id设置为id
+                reported.setId(reported.getProjectId());
+                ruralProjectRecordsReportedDao.insert(reported);
+            }else{
+                reported.preUpdate();
+                ruralProjectRecordsReportedDao.update(reported);
+            }
+            //删除上报咨询员信息
+            ruralProjectRecordsReportedDao.deleteConsultant(reported);
+            //保存咨询员信息
+            for (ReportedConsultant info : reported.getReportedConsultantList()){
+                if (info.getZixunyuan() == null){
+                    continue;
+                }
+                //添加项目上报id
+                info.setReportedId(reported.getId());
+                info.preInsert();
+                ruralProjectRecordsReportedDao.insertConsultant(info);
+            }
+
+            //保存附件信息
+            if(reported.getWorkAttachments().size()>0){
+                List<WorkClientAttachment> workAttachments = reported.getWorkAttachments();
+                for (WorkClientAttachment workClientAttachment: workAttachments) {
+                    if (workClientAttachment.getId() == null){
+                        continue;
+                    }
+                    if (WorkClientAttachment.DEL_FLAG_NORMAL.equals(workClientAttachment.getDelFlag())){
+                        workClientAttachment.setAttachmentId(reported.getId());
+                        workClientAttachment.setAttachmentFlag("95");
+                        workClientAttachment.setAttachmentUser(UserUtils.getUser().getId());
+                        if (com.jeeplus.common.utils.StringUtils.isBlank(workClientAttachment.getId()) || "null".equals(workClientAttachment.getId())){
+                            workattachmentService.insertOnWorkClientAttachment(workClientAttachment);
+                        }else{
+                            workattachmentService.updateOnWorkClientAttachment(workClientAttachment);
+                        }
+                    }else{
+                        workClientAttachmentDao.delete(workClientAttachment);
+                    }
+                }
+            }
+        }
         return "true";
     }
-
     public ProjectReportData getProjectReportDateByProjectId(String projectId){
         if (StringUtils.isNotBlank(projectId)) {
             ProjectReportData projectReportData = dao.getProjectReportDateByProjectId(projectId);

+ 45 - 14
src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectMessageController.java

@@ -549,20 +549,43 @@ public class RuralProjectMessageController extends BaseController {
         //查询总审人员信息
         List<User> auditUserList = userService.getAuditUserList();
         ruralProjectRecords.setBzshbUserList(auditUserList);
-        model.addAttribute("processInstanceId",projectReportData.getProcessInstanceId());
-        model.addAttribute("projectReportData",projectReportData);
-        model.addAttribute("projectId", projectcontentinfo1.getProject().getId());
-        model.addAttribute("project", projectcontentinfo1.getProject());
-        model.addAttribute("reportedId", projectcontentinfo.getReportedId());
-        model.addAttribute("projectRecords", ruralProjectRecords);
-        model.addAttribute("id", projectcontentinfo.getId());
-        model.addAttribute("projectcontentinfo", projectcontent);
-        model.addAttribute("consultantinfo", consultants);
-        //获取是否含有上报信息
-        RuralProjectRecordsReported reported = ruralProjectMessageService.getRuralProjectRecordsReportedById(projectcontentinfo.getReportedId());
-        if(null != reported){
-            model.addAttribute("reportedView", 1);
+
+
+        //查询上报信息表中是否含有数据,没有则进行获取基础数据
+        RuralProjectRecordsReported reported = ruralProjectMessageService.getRuralProjectRecordsReported(projectRecords.getId());
+        if(reported == null){
+            model.addAttribute("reportedFalg", false);
+
+        }else{
+            //根据上报id查询上报咨询员的信息
+            List<RuralReportConsultant> reportedConsultants=ruralProjectMessageService.getReportedConsultantsList(reported.getId());
+            //查询报告咨询员的信息
+            List<RuralReportConsultant> reportConsultants=ruralProjectMessageService.getConsultantsList(projectRecords.getId());
+            List<RuralReportConsultant> consultantLista = Lists.newArrayList();
+            if(reportedConsultants.size() == 0){
+                //如果上报的咨询员信息为空 则处理报告咨询员信息
+                consultantLista = ruralProjectMessageService.disposeConsultant(reportConsultants, projectRecords);
+            }else{
+                //对上报的咨询员进行处理
+                consultantLista = ruralProjectMessageService.disposereportedConsultant(reportedConsultants);
+            }
+            RuralProjectRecords records = projectRecordsService.getQueryProjectUsers(reported.getProjectId());
+            if(StringUtils.isBlank(reported.getProjectRecordId())){
+                reported.setProjectRecordId(records.getProjectId());
+            }
+            model.addAttribute("ruralProjectRecordsReported", reported);
+            projectcontent.setRecordsReported(reported);
+            //查询项目信息
+            model.addAttribute("ruralProjectRecords", records);
+            model.addAttribute("consultantInfo1", consultantLista);
+            if(StringUtils.isBlank(reported.getS1())){
+                reported.setS1("10");
+            }
+            //获取工程类型
+            ProjectEngineeringInfo engineeringInfos=engineeringService.getProjectReportedType(reported.getPorjectUse());
+            model.addAttribute("engineeringInfo", engineeringInfos);
         }
+
         List<MainDictDetail> achievementTypes = DictUtils.getMainDictList("achievement_type");
         if(null != achievementTypes){
             for (MainDictDetail achievementType:achievementTypes) {
@@ -572,10 +595,18 @@ public class RuralProjectMessageController extends BaseController {
                 }
             }
         }
+        model.addAttribute("processInstanceId",projectReportData.getProcessInstanceId());
+        model.addAttribute("projectReportData",projectReportData);
+        model.addAttribute("projectId", projectcontentinfo1.getProject().getId());
+        model.addAttribute("project", projectcontentinfo1.getProject());
+        model.addAttribute("reportedId", projectcontentinfo.getReportedId());
+        model.addAttribute("projectRecords", ruralProjectRecords);
+        model.addAttribute("id", projectcontentinfo.getId());
+        model.addAttribute("projectcontentinfo", projectcontent);
+        model.addAttribute("consultantinfo", consultants);
         return "modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/adminReportEditForms";
     }
 
-
     /**
      * admin修改报告信息
      * @param projectcontentinfo

+ 175 - 0
src/main/webapp/static/oss/ossupload.js

@@ -760,6 +760,181 @@ function multitest (ossClient, storeAs, file,attachmentId,attachmentFlag,uploadP
         console.log(err);
     });
 };
+function multipartUploadWithStsRecordsReported(storeAs, file,attachmentId,attachmentFlag,uploadPath,divId,size, cpt,idx,prefix,currentUser) {
+
+    console.log("-----------------------start");
+    console.log("-----------------------"+realPath);
+
+    file.name.replace(" ","")
+    file.name.replace(/—/g,"")
+    var fileName = file.name;
+    // 将单引号‘’都转换成',将双引号“”都转换成"
+    fileName = fileName.replace(/\’|\‘/g,"'").replace(/\“|\”/g,"\"");
+    // 将中括号【】转换成[],将大括号{}转换成{}
+    fileName = fileName.replace(/\【/g,"(").replace(/\】/g,")").replace(/\{/g,"(").replace(/\}/g,")");
+    fileName = fileName.replace(/\[/g,"(").replace(/\]/g,")").replace(/\{/g,"(").replace(/\}/g,")");
+    // 将逗号,转换成,,将:转换成:
+    fileName = fileName.replace(/,/g,",").replace(/:/g,":");
+    //将中文——转换为英文-
+    fileName = fileName.replace(/—/g,"-")
+    fileName = fileName.replace("……","")
+    fileName = fileName.replace("±","")
+    var dfl=new File([file],fileName,{type:file.type});
+    file = dfl
+
+    requestUrl = realPath+"/previewController/getAccess";
+    OSS.urllib.request(requestUrl, {method: 'GET'}, function (err, response) {
+        if (err) {
+            console.log(err);
+            $.ajax({
+                type:"post",
+                url:realPath+"/previewController/saveJSError",
+                data:{object:err.toString()},
+                async: false,
+                success:function(data){
+                }
+            });
+            return alert(err);
+        }
+        try {
+            result = JSON.parse(response);
+        } catch (e) {
+            errmsg = 'parse sts response info error: ' + e.message;
+            return alert(errmsg);
+        }
+        console.log("---------result"+result);
+        client = new OSS.Wrapper({
+            accessKeyId: result.AccessKeyId,
+            accessKeySecret: result.AccessKeySecret,
+            stsToken: result.SecurityToken,
+            bucket: result.Bucket,
+            endpoint: result.Endpoint,
+            timeout:'30000'
+        });
+        storeAs = "attachment-file/" + storeAs +"/"+today+new Date().getTime()+ file.name;
+        if(cpt == 1)
+            multitestFlag(client,storeAs, file,attachmentId,attachmentFlag,uploadPath.replace('http://dmtest-test.oss-cn-shanghai.aliyuncs.com', result.AliyunUrl),divId,size, cpt,idx,prefix,currentUser);
+        else
+            multitestRecordsReported(client, storeAs, file,attachmentId,attachmentFlag,uploadPath.replace('http://dmtest-test.oss-cn-shanghai.aliyuncs.com', result.AliyunUrl),divId,size, cpt);
+    })
+};
+function multitestRecordsReported (ossClient, storeAs, file,attachmentId,attachmentFlag,uploadPath,divId, size,cpt) {
+
+    var names =  storeAs.split("/");
+    var name = names[names.length-1];
+    ossClient.multipartUpload(storeAs, file,{
+        partSize: 1 * 1024 * 1024,
+        parallel: 5,
+        progress: function* (percent, cpt) {
+            var p = Math.floor(percent*100);
+            $("#jindutiao"+divId).attr("style","width: "+p+"%");
+            $("#jindutiao"+divId).attr("aria-valuenow",p+"%");
+            $("#baifenbi"+divId).html(p+"%");
+            $("#fileName"+divId).html(file.name);
+            checkpoint_temp = cpt;
+        }
+    }).then(function (result) {
+        var fileLocation = "";
+        var lookUrl = "";
+        //获取文件存储位置(0:本地;1:百度云;2:阿里云)
+        $.ajax({
+            type:"get",
+            url:realPath+"/bos/getFileStorageLocation",
+            async: false,
+            success:function(data){
+                fileLocation = data.fileLocation;
+            }
+        });
+
+        returnUrl = realPath+"/sys/workattachment/saveAttachment";
+        $.ajax({
+            type:'post',
+            url:returnUrl,
+            data:{
+                "attachmentName":file['name'],
+                "attachmentId":attachmentId,
+                "attachmentFlag":attachmentFlag,
+                "fileSize":file['size'],
+                "url":"/"+storeAs
+            },
+            success:function(data){
+                var lowerType = data.type.toLowerCase();
+                if(data.status=="Success"){
+                    parent.layer.msg("上传成功!",{icon:1});
+                    var lenght =$(".trIdAdds").length;
+                    if (size != 0){
+                        lenght += size;
+                    }
+                    var addFile = "addFile"+divId;
+                    var str = '<tr class="trIdAdds">'+
+                        '<td class="text-center">' ;
+                    if(2 == fileLocation){
+                        $.ajax({
+                            type:"post",
+                            async:false,
+                            url:realPath+"/workfullmanage/workFullManage/getFileTemporaryLookUrl",
+                            data:{"file":data.url,},
+                            success:function(result){
+                                lookUrl = result.lookUrl;
+                                if (isContains("jpg,png,gif,bmp,jpeg",lowerType)){
+                                    str = str +'<img src="'+lookUrl+'" width="50" height="50" onclick="openDialogView(\'预览\',\''+ '/a/sys/picturepreview/picturePreview?url=' +lookUrl+ '\',\'90%\',\'90%\')" alt="'+data.attachmentName+'"/>';
+                                }else if(isContains("pdf",lowerType)){
+                                    str = str + '<a class="attention-info" href="javascript:void(0)" onclick="openPreview(\''+lookUrl+'\',1)">'+data.attachmentName+'</a>';
+                                }else {
+                                    str = str + '<a class="attention-info" href="javascript:void(0)" onclick="openPreview(\''+lookUrl+'\',2)">'+data.attachmentName+'</a>';
+                                }
+                            }
+                        });
+
+                    }else{
+                        if (isContains("jpg,png,gif,bmp,jpeg",lowerType)){
+                            str = str +'<img src="'+data.url+'" width="50" height="50" onclick="openDialogView(\'预览\',\''+realPath+ '/a/sys/picturepreview/picturePreview?url=' +data.url+ '\',\'90%\',\'90%\')" alt="'+data.attachmentName+'"/>';
+                        }else if(isContains("pdf",lowerType)){
+                            str = str + '<a class="attention-info" href="javascript:void(0)" onclick="openPreview(\''+data.url+'\',1)">'+data.attachmentName+'</a>';
+                        }else {
+                            str = str + '<a class="attention-info" href="javascript:void(0)" onclick="openPreview(\''+data.url+'\',2)">'+data.attachmentName+'</a>';
+                        }
+                    }
+                    str = str +'</td>'+
+                        '<td >'+data.createByName+'</td>'+
+                        '<td >'+data.createDate+
+                        '<input name="recordsReported.workAttachments['+lenght+'].id" type="hidden" readonly="readonly" maxlength="20" style="width:140px;" class="form-control" value=""/>'+
+                        '<input name="recordsReported.workAttachments['+lenght+'].attachmentId" type="hidden" readonly="readonly" maxlength="20" style="width:140px;" class="form-control" value="'+data.attachmentId+'"/>'+
+                        '<input name="recordsReported.workAttachments['+lenght+'].url" type="hidden" readonly="readonly" maxlength="20" style="width:140px;" class="form-control" value="'+data.url+'"/>'+
+                        '<input name="recordsReported.workAttachments['+lenght+'].temporaryUrl" type="hidden" readonly="readonly" maxlength="20" style="width:140px;" class="form-control" value="'+data.temporaryUrl+'"/>'+
+                        '<input name="recordsReported.workAttachments['+lenght+'].attachmentName" type="hidden" readonly="readonly" maxlength="20" style="width:140px;" class="form-control" value="'+data.attachmentName+'"/>'+
+                        '<input name="recordsReported.workAttachments['+lenght+'].createBy.id" type="hidden" readonly="readonly" maxlength="20" style="width:140px;" class="form-control" value="'+data.createBy+'"/>'+
+                        '<input name="recordsReported.workAttachments['+lenght+'].type" type="hidden" readonly="readonly" maxlength="20" style="width:140px;" class="form-control" value="'+data.type+'"/>'+
+                        '<input name="recordsReported.workAttachments['+lenght+'].attachmentFlag" type="hidden" readonly="readonly" maxlength="20" style="width:140px;" class="form-control" value="'+data.attachmentFlag+'"/>'+
+                        '<input name="recordsReported.workAttachments['+lenght+'].fileSize" type="hidden" readonly="readonly" maxlength="20" style="width:140px;" class="form-control" value="'+data.fileSize+'"/>'+
+                        '</td>'+
+                        '<td class="op-td">'+
+                        '<div class="op-btn-box">';
+                    if(2 == fileLocation){
+                        if(isContains("pdf",lowerType)){
+                            str = str +'<a href="javascript:void(0)" onclick="openPreview(\''+lookUrl+'\',1)" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>';
+                        }else{
+                            str = str +'<a href="'+lookUrl+'" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>';
+                        }
+                    }else{
+                        str = str +'<a href="javascript:location.href=\''+realPath+'/a/workfullmanage/workFullManage/downLoadAttach?file=\'+encodeURIComponent(\''+data.url+'\');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>';
+                    }
+                    str = str + '<a href="javascript:void(0)" onclick="ossCollectingAccessory(this,\''+realPath+'/projectAccessory/projectAccessory/saveCollectAccessory?url='+data.url+'&fileName='+data.attachmentName+'\',\''+addFile+'\',\''+data.createBy+'\')" class="op-btn op-btn-delete" style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>'+
+                        '<a href="javascript:void(0)" onclick="deleteFileFromAliyun1(this,\''+realPath+'/a/sys/workattachment/deleteFileFromAliyun?url='+encodeURIComponent(data.url)+'&id='+data.id+'&type=2\',\''+addFile+'\',\''+divId+'\')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>'+
+                        '</div>' +
+                        '</td>'+
+                        '</tr>';
+                    $("#file"+divId).append(str);
+                }else {
+                    parent.layer.msg("上传失败!",{icon:2});
+                }
+            }
+        })
+    }).catch(function (err) {
+        console.log("err------ err:");
+        console.log(err);
+    });
+};
 function ossCollectingAccessory(obj,url,id,uploadUserId){
     $.ajax({
         type:"post",

+ 9 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/cost/newReportedForm.jsp

@@ -590,6 +590,11 @@
                 $("#GCGMValueParameter").removeClass("number");
                 $("#GCGMValueParameter").addClass("number");
             }
+            var contents=${ruralProjectRecordsReported.contentsIncludeList}
+            for(var i=0;i<contents.length;i++){
+                var con=contents[i];
+                $(".contents_"+con+"").prop("checked",true)
+            }
         });
 
         function ZiXunBDEChange(){
@@ -1322,7 +1327,10 @@
                 <div class="layui-item layui-col-sm12">
                     <label class="layui-form-label double-line">咨询项目造价包含内容说明(勾选):</label>
                     <div class="layui-input-block paddingDiv">
-                        <form:checkboxes path="contentsIncludeList" lay-filter="chargeCriterionList" lay-skin="primary" itemLabel="label" itemValue="value" htmlEscape="true" items="${fns:getMainDictList('contents_include')}" />
+                        <c:forEach items="${fns:getMainDictList('contents_include')}" var="contents">
+                            <input type="checkbox" name="contentsIncludeList" class="contents_${contents.value}" value="${contents.value}" title="${contents.label}"/>
+                        </c:forEach>
+<%--                        <form:checkboxes path="contentsIncludeList" lay-filter="chargeCriterionList" lay-skin="primary" itemLabel="label" itemValue="value" htmlEscape="true" items="${fns:getMainDictList('contents_include')}" />--%>
                     </div>
                 </div>
                 <div class="overallProcessDiv" style="display: none">

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

@@ -708,7 +708,10 @@
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">投资性质:</label>
 					<div class="layui-input-block">
-						<c:forEach  items="${fns:getMainDictList('project_properties')}" var="v">
+						<c:if test="${projectRecords.projectProperties==null}">
+							<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input"/>
+						</c:if>
+						<c:forEach items="${fns:getMainDictList('project_properties')}" var="v">
 							<c:if test="${v.value==projectRecords.projectProperties}">
 								<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${v.label}"/>
 							</c:if>

+ 3 - 0
src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/new/reportModify.jsp

@@ -636,6 +636,9 @@
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">投资性质:</label>
 					<div class="layui-input-block">
+						<c:if test="${projectRecords.projectProperties==null}">
+							<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input"/>
+						</c:if>
 						<c:forEach  items="${fns:getMainDictList('project_properties')}" var="v">
 							<c:if test="${v.value==projectRecords.projectProperties}">
 								<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${v.label}"/>

+ 3 - 0
src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsView.jsp

@@ -189,6 +189,9 @@
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">投资性质:</label>
 					<div class="layui-input-block">
+						<c:if test="${projectRecords.projectProperties==null}">
+							<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input"/>
+						</c:if>
 						<c:forEach  items="${fns:getMainDictList('project_properties')}" var="v">
 							<c:if test="${v.value==projectRecords.projectProperties}">
 								<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${v.label}"/>

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 1580 - 74
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/adminReportEditForms.jsp


+ 3 - 0
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/projectRecordsMessageAudit.jsp

@@ -238,6 +238,9 @@
 					<div class="layui-item layui-col-sm6 lw8">
 						<label class="layui-form-label">投资性质:</label>
 						<div class="layui-input-block">
+							<c:if test="${projectRecords.projectProperties==null}">
+								<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input"/>
+							</c:if>
 							<c:forEach  items="${fns:getMainDictList('project_properties')}" var="v">
 								<c:if test="${v.value==projectRecords.projectProperties}">
 									<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${v.label}"/>

+ 3 - 0
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/reportForm.jsp

@@ -656,6 +656,9 @@
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">投资性质:</label>
 					<div class="layui-input-block">
+						<c:if test="${projectRecords.projectProperties==null}">
+							<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input"/>
+						</c:if>
 						<c:forEach  items="${fns:getMainDictList('project_properties')}" var="v">
 							<c:if test="${v.value==projectRecords.projectProperties}">
 								<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${v.label}"/>

+ 3 - 0
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/projectRecordsMessageView.jsp

@@ -153,6 +153,9 @@
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">投资性质:</label>
 					<div class="layui-input-block">
+						<c:if test="${projectRecords.projectProperties==null}">
+							<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input"/>
+						</c:if>
 						<c:forEach  items="${fns:getMainDictList('project_properties')}" var="v">
 							<c:if test="${v.value==projectRecords.projectProperties}">
 								<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${v.label}"/>

+ 3 - 0
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/reportView.jsp

@@ -197,6 +197,9 @@
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">投资性质:</label>
 					<div class="layui-input-block">
+						<c:if test="${projectRecords.projectProperties==null}">
+							<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input"/>
+						</c:if>
 						<c:forEach  items="${fns:getMainDictList('project_properties')}" var="v">
 							<c:if test="${v.value==projectRecords.projectProperties}">
 								<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${v.label}"/>

+ 9 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/reportedAudit.jsp

@@ -595,6 +595,11 @@
                 $("#GCGMValueParameter").removeClass("number");
                 $("#GCGMValueParameter").addClass("number");
             }
+            var contents=${ruralProjectRecordsReported.contentsIncludeList}
+            for(var i=0;i<contents.length;i++){
+                var con=contents[i];
+                $(".contents_"+con+"").prop("checked",true)
+            }
         });
 
         function ZiXunBDEChange(){
@@ -1335,7 +1340,10 @@
                 <div class="layui-item layui-col-sm12">
                     <label class="layui-form-label double-line">咨询项目造价包含内容说明(勾选):</label>
                     <div class="layui-input-block paddingDiv">
-                        <form:checkboxes path="contentsIncludeList" lay-filter="chargeCriterionList" lay-skin="primary" itemLabel="label" itemValue="value" htmlEscape="true" items="${fns:getMainDictList('contents_include')}" />
+                        <c:forEach items="${fns:getMainDictList('contents_include')}" var="contents">
+                            <input type="checkbox" name="contentsIncludeList" class="contents_${contents.value}" value="${contents.value}" title="${contents.label}"/>
+                        </c:forEach>
+<%--                        <form:checkboxes path="contentsIncludeList" lay-filter="chargeCriterionList" lay-skin="primary" itemLabel="label" itemValue="value" htmlEscape="true" items="${fns:getMainDictList('contents_include')}" />--%>
                     </div>
                 </div>
                 <div class="overallProcessDiv" style="display: none">

+ 9 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/reportedForm.jsp

@@ -590,6 +590,11 @@
                 $("#GCGMValueParameter").removeClass("number");
                 $("#GCGMValueParameter").addClass("number");
             }
+            var contents=${ruralProjectRecordsReported.contentsIncludeList}
+            for(var i=0;i<contents.length;i++){
+                var con=contents[i];
+                $(".contents_"+con+"").prop("checked",true)
+            }
         });
 
         function ZiXunBDEChange(){
@@ -1308,7 +1313,10 @@
                 <div class="layui-item layui-col-sm12">
                     <label class="layui-form-label double-line">咨询项目造价包含内容说明(勾选):</label>
                     <div class="layui-input-block paddingDiv">
-                        <form:checkboxes path="contentsIncludeList" lay-filter="chargeCriterionList" lay-skin="primary" itemLabel="label" itemValue="value" htmlEscape="true" items="${fns:getMainDictList('contents_include')}" />
+                        <c:forEach items="${fns:getMainDictList('contents_include')}" var="contents">
+                            <input type="checkbox" name="contentsIncludeList" class="contents_${contents.value}" value="${contents.value}" title="${contents.label}"/>
+                        </c:forEach>
+<%--                        <form:checkboxes path="contentsIncludeList" lay-filter="chargeCriterionList" lay-skin="primary" itemLabel="label" itemValue="value" htmlEscape="true" items="${fns:getMainDictList('contents_include')}" />--%>
                     </div>
                 </div>
                 <div class="overallProcessDiv" style="display: none">

+ 9 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/reportedModify.jsp

@@ -587,6 +587,11 @@
                 $("#GCGMValueParameter").removeClass("number");
                 $("#GCGMValueParameter").addClass("number");
             }
+            var contents=${ruralProjectRecordsReported.contentsIncludeList}
+            for(var i=0;i<contents.length;i++){
+                var con=contents[i];
+                $(".contents_"+con+"").prop("checked",true)
+            }
         });
 
         function ZiXunBDEChange(){
@@ -1311,7 +1316,10 @@
                 <div class="layui-item layui-col-sm12">
                     <label class="layui-form-label double-line">咨询项目造价包含内容说明(勾选):</label>
                     <div class="layui-input-block paddingDiv">
-                        <form:checkboxes path="contentsIncludeList" lay-filter="chargeCriterionList" lay-skin="primary" itemLabel="label" itemValue="value" htmlEscape="true" items="${fns:getMainDictList('contents_include')}" />
+                        <c:forEach items="${fns:getMainDictList('contents_include')}" var="contents">
+                            <input type="checkbox" name="contentsIncludeList" class="contents_${contents.value}" value="${contents.value}" title="${contents.label}"/>
+                        </c:forEach>
+<%--                        <form:checkboxes path="contentsIncludeList" lay-filter="chargeCriterionList" lay-skin="primary" itemLabel="label" itemValue="value" htmlEscape="true" items="${fns:getMainDictList('contents_include')}" />--%>
                     </div>
                 </div>
                 <div class="overallProcessDiv" style="display: none">

+ 9 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/reportedView.jsp

@@ -100,6 +100,11 @@
             }else {
                 $("#ptDiv").hide();
             }
+            var contents=${ruralProjectRecordsReported.contentsIncludeList}
+            for(var i=0;i<contents.length;i++){
+                var con=contents[i];
+                $(".contents_"+con+"").prop("checked",true)
+            }
         });
     </script>
 </head>
@@ -376,7 +381,10 @@
                 <div class="layui-item layui-col-sm12">
                     <label class="layui-form-label double-line">咨询项目造价包含内容说明(勾选):</label>
                     <div class="layui-input-block paddingDiv">
-                        <form:checkboxes path="contentsIncludeList" disabled="true" lay-filter="chargeCriterionList" lay-skin="primary" itemLabel="label" itemValue="value" htmlEscape="true" items="${fns:getMainDictList('contents_include')}" />
+                        <c:forEach items="${fns:getMainDictList('contents_include')}" var="contents">
+                            <input type="checkbox" disabled name="contentsIncludeList" class="contents_${contents.value}" value="${contents.value}" title="${contents.label}"/>
+                        </c:forEach>
+<%--                        <form:checkboxes path="contentsIncludeList" disabled="true" lay-filter="chargeCriterionList" lay-skin="primary" itemLabel="label" itemValue="value" htmlEscape="true" items="${fns:getMainDictList('contents_include')}" />--%>
                     </div>
                 </div>
                 <div class="overallProcessDiv" style="display: none">

+ 3 - 0
src/main/webapp/webpage/modules/ruralprojectrecords/view/ruralProjectRecordsView.jsp

@@ -134,6 +134,9 @@
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">投资性质:</label>
 					<div class="layui-input-block">
+						<c:if test="${projectRecords.projectProperties==null}">
+							<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input"/>
+						</c:if>
 						<c:forEach  items="${fns:getMainDictList('project_properties')}" var="v">
 							<c:if test="${v.value==projectRecords.projectProperties}">
 								<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${v.label}"/>