From 81e69194f7aa79f502a660bcd65a683fe63f5e27 Mon Sep 17 00:00:00 2001
From: mhsnet <mhsnet@163.com>
Date: Fri, 19 Apr 2024 16:33:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=90=8C=E6=A8=A1=E6=9D=BF=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ContractLTemplateServiceImpl.java    |  8 ++---
 .../jnpf/entity/ContractLTemplateEntity.java  | 20 ++++++-------
 .../src/views/scm/contractLTemplate/form.vue  |  8 ++++-
 .../ContractLTemplateClauseListBox.vue        | 29 ++++++-------------
 4 files changed, 30 insertions(+), 35 deletions(-)

diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/ContractLTemplateServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/ContractLTemplateServiceImpl.java
index c8d04acf..297e6d66 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/ContractLTemplateServiceImpl.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/ContractLTemplateServiceImpl.java
@@ -373,13 +373,13 @@ public class ContractLTemplateServiceImpl extends ServiceImpl<ContractLTemplateM
 
         if(isSave){
             String mainId =  RandomUtil.uuId() ;
-        entity.setCreatorTime(DateUtil.getNowDate());
-        entity.setLastModifyTime(null);
+//        entity.setCreatorTime(DateUtil.getNowDate());
+//        entity.setLastModifyTime(null);
             entity.setId(mainId);
             entity.setVersion(0);
         }else{
-        entity.setCreatorTime(DateUtil.getNowDate());
-        entity.setLastModifyTime(null);
+//        entity.setCreatorTime(DateUtil.getNowDate());
+//        entity.setLastModifyTime(null);
         }
         this.saveOrUpdate(entity);
 
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractLTemplateEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractLTemplateEntity.java
index c137824e..06b638c1 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractLTemplateEntity.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractLTemplateEntity.java
@@ -56,19 +56,19 @@ public class ContractLTemplateEntity  {
     private String openSignTimeB;
     @TableField(value = "OPEN_SIGNED_AT_B" , updateStrategy = FieldStrategy.IGNORED)
     private String openSignedAtB;
-    @TableField("F_CREATOR_TIME")
+    @TableField(value = "F_CREATOR_TIME" , fill = FieldFill.INSERT)
     private Date creatorTime;
-    @TableField("F_CREATOR_USER_ID")
+    @TableField(value = "F_CREATOR_USER_ID" , fill = FieldFill.INSERT)
     private String creatorUserId;
-    @TableField("F_LAST_MODIFY_TIME")
+    @TableField(value = "F_LAST_MODIFY_TIME" , fill = FieldFill.INSERT_UPDATE)
     private Date lastModifyTime;
-    @TableField("F_LAST_MODIFY_USER_ID")
+    @TableField(value = "F_LAST_MODIFY_USER_ID" , fill = FieldFill.INSERT_UPDATE)
     private String lastModifyUserId;
-    @TableField("F_DELETE_TIME")
+    @TableField(value = "F_DELETE_TIME" , fill = FieldFill.UPDATE)
     private Date deleteTime;
-    @TableField("F_DELETE_USER_ID")
+    @TableField(value = "F_DELETE_USER_ID" , fill = FieldFill.UPDATE)
     private String deleteUserId;
-    @TableField("F_DELETE_MARK")
+    @TableField(value = "F_DELETE_MARK" , updateStrategy = FieldStrategy.IGNORED)
     private Integer deleteMark;
     @TableField("F_TENANT_ID")
     private String tenantId;
@@ -76,10 +76,10 @@ public class ContractLTemplateEntity  {
     private String flowId;
     @TableField("F_VERSION")
     private Integer version;
-    @TableField("ORGANIZE_JSON_ID")
+    @TableField(value = "ORGANIZE_JSON_ID" , fill = FieldFill.INSERT)
     private String organizeJsonId;
-    @TableField("COMPANY_ID")
+    @TableField(value = "COMPANY_ID" , fill = FieldFill.INSERT)
     private String companyId;
-    @TableField("DEPARTMENT_ID")
+    @TableField(value = "DEPARTMENT_ID" , fill = FieldFill.INSERT)
     private String departmentId;
 }
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/contractLTemplate/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/contractLTemplate/form.vue
index 5c4f0c37..e3a0db18 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/contractLTemplate/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/contractLTemplate/form.vue
@@ -872,7 +872,13 @@ export default {
       this.visible = false;
       this.$emit("refreshDataList", true);
     },
+    fnTypeChg() {
+      this.dataForm.contractLTemplateClauseList = [];
+    },
     changeData(model, index) {
+      if (model == "type") {
+        this.fnTypeChg();
+      }
       this.isEdit = false;
       this.childIndex = index;
       let modelAll = model.split("-");
@@ -1154,7 +1160,7 @@ export default {
       }
     },
     fnSltContractLTemplateClauseList() {
-      this.$refs.refContractLTemplateClauseListBox.init("cs1", "cs2");
+      this.$refs.refContractLTemplateClauseListBox.init(this.dataForm.type);
     },
     fnInitClauseList(list) {
       for (let i = 0; i < list.length; i++) {
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/ContractLTemplateClauseListBox.vue b/jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/ContractLTemplateClauseListBox.vue
index 214ce75b..40200757 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/ContractLTemplateClauseListBox.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/ContractLTemplateClauseListBox.vue
@@ -91,35 +91,25 @@ export default {
       list: [],
       total: 0,
       listQuery: {
-        superQueryJson: "",
         currentPage: 1,
+        dataType: 0,
+        keyword: "",
+        menuId: "519520333632372869",
+        moduleId: "519502523443183621",
         pageSize: 20,
-        sort: "desc",
         sidx: "",
-        businessLineIdArr: ""
+        sort: "desc",
+        superQueryJson: ""
       },
       checked: []
     };
   },
   methods: {
-    init(excludeIdList, business_line_id) {
+    init(type) {
       this.visible = true;
-      console.log("hi");
-      // this.visible = true;
-      // this.listLoading = true;
-      // if (excludeIdList && excludeIdList instanceof Array) {
-      //   this.excludeIdList = excludeIdList;
-      //   if (!excludeIdList.page) {
-      //     this.listQuery.businessLineIdArr = business_line_id;
-      //   }
-      // }
-      // console.log(this.listQuery);
       let query = {
-        // ...this.listQuery,
-        // dataType: 0,
-        // keyword: this.keyword,
-        // excludeIdList: this.excludeIdList,
-        type: 1
+        ...this.listQuery,
+        contractType: type
       };
       request({
         url: `/api/scm/ContractClause/getList`,
@@ -141,7 +131,6 @@ export default {
           e.fieldList = JSON.stringify(fieldsListA);
           listA.push(e);
         }
-        console.log(listA);
         this.list = listA;
         this.listLoading = false;
         this.total = res.data.pagination.total;