From f69550c015833a4ec99834c5f36b80f5c7740e55 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 28 Jun 2022 14:54:50 +0800
Subject: [PATCH 1/2] BUG 30380

---
 packages/extra/AppCodeGeneration/components/Add.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/extra/AppCodeGeneration/components/Add.vue b/packages/extra/AppCodeGeneration/components/Add.vue
index 03d3f55e..b58f8c69 100644
--- a/packages/extra/AppCodeGeneration/components/Add.vue
+++ b/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') {

From 315d852eafc5b97b3e77ea03ac96da46796c4671 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 28 Jun 2022 15:03:50 +0800
Subject: [PATCH 2/2] BUG 30381

---
 .../mattersConfig/components/processApproval.vue  | 15 +++------------
 .../mattersConfig/components/processApproval.vue  |  6 ++----
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/packages/work/processManagement/mattersConfig/components/processApproval.vue b/packages/work/processManagement/mattersConfig/components/processApproval.vue
index 3e5dfc67..65e5ab67 100644
--- a/packages/work/processManagement/mattersConfig/components/processApproval.vue
+++ b/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();
     },
diff --git a/project/xiushan/apps/processManagement/mattersConfig/components/processApproval.vue b/project/xiushan/apps/processManagement/mattersConfig/components/processApproval.vue
index fec186d3..1d58492c 100644
--- a/project/xiushan/apps/processManagement/mattersConfig/components/processApproval.vue
+++ b/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();
       }
     },
     // 确定添加审批步骤