合同归档修改

src/main/webapp/webpage/modules/workcontractrecord/workContractRecordAudit.jsp

@@ -14,15 +14,15 @@
               if(obj == 1){
                   $('#flag').val('yes');
                   if(fileNum == ''|| fileNum == undefined){
-                      top.layer.alert('填写案卷号！', {icon: 0});
+                      top.layer.msg('填写案卷号！', {icon: 0});
                       return;
 				  }
                   if(fileNumTow == ''|| fileNumTow == undefined){
-                      top.layer.alert('请再次填写案卷号！', {icon: 0});
+                      top.layer.msg('请再次填写案卷号！', {icon: 0});
                       return;
 				  }
 				  if(fileNum != fileNumTow){
-					  top.layer.alert('两次案卷号填写不同，请重新输入！', {icon: 0});
+					  top.layer.msg('两次案卷号填写不同，请重新输入！', {icon: 0});
 					  return;
 				  }
               }else{
@@ -107,12 +107,18 @@
 			<div class="form-group layui-row first lw8">
 				<div class="form-group-label"><h2>基础信息</h2></div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label"><span class="require-item">*</span>合同名称：</label>
+					<label class="layui-form-label">客户名称：</label>
+					<div class="layui-input-block">
+						<input  htmlEscape="false" readonly="true" class="form-control  layui-input" value="${workContractRecord.workContractInfo.client.name}"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">合同名称：</label>
 					<div class="layui-input-block with-icon">
 						<input htmlEscape="false"   readonly="true" class="form-control layui-input" value="${workContractRecord.workContractInfo.name}"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6">
+				<%--<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">归档申请编号：</label>
 					<div class="layui-input-block">
 						<div class="input-group">
@@ -122,25 +128,19 @@
 							</span>
 						</div>
 					</div>
-				</div>
+				</div>--%>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">合同编号：</label>
 					<div class="layui-input-block">
 						<input  htmlEscape="false" readonly="true" class="form-control  layui-input" value="${workContractRecord.workContractInfo.contractNum}"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label">委托方：</label>
-					<div class="layui-input-block">
-						<input  htmlEscape="false" readonly="true" class="form-control  layui-input" value="${workContractRecord.workContractInfo.client.name}"/>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6">
+				<%--<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">工程分类：</label>
 					<div class="layui-input-block">
 						<input  htmlEscape="false" readonly="true" class="form-control  layui-input" value="${fns:getMainDictLabel(workContractRecord.workContractInfo.contractType, 'contract_type','')}"/>
 					</div>
-				</div>
+				</div>--%>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">归档人：</label>
 					<div class="layui-input-block">
@@ -156,13 +156,13 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>案卷号：</label>
 					<div class="layui-input-block">
-						<form:input path="fileNum" htmlEscape="false" class="form-control required layui-input"/>
+						<form:input path="fileNum" htmlEscape="false" class="form-control layui-input"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label double-line"><span class="require-item">*</span>确认案卷号：</label>
 					<div class="layui-input-block">
-						<input id="fileNumTow" name="fileNumTow" type="text"  class="layui-input required form-control" equalTo="#fileNum"/>
+						<input id="fileNumTow" name="fileNumTow" type="text"  class="layui-input form-control" equalTo="#fileNum"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm12  with-textarea">

src/main/webapp/webpage/modules/workcontractrecord/workContractRecordForm.jsp

@@ -89,12 +89,18 @@
 			<div class="form-group layui-row first lw8">
 				<div class="form-group-label"><h2>基础信息</h2></div>
 				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">客户名称：</label>
+					<div class="layui-input-block">
+						<form:input id="cName" path="workContractInfo.client.name" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">合同名称：</label>
 					<div class="layui-input-block">
 						<form:input id="workContractInfoName" path="workContractInfo.name" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6">
+				<%--<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">归档申请编号：</label>
 					<div class="layui-input-block">
 						<div class="input-group">
@@ -104,29 +110,23 @@
 							</span>
 						</div>
 					</div>
-				</div>
+				</div>--%>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">合同编号：</label>
 					<div class="layui-input-block">
 						<form:input id="contractNum" path="workContractInfo.contractNum" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label">委托方：</label>
-					<div class="layui-input-block">
-						<form:input id="cName" path="workContractInfo.client.name" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6">
+				<%--<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">工程分类：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${fns:getMainDictLabel(workContractRecord.workContractInfo.contractType, 'contract_type', '')}"/>
-						<%--<form:select id="contractType" path="workContractInfo.contractType" disabled="true" class="form-control simple-select required">
+						&lt;%&ndash;<form:select id="contractType" path="workContractInfo.contractType" disabled="true" class="form-control simple-select required">
 							<form:option value="" label=""/>
 							<form:options items="${fns:getMainDictList('contract_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-						</form:select>--%>
+						</form:select>&ndash;%&gt;
 					</div>
-				</div>
+				</div>--%>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">归档人：</label>
 					<div class="layui-input-block">
@@ -134,18 +134,18 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label">归档日期：</label>
+					<label class="layui-form-label">归档申请日期：</label>
 					<div class="layui-input-block">
 						<input id="createDate" name="createDate"  htmlEscape="false" readonly="true" class="form-control  layui-input" value="<fmt:formatDate value="${workContractRecord.createDate}" pattern="yyyy-MM-dd"/>"/>
 						<%--<input class="laydate-icondate form-control layui-input layer-date laydate-icon" id="createDate" name="createDate" value="<fmt:formatDate value="${workContractRecord.createDate}" pattern="yyyy-MM-dd"/>">--%>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6">
+				<%--<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">案卷号：</label>
 					<div class="layui-input-block">
 						<form:input path="fileNum" htmlEscape="false"  readonly="true"  class="form-control layui-input"/>
 					</div>
-				</div>
+				</div>--%>
 				<div class="layui-item layui-col-sm12  with-textarea">
 					<label class="layui-form-label">说明：</label>
 					<div class="layui-input-block">

src/main/webapp/webpage/modules/workcontractrecord/workContractRecordModifyApply.jsp

@@ -96,12 +96,18 @@
 			<div class="form-group layui-row first">
 				<div class="form-group-label"><h2>基础信息</h2></div>
 				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">客户名称：</label>
+					<div class="layui-input-block">
+						<form:input id="cName" path="workContractInfo.client.name" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">合同名称：</label>
 					<div class="layui-input-block">
 						<form:input id="workContractInfoName" path="workContractInfo.name" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6">
+				<%--<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">归档申请编号：</label>
 					<div class="layui-input-block">
 						<div class="input-group">
@@ -111,29 +117,23 @@
 							</span>
 						</div>
 					</div>
-				</div>
+				</div>--%>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">合同编号：</label>
 					<div class="layui-input-block">
 						<form:input id="contractNum" path="workContractInfo.contractNum" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label">委托方：</label>
-					<div class="layui-input-block">
-						<form:input id="cName" path="workContractInfo.client.name" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6">
+				<%--<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">工程分类：</label>
 					<div class="layui-input-block">
-						<%--<form:select id="contractType" path="workContractInfo.contractType" disabled="true" class="form-control simple-select required">
+						&lt;%&ndash;<form:select id="contractType" path="workContractInfo.contractType" disabled="true" class="form-control simple-select required">
 							<form:option value="" label=""/>
 							<form:options items="${fns:getMainDictList('contract_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-						</form:select>--%>
+						</form:select>&ndash;%&gt;
 							<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${fns:getMainDictLabel(workContractRecord.workContractInfo.contractType, 'contract_type', '')}"/>
 					</div>
-				</div>
+				</div>--%>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">归档人：</label>
 					<div class="layui-input-block">
@@ -147,12 +147,12 @@
 						<%--<input class="laydate-icondate form-control layui-input layer-date laydate-icon" id="createDate" name="createDate" value="<fmt:formatDate value="${workContractRecord.createDate}" pattern="yyyy-MM-dd"/>">--%>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6">
+				<%--<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">案卷号：</label>
 					<div class="layui-input-block">
 						<form:input path="fileNum" htmlEscape="false"  readonly="true"  class="form-control layui-input"/>
 					</div>
-				</div>
+				</div>--%>
 				<div class="layui-item layui-col-sm12  with-textarea">
 					<label class="layui-form-label">说明：</label>
 					<div class="layui-input-block">

src/main/webapp/webpage/modules/workcontractrecord/workContractView.jsp

@@ -82,12 +82,18 @@
 			<div class="form-group layui-row first lw8">
 				<div class="form-group-label"><h2>基础信息</h2></div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label"><span class="require-item">*</span>合同名称：</label>
+					<label class="layui-form-label">客户名称：</label>
+					<div class="layui-input-block">
+						<input  htmlEscape="false" readonly="true" class="form-control  layui-input" value="${workContractRecord.workContractInfo.client.name}"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">合同名称：</label>
 					<div class="layui-input-block with-icon">
 						<input htmlEscape="false"   readonly="true" class="form-control layui-input" value="${workContractRecord.workContractInfo.name}"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6">
+				<%--<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">归档申请编号：</label>
 					<div class="layui-input-block">
 						<div class="input-group">
@@ -97,25 +103,19 @@
 							</span>
 						</div>
 					</div>
-				</div>
+				</div>--%>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">合同编号：</label>
 					<div class="layui-input-block">
 						<input  htmlEscape="false" readonly="true" class="form-control  layui-input" value="${workContractRecord.workContractInfo.contractNum}"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label">委托方：</label>
-					<div class="layui-input-block">
-						<input  htmlEscape="false" readonly="true" class="form-control  layui-input" value="${workContractRecord.workContractInfo.client.name}"/>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6">
+				<%--<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">工程分类：</label>
 					<div class="layui-input-block">
 						<input  htmlEscape="false" readonly="true" class="form-control  layui-input" value="${fns:getMainDictLabel(workContractRecord.workContractInfo.contractType, 'contract_type','')}"/>
 					</div>
-				</div>
+				</div>--%>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">归档人：</label>
 					<div class="layui-input-block">
@@ -129,7 +129,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label"><span class="require-item">*</span>案卷号：</label>
+					<label class="layui-form-label">案卷号：</label>
 					<div class="layui-input-block">
 						<input  htmlEscape="false" readonly="true" class="form-control  layui-input" value="${workContractRecord.fileNum}"/>
 					</div>