合同登记

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectViewController.java

@@ -213,6 +213,7 @@ public class RuralProjectViewController extends BaseController {
             }
         }
 
+
         model.addAttribute("projectRecords", projectRecords);
         long l8 = System.currentTimeMillis();
         RuralProjectRecordsReported reported = ruralProjectMessageService.getRuralProjectRecordsReported(projectRecords.getId());

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

@@ -2182,9 +2182,9 @@
 		FROM rural_project_records a
 		<where>
 			a.project_name=#{projectName}  and a.`status`!=7
-			<if test="companyType !=null and companyType !=''">
+			<!--<if test="companyType !=null and companyType !=''">
 				and a.company_type= #{companyType}
-			</if>
+			</if>-->
 		</where>
 	</select>
     <select id="reReportDataNumber"

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/new/reportForm.jsp

@@ -1009,6 +1009,7 @@
 					</div>
 				</div>
 			</div>
+
 			<div class="form-group layui-row first lw12">
 				<div class="form-group-label"><h2>质量复核信息</h2></div>
 					<div class="layui-item layui-col-sm6">

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

@@ -323,7 +323,7 @@
                 }
             });
             var workClientLinkmanInfo = $("#workClientLinkmanInfo").val()
-            if(workClientLinkmanInfo != null && workClientLinkmanInfo !=""){
+            /*if(workClientLinkmanInfo != null && workClientLinkmanInfo !=""){
 
                 //按钮禁用
                 $("#addUserButton").removeClass("disables");
@@ -341,7 +341,7 @@
                 $("#linkmanButton").removeClass("forbidden");
                 $("#linkmanButton").removeClass("notForbidden");
                 $("#linkmanButton").addClass("forbidden");
-            }
+            }*/
             $("input[name='ext']").on('ifChecked',function(event){
                 radioVal = $(this).val();
                 if(radioVal == 0){
@@ -606,7 +606,7 @@
             }
 
             //按钮禁用
-            $("#addUserButton").removeClass("disables");
+            /*$("#addUserButton").removeClass("disables");
             $("#addUserButton").removeClass("notDisables");
             $("#addUserButton").addClass("disables");
             //a标签置灰
@@ -620,7 +620,7 @@
 
             $("#linkmanButton").removeClass("forbidden");
             $("#linkmanButton").removeClass("notForbidden");
-            $("#linkmanButton").addClass("forbidden");
+            $("#linkmanButton").addClass("forbidden");*/
         }
         function hasInArr(id,idArr) {
             for(var i=0;i<idArr.length;i++){
@@ -832,54 +832,6 @@
                 });
             }
         }
-
-        function getApprovalFee() {
-            //总价
-            var af = $("#estimateTotalFees").val();
-            if(af !=''){
-                $("#estimateTotalFees").val(af)
-            }
-            $("#buildingFees").val("");
-            $("#installFees").val("");
-            $("#buildingPercent").val("");
-            $("#installPercent").val("");
-        }
-
-        function getInstallFee() {
-            var af = $("#estimateTotalFees").val();
-            //安装
-            var inf = $("#installFees").val();
-            if(inf != ''&& af !=''){
-                var hf = parseInt(af)-parseInt(inf);
-                var rate = (Math.round(parseInt(inf) / parseInt(af) * 100) / 100 * 100).toFixed(2);
-                $("#installPercent").val(rate);
-                $("#buildingFees").val(hf);
-                bf = hf;
-                var bRate = (Math.round(parseInt(hf) / parseInt(af) * 100) / 100 * 100).toFixed(2);
-                $("#buildingPercent").val(bRate);
-            }
-            if(inf == ''|| af ==''){
-                $("#installPercent").val("");
-            }
-        }
-
-        function getBuildingFee() {
-            var af = $("#estimateTotalFees").val();
-            //土建
-            var bf = $("#buildingFees").val();
-            if(bf != ''&& af !=''){
-                var hf = parseInt(af)-parseInt(bf);
-                var rate = (Math.round(parseInt(bf) / parseInt(af) * 100) / 100 * 100).toFixed(2);
-                $("#buildingPercent").val(rate);
-                $("#installFees").val(hf);
-                inf = hf;
-                var inRate = (Math.round(parseInt(hf) / parseInt(af) * 100) / 100 * 100).toFixed(2);
-                $("#installPercent").val(inRate);
-            }
-            if(bf == ''|| af ==''){
-                $("#buildingPercent").val("");
-            }
-        }
         function reProjectName(obj) {
             var name=$(obj).val()
             var proName='${ruralProjectRecords.projectName}'
@@ -1197,7 +1149,7 @@
                 </div>
                 <div class="layui-item layui-col-sm6 lw7" style="display: none">
                     <div class="layui-input-block">
-                        <form:input path="companyType" htmlEscape="false"  readonly="true" class="form-control layui-input" value="${ruralProjectRecords.companyType}"/>
+                        <form:input path="companyType" htmlEscape="false"  readonly="true" class="form-control judgment layui-input" value="${ruralProjectRecords.companyType}"/>
                     </div>
                 </div>
                 <%--<div class="layui-item layui-col-sm6 lw7">
@@ -1314,13 +1266,13 @@
                 <div class="layui-item layui-col-sm6 lw7 with-textarea">
                     <label class="layui-form-label">工程概况：</label>
                     <div class="layui-input-block">
-                        <form:textarea placeholder="请输入工程概况" path="projectDesc" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
+                        <form:textarea placeholder="请输入工程概况" path="projectDesc" htmlEscape="false" rows="4"  maxlength="255"  class="form-control judgment"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7 with-textarea">
                     <label class="layui-form-label ">备注：</label>
                     <div class="layui-input-block">
-                        <form:textarea placeholder="请输入备注" path="remarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
+                        <form:textarea placeholder="请输入备注" path="remarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control judgment"/>
                     </div>
                 </div>
             </div>
@@ -1367,17 +1319,17 @@
                     <input id="workClientLinkmanList{{idx}}_delFlag" name="workClientLinkmanList[{{idx}}].delFlag" type="hidden" value="0"/>
                 </td>
                 <td>
-                    <input <input style="background-color: #FFFFFF;"  id="workClientLinkmanList{{idx}}_clientName" name="workClientLinkmanList[{{idx}}].clientId.name" type="text" value="{{row.clientId.name}}"    class="form-control "/>
+                    <input <input style="background-color: #FFFFFF;"  id="workClientLinkmanList{{idx}}_clientName" name="workClientLinkmanList[{{idx}}].clientId.name" type="text" value="{{row.clientId.name}}"    class="form-control judgment"/>
                 </td>
                 <td>
                     <input <input style="background-color: #FFFFFF;"  id="workClientLinkmanList{{idx}}_name" name="workClientLinkmanList[{{idx}}].name" type="text" value="{{row.name}}"    class="form-control judgment"/>
                 </td>
 
                 <td>
-                    <input <input style="background-color: #FFFFFF;"  id="workClientLinkmanList{{idx}}_linkPhone" name="workClientLinkmanList[{{idx}}].linkPhone" type="text" value="{{row.linkPhone}}"    class="form-control isTel"/>
+                    <input <input style="background-color: #FFFFFF;"  id="workClientLinkmanList{{idx}}_linkPhone" name="workClientLinkmanList[{{idx}}].linkPhone" type="text" value="{{row.linkPhone}}"    class="form-control judgment isTel"/>
                 </td>
                 <td>
-                    <input <input style="background-color: #FFFFFF;"  id="workClientLinkmanList{{idx}}_linkMobile" name="workClientLinkmanList[{{idx}}].linkMobile" type="text" value="{{row.linkMobile}}"    class="form-control isPhone"/>
+                    <input <input style="background-color: #FFFFFF;"  id="workClientLinkmanList{{idx}}_linkMobile" name="workClientLinkmanList[{{idx}}].linkMobile" type="text" value="{{row.linkMobile}}"    class="form-control judgment isPhone"/>
                 </td>
                 <td class="text-center op-td" >
                     {{#delBtn}}<span class="op-btn op-btn-delete" onclick="delEntrustRow(this, '#workClientLinkmanList{{idx}}')" title="删除"><i class="glyphicon glyphicon-remove"></i>&nbsp;删除</span>{{/delBtn}}
@@ -1437,17 +1389,17 @@
                         <input id="workConstructionLinkmanList{{idx}}_delFlag" name="workConstructionLinkmanList[{{idx}}].delFlag" type="hidden" value="0"/>
 					</td>
                     <td>
-                        <input <input style="background-color: #FFFFFF;"  id="workConstructionLinkmanList{{idx}}_clientName" name="workConstructionLinkmanList[{{idx}}].clientId.name" type="text" value="{{row.clientId.name}}"    class="form-control "/>
+                        <input <input style="background-color: #FFFFFF;"  id="workConstructionLinkmanList{{idx}}_clientName" name="workConstructionLinkmanList[{{idx}}].clientId.name" type="text" value="{{row.clientId.name}}"    class="form-control judgment"/>
                     </td>
                     <td>
                         <input <input style="background-color: #FFFFFF;"  id="workConstructionLinkmanList{{idx}}_name" name="workConstructionLinkmanList[{{idx}}].name" type="text" value="{{row.name}}"    class="form-control judgment"/>
                     </td>
 
                     <td>
-                        <input <input style="background-color: #FFFFFF;"  id="workConstructionLinkmanList{{idx}}_linkPhone" name="workConstructionLinkmanList[{{idx}}].linkPhone" type="text" value="{{row.linkPhone}}"    class="form-control isTel"/>
+                        <input <input style="background-color: #FFFFFF;"  id="workConstructionLinkmanList{{idx}}_linkPhone" name="workConstructionLinkmanList[{{idx}}].linkPhone" type="text" value="{{row.linkPhone}}"    class="form-control judgment isTel"/>
                     </td>
                     <td>
-                        <input <input style="background-color: #FFFFFF;"  id="workConstructionLinkmanList{{idx}}_linkMobile" name="workConstructionLinkmanList[{{idx}}].linkMobile" type="text" value="{{row.linkMobile}}"    class="form-control isPhone"/>
+                        <input <input style="background-color: #FFFFFF;"  id="workConstructionLinkmanList{{idx}}_linkMobile" name="workConstructionLinkmanList[{{idx}}].linkMobile" type="text" value="{{row.linkMobile}}"    class="form-control judgment isPhone"/>
                     </td>
 					<td class="text-center" width="10">
 						{{#delBtn}}<span class="op-btn op-btn-delete" onclick="delRow(this, '#workConstructionLinkmanList{{idx}}')" title="删除"><i class="fa fa-trash"></i>&nbsp;删除</span>{{/delBtn}}

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

@@ -76,7 +76,7 @@
                 maxmin: true, //开启最大化最小化按钮
                 content: url,
                 skin: 'three-btns',
-                btn: ['提交', '关闭'],
+                btn: ['提交','暂存' ,'关闭'],
                 btn1: function(index, layero){
                     var body = top.layer.getChildFrame('body', index);
                     var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
@@ -93,8 +93,26 @@
                         setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
                     }
                 },
-                btn2: function (index) {
-                }
+                btn2: 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(2) ){
+						// top.layer.close(index);//关闭对话框。
+						setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+					}else {
+						return false;
+					}
+                },
+				btn3: function (index) {
+				}
             });
         }
 		//打开对话框(查看)
@@ -592,15 +610,15 @@
 						}
                         if(d.canedit1 != undefined && d.canedit1 =="1")
                         {
-                            xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/ruralProject/ruralCostProjectRecords/form?id=" + d.id +"&companyType=${companyType}','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
+                            xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/ruralProject/ruralCostProjectRecords/form?id=" + d.id +"&companyType=${companyType}','95%', '95%','','提交,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
                         }
                         if(d.canedit2 != undefined && d.canedit2 =="1")
                         {
-                            xml+="<a href=\"#\" onclick=\"openDialogre('调整项目', '${ctx}/ruralProject/ruralCostProjectRecords/modify?id=" + d.id + "&companyType=${companyType}','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
+                            xml+="<a href=\"#\" onclick=\"openDialogre('调整项目', '${ctx}/ruralProject/ruralCostProjectRecords/modify?id=" + d.id + "&companyType=${companyType}','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
                         }
                         if(d.canrecall != undefined && d.canrecall =="1")
                         {
-                            xml+="<a href=\"#\" onclick=\"openDialogre('调整项目', '${ctx}/ruralProject/ruralCostProjectRecords/form?id=" + d.id + "&companyType=${companyType}','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
+                            xml+="<a href=\"#\" onclick=\"openDialogre('调整项目', '${ctx}/ruralProject/ruralCostProjectRecords/form?id=" + d.id + "&companyType=${companyType}','95%', '95%','','提交,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
                         }
                         if(d.candel != undefined && d.candel =="1")
                         {
@@ -626,12 +644,12 @@
                         }
 						if(d.deleteAdmin != undefined && d.deleteAdmin =="1")
 						{
-							xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/ruralProject/ruralCostProjectRecords/adminModify?companyType=${companyType}&id=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
+							xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/ruralProject/ruralCostProjectRecords/adminModify?companyType=${companyType}&id=" + d.id + "','95%', '95%','','提交,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
 							xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectRecords/adminDelete?companyType=${companyType}&id=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\"> 删除</a>";
 						}
 						if(d.modifyRecords != undefined && d.modifyRecords =="1")
 						{
-							xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/ruralProject/ruralCostProjectRecords/form?companyType=${companyType}&id=" + d.id +"','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
+							xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/ruralProject/ruralCostProjectRecords/form?companyType=${companyType}&id=" + d.id +"','95%', '95%','','提交,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
 							xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectRecords/delete?companyType=${companyType}&id=" + d.id + "\" onclick=\"return confirmx('确认要作废该项目信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\"> 作废</a>";
 						}
 						xml+="</div>"

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsList.jsp

@@ -75,7 +75,7 @@
                 maxmin: true, //开启最大化最小化按钮
                 content: url,
                 skin: 'three-btns',
-				btn: ['提交', '关闭'],
+				btn: ['提交','暂存', '关闭'],
                 /*yes: function (index, layero) {
                     var body = top.layer.getChildFrame('body', index);
                     var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
@@ -112,7 +112,25 @@
                         setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
                     }
                 },
-                btn2: function (index) {
+				btn2: 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(2) ){
+						// top.layer.close(index);//关闭对话框。
+						setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+					}else {
+						return false;
+					}
+				},
+                btn3: function (index) {
                 }
             });
         }
@@ -529,15 +547,15 @@
                         }
                         if(d.canedit1 != undefined && d.canedit1 =="1")
                         {
-                            xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/ruralProject/ruralProjectRecords/form?companyType=${companyType}&id=" + d.id +"','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
+                            xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/ruralProject/ruralProjectRecords/form?companyType=${companyType}&id=" + d.id +"','95%', '95%','','提交,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
                         }
                         if(d.canedit2 != undefined && d.canedit2 =="1")
                         {
-                            xml+="<a href=\"#\" onclick=\"openDialogre('调整项目', '${ctx}/ruralProject/ruralProjectRecords/modify?companyType=${companyType}&id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
+                            xml+="<a href=\"#\" onclick=\"openDialogre('调整项目', '${ctx}/ruralProject/ruralProjectRecords/modify?companyType=${companyType}&id=" + d.id + "','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
                         }
                         if(d.canrecall != undefined && d.canrecall =="1")
                         {
-                            xml+="<a href=\"#\" onclick=\"openDialogre('调整项目', '${ctx}/ruralProject/ruralProjectRecords/form?companyType=${companyType}&id=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
+                            xml+="<a href=\"#\" onclick=\"openDialogre('调整项目', '${ctx}/ruralProject/ruralProjectRecords/form?companyType=${companyType}&id=" + d.id + "','95%', '95%','','提交,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
                         }
                         if(d.candel != undefined && d.candel =="1")
                         {
@@ -562,12 +580,12 @@
                         }
                         if(d.deleteAdmin != undefined && d.deleteAdmin =="1")
                         {
-							xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/ruralProject/ruralProjectRecords/adminModify?companyType=${companyType}&id=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改</a>";
+							xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/ruralProject/ruralProjectRecords/adminModify?companyType=${companyType}&id=" + d.id + "','95%', '95%','','提交,暂存,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改</a>";
 							xml+="<a href=\"${ctx}/ruralProject/ruralProjectRecords/adminDelete?id=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\"> 删除</a>";
                         }
 						if(d.modifyRecords != undefined && d.modifyRecords =="1")
 						{
-							xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/ruralProject/ruralProjectRecords/form?companyType=${companyType}&id=" + d.id +"','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
+							xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/ruralProject/ruralProjectRecords/form?companyType=${companyType}&id=" + d.id +"','95%', '95%','','提交,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
 							xml+="<a href=\"${ctx}/ruralProject/ruralProjectRecords/delete?id=" + d.id + "\" onclick=\"return confirmx('确认要作废该项目信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\"> 作废</a>";
 						}
                         xml+="</div>"