From e024929772adb97f9955e715a654747d4eec82ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Mon, 7 Mar 2022 14:53:26 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?=
 =?UTF-8?q?=E8=AE=A2=E8=AE=A1=E5=88=92=E7=AE=A1=E6=8E=A7=E9=A9=B3=E5=9B=9E?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E8=BF=9B=E5=85=A5=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/home2/components/todoList/index.vue |  2 +-
 .../qbzxdjhgk/component/merge.vue             |  2 +-
 .../pages/creatProcess/qbzxdjhgk/step1.vue    | 56 +++++++++++--------
 .../tabComponents/processCenter/index.vue     |  2 +-
 4 files changed, 36 insertions(+), 26 deletions(-)

diff --git a/src/pages/home2/components/todoList/index.vue b/src/pages/home2/components/todoList/index.vue
index 48daaee9f..491634fc6 100644
--- a/src/pages/home2/components/todoList/index.vue
+++ b/src/pages/home2/components/todoList/index.vue
@@ -1674,7 +1674,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          }else if(row.taskInfo === '企标制修订计划整改') {
+          }else if(row.taskInfo === '重新起草') {
             this.$router.push({
               name: 'qbzxdjhgkStep1',
               query: {
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
index eb413388b..f41b18984 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
@@ -786,7 +786,7 @@ export default {
         _this: this
       }, res => {
         this.workData = res.data.records;
-        this.total = res.data.total;
+        this.totalNo = res.data.total;
       }, e => {
       });
     },
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
index ed5506ad4..372939517 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
@@ -275,6 +275,7 @@ export default {
   },
   data() {
     return {
+      submitFlag: '',
       toggleType: '5',
       comFlag: 1,
       active: "1",
@@ -338,7 +339,8 @@ export default {
     if(this.taskId){
       this.approvalFlag = true
       this.processTable()
-      this.getData();
+      //被驳回时调用
+      this.getHistoryData()
    }
   },
   methods: {
@@ -355,16 +357,6 @@ export default {
       }, e => {
       })
     },
-    getDatas(){
-      queryTaskFirst({
-        bpnId: this.$route.query.bpnId
-      }).then(res => {
-        let mes = JSON.parse(res.mes)
-        this.roleForm = mes.roleForm
-        this.qbfsForm = mes.qbfsForm
-        this.commentText = mes.commentText
-      });
-    },
     getData() {
       this.formLoading = true
       this.showFlag = false
@@ -375,11 +367,29 @@ export default {
         this.getFormFieldList(mes);
       });
     },
+    getHistoryData() {
+      this.submitFlag = '重新起草'
+      this.showFlag = false
+      this.formLoading = true
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.$route.query.taskIds,
+          pId: this.$route.query.prcId,
+        }).then(res => {
+          if (res) {
+            const processForm = JSON.parse(res.mesg)
+            this.getFormFieldList(processForm)
+          }
+        }).catch(e => {
+        })
+      })
+    },
     /**
      * @description: 动态表单读取
      */
     getFormFieldList(item) {
-      let type = item.qbfsForm.type
+      console.log(item);
+      let type = item.type || item.qbfsForm.type
       this.$nextTick(() => {
         switch (type){
           case '1':
@@ -398,18 +408,18 @@ export default {
             this.comName = "establish"
             break
         }
-        this.qbfsForm = item.qbfsForm;
+        this.qbfsForm = item.qbfsForm || item;
         this.formLoading = false;
-        this.roleForm.dockUser = item.roleForm.dockUser;
-        this.roleForm.dockUserName = item.roleForm.dockUserName;
-        this.roleForm.countersigner = item.roleForm.countersigner;
-        this.roleForm.countersignerName = item.roleForm.countersignerName;
-        this.roleForm.approver = item.roleForm.approver;
-        this.roleForm.approverName = item.roleForm.approverName;
-        this.roleForm.engineer = item.roleForm.engineer;
-        this.roleForm.engineerName = item.roleForm.engineerName;
-        this.roleForm.examine = item.roleForm.examine;
-        this.roleForm.examineName = item.roleForm.examineName;
+        this.roleForm.dockUser = item.dockUser || item.roleForm.dockUser;
+        this.roleForm.dockUserName = item.dockUserName || item.roleForm.dockUserName;
+        this.roleForm.countersigner = item.countersigner || item.roleForm.countersigner;
+        this.roleForm.countersignerName = item.countersignerName || item.roleForm.countersignerName;
+        this.roleForm.approver = item.approver ||item.roleForm.approver;
+        this.roleForm.approverName = item.approverName || item.roleForm.approverName;
+        this.roleForm.engineer = item.engineer || item.roleForm.engineer;
+        this.roleForm.engineerName = item.engineerName || item.roleForm.engineerName;
+        this.roleForm.examine = item.examine || item.roleForm.examine;
+        this.roleForm.examineName = item.examineName || item.roleForm.examineName;
       });
     },
     handleTabs(name) {
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index 25581178b..b79b864d6 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -2184,7 +2184,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          }else if(row.taskInfo === '企标制修订计划整改') {
+          }else if(row.taskInfo === '重新起草') {
             this.$router.push({
               name: 'qbzxdjhgkStep1',
               query:{

From f21499afe078ad32e0df0fcff0acad1dfc24960d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Mon, 7 Mar 2022 16:00:20 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=8F=90=E4=BA=A4=20=20=E5=8D=95=E5=85=83?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=8F=98=E5=9E=8B=E5=8F=B7=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzrk/step3.vue         |  2 +-
 .../pages/creatProcess/bzrk/step4.vue         | 21 ++++++++++++++-----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
index c39d5759b..9e2199b2c 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
@@ -1186,10 +1186,10 @@ export default {
     },
     handleSubmit() {
       this.isSubmit = true
+      this.form.submitType = this.submitType
       this.form.commentText = this.commentText
       this.form.approvalOpinion = this.approvalOpinion
       const json = JSON.stringify(this.form);
-      json.submitType = this.submitType
       this.$http.post('lawss/activiti/completeTask', {
         taskIds: this.taskIds,
         userId : this.userId,
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
index 231233b99..d0fb69bfe 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
@@ -875,10 +875,11 @@
                     :lazy=true
                     :multiple=true
                     :check-strictly=true
-                    :show-checkBox=true
                     :modalShowFlag="modalShowFlag4"
                     :drawerTitle="drawerTitle"
                     :url="url"
+                    :type="'TRUCK'"
+                    :show-checkBox="showCheckBox"
                     :urlChild="urlChild"
                     :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
                     :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel" @popoverHideCancel="popoverHideModelCancel"></tree-select-module>
@@ -895,6 +896,7 @@
                     :drawerTitle="drawerTitle"
                     :url="url"
                     :type="'CAR'"
+                    :show-checkBox="showCheckBox"
                     :urlChild="urlChild"
                     :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
                     :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel2" @popoverHideCancel="popoverHideModelCancel2"></tree-select-module>
@@ -1596,6 +1598,7 @@ export default {
       commentText: '', // 意见
       title: '', // 新增编辑抽屉标题
       ListModel: false, // 新增编辑抽屉开关
+      showCheckBox: true, // 树形控件是否展示多选框
       active: '1', // 默认显示
       isSubmit: false,
       saveLoading: false,
@@ -1988,11 +1991,19 @@ export default {
       this.modalShowFlag4 = true
       this.url = ''
       this.urlChild = ''
-      this.url = "sarModelTree/list"
+      this.url = "sarModelTree/listByType"
       this.urlChild = "sarModelTree/childByList"
       this.key3++
     },
-
+    choiceZRR5(type, title, id) {
+      this.drawerTitle = title
+      this.modalShowFlag5 = true
+      this.url = ''
+      this.urlChild = ''
+      this.url = "sarModelTree/listByType"
+      this.urlChild = "sarModelTree/childByList"
+      this.key4++
+    },
     choiceTree(type, title, id) {
       this.drawerTitle = title
       this.getListTree(this.form)
@@ -2801,10 +2812,10 @@ export default {
               if (res.ok) {
                 this.fileInfoHandle();
                 this.isSubmit = true
+                this.form.submitType = this.submitType
                 this.form.commentText = this.commentText
                 this.form.approvalOpinion = this.approvalOpinion
                 const json = JSON.stringify(this.form);
-                json.submitType = this.submitType
                 this.$http.post('lawss/activiti/completeTask', {
                   taskIds: this.taskIds,
                   userId: this.userId,
@@ -2829,10 +2840,10 @@ export default {
           } else {
             this.fileInfoHandle();
             this.isSubmit = true
+            this.form.submitType = this.submitType
             this.form.commentText = this.commentText
             this.form.approvalOpinion = this.approvalOpinion
             const json = JSON.stringify(this.form);
-            json.submitType = this.submitType
             this.$http.post('lawss/activiti/completeTask', {
               taskIds: this.taskIds,
               userId: this.userId,

From fa2484a5e9b7b3e4c63822d2c27d9405b558a340 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Mon, 7 Mar 2022 16:15:07 +0800
Subject: [PATCH 03/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=81=E6=A0=87?=
 =?UTF-8?q?=E5=88=B6=E4=BF=AE=E8=AE=A2=E8=AE=A1=E5=88=92=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
index dd5edaf33..0d0a4635a 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
@@ -531,6 +531,7 @@ export default {
         this.$http.postData('importWkExcel/importData', _formData,{
           _this: this
         }, res => {
+          console.log(res);
           if(res.ok){
             if(res.data.length){
               this.qblx_pageData.qblxData = res.data
@@ -539,7 +540,7 @@ export default {
               this.$message.warning('请勿上传为空的文件')
             }
           }else{
-            this.$confirm(res.message, "提示", {
+            this.$confirm(res.data, "提示", {
               confirmButtonText: "确认",
               confirmButtonClass: "common-button-primary",
               cancelButtonText: "取消",

From 5d949f5907183bc2297f3559f9f075d63029a8b8 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Mon, 7 Mar 2022 16:24:50 +0800
Subject: [PATCH 04/10] commit

---
 src/pages/processCenter/pages/creatProcess/bzrk/step2.vue | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
index fd0fcb3c2..fd0c50c8b 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
@@ -559,12 +559,14 @@
                   <el-tooltip v-if="form.dtbjh" effect="dark" :content=form.dtbjh placement="top-start">
                     <el-input
                             v-model="form.dtbjh"
+                            disabled
                             placeholder="请输入代替标准号"
                             clearable
                     ></el-input>
                   </el-tooltip>
                   <el-input
                           v-else
+                          disabled
                           v-model="form.dtbjh"
                           placeholder="请输入代替标准号"
                           clearable
@@ -588,6 +590,7 @@
                 <el-form-item label="部分代替标准号" prop="bfbdtbzh" class="add-form-item form-item-disabled">
                   <el-tooltip v-if="form.bfbdtbzh" effect="dark" :content=form.bfbdtbzh placement="top-start">
                     <el-input
+                            disabled
                             v-model="form.bfbdtbzh"
                             placeholder="请输入部分代替标准号"
                             clearable
@@ -595,6 +598,7 @@
                   </el-tooltip>
                   <el-input
                           v-else
+                          disabled
                           v-model="form.bfbdtbzh"
                           placeholder="请输入部分代替标准号"
                           clearable
@@ -604,6 +608,7 @@
                   <el-tooltip v-if="form.cbbh" effect="dark" :content=form.cbbh placement="top-start">
                     <el-input
                             v-model="form.cbbh"
+                            disabled
                             placeholder="请输入采标编号"
                             clearable
                     ></el-input>
@@ -611,6 +616,7 @@
                   <el-input
                           v-else
                           v-model="form.cbbh"
+                          disabled
                           placeholder="请输入采标编号"
                           clearable
                   ></el-input>
@@ -619,6 +625,7 @@
                   <el-tooltip v-if="form.yybj" effect="dark" :content=form.yybj placement="top-start">
                     <el-input
                             v-model="form.yybj"
+                            disabled
                             placeholder="请输入引用标准"
                             clearable
                     ></el-input>
@@ -626,6 +633,7 @@
                   <el-input
                           v-else
                           v-model="form.yybj"
+                          disabled
                           placeholder="请输入引用标准"
                           clearable
                   ></el-input>

From eec0977b10021eacd12eb437b383cc88ac31fd5e Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Mon, 7 Mar 2022 16:27:44 +0800
Subject: [PATCH 05/10] commit

---
 src/pages/processCenter/pages/creatProcess/bzrk/step3.vue | 8 ++++++++
 src/pages/processCenter/pages/creatProcess/bzrk/step5.vue | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
index 9e2199b2c..2204dc818 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
@@ -510,6 +510,7 @@
                   <el-tooltip v-if="form.dtbjh" effect="dark" :content=form.dtbjh placement="top-start">
                     <el-input
                             v-model="form.dtbjh"
+                            disabled
                             placeholder="请输入代替标准号"
                             clearable
                     ></el-input>
@@ -517,6 +518,7 @@
                   <el-input
                           v-else
                           v-model="form.dtbjh"
+                          disabled
                           placeholder="请输入代替标准号"
                           clearable
                   ></el-input>
@@ -547,6 +549,7 @@
                 <el-form-item label="部分代替标准号" prop="bfbdtbzh" class="add-form-item form-item-disabled">
                   <el-tooltip v-if="form.bfbdtbzh" effect="dark" :content=form.bfbdtbzh placement="top-start">
                     <el-input
+                            disabled
                             v-model="form.bfbdtbzh"
                             placeholder="请输入部分代替标准号"
                             clearable
@@ -554,6 +557,7 @@
                   </el-tooltip>
                   <el-input
                           v-else
+                          disabled
                           v-model="form.bfbdtbzh"
                           placeholder="请输入部分代替标准号"
                           clearable
@@ -563,6 +567,7 @@
                   <el-tooltip v-if="form.cbbh" effect="dark" :content=form.cbbh placement="top-start">
                     <el-input
                             v-model="form.cbbh"
+                            disabled
                             placeholder="请输入采标编号"
                             clearable
                     ></el-input>
@@ -570,6 +575,7 @@
                   <el-input
                           v-else
                           v-model="form.cbbh"
+                          disabled
                           placeholder="请输入采标编号"
                           clearable
                   ></el-input>
@@ -578,12 +584,14 @@
                   <el-tooltip v-if="form.yybj" effect="dark" :content=form.yybj placement="top-start">
                     <el-input
                             v-model="form.yybj"
+                            disabled
                             placeholder="请输入引用标准"
                             clearable
                     ></el-input>
                   </el-tooltip>
                   <el-input
                           v-else
+                          disabled
                           v-model="form.yybj"
                           placeholder="请输入引用标准"
                           clearable
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
index f26b410a7..43b777c60 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
@@ -468,12 +468,14 @@
                   <el-tooltip v-if="form.dtbjh" effect="dark" :content=form.dtbjh placement="top-start">
                     <el-input
                             v-model="form.dtbjh"
+                            disabled
                             placeholder="请输入代替标准号"
                             clearable
                     ></el-input>
                   </el-tooltip>
                   <el-input
                           v-else
+                          disabled
                           v-model="form.dtbjh"
                           placeholder="请输入代替标准号"
                           clearable
@@ -507,12 +509,14 @@
                   <el-tooltip v-if="form.bfbdtbzh" effect="dark" :content=form.bfbdtbzh placement="top-start">
                     <el-input
                             v-model="form.bfbdtbzh"
+                            disabled
                             placeholder="请输入部分代替标准号"
                             clearable
                     ></el-input>
                   </el-tooltip>
                   <el-input
                           v-else
+                          disabled
                           v-model="form.bfbdtbzh"
                           placeholder="请输入部分代替标准号"
                           clearable
@@ -522,6 +526,7 @@
                   <el-tooltip v-if="form.cbbh" effect="dark" :content=form.cbbh placement="top-start">
                     <el-input
                             v-model="form.cbbh"
+                            disabled
                             placeholder="请输入采标编号"
                             clearable
                     ></el-input>
@@ -529,6 +534,7 @@
                   <el-input
                           v-else
                           v-model="form.cbbh"
+                          disabled
                           placeholder="请输入采标编号"
                           clearable
                   ></el-input>
@@ -537,6 +543,7 @@
                   <el-tooltip v-if="form.yybj" effect="dark" :content=form.yybj placement="top-start">
                     <el-input
                             v-model="form.yybj"
+                            disabled
                             placeholder="请输入引用标准"
                             clearable
                     ></el-input>
@@ -544,6 +551,7 @@
                   <el-input
                           v-else
                           v-model="form.yybj"
+                          disabled
                           placeholder="请输入引用标准"
                           clearable
                   ></el-input>

From cde1e47f485e79f94c53248b043131205f39d71f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Mon, 7 Mar 2022 16:54:03 +0800
Subject: [PATCH 06/10] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=8F=90=E4=BA=A4bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzrk/step2.vue         | 197 ++++++++----------
 1 file changed, 87 insertions(+), 110 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
index fd0c50c8b..42f0bbfde 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
@@ -559,14 +559,12 @@
                   <el-tooltip v-if="form.dtbjh" effect="dark" :content=form.dtbjh placement="top-start">
                     <el-input
                             v-model="form.dtbjh"
-                            disabled
                             placeholder="请输入代替标准号"
                             clearable
                     ></el-input>
                   </el-tooltip>
                   <el-input
                           v-else
-                          disabled
                           v-model="form.dtbjh"
                           placeholder="请输入代替标准号"
                           clearable
@@ -590,7 +588,6 @@
                 <el-form-item label="部分代替标准号" prop="bfbdtbzh" class="add-form-item form-item-disabled">
                   <el-tooltip v-if="form.bfbdtbzh" effect="dark" :content=form.bfbdtbzh placement="top-start">
                     <el-input
-                            disabled
                             v-model="form.bfbdtbzh"
                             placeholder="请输入部分代替标准号"
                             clearable
@@ -598,7 +595,6 @@
                   </el-tooltip>
                   <el-input
                           v-else
-                          disabled
                           v-model="form.bfbdtbzh"
                           placeholder="请输入部分代替标准号"
                           clearable
@@ -608,7 +604,6 @@
                   <el-tooltip v-if="form.cbbh" effect="dark" :content=form.cbbh placement="top-start">
                     <el-input
                             v-model="form.cbbh"
-                            disabled
                             placeholder="请输入采标编号"
                             clearable
                     ></el-input>
@@ -616,7 +611,6 @@
                   <el-input
                           v-else
                           v-model="form.cbbh"
-                          disabled
                           placeholder="请输入采标编号"
                           clearable
                   ></el-input>
@@ -625,7 +619,6 @@
                   <el-tooltip v-if="form.yybj" effect="dark" :content=form.yybj placement="top-start">
                     <el-input
                             v-model="form.yybj"
-                            disabled
                             placeholder="请输入引用标准"
                             clearable
                     ></el-input>
@@ -633,7 +626,6 @@
                   <el-input
                           v-else
                           v-model="form.yybj"
-                          disabled
                           placeholder="请输入引用标准"
                           clearable
                   ></el-input>
@@ -644,33 +636,16 @@
         </el-form>
       </div>
       <div>
-        <el-collapse accordion v-model="activeName">
-          <el-collapse-item title="审批意见" name="1">
+        <el-collapse accordion>
+          <el-collapse-item title="审批意见">
             <div style="margin: 10px 0;">
-              <el-form
-                ref="formTongGuo"
-                :model="formTongGuo"
-                :rules="rules">
-                <!--                    <el-form-item-->
-                <!--                        prop="approvalOpinion"-->
-                <!--                    >-->
-                <!--                      <el-select @change="getRule" v-model="formTongGuo.approvalOpinion" placeholder="请审批" style="margin-bottom: 20px;">-->
-                <!--                        <el-option label="驳回" value="1"></el-option>-->
-                <!--                        <el-option label="通过" value="0"></el-option>-->
-                <!--                      </el-select>-->
-                <!--                    </el-form-item>-->
-                <el-form-item
-                  prop="commentText"
-                >
-                  <el-input
-                    type="textarea"
-                    :rows="3"
-                    resize="none"
-                    placeholder="请输入意见"
-                    v-model="formTongGuo.commentText">
-                  </el-input>
-                </el-form-item>
-              </el-form>
+              <el-input
+                type="textarea"
+                :rows="3"
+                resize="none"
+                placeholder="请输入意见"
+                v-model="commentText">
+              </el-input>
             </div>
           </el-collapse-item>
         </el-collapse>
@@ -813,11 +788,11 @@
 </template>
 
 <script>
-import ProcessHeader from '../../components/ProcessHeader'
-import ProcessFooter from '../../components/ProcessFooter'
-import ProcessTitle from '../../components/ProcessTitle'
-import {inboundLiaisonDetail, processCreateStand, changeAssigneeNew } from 'api/process'
-import TreeSelect from '@/components/treeSelect/treeSelect.vue';
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessFooter from "../../components/ProcessFooter";
+import ProcessTitle from "../../components/ProcessTitle";
+import { changeAssigneeNew, inboundLiaisonDetail, processCreateStand } from "api/process";
+import TreeSelect from "@/components/treeSelect/treeSelect.vue";
 import CusTomDataPickerGroup
   from "@/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup";
 
@@ -842,22 +817,23 @@ export default {
       drawerModal: false,
       drawerTitle: '',
       nodeList: [],
-      selectPeople: '',
-      xgdFileId: '',
-      fbgbjbdFileId: '',
-      bpgFileId: '',
-      ssgFileId: '',
-      zqyjgFileId: '',
-      jdwjFileId: '',
-      kwjFileId: '',
-      glwjFileId: '',
-      caFileId: '',
-      zbjbdFileId: '',
+      selectPeople: "",
+      xgdFileId: "",
+      fbgbjbdFileId: "",
+      bpgFileId: "",
+      ssgFileId: "",
+      zqyjgFileId: "",
+      jdwjFileId: "",
+      kwjFileId: "",
+      glwjFileId: "",
+      caFileId: "",
+      commentText: "",
+      zbjbdFileId: "",
       rules: {
-        commentText: [{required: true, message: '请输入意见', trigger: 'blur'}],
-        approvalOpinion: [{required: true, message: '请选择审批意见', trigger: 'change'}]
+        commentText: [{ required: true, message: "请输入意见", trigger: "blur" }],
+        approvalOpinion: [{ required: true, message: "请选择审批意见", trigger: "change" }]
       },
-      activeName: '1',
+      activeName: "1",
       // 当前流程类型(1待办/2已办)
       processType: 1,
       detailData: [],
@@ -1232,76 +1208,77 @@ export default {
     },
     handleSave() {
     },
+    //流程驳回按钮
     handle1() {
-      this.formTongGuo.approvalOpinion = 1
-      this.handleSubmit()
+      if (this.commentText) {
+        this.formTongGuo.approvalOpinion = 1;
+        this.handleSubmit();
+      } else {
+        this.$message.warning("请填写审批意见");
+      }
     },
+    //流程提交按钮
     handle2() {
-      this.formTongGuo.approvalOpinion = 0
-      this.handleSubmit()
+      this.formTongGuo.approvalOpinion = 0;
+      this.handleSubmit();
     },
     handleSubmit() {
-      this.getRule()
       const val = this.form.country;
-      if (val !== '' && val !== null && typeof (val) !== 'undefined') {
+      if (val !== "" && val !== null && typeof (val) !== "undefined") {
         if (val instanceof Array) {
           this.form.country = val.join(",");
         } else {
-          this.form.country = val
+          this.form.country = val;
         }
-      } else if (val === '') {
-        this.form.country = []
+      } else if (val === "") {
+        this.form.country = [];
       }
-      this.$refs['formTongGuo'].validate((valid) => {
-        if (valid) {
-          this.isSubmit = true
-          this.form.commentText = this.formTongGuo.commentText
-          this.form.approvalOpinion = this.formTongGuo.approvalOpinion
-          console.log(this.form)
-          if (this.form.syrz.length === 0) {
-            this.form.syrz = ''
+      this.isSubmit = true;
+      this.form.commentText = this.commentText;
+      this.form.approvalOpinion = this.formTongGuo.approvalOpinion;
+      console.log(this.form);
+      if (this.form.syrz.length === 0) {
+        this.form.syrz = "";
+      }
+      if (this.form.nylx.length === 0) {
+        this.form.nylx = "";
+      }
+      if (this.form.zrbm.length === 0) {
+        this.form.zrbm = "";
+      }
+      if (this.form.qcdw.length === 0) {
+        this.form.qcdw = "";
+      }
+      if (this.form.cllx.length === 0) {
+        this.form.cllx = "";
+      }
+      if (this.form.sycpx.length === 0) {
+        this.form.sycpx = "";
+      }
+      if (this.form.zrgcs.length === 0) {
+        this.form.zrgcs = "";
+      }
+      this.form.menuIds = this.form.treeListId;
+      const json = JSON.stringify(this.form);
+      this.$http.post("lawss/activiti/completeTask", {
+        taskIds: this.taskIds,
+        userId: this.userId,
+        json: json
+      }, {
+        _this: this
+      }, res => {
+        if (res.success) {
+          if (this.formTongGuo.approvalOpinion == "1") {
+            this.$message.warning("驳回成功");
+            this.isSubmit = false;
+            this.formTongGuo.commentText = "";
+            // 流程提交之后，应该流转至待办任务页面
+            this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" });
+          } else {
+            this.processCreateStand(json);
           }
-          if (this.form.nylx.length === 0) {
-            this.form.nylx = ''
-          }
-          if (this.form.zrbm.length === 0) {
-            this.form.zrbm = ''
-          }
-          if (this.form.qcdw.length === 0) {
-            this.form.qcdw = ''
-          }
-          if (this.form.cllx.length === 0) {
-            this.form.cllx = ''
-          }
-          if (this.form.sycpx.length === 0) {
-            this.form.sycpx = ''
-          }
-          if (this.form.zrgcs.length === 0) {
-            this.form.zrgcs = ''
-          }
-          this.form.menuIds = this.form.treeListId
-          const json = JSON.stringify(this.form);
-          this.$http.post('lawss/activiti/completeTask', {
-            taskIds: this.taskIds,
-            userId: this.userId,
-            json: json
-          }, {
-            _this: this
-          }, res => {
-            if (res.success) {
-              if (this.formTongGuo.approvalOpinion == '1') {
-                this.$message.warning("驳回成功")
-                this.isSubmit = false
-                this.formTongGuo.commentText = ''
-                // 流程提交之后，应该流转至待办任务页面
-                this.$router.push({path: '/processCenter?tabsName=ProcessCenter'})
-              } else {
-                this.processCreateStand(json)
-              }
-            }
-          })
         }
-      })
+      });
     },
 
     /**

From e3b54013abe5b43c04bb5eda588a34c7a64a42a6 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Mon, 7 Mar 2022 16:54:11 +0800
Subject: [PATCH 07/10] commit

---
 src/pages/processCenter/pages/creatProcess/bzrk/step3.vue | 1 +
 src/pages/processCenter/pages/creatProcess/bzrk/step5.vue | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
index 2204dc818..b27a56268 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
@@ -67,6 +67,7 @@
                   <el-tooltip v-if="form.standName" effect="dark" :content=form.standName placement="top-start">
                     <el-input
                             v-model="form.standName"
+                            disabled
                             placeholder="请输入标准中文名称"
                             clearable
                     ></el-input>
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
index 43b777c60..f41121628 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
@@ -52,6 +52,7 @@
                   <el-tooltip v-if="form.standName" effect="dark" :content=form.standName placement="top-start">
                     <el-input
                             v-model="form.standName"
+                            disabled
                             placeholder="请输入标准中文名称"
                             clearable
                     ></el-input>

From 99191bb2180ad776a5a8fcaf45c6bfa23ac11278 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Mon, 7 Mar 2022 17:42:29 +0800
Subject: [PATCH 08/10] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8Bbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzrk/step1.vue         | 19 ++++++++++++++++++-
 .../pages/creatProcess/bzrk/step4.vue         |  6 +++---
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index a4f738e4f..8b1a950c3 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -1456,6 +1456,7 @@ export default {
       callback()
     }
     return {
+      gdType: '', //归档位置的赋值
         standTypeModel: 'INLAND',
       submitType: '',
       nodeList3: [],
@@ -2223,6 +2224,7 @@ export default {
       switch (status) {
         // 新增
         case 1:
+          this.gdType = '新增'
           this.selectedList = []
           this.standardCheckedList = []
           this.standardDrawer = false
@@ -2231,6 +2233,7 @@ export default {
           break
         // 带入（确认）
         case 2:
+          this.gdType = '带入'
           if (this.standardCheckedList.length === 1) {
             this.$http.get('sarStandardsInfo/sar-standards-info/getStandInfoUpdateById', {id: this.standardCheckedList[0].id}, {
               _this: this
@@ -2368,7 +2371,7 @@ export default {
       }, {}, res => {
         if (res.ok) {
           this.treeListOptions = res.data
-          if(bringData.standNumber){
+          if(this.gdType === '带入'){
             this.$http.get('sarStandardsInfo/sar-standards-info/getStandMenuId', {
               standId: bringData.id,
             }, {}, reson => {
@@ -2388,6 +2391,20 @@ export default {
                 this.form.treeListId = treeListId
               }
             })
+          }else{
+            let treeList = ''
+            let treeListId = ''
+            reson.data.forEach(item=>{
+              this.treeCheckedKeys.push(item.menuId)
+              if (treeList.length > 0) {
+                treeList += ','
+                treeListId += ','
+              }
+              treeList += item.menuName
+              treeListId += item.menuId
+            })
+            this.form.treeListName = treeList
+            this.form.treeListId = treeListId
           }
         }
       })
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
index d0fb69bfe..ee7e22ba5 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
@@ -10,7 +10,7 @@
       <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
       <!--      <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">审批历史</div>-->
     </div>
-    <div class="content" v-if="active === '1'">
+    <div class="content" v-show="active === '1'">
       <div style="flex: auto; overflow: auto;">
         <el-form
           ref="form"
@@ -1260,7 +1260,7 @@
         </el-collapse>
       </div>
     </div>
-    <div class="content" v-if="active === '2'">
+    <div class="content" v-show="active === '2'">
       <div class="block" style="padding-top: 20px;">
         <el-timeline>
           <el-timeline-item timestamp="发起流程" placement="top" :color="user1 ? '#66b1ff' : ''">
@@ -1307,7 +1307,7 @@
         </el-timeline>
       </div>
     </div>
-    <div class="content" v-if="active === '3'">
+    <div class="content" v-show="active === '3'">
       <div class="flow-list">
         <el-table
           height="100%"

From 10691f3726f0ce6b755f6dc6e5d51707aaa6b068 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Tue, 8 Mar 2022 15:48:01 +0800
Subject: [PATCH 09/10] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=84=E4=BC=B0?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=A0=87=E5=87=86=E5=8F=B7=E5=88=97=E5=AE=BD?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/creatProcess/xmpg/step1.vue | 1 +
 src/pages/processCenter/pages/creatProcess/xmpg/step2.vue | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
index 97e265f79..ed674b6cf 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
@@ -87,6 +87,7 @@
           </el-table-column>
           <el-table-column
             align="center"
+            width="180"
             label="标准号"
           >
             <template slot-scope="scope">
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
index f5f01c585..bbd813598 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
@@ -40,7 +40,7 @@
                   @selection-change="selectStandChange">
           <el-table-column align="center" type="selection" width="55">
           </el-table-column>
-          <el-table-column label="标准号" prop="standNumber">
+          <el-table-column label="标准号"  width="180" prop="standNumber">
             <template slot-scope="scope">
               <a v-if="scope.row.standYear" class="table-jump"
                  @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber

From c0ef14dcd8060934d970bfc7afe7f4a5f5bec779 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Tue, 8 Mar 2022 15:51:17 +0800
Subject: [PATCH 10/10] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nonConfomity/pages/historicalData.vue      | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue b/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue
index 94833ef5f..5c784384e 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue
@@ -119,18 +119,6 @@
           align="center"
           label="责任工程师">
         </el-table-column>
-        <el-table-column
-          prop="authEngineer"
-          width="150"
-          align="center"
-          label="认证工程师">
-        </el-table-column>
-        <el-table-column
-          prop="qaEngineer"
-          width="150"
-          align="center"
-          label="质量工程师">
-        </el-table-column>
         <el-table-column
         prop="actualCloseTime"
         width="130"
@@ -194,12 +182,6 @@
             <el-form-item class="add-form-item" label="责任工程师:">
               <div class="seeItem">{{historySeeForm.dutyEngineer}}</div>
             </el-form-item>
-            <el-form-item class="add-form-item" label="认证工程师:">
-              <div class="seeItem">{{historySeeForm.authEngineer}}</div>
-            </el-form-item>
-            <el-form-item class="add-form-item" label="质量工程师:">
-              <div class="seeItem">{{historySeeForm.qaEngineer}}</div>
-            </el-form-item>
             <el-form-item class="add-form-item" label="要求关闭时间:">
               <div class="seeItem">{{historySeeForm.actualCloseTime ? historySeeForm.actualCloseTime.substring(0, 11) : '-'}}</div>
             </el-form-item>