修改合同页面案件好展示问题

src/main/java/com/jeeplus/modules/workcontractinfo/entity/WorkContractInfo.java

@@ -116,7 +116,7 @@ public class WorkContractInfo extends ActEntity<WorkContractInfo> {
 	private String endInvestmentAmount;
 	private String contrractRecordStatus;   //归档状态
 	private String contrractRecordId;   //归档合同id
-	private String recordNum;   //归档编号
+	private String recordNum;   //案卷号
 
 	private String borrowStatus;   //借用状态
 	private String giveStatus;   //归还状态

src/main/java/com/jeeplus/modules/workcontractinfo/web/WorkContractInfoController.java

@@ -171,12 +171,6 @@ public class WorkContractInfoController extends BaseController {
                     info.setBorrowId("");
                 }
                 if(user.getRoleList().size()>0){
-                    //判断是否为归档员
-                    if ("htgly".equals(user.getRoleList().get(0).getEnname())){
-                        info.setOpinion("1");
-                    }else{
-                        info.setOpinion("0");
-                    }
                     //判断是否为admin
                     if (UserUtils.isManager()){
                         info.setFlagAdmin("1");
@@ -184,7 +178,6 @@ public class WorkContractInfoController extends BaseController {
                         info.setFlagAdmin("0");
                     }
                 }else{
-                    info.setOpinion("0");
                     info.setFlagAdmin("0");
                 }
             }

src/main/resources/mappings/modules/workcontractinfo/WorkContractInfoDao.xml

@@ -249,7 +249,7 @@
 		a.common_flag AS "commonFlag",
 		a.signature_status as "signatureStatus",
 		ifnull(wcr.status,0) as "contrractRecordStatus",
-		ifnull(wcr.record_num,"") as "recordNum",
+		ifnull(wcr.file_num,"") as "recordNum",
 		wcr.id as "contrractRecordId"
 		FROM work_contract_info a
 		<include refid="workContractInfoJoins"/>

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

@@ -403,7 +403,7 @@ function getAuditContractState(id)
         case "2":result.label = "auditing";result.status="审批中";break;
         case "3":result.label = "cancel";result.status="撤回";break;
         case "4":result.label = "reject";result.status="驳回";break;
-        case "5":result.label = "signed";result.status="已签";break;
+        case "5":result.label = "signed";result.status="已签订";break;
         case "6":result.label = "discarding";result.status="作废中";break;
         case "7":result.label = "discarded";result.status="已作废";break;
         case "8":result.label = "changing";result.status="变更中";break;

src/main/webapp/webpage/modules/projectcontentinfo/projectReportRecordAudit.jsp

@@ -148,7 +148,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"><span class="require-item">*</span>案卷号：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false" name="fileNum"  class="form-control required layui-input" value="${projectReportRecord.fileNum}"/>
 					</div>

src/main/webapp/webpage/modules/projectcontentinfo/projectReportRecordModifyApply.jsp

@@ -189,7 +189,7 @@
 					</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">
 						<form:input path="fileNum" htmlEscape="false"    class="form-control  layui-input"/>
 					</div>

src/main/webapp/webpage/modules/projectcontentinfo/projectReportRecordView.jsp

@@ -102,7 +102,7 @@
 				</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 htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectReportRecord.fileNum}"/>
 				</div>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectReportRecord/projectReportRecordView.jsp

@@ -121,7 +121,7 @@
 				</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 htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectReportRecord.fileNum}"/>
 				</div>

src/main/webapp/webpage/modules/ruralprojectrecords/projectReportRecord/projectReportRecordView.jsp

@@ -121,7 +121,7 @@
 				</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 htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectReportRecord.fileNum}"/>
 				</div>

src/main/webapp/webpage/modules/workContractBorrow/workContractBorrowView.jsp

@@ -129,7 +129,7 @@
 					</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  htmlEscape="false" readonly="true" class="form-control  layui-input" value="${workContractRecord.fileNum}"/>
 					</div>

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoList.jsp

@@ -611,7 +611,7 @@
                 ,{field:'contractName',align:'center', title: '合同名称',minWidth:200,templet:function(d){
                         return "<a class=\"attention-info\" title=\""+d.contractName+"\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同管理', '${ctx}/workcontractinfo/workContractInfo/lookForm?id=" + d.id + "','95%', '95%')\">" + d.contractName + "</a>";
                     }}
-                ,{field:'recordNum',align:'center', title: '归档编号',minWidth:200,templet:function(d){
+                ,{field:'recordNum',align:'center', title: '案卷号',minWidth:200,templet:function(d){
                         return "<a class=\"attention-info\" title=\""+d.recordNum+"\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同归档信息', '${ctx}/workcontractrecord/workContractRecord/form?id=" + d.contrractRecordId + "&tabId=1','95%', '95%')\">" + d.recordNum + "</a>";
                     }}
                 ,{field:'clientName',align:'center', title: '客户名称',minWidth:160,templet:function(d){
@@ -779,7 +779,6 @@
                     ,"borrowStatus":"${workContractInfo.borrowStatus}"
                     ,"giveStatus":"${workContractInfo.giveStatus}"
                     ,"borrowId":"${workContractInfo.borrowId}"
-                    ,"opinion":"${workContractInfo.opinion}"
                     ,"flagAdmin":"${workContractInfo.flagAdmin}"
                     <%--<c:if test="${workContractInfo.contractState == 5 && fns:getUser().id == workContractInfo.createBy.id && workContractInfo.signatureStatus == 1   }">,"signature":"1"</c:if>/*签章*/--%>
                     <%--<c:if test="${workContractInfo.contractState == 5 && fns:getUser().id == workContractInfo.createBy.id}">,"canalter":"1"</c:if>/*变更*/--%>
@@ -821,12 +820,7 @@
 							<c:when test="${(workContractInfo.borrowStatus == '1' or workContractInfo.borrowStatus == '3' or workContractInfo.borrowStatus == '4')}">,"candeleteBorrow":"1"</c:when>
 						</c:choose>
 					</c:if>
-					<c:if test="${'1' == workContractInfo.opinion}">
-						<c:choose>
-							<c:when test="${workContractInfo.borrowStatus == '5' && workContractInfo.giveStatus != '5'}">,"giveBorrow":"1"</c:when>
-						</c:choose>
-					</c:if>
-					<c:if test="${'1' == workContractInfo.flagAdmin or '1' == workContractInfo.opinion}">
+					<c:if test="${'1' == workContractInfo.flagAdmin}">
 						<c:choose>
 							<c:when test="${workContractInfo.contractState == 5 }">,"updateAdmin":"1"</c:when>
 						</c:choose>

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.alert('填写案卷号！', {icon: 0});
                       return;
 				  }
                   if(fileNumTow == ''|| fileNumTow == undefined){
-                      top.layer.alert('请再次填写档案号！', {icon: 0});
+                      top.layer.alert('请再次填写案卷号！', {icon: 0});
                       return;
 				  }
 				  if(fileNum != fileNumTow){
-					  top.layer.alert('两次档案号填写不同，请重新输入！', {icon: 0});
+					  top.layer.alert('两次案卷号填写不同，请重新输入！', {icon: 0});
 					  return;
 				  }
               }else{
@@ -154,13 +154,13 @@
 					</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"><span class="require-item">*</span>案卷号：</label>
 					<div class="layui-input-block">
 						<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>
+					<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>

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

@@ -141,7 +141,7 @@
 					</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">
 						<form:input path="fileNum" htmlEscape="false"  readonly="true"  class="form-control layui-input"/>
 					</div>

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

@@ -148,7 +148,7 @@
 					</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">
 						<form:input path="fileNum" htmlEscape="false"  readonly="true"  class="form-control layui-input"/>
 					</div>

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

@@ -129,13 +129,13 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label">档案号：</label>
+					<label class="layui-form-label"><span class="require-item">*</span>案卷号：</label>
 					<div class="layui-input-block">
 						<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>
+					<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>