项目上报功能

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectMessageService.java

@@ -1515,9 +1515,11 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
         reported.setProjectName(records.getProjectName());
         reported.setXmFZR(records.getLeaderIds());
         reported.setLeaderNameStr(records.getLeaderNameStr());
-        reported.setZiXunHTBH(records.getWorkContractInfo().getContractNum());
-        reported.setWeiTuoDW(records.getWorkContractInfo().getClient().getName());
-        reported.setLianXiDH(records.getWorkContractInfo().getClient().getTelephone());
+        if(null != records.getWorkContractInfo()){
+            reported.setZiXunHTBH(records.getWorkContractInfo().getContractNum());
+            reported.setWeiTuoDW(records.getWorkContractInfo().getClient().getName());
+            reported.setLianXiDH(records.getWorkContractInfo().getClient().getTelephone());
+        }
         reported.setDangABH(records.getReportData().getNumber());
 
         SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");

src/main/java/com/jeeplus/modules/workreimbursement/service/WorkReimbursementService.java

@@ -239,6 +239,18 @@ public class WorkReimbursementService extends CrudService<WorkReimbursementDao,
         page.setCountFlag(false);
         workReimbursement.setPage(page);
         page.setList(findList(workReimbursement));
+
+        List<WorkReimbursement> list = page.getList();
+        for (WorkReimbursement info: list) {
+            WorkAccount workAccount = info.getWorkAccount();
+            if(null != workAccount){
+                if(0 == workAccount.getProjectRadio()){
+                    ProjectRecords project = new ProjectRecords();
+                    project.setProjectName(workAccount.getReimburseRemarks());
+                    info.setProject(project);
+                }
+            }
+        }
         return page;
     }
 

src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectRecordsReported.xml

@@ -74,11 +74,13 @@
 		,pra2.name as "county"
 		,pra3.name as "province"
 		,rpr.project_id as "projectRecordId"
+		,wci.contract_num as "workContractInfo.contractNum"
 		FROM rural_project_records_reported a
 		left join project_reported_area pra on a.s2 = pra.id
 		left join project_reported_area pra2 on a.s3 = pra2.id
 		left join project_reported_area pra3 on a.s1 = pra3.id
 		left join rural_project_records rpr on a.id = rpr.id
+		left join work_contract_info wci on a.ZiXunHTBH = wci.id
 		WHERE a.id = #{id}
 	</select>
 

src/main/resources/mappings/modules/workreimbursement/WorkReimbursementDao.xml

@@ -58,6 +58,8 @@
 			<include refid="workReimbursementColumns"/>
 		,wa.reimbursement_name AS "submitterId"
 		,wa.money as "money"
+		,wa.project_radio as "workAccount.projectRadio"
+		,wa.reimburse_remarks as "workAccount.reimburseRemarks"
 		,(select office_id from sys_user where id = wa.reimbursement_name) AS "officeId"
 		FROM work_reimbursement a
 		left join work_account wa on wa.work_reimbursement_id =a.id

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

@@ -48,7 +48,7 @@ function searchGrid${id}(){
 
 	<input id="${id}Id" name="${name}"  type="hidden" value="${value}"/>
 	<div class="input-group" style="width: 100%">
-		<input id="${id}Name"  name="${labelName }" ${allowInput?'':'readonly="readonly"'}  type="text" value="${labelValue}" data-msg-required="${dataMsgRequired}"
+		<input id="${id}Name"  name="${labelName }" ${allowInput?'':'readonly="readonly"'} onclick="searchGrid${id}()" type="text" value="${labelValue}" data-msg-required="${dataMsgRequired}"
 		class="${cssClass}" style="${cssStyle}"/>
        		 <span class="input-group-btn">
 	       		 <button type="button" onclick="searchGrid${id}()" id="${id}Button" class="btn <c:if test="${fn:contains(cssClass, 'input-sm')}"> btn-sm </c:if><c:if test="${fn:contains(cssClass, 'input-lg')}"> btn-lg </c:if>  btn-primary ${disabled} ${hideBtn ? 'hide' : ''}"><i class="fa fa-search"></i>

src/main/webapp/static/common/jeeplus.js

@@ -465,7 +465,7 @@ function getReportedState(id)
         case "2":result.label = "auditing";result.status="上报中";result.action = false;break;
         case "3":result.label = "cancel";result.status="撤回";break;
         case "4":result.label = "reject";result.status="驳回";break;
-        case "5":result.label = "signed";result.status="已上报";result.action = false;break;
+        case "5":result.label = "signed";result.status="已上报";break;
         case "6":result.label = "signed";result.status="超期未上报";result.action = false;break;
         case "7":result.label = "signed";result.status="超期上报";result.action = false;break;
         default:

src/main/webapp/webpage/modules/ruralprojectrecords/cost/reportedForm.jsp

@@ -84,6 +84,16 @@
                     parent.layer.msg("请选择工程所在区县!", {icon: 5});
                     return false;
                 }
+
+                var BaoGaoShuQianFaDate = $("#BaoGaoShuQianFaDate").val();
+                var s = BaoGaoShuQianFaDate.replace(/-/g,"/");
+                var baogaoDate = new Date(s );
+                var nowDate = new Date();
+                var a = nowDate - baogaoDate;
+                var days = Math.floor(a / (24 * 3600 * 1000));
+                if(days >37){
+                    parent.layer.msg("出具报告日期超期，请重新选择!", {icon: 5});
+                }
                 $("#inputForm").submit();
                 return true;
             }else{
@@ -152,7 +162,8 @@
                 event: 'focus', //响应事件。如果没有传入event，则按照默认的click
                 type : 'date'
                 , trigger: 'click'
-                ,max: 38 //38天后
+                ,max: 0
+                ,min: -37 //37天之前
             });
 
 
@@ -436,6 +447,21 @@
                 }
             }
         }
+
+        function setContractValue(obj){
+            var clientId = $("#contractClientId").val();
+            $.ajax({
+                type:'post',
+                url:'${ctx}/ruralProject/ruralProjectRecords/getContractInfo',
+                data:{
+                    "id":obj
+                },
+                success:function(data){
+                    $("#WeiTuoDW").val(data.client.name);
+                    $("#LianXiDH").val(data.client.telephone);
+                }
+            });
+        }
     </script>
 </head>
 <body>
@@ -499,12 +525,19 @@
                         </form:select>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw6">
+                <div class="layui-item layui-col-sm6 lw6" id="d1">
+                    <label class="layui-form-label"><span class="require-item">*</span>合同编号：</label>
+                    <div class="layui-input-block  with-icon">
+                        <sys:gridselectContract url="${ctx}/ruralProject/ruralProjectRecords/selectcontract" type="" isTotal="" id="contractId" name="ZiXunHTBH"  value="${ruralProjectRecords.workContractInfo.id}"  title="选择合同" labelName="workContractInfo.name"
+                                                labelValue="${ruralProjectRecords.workContractInfo.contractNum}" cssClass="form-control required layui-input" fieldLabels="合同名称" fieldKeys="name" searchLabel="合同名称" searchKey="name" ></sys:gridselectContract>
+                    </div>
+                </div>
+                <%--<div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>合同编号：</label>
                     <div class="layui-input-block">
                         <form:input path="ZiXunHTBH" htmlEscape="false"  class="form-control layui-input required"/>
                     </div>
-                </div>
+                </div>--%>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>项目报告号：</label>
                     <div class="layui-input-block">

src/main/webapp/webpage/modules/ruralprojectrecords/cost/reportedModify.jsp

@@ -107,6 +107,16 @@
                     parent.layer.msg("请选择咨询项目造价包含内容说明!", {icon: 5});
                     return false;
                 }
+
+                var BaoGaoShuQianFaDate = $("#BaoGaoShuQianFaDate").val();
+                var s = BaoGaoShuQianFaDate.replace(/-/g,"/");
+                var baogaoDate = new Date(s );
+                var nowDate = new Date();
+                var a = nowDate - baogaoDate;
+                var days = Math.floor(a / (24 * 3600 * 1000));
+                if(days >37){
+                    parent.layer.msg("出具报告日期超期，请重新选择!", {icon: 5});
+                }
                 $("#inputForm").submit();
                 return true;
             }else{
@@ -191,7 +201,8 @@
                 event: 'focus', //响应事件。如果没有传入event，则按照默认的click
                 type : 'date'
                 , trigger: 'click'
-                ,max: 38 //38天后
+                ,max: 0
+                ,min: -37 //37天之前
             });
 
 
@@ -474,6 +485,21 @@
                 }
             }
         }
+
+        function setContractValue(obj){
+            var clientId = $("#contractClientId").val();
+            $.ajax({
+                type:'post',
+                url:'${ctx}/ruralProject/ruralProjectRecords/getContractInfo',
+                data:{
+                    "id":obj
+                },
+                success:function(data){
+                    $("#WeiTuoDW").val(data.client.name);
+                    $("#LianXiDH").val(data.client.telephone);
+                }
+            });
+        }
     </script>
 </head>
 <body>
@@ -544,10 +570,11 @@
                         </form:select>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw6">
+                <div class="layui-item layui-col-sm6 lw6" id="d1">
                     <label class="layui-form-label"><span class="require-item">*</span>合同编号：</label>
-                    <div class="layui-input-block">
-                        <form:input path="ZiXunHTBH" htmlEscape="false"  class="form-control layui-input required"/>
+                    <div class="layui-input-block  with-icon">
+                        <sys:gridselectContract url="${ctx}/ruralProject/ruralProjectRecords/selectcontract" type="" isTotal="" id="contractId" name="ZiXunHTBH"  value="${ruralProjectRecordsReported.ziXunHTBH}"  title="选择合同" labelName="workContractInfo.name"
+                                                labelValue="${ruralProjectRecordsReported.workContractInfo.contractNum}" cssClass="form-control required layui-input" fieldLabels="合同名称" fieldKeys="name" searchLabel="合同名称" searchKey="name" ></sys:gridselectContract>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/reportedAudit.jsp

@@ -41,75 +41,85 @@
         var clientCount = 0;
         function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
             if(validateForm.form()){
-                //咨询标的额
-                var ZiXunBDE = $("#ZiXunBDE").val();
-                if(ZiXunBDE!= undefined && ZiXunBDE!= '' && ZiXunBDE>=500){
-                    //人工工日用量
-                    var RGGRYL = $("#RGGRYL").val();
-                    var GCGMValue = $("#GCGMValue").val();
-                    if(RGGRYL== undefined || RGGRYL== null || RGGRYL == '' || RGGRYL == 0){
-                        parent.layer.msg("咨询标的额大于500万,请填写人工工日用量!", {icon: 5});
+
+                if(obj == 1){
+                    $('#flag').val('yes');
+
+                    //咨询标的额
+                    var ZiXunBDE = $("#ZiXunBDE").val();
+                    if(ZiXunBDE!= undefined && ZiXunBDE!= '' && ZiXunBDE>=500){
+                        //人工工日用量
+                        var RGGRYL = $("#RGGRYL").val();
+                        var GCGMValue = $("#GCGMValue").val();
+                        if(RGGRYL== undefined || RGGRYL== null || RGGRYL == '' || RGGRYL == 0){
+                            parent.layer.msg("咨询标的额大于500万,请填写人工工日用量!", {icon: 5});
+                            return false;
+                        }
+                        if(GCGMValue== undefined || GCGMValue== null || GCGMValue == '' || GCGMValue == 0){
+                            parent.layer.msg("咨询标的额大于500万,建筑面积回魔必须大于0!", {icon: 5});
+                            return false;
+                        }
+                    }
+                    //咨询营业收入
+                    var ZiXunShouRu = $("#ZiXunShouRu").val();
+                    //审定价
+                    var ShenDingJia = $("#ShenDingJia").val();
+                    if(parseFloat(ZiXunShouRu) >= parseFloat(ShenDingJia)){
+                        parent.layer.msg("咨询营业收入金额应小于审定价!", {icon: 5});
                         return false;
                     }
-                    if(GCGMValue== undefined || GCGMValue== null || GCGMValue == '' || GCGMValue == 0){
-                        parent.layer.msg("咨询标的额大于500万,建筑面积回魔必须大于0!", {icon: 5});
+                    var list = [];
+                    var size = $("#reportedConsultantList tr").length;
+                    if(size>20){
+                        parent.layer.msg("咨询员数量不得超过20人!", {icon: 5});
                         return false;
                     }
-                }
-                //咨询营业收入
-                var ZiXunShouRu = $("#ZiXunShouRu").val();
-                //审定价
-                var ShenDingJia = $("#ShenDingJia").val();
-                if(parseFloat(ZiXunShouRu) >= parseFloat(ShenDingJia)){
-                    parent.layer.msg("咨询营业收入金额应小于审定价!", {icon: 5});
-                    return false;
-                }
-                var list = [];
-                var size = $("#reportedConsultantList tr").length;
-                if(size>20){
-                    parent.layer.msg("咨询员数量不得超过20人!", {icon: 5});
-                    return false;
-                }
-                if(size>0){
-                    for (var i = 1;i<=50;i++){
-                        var zixunyuan = $("#reportedConsultantList"+i+"_zixunyuanId").val();
-                        if(zixunyuan!=undefined && zixunyuan != null && zixunyuan !=''){
-                            list.push(zixunyuan);
+                    if(size>0){
+                        for (var i = 1;i<=50;i++){
+                            var zixunyuan = $("#reportedConsultantList"+i+"_zixunyuanId").val();
+                            if(zixunyuan!=undefined && zixunyuan != null && zixunyuan !=''){
+                                list.push(zixunyuan);
+                            }
                         }
-                    }
-                    var nary = list.sort();
-                    for(var i = 0; i < nary.length - 1; i++) {
-                        if(nary[i] == nary[i + 1]) {
-                            parent.layer.msg("咨询员重复，请重新选择!", {icon: 5});
-                            return false;
+                        var nary = list.sort();
+                        for(var i = 0; i < nary.length - 1; i++) {
+                            if(nary[i] == nary[i + 1]) {
+                                parent.layer.msg("咨询员重复，请重新选择!", {icon: 5});
+                                return false;
+                            }
                         }
                     }
-                }
-
-                var team = $("#team").val()
-                var city = $("#city").val()
-                var county = $("#county").val()
-                if(team ==undefined || team == null || team == ''){
-                    parent.layer.msg("请选择工程所在省份!", {icon: 5});
-                    return false;
-                }
-                if(city ==undefined || city == null || city == ''){
-                    parent.layer.msg("请选择工程所在地级市!", {icon: 5});
-                    return false;
-                }
-                if(county ==undefined || county == null || county == ''){
-                    parent.layer.msg("请选择工程所在区县!", {icon: 5});
-                    return false;
-                }
 
-                var checkedCount = $('input[type=checkbox]:checked').length;
-                if(checkedCount == 0){
-                    parent.layer.msg("请选择咨询项目造价包含内容说明!", {icon: 5});
-                    return false;
-                }
+                    var team = $("#team").val()
+                    var city = $("#city").val()
+                    var county = $("#county").val()
+                    if(team ==undefined || team == null || team == ''){
+                        parent.layer.msg("请选择工程所在省份!", {icon: 5});
+                        return false;
+                    }
+                    if(city ==undefined || city == null || city == ''){
+                        parent.layer.msg("请选择工程所在地级市!", {icon: 5});
+                        return false;
+                    }
+                    if(county ==undefined || county == null || county == ''){
+                        parent.layer.msg("请选择工程所在区县!", {icon: 5});
+                        return false;
+                    }
 
-                if(obj == 1){
-                    $('#flag').val('yes');
+                    var checkedCount = $('input[type=checkbox]:checked').length;
+                    if(checkedCount == 0){
+                        parent.layer.msg("请选择咨询项目造价包含内容说明!", {icon: 5});
+                        return false;
+                    }
+                    var BaoGaoShuQianFaDate = $("#BaoGaoShuQianFaDate").val();
+                    var s = BaoGaoShuQianFaDate.replace(/-/g,"/");
+                    var baogaoDate = new Date(s );
+                    var nowDate = new Date();
+                    var a = nowDate - baogaoDate;
+                    var days = Math.floor(a / (24 * 3600 * 1000));
+                    if(days >37){
+                        parent.layer.msg("出具报告日期超期，请重新选择!", {icon: 5});
+                    }
                 }else{
                     $('#flag').val('no');
                 }
@@ -197,7 +207,8 @@
                 event: 'focus', //响应事件。如果没有传入event，则按照默认的click
                 type : 'date'
                 , trigger: 'click'
-                ,max: 38 //38天后
+                ,min: -40 //40天之前
+                ,max: 0
             });
 
 
@@ -480,6 +491,20 @@
                 }
             }
         }
+        function setContractValue(obj){
+            var clientId = $("#contractClientId").val();
+            $.ajax({
+                type:'post',
+                url:'${ctx}/ruralProject/ruralProjectRecords/getContractInfo',
+                data:{
+                    "id":obj
+                },
+                success:function(data){
+                    $("#WeiTuoDW").val(data.client.name);
+                    $("#LianXiDH").val(data.client.telephone);
+                }
+            });
+        }
     </script>
 </head>
 <body>
@@ -551,10 +576,11 @@
                         </form:select>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw6">
+                <div class="layui-item layui-col-sm6 lw6" id="d1">
                     <label class="layui-form-label"><span class="require-item">*</span>合同编号：</label>
-                    <div class="layui-input-block">
-                        <form:input path="ZiXunHTBH" htmlEscape="false"  class="form-control layui-input required"/>
+                    <div class="layui-input-block  with-icon">
+                        <sys:gridselectContract url="${ctx}/ruralProject/ruralProjectRecords/selectcontract" type="" isTotal="" id="contractId" name="ZiXunHTBH"  value="${ruralProjectRecordsReported.ziXunHTBH}"  title="选择合同" labelName="workContractInfo.name"
+                                                labelValue="${ruralProjectRecordsReported.workContractInfo.contractNum}" cssClass="form-control required layui-input" fieldLabels="合同名称" fieldKeys="name" searchLabel="合同名称" searchKey="name" ></sys:gridselectContract>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/reportedForm.jsp

@@ -108,6 +108,15 @@
                     return false;
                 }
 
+                var BaoGaoShuQianFaDate = $("#BaoGaoShuQianFaDate").val();
+                var s = BaoGaoShuQianFaDate.replace(/-/g,"/");
+                var baogaoDate = new Date(s );
+                var nowDate = new Date();
+                var a = nowDate - baogaoDate;
+                var days = Math.floor(a / (24 * 3600 * 1000));
+                if(days >37){
+                    parent.layer.msg("出具报告日期超期，请重新选择!", {icon: 5});
+                }
 
                 $("#inputForm").submit();
                 return true;
@@ -193,7 +202,8 @@
                 event: 'focus', //响应事件。如果没有传入event，则按照默认的click
                 type : 'date'
                 , trigger: 'click'
-                ,max: 38 //38天后
+                ,max: 0
+                ,min: -37 //37天之前
             });
 
 
@@ -476,6 +486,21 @@
                 }
             }
         }
+
+        function setContractValue(obj){
+            var clientId = $("#contractClientId").val();
+            $.ajax({
+                type:'post',
+                url:'${ctx}/ruralProject/ruralProjectRecords/getContractInfo',
+                data:{
+                    "id":obj
+                },
+                success:function(data){
+                    $("#WeiTuoDW").val(data.client.name);
+                    $("#LianXiDH").val(data.client.telephone);
+                }
+            });
+        }
     </script>
 </head>
 <body>
@@ -539,12 +564,19 @@
                         </form:select>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw6">
+                <div class="layui-item layui-col-sm6 lw6" id="d1">
+                    <label class="layui-form-label"><span class="require-item">*</span>合同编号：</label>
+                    <div class="layui-input-block  with-icon">
+                        <sys:gridselectContract url="${ctx}/ruralProject/ruralProjectRecords/selectcontract" type="" isTotal="" id="contractId" name="ZiXunHTBH"  value="${ruralProjectRecordsReported.ziXunHTBH}"  title="选择合同" labelName="workContractInfo.name"
+                                                labelValue="${ruralProjectRecordsReported.workContractInfo.contractNum}" cssClass="form-control required layui-input" fieldLabels="合同名称" fieldKeys="name" searchLabel="合同名称" searchKey="name" ></sys:gridselectContract>
+                    </div>
+                </div>
+                <%--<div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>合同编号：</label>
                     <div class="layui-input-block">
                         <form:input path="ZiXunHTBH" htmlEscape="false"  class="form-control layui-input required"/>
                     </div>
-                </div>
+                </div>--%>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>项目报告号：</label>
                     <div class="layui-input-block">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/reportedModify.jsp

@@ -107,6 +107,16 @@
                     parent.layer.msg("请选择咨询项目造价包含内容说明!", {icon: 5});
                     return false;
                 }
+
+                var BaoGaoShuQianFaDate = $("#BaoGaoShuQianFaDate").val();
+                var s = BaoGaoShuQianFaDate.replace(/-/g,"/");
+                var baogaoDate = new Date(s );
+                var nowDate = new Date();
+                var a = nowDate - baogaoDate;
+                var days = Math.floor(a / (24 * 3600 * 1000));
+                if(days >37){
+                    parent.layer.msg("出具报告日期超期，请重新选择!", {icon: 5});
+                }
                 $("#inputForm").submit();
                 return true;
             }else{
@@ -191,7 +201,8 @@
                 event: 'focus', //响应事件。如果没有传入event，则按照默认的click
                 type : 'date'
                 , trigger: 'click'
-                ,max: 38 //38天后
+                ,max: 0
+                ,min: -37 //37天之前
             });
 
 
@@ -474,6 +485,20 @@
                 }
             }
         }
+        function setContractValue(obj){
+            var clientId = $("#contractClientId").val();
+            $.ajax({
+                type:'post',
+                url:'${ctx}/ruralProject/ruralProjectRecords/getContractInfo',
+                data:{
+                    "id":obj
+                },
+                success:function(data){
+                    $("#WeiTuoDW").val(data.client.name);
+                    $("#LianXiDH").val(data.client.telephone);
+                }
+            });
+        }
     </script>
 </head>
 <body>
@@ -544,10 +569,11 @@
                         </form:select>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw6">
+                <div class="layui-item layui-col-sm6 lw6" id="d1">
                     <label class="layui-form-label"><span class="require-item">*</span>合同编号：</label>
-                    <div class="layui-input-block">
-                        <form:input path="ZiXunHTBH" htmlEscape="false"  class="form-control layui-input required"/>
+                    <div class="layui-input-block  with-icon">
+                        <sys:gridselectContract url="${ctx}/ruralProject/ruralProjectRecords/selectcontract" type="" isTotal="" id="contractId" name="ZiXunHTBH"  value="${ruralProjectRecordsReported.ziXunHTBH}"  title="选择合同" labelName="workContractInfo.name"
+                                                labelValue="${ruralProjectRecordsReported.workContractInfo.contractNum}" cssClass="form-control required layui-input" fieldLabels="合同名称" fieldKeys="name" searchLabel="合同名称" searchKey="name" ></sys:gridselectContract>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/reportedView.jsp

@@ -139,7 +139,7 @@
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label">合同编号：</label>
                     <div class="layui-input-block">
-                        <form:input path="ZiXunHTBH" htmlEscape="false" readonly="true" class="form-control layui-input required" style="background-color: #ffffff;"/>
+                        <input type="text" htmlEscape="false" readonly="true" value="${ruralProjectRecordsReported.workContractInfo.contractNum}" class="form-control layui-input required" style="background-color: #ffffff;">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">

src/main/webapp/webpage/modules/workreimbursement/workReimbursementFormAdd.jsp

@@ -776,10 +776,10 @@
                             <input id="workAccountList{{idx}}_money" onchange="getMoney(this.value)" name="workAccountList[{{idx}}].money" type="text" value="{{row.money}}"  placeholder="请输入费用" maxlength="10" class="form-control number"/>
                         </td>
                         <td style="text-align:center;">
-                            <input id="workAccountList{{idx}}_bills"  name="workAccountList[{{idx}}].bills" type="text" value="{{row.bills}}" maxlength="32" placeholder="请输入单据张数"  class="form-control number"/>
+                            <input id="workAccountList{{idx}}_bills"  name="workAccountList[{{idx}}].bills" type="text" value="{{row.bills}}" maxlength="3" placeholder="请输入单据张数"  class="form-control number"/>
                         </td>
                         <td style="text-align:center;">
-                            <input id="workAccountList{{idx}}_evectionNumber"  name="workAccountList[{{idx}}].evectionNumber" type="text" value="{{row.evectionNumber}}" maxlength="32" placeholder="请输入出差天数"  class="form-control number"/>
+                            <input id="workAccountList{{idx}}_evectionNumber"  name="workAccountList[{{idx}}].evectionNumber" type="text" value="{{row.evectionNumber}}" maxlength="3" placeholder="请输入出差天数"  class="form-control number"/>
                         </td>
                         <td>
                             <input id="workAccountList{{idx}}_remarks" name="workAccountList[{{idx}}].remarks" type="text" value="{{row.remarks}}"  placeholder="请输入内容" maxlength="32" class="form-control "/>

src/main/webapp/webpage/modules/workreimbursement/workReimbursementList.jsp

@@ -150,23 +150,23 @@
             ,cols: [[
                 // {checkbox: true, fixed: true},
                 {field:'submitterId',align:'center',  width:40,title: '序号'}
-                ,{field:'number',align:'center', title: '报销编号', minWidth:150,templet:function(d){
+                ,{field:'number',align:'center', title: '报销编号', width:150,templet:function(d){
                         var xml = "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('查看报销单', '${ctx}/workreimbursement/workReimbursement/form?id=" + d.id + "&tabId=1','95%','95%')\">" +
                             "<span title=" + d.realnumber + ">" + d.number + "</span></a>";
                         return xml;
                     }}
-                ,{field:'handleName',align:'center', title: '经办人', width:80,templet:function(d){
+                ,{field:'projectId', align:'center',title: '报销项目', minWidth:150,templet:function(d){
+                        return "<span title='"+ d.projectId +"'>" + d.projectId + "</span>";
+                    }}
+                ,{field:'handleName',align:'center', title: '经办人', width:100,templet:function(d){
                         return "<span title='"+ d.handleName +"'>" + d.handleName + "</span>";
                     }}
-                ,{field:'submitterName',align:'center', title: '报销人', width:80,templet:function(d){
+                ,{field:'submitterName',align:'center', title: '报销人', width:100,templet:function(d){
                         return "<span title='"+ d.submitterName +"'>" + d.submitterName + "</span>";
                     }}
-                ,{field:'officeId',align:'center', title: '报销部门', minWidth:110,templet:function(d){
+                ,{field:'officeId',align:'center', title: '报销部门', width:130,templet:function(d){
                         return "<span title='"+ d.officeId +"'>" + d.officeId + "</span>";
                     }}
-                ,{field:'projectId', align:'center',title: '报销项目', minWidth:150,templet:function(d){
-                        return "<span title='"+ d.projectId +"'>" + d.projectId + "</span>";
-                    }}
                 ,/*{field:'projectLeader', align:'center',title: '项目负责人', width:80,templet:function(d){
                         return "<span title='"+ d.projectLeader +"'>" + d.projectLeader + "</span>";
                     }}

src/main/webapp/webpage/modules/workreimbursement/workReimbursementModifyApply.jsp

@@ -894,10 +894,10 @@
                             <input id="workAccountList{{idx}}_money" onchange="getMoney(this.value)" name="workAccountList[{{idx}}].money" type="text" value="{{row.money}}"  placeholder="请输入费用" maxlength="10" class="form-control number"/>
                         </td>
                         <td style="text-align:center;">
-                            <input id="workAccountList{{idx}}_bills"  name="workAccountList[{{idx}}].bills" type="text" value="{{row.bills}}" maxlength="32" placeholder="请输入单据张数"  class="form-control number"/>
+                            <input id="workAccountList{{idx}}_bills"  name="workAccountList[{{idx}}].bills" type="text" value="{{row.bills}}" maxlength="3" placeholder="请输入单据张数"  class="form-control number"/>
                         </td>
                         <td style="text-align:center;">
-                            <input id="workAccountList{{idx}}_evectionNumber"  name="workAccountList[{{idx}}].evectionNumber" type="text" value="{{row.evectionNumber}}" maxlength="32" placeholder="请输入出差天数"  class="form-control number"/>
+                            <input id="workAccountList{{idx}}_evectionNumber"  name="workAccountList[{{idx}}].evectionNumber" type="text" value="{{row.evectionNumber}}" maxlength="3" placeholder="请输入出差天数"  class="form-control number"/>
                         </td>
                         <td>
                             <input id="workAccountList{{idx}}_remarks" name="workAccountList[{{idx}}].remarks" type="text" value="{{row.remarks}}"  placeholder="请输入内容" maxlength="32" class="form-control "/>