Explorar o código

合同归档员需要再次输入归档账号

user5 %!s(int64=4) %!d(string=hai) anos
pai
achega
f8ad9df0df

+ 9 - 1
src/main/java/com/jeeplus/modules/workcontractrecord/entity/WorkContractRecord.java

@@ -33,6 +33,7 @@ public class WorkContractRecord extends ActEntity<WorkContractRecord> {
 	private WorkContractInfo workContractInfo;		// 合同
 	private String recordNum;		// 归档申请编号
 	private String fileNum;		// 档案号
+	private String fileNumTow;		// 再次录入档案号
 	private String instruction;		// 说明
 	private String status;		// 审核状态
 	private String home;       //跳转首页标记
@@ -200,5 +201,12 @@ public class WorkContractRecord extends ActEntity<WorkContractRecord> {
 	public void setStatus(String status) {
 		this.status = status;
 	}
-	
+
+	public String getFileNumTow() {
+		return fileNumTow;
+	}
+
+	public void setFileNumTow(String fileNumTow) {
+		this.fileNumTow = fileNumTow;
+	}
 }

+ 4 - 0
src/main/resources/mappings/modules/workcontractrecord/WorkContractRecordDao.xml

@@ -16,6 +16,7 @@
 		a.contract_info_id AS "workContractInfo.id",
 		a.record_num AS "recordNum",
 		a.file_num AS "fileNum",
+		a.file_num_tow as "fileNumTow",
 		a.instruction AS "instruction",
 		workContractInfo.contract_num AS "workContractInfo.contractNum",
 		workContractInfo.name AS "workContractInfo.name",
@@ -127,6 +128,7 @@
 			contract_info_id,
 			record_num,
 			file_num,
+			file_num_tow,
 			instruction,
 			status
 		) VALUES (
@@ -143,6 +145,7 @@
 			#{workContractInfo.id},
 			#{recordNum},
 			#{fileNum},
+			#{fileNumTow},
 			#{instruction},
 			#{status}
 		)
@@ -159,6 +162,7 @@
 			contract_info_id = #{workContractInfo.id},
 			record_num = #{recordNum},
 			file_num = #{fileNum},
+			file_num_tow = #{fileNumTow},
 			instruction = #{instruction},
 			status = #{status}
 		WHERE id = #{id}

+ 16 - 1
src/main/webapp/webpage/modules/workcontractrecord/workContractRecordAudit.jsp

@@ -10,12 +10,21 @@
 		function doSubmit(obj){//回调函数,在编辑和保存动作时,供openDialog调用提交表单。
 		  if(validateForm.form()){
 		      var fileNum =  $("#fileNum").val();
+		      var fileNumTow =  $("#fileNumTow").val();
               if(obj == 1){
                   $('#flag').val('yes');
                   if(fileNum == ''|| fileNum == undefined){
                       top.layer.alert('填写档案号!', {icon: 0});
                       return;
 				  }
+                  if(fileNumTow == ''|| fileNumTow == undefined){
+                      top.layer.alert('请再次填写档案号!', {icon: 0});
+                      return;
+				  }
+				  if(fileNum != fileNumTow){
+					  top.layer.alert('两次档案号填写不同,请重新输入!', {icon: 0});
+					  return;
+				  }
               }else{
                   $('#flag').val('no');
               }
@@ -147,7 +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 layui-input"/>
+						<form:input path="fileNum" htmlEscape="false" class="form-control required 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"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm12  with-textarea">

+ 6 - 0
src/main/webapp/webpage/modules/workcontractrecord/workContractView.jsp

@@ -134,6 +134,12 @@
 						<input  htmlEscape="false" readonly="true" class="form-control  layui-input" value="${workContractRecord.fileNum}"/>
 					</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.fileNumTow}"/>
+					</div>
+				</div>
 				<div class="layui-item layui-col-sm12  with-textarea">
 					<label class="layui-form-label">说明:</label>
 					<div class="layui-input-block">