Merge branch 'master' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-wt

src/views/bpm/collaborative/index.vue

@@ -373,7 +373,7 @@
       return {
         currentDictType: '',
         currentFormId: '',
-        cacheKeyUrl: 'wt-eaf1548b-collaborative',
+        cacheKeyUrl: 'wt-202608101035-eaf1548b-collaborative',
         configFormDialogFlag: false,
         processSubmitDialogFlag: false,
         formDetailDialogFlag: false,
@@ -644,9 +644,9 @@
         let makingJson =
           JSON.parse(this.defaultTemplateList?.[0]?.formJson?.makingJson) || {};
         console.log('makingJson~~~', makingJson);
-        this.formColumnList = makingJson.list;
+        // this.formColumnList = makingJson.list;
         console.log(
-          this.formColumnList,
+          // this.formColumnList,
           this.templateList[this.currentDictType]
         );
       },
@@ -707,7 +707,7 @@
           ? JSON.parse(find.formJson.makingJson) || {}
           : {};
         console.log(makingJson, 'makingJson');
-        this.formColumnList = makingJson.list;
+        // this.formColumnList = makingJson.list;
         this.$nextTick(() => {
           this.$refs.table.reload({ page: 1, where });
         });