Browse Source

合同归档功能修改

user5 4 years ago
parent
commit
900890525b

+ 4 - 0
src/main/java/com/jeeplus/modules/workcontractrecord/web/WorkContractRecordController.java

@@ -116,7 +116,11 @@ public class WorkContractRecordController extends BaseController {
 			}
 		}if("4".equals(tabId)){
 			WorkContractInfo workContractInfo=workContractInfoService.get(workContractRecord.getId());
+			if(StringUtils.isNotBlank(workContractInfo.getChargeCriterion())){
+				workContractInfo.setChargeCriterionList(Arrays.asList(workContractInfo.getChargeCriterion().split(",")));
+			}
 			workContractRecord.setWorkContractInfo(workContractInfo);
+			workContractRecord.setWorkAttachments(workContractInfo.getWorkAttachments());
 			workContractRecord.setId(null);
 			view = "workContractRecordForm";
 		}

+ 2 - 2
src/main/webapp/webpage/modules/workcontractinfo/workContractInfoFormAdd.jsp

@@ -58,12 +58,12 @@
         }
         $(document).ready(function() {
 			var chargeCriterionH = $("#chargeCriterionH").val();
-			if(chargeCriterionH.indexOf("4")!=-1){
+			/*if(chargeCriterionH.indexOf("4")!=-1){
 				// document.getElementById("otherDetails").readOnly=false
 			}else{
 				// document.getElementById("otherDetails").readOnly=true
 				$("#otherDetails").val("");
-			}
+			}*/
             if($("#createDate").val()==null || $("#createDate").val()==''){
                 $("#createDate").val(getNowFormatDate());
             }