Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev

packages/extra/AppCodeGeneration/components/Add.vue

@@ -421,7 +421,7 @@ export default {
           this.formDataList.map((item) => {
             if (item.length) {
               item.map((items) => {
-                if (items.type == 'checkbox' && this.formData[items.fieldDbName].length) { //多选
+                if (items.type == 'checkbox') { //多选
                   this.formData[items.fieldDbName] = this.formData[items.fieldDbName]?.toString()
                 }
                 if (items.type == 'upload') {

packages/work/processManagement/mattersConfig/components/processApproval.vue

@@ -112,14 +112,7 @@ export default {
       isSelectImg: false,
       isSelectUnit: false,
       isSelectPerson: false,
-      nodeObj: {
-        candidateApproverType: '1',
-        candidateList: [],
-        nodeIndex: '',
-        nodeName: '',
-        nodeType: '',
-        scopeCandidates: ''
-      },
+      nodeObj: {},
       indexType: '',
       titleType: '',
       bomIndex: '',
@@ -173,9 +166,7 @@ export default {
         this.nodeObj = JSON.parse(JSON.stringify(item));
       } else {
         this.titleType = '添加审批步骤';
-        if (this.form.processNodeList.length > 0) {
-          this.init();
-        }
+        this.init();
       }
     },
     // 确定添加审批步骤
@@ -200,7 +191,7 @@ export default {
         nodeIndex: '',
         nodeName: '',
         nodeType: '',
-        scopeCandidates: '1'
+        scopeCandidates: '1',
       };
       this.$refs['addForm'].resetFields();
     },

project/xiushan/apps/processManagement/mattersConfig/components/processApproval.vue

@@ -117,7 +117,7 @@ export default {
       isSelectImg: false,
       isSelectUnit: false,
       isSelectPerson: false,
-      nodeObj: {areaFilter: [], annexEnable: null, pictureEnable: null},
+      nodeObj: {},
       indexType: '',
       titleType: '',
       bomIndex: '',
@@ -173,9 +173,7 @@ export default {
         this.nodeObj = this.$copy(item)
       } else {
         this.titleType = '添加审批步骤';
-        if (this.form.processNodeList.length > 0) {
-          this.init();
-        }
+        this.init();
       }
     },
     // 确定添加审批步骤