From ef007fbcc33c62ad6f8356e9b4dd471f7854d4c4 Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Thu, 28 Dec 2023 17:44:53 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8A=80=E6=9C=AF=E6=A0=87=E5=87=86):=20?=
 =?UTF-8?q?=E8=B5=B7=E8=8D=89=E9=83=A8=E9=97=A8=E7=A6=81=E6=AD=A2=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E3=80=81=E6=A0=B9=E6=8D=AE=E8=B5=B7=E8=8D=89=E4=BA=BA?=
 =?UTF-8?q?=E5=B8=A6=E5=85=A5=E5=8D=95=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/qbrk-product/step1.vue       |  2 ++
 .../pages/creatProcess/qbrk/common/formEditList.vue |  1 +
 .../creatProcess/qbrk/common/formEditListFb.vue     |  1 +
 .../pages/creatProcess/qbrk/step1-2.vue             |  7 +++----
 .../processCenter/pages/creatProcess/qbrk/step1.vue |  7 +++----
 .../pages/creatProcess/qbrk/step12.vue              | 13 +++++++++++++
 .../pages/creatProcess/qbrk/step13.vue              |  4 ++--
 .../processCenter/pages/creatProcess/qbrk/step3.vue |  4 ++--
 .../processCenter/pages/creatProcess/qbrk/step6.vue |  4 ++--
 .../pages/creatProcess/qbrk/stepC1.vue              |  4 ++--
 .../pages/creatProcess/qbrk/stepC3.vue              |  4 ++--
 .../pages/creatProcess/qbrk/stepC6.vue              |  4 ++--
 12 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
index cf22ed4c0..43271aeb7 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
@@ -1,3 +1,4 @@
+<!-- eslint-disable -->
 <template><div class="bzrkStep1">
         <!--        标准入库流程-->
         <ProcessHeader toggle>
@@ -996,6 +997,7 @@
 </template>
 
 <script>
+/* eslint-disable */
     import { onlyOfficeUrl } from '@/sysConfig'
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue
index 5638f837f..300b83067 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue
@@ -322,6 +322,7 @@
               v-model="form.QCDW"
               placeholder="选择起草部门"
               readonly="readonly"
+              disabled
               @click.native="choiceQCDW('QCDWId', '起草部门', form.QCDW)"
             />
           </el-form-item>
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue
index 064fc9dc8..93f98c7c8 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue
@@ -322,6 +322,7 @@
           <el-form-item label="起草部门" prop="QCDW" class="add-form-item form-item-disabled">
             <el-input
               v-model="form.QCDW"
+              disabled
               placeholder="选择起草部门"
               readonly="readonly"
               @click.native="choiceQCDW('QCDWId', '起草部门', form.QCDW)"
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue
index 2a8598246..d55222f86 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue
@@ -349,8 +349,8 @@
                 <el-form-item label="起草部门" prop="QCDW" class="add-form-item form-item-disabled">
                   <el-input
                     v-model="form.QCDW"
-                    :disabled="disabledXX"
                     readonly="readonly"
+                    disabled
                     placeholder="选择起草部门"
                     @click.native="choiceQCDW('QCDWId', '起草部门', form.QCDW)"
                   />
@@ -362,7 +362,6 @@
                 >
                   <el-input
                     v-model="form.WJSCRYBUSSName"
-                    :disabled="disabledXX"
                     placeholder="请输入文件上传人员"
                     disabled
                     clearable
@@ -2457,8 +2456,8 @@ export default {
         this.form.QCRBUSS = nameList;
         if (data && data.length > 0) {
           console.log(data)
-          const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(',')
-          const institutionNameList = this.unique(data.map(item => item.topUnit)).join(',')
+          const institutionIdList = this.unique(data.map(item => item.institutionId)).join(',')
+          const institutionNameList = this.unique(data.map(item => item.institutionCascade)).join(',')
           this.form.QCDWID = institutionIdList
           this.form.QCDW = institutionNameList
         }
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
index 40dcb2982..175f1c637 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
@@ -357,7 +357,7 @@
                 <el-form-item label="起草部门" prop="QCDW" class="add-form-item form-item-disabled">
                   <el-input
                     v-model="form.QCDW"
-                    :disabled="disabledXX"
+                    disabled
                     readonly="readonly"
                     placeholder="选择起草部门"
                     @click.native="choiceQCDW('QCDWId', '起草部门', form.QCDW)"
@@ -370,7 +370,6 @@
                 >
                   <el-input
                     v-model="form.WJSCRYBUSSName"
-                    :disabled="disabledXX"
                     placeholder="请输入文件上传人员"
                     disabled
                     clearable
@@ -2537,8 +2536,8 @@ export default {
         this.form.QCRBUSS = nameList;
         if (data && data.length > 0) {
           console.log(data)
-          const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(',')
-          const institutionNameList = this.unique(data.map(item => item.topUnit)).join(',')
+          const institutionIdList = this.unique(data.map(item => item.institutionId)).join(',')
+          const institutionNameList = this.unique(data.map(item => item.institutionCascade)).join(',')
           this.form.QCDWID = institutionIdList
           this.form.QCDW = institutionNameList
         }
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
index 0a3fc80c7..c6a2ff3ca 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
@@ -1404,7 +1404,20 @@ export default {
       }else if(this.userType === 'hqUserId') {
         this.roleForm.hqUserId = idList;
         this.roleForm.hqUserName = nameList;
+      }else if(this.userType === 'QCRBUSS') {
+        this.form.QCRBUSSID = idList;
+        this.form.QCRBUSS = nameList;
       }
+      if(data && data.length > 0) {
+        const institutionIdList = this.unique(data.map(item => item.institutionId)).join(',')
+        const institutionNameList = this.unique(data.map(item => item.institutionCascade)).join(',')
+        this.form.QCDWID = institutionIdList
+        this.form.QCDW = institutionNameList
+      }
+    },
+    unique (newArr) {
+      const res = new Map();
+      return newArr.filter((newArr) => !res.has(newArr) && res.set(newArr, 1));
     },
     checkedRole (data) {
       if (this.type === 0) {
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
index 44fcaeb4b..e89b8076b 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
@@ -1543,8 +1543,8 @@ export default {
         this.formKey++
       }
       if(data !== undefined && data && data.length > 0) {
-        const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(',')
-        const institutionNameList = this.unique(data.map(item => item.topUnit)).join(',')
+        const institutionIdList = this.unique(data.map(item => item.institutionId)).join(',')
+        const institutionNameList = this.unique(data.map(item => item.institutionCascade)).join(',')
         this.form.QCDWID = institutionIdList
         this.form.QCDW = institutionNameList
       }
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
index 5b887ed03..cfbf3418d 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
@@ -1452,8 +1452,8 @@ export default {
         this.formKey++
       }
       if(data !== undefined && data && data.length > 0) {
-        const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(',')
-        const institutionNameList = this.unique(data.map(item => item.topUnit)).join(',')
+        const institutionIdList = this.unique(data.map(item => item.institutionId)).join(',')
+        const institutionNameList = this.unique(data.map(item => item.institutionCascade)).join(',')
         this.form.QCDWID = institutionIdList
         this.form.QCDW = institutionNameList
       }
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
index 5a1467408..253cc8c36 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
@@ -1801,8 +1801,8 @@ export default {
         this.formKey++
       }
       if(data !== undefined && data && data.length > 0) {
-        const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(',')
-        const institutionNameList = this.unique(data.map(item => item.topUnit)).join(',')
+        const institutionIdList = this.unique(data.map(item => item.institutionId)).join(',')
+        const institutionNameList = this.unique(data.map(item => item.institutionCascade)).join(',')
         this.form.QCDWID = institutionIdList
         this.form.QCDW = institutionNameList
       }
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue
index 0d1c729c0..d37f9af1c 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue
@@ -1647,8 +1647,8 @@ export default {
       }
       if(data && data.length > 0) {
         console.log(data)
-        const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(',')
-        const institutionNameList = this.unique(data.map(item => item.topUnit)).join(',')
+        const institutionIdList = this.unique(data.map(item => item.institutionId)).join(',')
+        const institutionNameList = this.unique(data.map(item => item.institutionCascade)).join(',')
         this.form.QCDWID = institutionIdList
         this.form.QCDW = institutionNameList
       }
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue
index 1a6f901ca..01075e914 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue
@@ -1435,8 +1435,8 @@ export default {
         this.formKey++
       }
       if(data !== undefined && data && data.length > 0) {
-        const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(',')
-        const institutionNameList = this.unique(data.map(item => item.topUnit)).join(',')
+        const institutionIdList = this.unique(data.map(item => item.institutionId)).join(',')
+        const institutionNameList = this.unique(data.map(item => item.institutionCascade)).join(',')
         this.form.QCDWID = institutionIdList
         this.form.QCDW = institutionNameList
       }
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
index 27e5caf16..219a5b043 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
@@ -1797,8 +1797,8 @@ export default {
         this.formKey++
       }
       if(data !== undefined && data && data.length > 0) {
-        const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(',')
-        const institutionNameList = this.unique(data.map(item => item.topUnit)).join(',')
+        const institutionIdList = this.unique(data.map(item => item.institutionId)).join(',')
+        const institutionNameList = this.unique(data.map(item => item.institutionCascade)).join(',')
         this.form.QCDWID = institutionIdList
         this.form.QCDW = institutionNameList
       }