新增项目选择合同根据合同类型展示对应字段

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

@@ -21,7 +21,7 @@ function searchGrid${id}(){
     var url = "${url}?fieldLabels=${fieldLabels}&fieldKeys=${fieldKeys}&url=${url}&searchLabel=${searchLabel}&searchKey=${searchKey}&type=${type}&isTotal=${isTotal}";
     url = encodeURI(url);
 	top.layer.open({
-	    type: 2,  
+	    type: 2,
 	    area: ['90%','90%'],
 	    title:"${title}",
 	    name:'friend',
@@ -40,9 +40,9 @@ function searchGrid${id}(){
 			top.layer.close(index);//关闭对话框。
 			setContractValue(item.split('_item_')[0]);
 		},
-		  cancel: function(index){ 
+		  cancel: function(index){
 	       }
-	}); 
+	});
 };
 </script>
 
@@ -52,8 +52,8 @@ function searchGrid${id}(){
 		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>
-	             </button> 
+	             </button>
        		 </span>
-       		
+
     </div>
 	 <label id="${id}Name-error" class="error" for="${id}Name" style="display:none"></label>

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

@@ -116,6 +116,14 @@
                         $("#ext").attr("checked",true);
                         $("#divv").show();
                         $("#divv3").show();
+                        var contractInformation='${ruralProjectRecords.workContractInfo.contractInformation}'
+                        if(contractInformation == "1"){
+                            $("#c2").show();
+                            $("#c1").hide();
+                        }else{
+                            $("#c2").hide();
+                            $("#c1").show();
+                        }
                         form.render();
                     }
                 }
@@ -293,7 +301,15 @@
                     "id":obj
                 },
                 success:function(data){
+                    if(data.contractInformation == "1"){
+                        $("#c2").show();
+                        $("#c1").hide();
+                    }else{
+                        $("#c2").hide();
+                        $("#c1").show();
+                    }
                     $("#contractName").val(data.name);
+                    $("#otherDetails").val(data.otherDetails);
                     $("#contractPrice").val(data.contractPrice);
                     formatNum($("#contractPrice"));
                     $("#contractClientName").val(data.client.name);
@@ -770,10 +786,16 @@
                                <input  htmlEscape="false"  readonly="true" id="contractName"  class="form-control layui-input" value="${ruralProjectRecords.workContractInfo.name}"/>
                            </div>
                        </div>
-                       <div class="layui-item layui-col-sm6 lw7">
-                           <label class="layui-form-label double-line">合同金额(元)：</label>
+                       <div class="layui-item layui-col-sm6 lw7" id="c1">
+                           <label class="layui-form-label">合同金额(元)：</label>
+                           <div class="layui-input-block">
+                               <input htmlEscape="false"  readonly="true" id="contractPrice"  class="form-control layui-input" value="${ruralProjectRecords.workContractInfo.contractPrice}" onchange="formatNum(this);"/>
+                           </div>
+                       </div>
+                       <div class="layui-item layui-col-sm6 lw7" id="c2" style="display: none">
+                           <label class="layui-form-label">费率描述：</label>
                            <div class="layui-input-block">
-                               <input htmlEscape="false" readonly="true" id="contractPrice"  class="form-control layui-input" value="${ruralProjectRecords.workContractInfo.contractPrice}" onchange="formatNum(this);"/>
+                               <input htmlEscape="false"  readonly="true" id="otherDetails"  class="form-control layui-input" value="${ruralProjectRecords.workContractInfo.otherDetails}"/>
                            </div>
                        </div>
                        <div class="layui-item layui-col-sm6 lw7">

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

@@ -99,6 +99,14 @@
                         $("#ext").attr("checked",true);
                         $("#divv").show();
                         $("#divv3").show();
+                        var contractInformation='${projectRecords.workContractInfo.contractInformation}'
+                        if(contractInformation == "1"){
+                            $("#c2").show();
+                            $("#c1").hide();
+                        }else{
+                            $("#c2").hide();
+                            $("#c1").show();
+                        }
                         form.render();
                     }
                 }
@@ -280,12 +288,20 @@
                     "id":obj
                 },
                 success:function(data){
+                    if(data.contractInformation == "1"){
+                        $("#c2").show();
+                        $("#c1").hide();
+                    }else{
+                        $("#c2").hide();
+                        $("#c1").show();
+                    }
                     $("#contractName").val(data.name);
+                    $("#otherDetails").val(data.otherDetails);
                     $("#contractPrice").val(data.contractPrice);
                     formatNum($("#contractPrice"));
                     $("#contractClientName").val(data.client.name);
                     $("#contractClientId").val(data.client.id);
-                    $("#constructionProjectType").val(data.constructionProjectTypeStr);
+                    $("#constructionProjectType").val(data.contractType);
                     $("#linkmanId").val(data.workClinetInfoIds);
                     //清理之前的联系人
                     var newClientId  = data.client.id;
@@ -759,12 +775,18 @@
                                 <input  htmlEscape="false"  readonly="true" id="contractName"  class="form-control layui-input" value="${projectRecords.workContractInfo.name}"/>
                             </div>
                         </div>
-                        <div class="layui-item layui-col-sm6 lw7">
-                            <label class="layui-form-label double-line">合同金额(元)：</label>
+                        <div class="layui-item layui-col-sm6 lw7"  id="c1">
+                            <label class="layui-form-label">合同金额(元)：</label>
                             <div class="layui-input-block">
                                 <input htmlEscape="false"  readonly="true" id="contractPrice"  class="form-control layui-input" value="${projectRecords.workContractInfo.contractPrice}" onchange="formatNum(this);"/>
                             </div>
                         </div>
+                        <div class="layui-item layui-col-sm6 lw7" id="c2" style="display: none">
+                            <label class="layui-form-label">费率描述：</label>
+                            <div class="layui-input-block">
+                                <input htmlEscape="false"  readonly="true" id="otherDetails"  class="form-control layui-input" value="${projectRecords.workContractInfo.otherDetails}"/>
+                            </div>
+                        </div>
                         <div class="layui-item layui-col-sm6 lw7">
                             <label class="layui-form-label">委托方：</label>
                             <div class="layui-input-block">

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

@@ -29,7 +29,7 @@
                 $("#inputForm").submit();
                 return true;
             }
-	
+
 		  return false;
 		}
 		$(document).ready(function() {
@@ -72,6 +72,15 @@
 					$("#clientName").val(tt);
 				},100);
 			}
+
+			var contractInformation='${projectRecords.workContractInfo.contractInformation}'
+			if(contractInformation == "1"){
+				$("#c2").show();
+				$("#c1").hide();
+			}else{
+				$("#c2").hide();
+				$("#c1").show();
+			}
 		});
 
         function insertTitle(tValue){
@@ -146,12 +155,18 @@
 							<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.name}"/>
 						</div>
 					</div>
-					<div class="layui-item layui-col-sm6 lw6">
+					<div class="layui-item layui-col-sm6 lw6" id="c1">
 						<label class="layui-form-label double-line">合同金额(元)：</label>
 						<div class="layui-input-block">
 							<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<fmt:formatNumber value="${projectRecords.workContractInfo.contractPrice}" pattern="#,##0.00#"/>"/>
 						</div>
 					</div>
+					<div class="layui-item layui-col-sm6 lw6" id="c2" style="display: none">
+						<label class="layui-form-label">费率描述：</label>
+						<div class="layui-input-block">
+							<input htmlEscape="false"  readonly="true" id="otherDetails"  class="form-control layui-input" value="${projectRecords.workContractInfo.otherDetails}"/>
+						</div>
+					</div>
 					<div class="layui-item layui-col-sm6 lw6">
 						<label class="layui-form-label">委托方：</label>
 						<div class="layui-input-block">
@@ -819,4 +834,4 @@
 	</div>
 </div>
 </body>
-</html>
+</html>

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

@@ -133,6 +133,14 @@
                         $("#ext").attr("checked",true);
                         $("#divv").show();
                         $("#divv3").show();
+                        var contractInformation='${ruralProjectRecords.workContractInfo.contractInformation}'
+                        if(contractInformation == "1"){
+                            $("#c2").show();
+                            $("#c1").hide();
+                        }else{
+                            $("#c2").hide();
+                            $("#c1").show();
+                        }
                         form.render();
                     }
                 }
@@ -318,7 +326,15 @@
                     "id":obj
                 },
                 success:function(data){
+                    if(data.contractInformation == "1"){
+                        $("#c2").show();
+                        $("#c1").hide();
+                    }else{
+                        $("#c2").hide();
+                        $("#c1").show();
+                    }
                     $("#contractName").val(data.name);
+                    $("#otherDetails").val(data.otherDetails);
                     $("#contractPrice").val(data.contractPrice);
                     formatNum($("#contractPrice"));
                     $("#contractClientName").val(data.client.name);
@@ -797,12 +813,18 @@
                                <input  htmlEscape="false"  readonly="true" id="contractName"  class="form-control layui-input" value="${ruralProjectRecords.workContractInfo.name}"/>
                            </div>
                        </div>
-                       <div class="layui-item layui-col-sm6 lw7">
-                           <label class="layui-form-label double-line">合同金额(元)：</label>
+                       <div class="layui-item layui-col-sm6 lw7" id="c1">
+                           <label class="layui-form-label">合同金额(元)：</label>
                            <div class="layui-input-block">
                                <input htmlEscape="false"  readonly="true" id="contractPrice"  class="form-control layui-input" value="${ruralProjectRecords.workContractInfo.contractPrice}" onchange="formatNum(this);"/>
                            </div>
                        </div>
+                       <div class="layui-item layui-col-sm6 lw7" id="c2" style="display: none">
+                           <label class="layui-form-label">费率描述：</label>
+                           <div class="layui-input-block">
+                               <input htmlEscape="false"  readonly="true" id="otherDetails"  class="form-control layui-input" value="${ruralProjectRecords.workContractInfo.otherDetails}"/>
+                           </div>
+                       </div>
                        <div class="layui-item layui-col-sm6 lw7">
                            <label class="layui-form-label">委托方：</label>
                            <div class="layui-input-block">

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

@@ -101,6 +101,14 @@
                         $("#ext").attr("checked",true);
                         $("#divv").show();
                         $("#divv3").show();
+                        var contractInformation='${projectRecords.workContractInfo.contractInformation}'
+                        if(contractInformation == "1"){
+                            $("#c2").show();
+                            $("#c1").hide();
+                        }else{
+                            $("#c2").hide();
+                            $("#c1").show();
+                        }
                         form.render();
                     }
                 }
@@ -284,12 +292,20 @@
                     "id":obj
                 },
                 success:function(data){
+                    if(data.contractInformation == "1"){
+                        $("#c2").show();
+                        $("#c1").hide();
+                    }else{
+                        $("#c2").hide();
+                        $("#c1").show();
+                    }
                     $("#contractName").val(data.name);
+                    $("#otherDetails").val(data.otherDetails);
                     $("#contractPrice").val(data.contractPrice);
                     formatNum($("#contractPrice"));
                     $("#contractClientName").val(data.client.name);
                     $("#contractClientId").val(data.client.id);
-                    $("#constructionProjectType").val(data.constructionProjectTypeStr);
+                    $("#constructionProjectType").val(data.contractType);
                     $("#linkmanId").val(data.workClinetInfoIds);
                     //清理之前的联系人
                     var newClientId  = data.client.id;
@@ -751,12 +767,18 @@
                                 <input  htmlEscape="false"  readonly="true" id="contractName"  class="form-control layui-input" value="${projectRecords.workContractInfo.name}"/>
                             </div>
                         </div>
-                        <div class="layui-item layui-col-sm6 lw7">
-                            <label class="layui-form-label double-line">合同金额(元)：</label>
+                        <div class="layui-item layui-col-sm6 lw7"  id="c1">
+                            <label class="layui-form-label">合同金额(元)：</label>
                             <div class="layui-input-block">
                                 <input htmlEscape="false"  readonly="true" id="contractPrice"  class="form-control layui-input" value="${projectRecords.workContractInfo.contractPrice}" onchange="formatNum(this);"/>
                             </div>
                         </div>
+                        <div class="layui-item layui-col-sm6 lw7" id="c2" style="display: none">
+                            <label class="layui-form-label">费率描述：</label>
+                            <div class="layui-input-block">
+                                <input htmlEscape="false"  readonly="true" id="otherDetails"  class="form-control layui-input" value="${projectRecords.workContractInfo.otherDetails}"/>
+                            </div>
+                        </div>
                         <div class="layui-item layui-col-sm6 lw7">
                             <label class="layui-form-label">委托方：</label>
                             <div class="layui-input-block">

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

@@ -17,6 +17,14 @@
 				},100);
 			}else{
 				$("#divv2").hide();
+				var contractInformation='${projectRecords.workContractInfo.contractInformation}'
+				if(contractInformation == "1"){
+					$("#c2").show();
+					$("#c1").hide();
+				}else{
+					$("#c2").hide();
+					$("#c1").show();
+				}
 			}
 
 		})
@@ -99,12 +107,18 @@
 						   <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.name}"/>
 					   </div>
 				   </div>
-				   <div class="layui-item layui-col-sm6 lw6">
+				   <div class="layui-item layui-col-sm6 lw6" id="c1">
 					   <label class="layui-form-label double-line">合同金额(元)：</label>
 					   <div class="layui-input-block">
 						   <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<fmt:formatNumber value="${projectRecords.workContractInfo.contractPrice}" pattern="#,##0.00#"/>"/>
 					   </div>
 				   </div>
+				   <div class="layui-item layui-col-sm6 lw6" id="c2" style="display: none">
+					   <label class="layui-form-label">费率描述：</label>
+					   <div class="layui-input-block">
+						   <input htmlEscape="false"  readonly="true" id="otherDetails"  class="form-control layui-input" value="${projectRecords.workContractInfo.otherDetails}"/>
+					   </div>
+				   </div>
 				   <div class="layui-item layui-col-sm6 lw6">
 					   <label class="layui-form-label">委托方：</label>
 					   <div class="layui-input-block">
@@ -750,4 +764,4 @@
 
 </script>
 </body>
-</html>
+</html>

src/main/webapp/webpage/modules/ruralprojectrecords/view/ruralProjectRecordsView.jsp

@@ -17,6 +17,14 @@
 				},100);
 			}else{
 				$("#divv2").hide();
+				var contractInformation='${projectRecords.workContractInfo.contractInformation}'
+				if(contractInformation == "1"){
+					$("#c2").show();
+					$("#c1").hide();
+				}else{
+					$("#c2").hide();
+					$("#c1").show();
+				}
 			}
 
 		})
@@ -64,12 +72,18 @@
 						   <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.name}"/>
 					   </div>
 				   </div>
-				   <div class="layui-item layui-col-sm6 lw6">
+				   <div class="layui-item layui-col-sm6 lw6" id="c1">
 					   <label class="layui-form-label double-line">合同金额(元)：</label>
 					   <div class="layui-input-block">
 						   <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="<fmt:formatNumber value="${projectRecords.workContractInfo.contractPrice}" pattern="#,##0.00#"/>"/>
 					   </div>
 				   </div>
+				   <div class="layui-item layui-col-sm6 lw6" id="c2" style="display: none">
+					   <label class="layui-form-label">费率描述：</label>
+					   <div class="layui-input-block">
+						   <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" id="otherDetails"  class="form-control layui-input" value="${projectRecords.workContractInfo.otherDetails}"/>
+					   </div>
+				   </div>
 				   <div class="layui-item layui-col-sm6 lw6">
 					   <label class="layui-form-label">委托方：</label>
 					   <div class="layui-input-block">
@@ -314,4 +328,4 @@
 	</div>
 </div>
 </body>
-</html>
+</html>