From 0e26b577cfd05447df688e13acb901501756c7bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Thu, 7 Apr 2022 14:48:31 +0800
Subject: [PATCH 01/13] =?UTF-8?q?52263=20=E6=A0=87=E5=87=86=E5=BE=81?=
 =?UTF-8?q?=E6=B1=82=E6=84=8F=E8=A7=81=E6=B5=81=E7=A8=8B=EF=BC=9A=E6=89=B9?=
 =?UTF-8?q?=E5=87=86=E8=8A=82=E7=82=B9=E6=B2=A1=E6=9C=89=E4=BA=BA=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue   | 1 -
 src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue   | 2 ++
 src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue   | 2 ++
 src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue | 2 ++
 src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue | 2 ++
 src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue   | 2 ++
 src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue   | 2 ++
 src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue   | 2 ++
 src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue   | 2 ++
 src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue   | 2 ++
 src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue   | 2 ++
 11 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
index f477a26c5..86809bb05 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
@@ -38,7 +38,6 @@
                 <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
                   <el-date-picker
                     v-model="form.endTime"
-                    :picker-options="pickerOptions"
                     type="date"
                     value-format="yyyy-MM-dd"
                     placeholder="请选择结束日期">
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
index 8ea4d056a..eb6f21c9e 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
@@ -378,6 +378,8 @@ export default {
         }).then(res => {
           let data = JSON.parse(res.mesg)
           this.commentText2 = data.commentText2 || ''
+          this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
+          this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
           this.form.startUserName = data.form ? data.form.startUserName : data.startUserName
           this.form.startUser = data.form ? data.form.startUser : data.startUser
           this.form.cid = data.form ? data.form.cid : data.cid
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
index bbdfbec0b..6e876e8b2 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
@@ -701,6 +701,8 @@
                             this.submitShow = true
                         }
                         this.commentText3 = data.commentText3 || ''
+                        this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
+                        this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
                         this.form.fjList = data.form ? data.form.fjList : (data.fjList ? data.fjList : [] )
                         this.form.modelList = data.form ? data.form.modelList : (data.modelList ? data.modelList : [] )
                         this.form.textType = data.form ? data.form.textType : data.textType
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue
index 2842bf7de..ee6c9d4e7 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue
@@ -455,6 +455,8 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
+                        this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
+                        this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
                         this.form.fjList = data.fjList || data.form.fjList
                         this.form.cid = data.cid || data.form.cid
                         this.form.endTime = data.endTime || data.form.endTime
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue
index 3f274da50..f305809b4 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue
@@ -440,6 +440,8 @@
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
                         this.form.fjList = data.fjList || data.form.fjList
+                        this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
+                        this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
                         this.commentText42 = data.commentText42 || ''
                         this.form.cid = data.cid || data.form.cid
                         this.form.endTime = data.endTime || data.form.endTime
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
index 222a4795c..12a5a2ebe 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
@@ -703,6 +703,8 @@ export default {
             this.submitShow = true
           }
           this.commentText4 = data.commentText || data.commentText4 || ''
+          this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
+          this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
           this.form.fjList = data.fjList || data.form.fjList
           this.form.spId = data.form ? data.form.spId :  ''
           this.form.spName = data.form ? data.form.spName :  ''
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
index 8a1e1a8cc..2caa67e8c 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
@@ -619,6 +619,8 @@
             let data = JSON.parse(res.mesg);
             console.log(data);
             this.commentText5 = data.commentText5 || ''
+            this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
+            this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
             this.form.fjList = data.form ? data.form.fjList : (data.fjList ? data.fjList : [] )
             this.form.modelList = data.form ? data.form.modelList : (data.modelList ? data.modelList : [] )
             this.form.textType = data.form ? data.form.textType : data.textType
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
index 36a6218ce..94c00c6a9 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
@@ -530,6 +530,8 @@
           }).then(res => {
             let data = JSON.parse(res.mesg);
             this.commentText6 = data.commentText6 || ''
+            this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
+            this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
             this.form.fjList = data.fjList || data.form.fjList
             this.form.cid = data.cid || data.form.cid;
             this.form.endTime = data.endTime || data.form.endTime;
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
index c44978deb..740498b71 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
@@ -491,6 +491,8 @@ export default {
         }).then(res => {
           let data = JSON.parse(res.mesg)
           this.commentText7 = data.commentText7 || ''
+          this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
+          this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
           this.form.fjList = data.fjList || data.form.fjList
           this.form.cid = data.cid || data.form.cid;
           this.form.endTime = data.endTime || data.form.endTime;
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
index fef5ad6d0..36b705625 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
@@ -491,6 +491,8 @@ export default {
         }).then(res => {
           let data = JSON.parse(res.mesg)
           this.commentText8 = data.commentText8 || ''
+          this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
+          this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
           this.form.fjList = data.fjList || data.form.fjList
           this.form.cid = data.cid || data.form.cid;
           this.form.endTime = data.endTime || data.form.endTime;
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
index 1a39fa879..9b62938e4 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
@@ -491,6 +491,8 @@ export default {
         }).then(res => {
           let data = JSON.parse(res.mesg)
           this.commentText9 = data.commentText9 || ''
+          this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
+          this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
           this.form.fjList = data.fjList || data.form.fjList
           this.form.cid = data.cid || data.form.cid;
           this.form.endTime = data.endTime || data.form.endTime;

From d9d11f5f609cc354609d703bd88f9388750fbb4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Thu, 7 Apr 2022 15:12:06 +0800
Subject: [PATCH 02/13] =?UTF-8?q?=E9=81=BF=E5=85=8D=E5=BD=A2=E6=88=90?=
 =?UTF-8?q?=E4=BA=8C=E6=AC=A1=E8=8D=89=E7=A8=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/qbzxdjhgk/step1.vue    | 48 ++++++++++---------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
index aeac07c9e..7c4f27e3f 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
@@ -283,6 +283,7 @@ export default {
       qbfsForm: {},
       formLoading: false,
       approvalFlag: false,
+      saveFlag: false,
       showFlag: true,
       taskIds: '',
       bpnId: '',
@@ -333,6 +334,7 @@ export default {
    this.taskIds = this.$route.query.taskIds
     this.bpnId = this.$route.query.bpnId
     if (this.bpnId !== undefined) {
+      this.saveFlag = true
       this.getData()
     }
     if(this.taskIds){
@@ -387,6 +389,7 @@ export default {
      * @description: 动态表单读取
      */
     getFormFieldList(item) {
+      console.log(item);
       this.toggleType= item.type || item.qbfsForm.type
       this.$nextTick(() => {
         switch (this.toggleType){
@@ -440,28 +443,7 @@ export default {
     },
     //流程保存
     handleSave() {
-      if(!this.approvalFlag){
-        //第一次正常保存
-        let qbzxdFrom = this.$refs["childForm"].qbfsForm;
-        qbzxdFrom.type = this.toggleType
-        this.saveLoading = true
-        let _formData = new FormData()
-        _formData.append('createUser', this.$store.getters.userInfo.userId)
-        _formData.append('createUserName', this.$store.getters.userInfo.userName)
-        _formData.append('prcType', '25')
-        _formData.append('json', JSON.stringify({
-          roleForm: this.roleForm,
-          qbfsForm: qbzxdFrom,
-          commentText: this.commentText
-        }))
-        saveTaskFirst(_formData).then(res => {
-          this.saveLoading = false
-          this.$message.success('保存成功')
-          this.bpnId = res.result
-        }).catch(e => {
-          this.saveLoading = false
-        })
-      }else{
+      if(this.approvalFlag || this.saveFlag){
         //被驳回后的保存
         this.saveLoading = true;
         let qbzxdFrom = this.$refs["childForm"].qbfsForm;
@@ -484,7 +466,27 @@ export default {
         }).catch(e => {
           this.saveLoading = false;
         });
-
+      }else{
+        //第一次正常保存
+        let qbzxdFrom = this.$refs["childForm"].qbfsForm;
+        qbzxdFrom.type = this.toggleType
+        this.saveLoading = true
+        let _formData = new FormData()
+        _formData.append('createUser', this.$store.getters.userInfo.userId)
+        _formData.append('createUserName', this.$store.getters.userInfo.userName)
+        _formData.append('prcType', '25')
+        _formData.append('json', JSON.stringify({
+          roleForm: this.roleForm,
+          qbfsForm: qbzxdFrom,
+          commentText: this.commentText
+        }))
+        saveTaskFirst(_formData).then(res => {
+          this.saveLoading = false
+          this.$message.success('保存成功')
+          this.bpnId = res.result
+        }).catch(e => {
+          this.saveLoading = false
+        })
       }
     },
     //流程提交

From dc15b1e391e7f487292971994b8ef0af7e5927da Mon Sep 17 00:00:00 2001
From: zhangyichen <5277314+zacty@user.noreply.gitee.com>
Date: Thu, 7 Apr 2022 15:36:22 +0800
Subject: [PATCH 03/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2052218=20=E9=80=89?=
 =?UTF-8?q?=E4=BA=BA=E7=BB=84=E4=BB=B6=EF=BC=8C=E9=92=88=E5=AF=B9=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E5=A4=9A=E4=BA=BA=E7=9A=84=E6=83=85=E5=86=B5=EF=BC=8C?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E7=9A=84=E4=BA=BA=E5=91=98=E6=8C=89=E9=A1=BA?=
 =?UTF-8?q?=E5=BA=8F=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/roleTree/index.vue               | 17 ++++++++++++++++-
 .../foreignStandardsAndRegulations/index.vue    |  2 ++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/components/roleTree/index.vue b/src/components/roleTree/index.vue
index 52e99ada9..3b912a230 100644
--- a/src/components/roleTree/index.vue
+++ b/src/components/roleTree/index.vue
@@ -125,6 +125,7 @@
         data () {
             return {
                 visible: false,
+                selectList: [],
                 nodeList2: [],
                 delList: [],
                 roleList: [],
@@ -300,7 +301,21 @@
                         this.delList = [data]
                     }
                 } else { // 多选
-                    this.roleList = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes())
+                  if (this.roleList.length === 0) {
+                    this.roleList.push(data)
+                  } else {
+                    let delFlag = true
+                    this.roleList.forEach((item, index) => {
+                      if (item.id === data.id) {
+                        this.roleList.splice(index, 1)
+                        delFlag = false
+                      }
+                    })
+                    if (delFlag) {
+                      this.roleList.push(data)
+                    }
+                  }
+                  //  this.roleList = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes())
                 }
             },
             loadNode(node, resolve) {
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index 62fa258af..a6b77cbc1 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -2707,6 +2707,7 @@ export default {
       this.modalShowRoleFlag = true
     },
     checkedRole2(data) {
+      console.log(data, '哈哈哈哈')
       let idList = ''
       let nameList = ''
       data.forEach(item => {
@@ -2717,6 +2718,7 @@ export default {
         idList += item.id
         nameList += item.name
       })
+      console.log(nameList , '额鹅鹅鹅饿')
       if (this.drawerTitle === '选择我司署名人') {
         this.sarStandardsInfoEO['WSSMR'] = nameList
       } else if (this.drawerTitle === '选择责任工程师') {

From 683131c13110c816d4879f79d07d8a777b66ee14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Thu, 7 Apr 2022 15:56:21 +0800
Subject: [PATCH 04/13] =?UTF-8?q?52375=20=E6=A0=87=E5=87=86=E8=A7=A3?=
 =?UTF-8?q?=E8=AF=BB=E6=B5=81=E7=A8=8B=EF=BC=9A=E7=AE=A1=E7=90=86=E5=91=98?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=EF=BC=8C=E5=90=8C=E6=84=8F=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=20500?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/creatProcess/bzjd/step2.vue | 3 +++
 src/pages/processCenter/pages/creatProcess/bzjd/step3.vue | 2 ++
 src/pages/processCenter/pages/creatProcess/bzjd/step4.vue | 2 ++
 src/pages/processCenter/pages/creatProcess/bzjd/step5.vue | 5 +++++
 src/pages/processCenter/pages/creatProcess/bzjd/step6.vue | 2 ++
 5 files changed, 14 insertions(+)

diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
index e4b81cf05..129867b83 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
@@ -500,7 +500,10 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
+                        console.log(data);
                         this.form.itemsNum = data.itemsNum || data.form.itemsNum
+                        this.form.deptUserId =  data.form ?  data.form.deptUserId : data.deptUserId
+                        this.form.deptUserIdName =  data.form ?  data.form.deptUserIdName : data.deptUserIdName
                         this.form.itemsName = data.itemsName || data.form.itemsName
                         this.commentText2 = data.commentText2 || ''
                         this.form.endTime = data.endTime || data.form.endTime
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
index 9d413ce8b..2a113aaf8 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
@@ -905,6 +905,8 @@
                         this.AOLIGEI = data.AOLIGEI
                         this.commentText3 = data.commentText3 || ''
                         this.todoId = res.id
+                        this.form.deptUserId =  data.form ?  data.form.deptUserId : data.deptUserId
+                        this.form.deptUserIdName =  data.form ?  data.form.deptUserIdName : data.deptUserIdName
                         this.form.itemsNum = data.itemsNum || data.form.itemsNum
                         this.form.itemsName = data.itemsName || data.form.itemsName
                         if (data.form) {
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
index 0ed030c01..a73dec473 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
@@ -486,6 +486,8 @@
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
                         this.form.endTime = data.endTime || data.form.endTime
+                        this.form.deptUserId =  data.form ?  data.form.deptUserId : data.deptUserId
+                        this.form.deptUserIdName =  data.form ?  data.form.deptUserIdName : data.deptUserIdName
                         this.form.itemsNum = data.itemsNum || data.form.itemsNum
                         this.form.itemsName = data.itemsName || data.form.itemsName
                         this.commentText4 = data.commentText4 || ''
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
index effb025f2..3ba94cc91 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
@@ -442,6 +442,8 @@
                 var json = this.json
                 json.zrApplyFlag = 1
                 json.commentText = this.commentText5
+                json.deptUserId = this.form.deptUserId
+                json.deptUserIdName = this.form.deptUserIdName
                 this.$http.post('lawss/activiti/completeTask', {
                     json: JSON.stringify(json),
                     taskId: this.taskIds,
@@ -482,9 +484,12 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
+                      console.log(data);
                         this.form.endTime = data.endTime || data.form.endTime
                         this.form.itemsNum = data.itemsNum || data.form.itemsNum
                         this.form.itemsName = data.itemsName || data.form.itemsName
+                        this.form.deptUserId =  data.form ?  data.form.deptUserId : data.deptUserId
+                        this.form.deptUserIdName =  data.form ?  data.form.deptUserIdName : data.deptUserIdName
                         this.commentText5 = data.commentText5 || ''
                         if (data.form) {
                             this.form.itemsName1 = data.form.itemsName1 || ''
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
index 82b76cca8..e95490ffc 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
@@ -486,6 +486,8 @@
                         this.form.endTime = data.endTime || data.form.endTime
                         this.form.itemsNum = data.itemsNum || data.form.itemsNum
                         this.form.itemsName = data.itemsName || data.form.itemsName
+                        this.form.deptUserId =  data.form ?  data.form.deptUserId : data.deptUserId
+                        this.form.deptUserIdName =  data.form ?  data.form.deptUserIdName : data.deptUserIdName
                         this.commentText6 = data.commentText6 || ''
                         if (data.form) {
                             this.form.itemsName1 = data.form.itemsName1 || ''

From 8fd86e7b40bd1b3e4fc2120eff83bd901961c9f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Thu, 7 Apr 2022 16:30:34 +0800
Subject: [PATCH 05/13] =?UTF-8?q?52442=20=E9=A1=B9=E7=9B=AE=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=E7=A1=AE=E8=AE=A4=E6=B5=81=E7=A8=8B:=E5=BD=93?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B8=85=E5=8D=95=E6=9C=89=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=97=B6,=E6=95=B0=E6=8D=AE=E8=B7=91=E5=AE=8C=E5=90=8E,?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BD=92=E6=A1=A3=E5=B0=B1=E4=BC=9A=E6=8A=8A?=
 =?UTF-8?q?=E4=B9=8B=E5=89=8D=E7=9A=84=E6=95=B0=E6=8D=AE=E7=BB=99=E8=A6=86?=
 =?UTF-8?q?=E7=9B=96=E6=8E=89,=E5=BA=94=E8=AF=A5=E6=8A=8A=E4=B9=8B?=
 =?UTF-8?q?=E5=89=8D=E7=9A=84=E6=95=B0=E6=8D=AE+=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE,=E7=8E=B0=E5=9C=A8=E6=98=AF?=
 =?UTF-8?q?=E5=8F=AA=E5=BD=92=E6=A1=A3=E4=BA=86=E6=96=B0=E5=A2=9E=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue | 1 +
 src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue | 4 +++-
 src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue | 4 +++-
 src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue | 4 +++-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
index 86809bb05..f477a26c5 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
@@ -38,6 +38,7 @@
                 <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
                   <el-date-picker
                     v-model="form.endTime"
+                    :picker-options="pickerOptions"
                     type="date"
                     value-format="yyyy-MM-dd"
                     placeholder="请选择结束日期">
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
index f423ef050..afa588c31 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
@@ -919,7 +919,9 @@ export default {
     //提交事件
     handleSubmit() {
       this.dataList.forEach(item => {
-        this.$set(item, 'standId', item.id)
+        if(!item.standId){
+          this.$set(item, 'standId', item.id)
+        }
       })
       this.isSubmit = true;
       this.qdform.commentText = this.commentText;
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue
index 59ed78827..b5eed52c5 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue
@@ -919,7 +919,9 @@ export default {
     //提交事件
     handleSubmit() {
       this.dataList.forEach(item => {
-        this.$set(item, 'standId', item.id)
+        if(!item.standId){
+          this.$set(item, 'standId', item.id)
+        }
       })
       this.isSubmit = true;
       this.qdform.commentText = this.commentText;
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue
index 26f79189d..42373edfc 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue
@@ -891,7 +891,9 @@ export default {
     //提交事件
     handleSubmit() {
       this.dataList.forEach(item => {
-        this.$set(item, 'standId', item.id)
+        if(!item.standId){
+          this.$set(item, 'standId', item.id)
+        }
       })
       this.isSubmit = true;
       this.qdform.commentText = this.commentText;

From 0e62faf67f3ea1c42eafc644bf657c80b4864ac8 Mon Sep 17 00:00:00 2001
From: zhangyichen <5277314+zacty@user.noreply.gitee.com>
Date: Thu, 7 Apr 2022 16:33:59 +0800
Subject: [PATCH 06/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2052235=20=E6=B5=B7?=
 =?UTF-8?q?=E5=A4=96=E5=BA=93=EF=BC=8C=E9=AB=98=E7=BA=A7=E6=A3=80=E7=B4=A2?=
 =?UTF-8?q?=E4=B9=8B=E5=90=8E=EF=BC=8C=E7=82=B9=E5=87=BB=E4=B8=8B=E9=9D=A2?=
 =?UTF-8?q?=E7=9A=84=E9=A1=B5=E7=A0=81=EF=BC=8C=E4=BC=9A=E6=8A=8A=E7=9B=AE?=
 =?UTF-8?q?=E5=89=8D=E6=A0=87=E5=87=86=E5=BA=93=E6=89=80=E6=9C=89=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=B1=95=E7=A4=BA=E5=87=BA=E6=9D=A5=EF=BC=88?=
 =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=A0=87=E5=87=86=E5=BA=93=E4=B9=9F=E8=BF=99?=
 =?UTF-8?q?=E6=A0=B7=E3=80=81=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E9=87=8C?=
 =?UTF-8?q?=E7=9A=84=E9=AB=98=E7=BA=A7=E6=9F=A5=E8=AF=A2=E4=B9=9F=E8=BF=99?=
 =?UTF-8?q?=E6=A0=B7=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domesticStandardsAndRegulations/index.vue       | 13 ++++++++-----
 .../foreignStandardsAndRegulations/index.vue        |  9 ++++++---
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 1e15fb23d..15617d7aa 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -105,7 +105,7 @@
                     size="mini"
                     class="common-button-primary"
                     v-btn-permission="'967c8b1402459951b5f75fcd1c548665'"
-                    @click="searchBtnClick(standCommonlySearch)">
+                    @click="searchBtnClick(standCommonlySearch, 1)">
                     查询
                   </el-button>
                   <el-button
@@ -3723,9 +3723,9 @@ export default {
       this.getDomesticStandardTable(this.standCommonlySearch)
     },
     // 点击搜索按钮
-    searchBtnClick(standCommonlySearch) {
+    searchBtnClick(standCommonlySearch, type) {
       let item = this.standCommonlySearch
-      this.getDomesticStandardTable(item)
+      this.getDomesticStandardTable(item, type)
     },
     // 搜索
     getDomesticStandardTableBtn(item) {
@@ -3823,7 +3823,7 @@ export default {
     // 高级检索
     selectMoreBtn() {
       this.isAdvancedSearch = true
-      this.sarStandardsSearch = {}
+      // this.sarStandardsSearch = {}
     },
     treeCollapse() {
       this.sideClose = !this.sideClose
@@ -4547,7 +4547,7 @@ export default {
       // 此处需要调用接口，修改个人配置
     },
     // 分页查询国内标准
-    getDomesticStandardTable(item) {
+    getDomesticStandardTable(item, type) {
       if (item !== '' && item !== null && item !== undefined) {
         item.pageSize = this.$store.getters.userInfo.configContent
       }
@@ -4670,6 +4670,9 @@ export default {
           if ((this.stahndinfoList.length === 0 || this.stahndinfoList === []) && this.sarStandardsSearch.page !== 1) {
             this.pageChange(1)
           }
+          if (type === 1) {
+            this.sarStandardsSearch = {}
+          }
         } else {
           this.$message.error(res.message)
         }
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index a6b77cbc1..1f8e3a39b 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -101,7 +101,7 @@
                     class="common-button-primary"
                     size="mini"
                     v-btn-permission="'366c89d1c54465faca96aaed26a158b1'"
-                    @click="searchBtnClick(standCommonlySearch)">
+                    @click="searchBtnClick(standCommonlySearch, 1)">
                     查询
                   </el-button>
                   <el-button
@@ -3147,8 +3147,8 @@ export default {
       this.getDomesticStandardTable()
     },
     // 点击搜索按钮
-    searchBtnClick() {
-      this.getDomesticStandardTable()
+    searchBtnClick(type) {
+      this.getDomesticStandardTable(undefined ,type)
     },
     // 搜索
     getDomesticStandardTableBtn(item) {
@@ -4017,6 +4017,9 @@ export default {
           }
           if ((this.stahndinfoList.length === 0 || this.stahndinfoList === []) && this.standCommonlySearch.page !== 1) {
             this.pageChange(1)
+          }
+          if (type === 1) {
+
           }
           this.stahndinfoList = res.data.list
           this.total = res.data.count

From 39aadc736b093ae9b74f491b251422f38736a2d8 Mon Sep 17 00:00:00 2001
From: zhangyichen <5277314+zacty@user.noreply.gitee.com>
Date: Thu, 7 Apr 2022 16:42:54 +0800
Subject: [PATCH 07/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2052444=20=E5=9B=BD?=
 =?UTF-8?q?=E5=86=85=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84=20=E9=AB=98?=
 =?UTF-8?q?=E7=BA=A7=E6=A3=80=E7=B4=A2=20=E6=8A=8A=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=94=B9=E6=88=90=E6=96=87=E6=9C=AC=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/languages/cn.js                                      | 1 +
 .../domesticStandardsAndRegulations/index.vue                   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/assets/languages/cn.js b/src/assets/languages/cn.js
index ee1dbbd3d..648cb25fc 100644
--- a/src/assets/languages/cn.js
+++ b/src/assets/languages/cn.js
@@ -260,6 +260,7 @@ export const m = {
   findByTheResponsibilityDepartment: '根据责任部门查找',
   findByNormativeReferenceStandard: '根据规范性引用标准查找',
   lookupByStandardStatus: '根据标准状态查找',
+  lookupByStandardStatusText: '根据文本状态查找',
   findByPrincipalCompiler: '根据主要编制者查找',
   contentInThisPaper: '内容摘要',
   substituteForStandNumber: '代替标准号',
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 15617d7aa..c8cb033ba 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -1636,7 +1636,7 @@
                   </el-form-item>
                   <!--            文本状态-->
                   <el-form-item :label="$t('m.standStateShow')" class="add-form-item form-item-disabled">
-                    <el-select v-model="sarStandardsSearch.textStatus" :placeholder="$t('m.lookupByStandardStatus')"
+                    <el-select v-model="sarStandardsSearch.textStatus" :placeholder="$t('m.lookupByStandardStatusText')"
                                clearable>
                       <el-option v-for="opt in standStateOptions" :value="opt.value === undefined ? '' :opt.value"
                                  :key="opt.value" :label="opt.label">{{ opt.label }}

From fba8ef8d7358e1d88652756e0acd2e025df50760 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Thu, 7 Apr 2022 16:43:40 +0800
Subject: [PATCH 08/13] =?UTF-8?q?52441=20=E9=A1=B9=E7=9B=AE=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=E7=A1=AE=E8=AE=A4=E6=B5=81=E7=A8=8B:=E5=B8=A6?=
 =?UTF-8?q?=E5=85=A5=E6=95=B0=E6=8D=AE=E5=90=8E,=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E8=93=9D=E8=89=B2=E5=AD=97=E4=BD=93=E5=BA=94=E8=AF=A5=E8=B7=B3?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85,=E7=8E=B0=E5=9C=A8=E8=B7=B3=E7=9A=84?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue | 4 ++--
 src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue   | 4 ++--
 src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue   | 4 ++--
 src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue   | 4 ++--
 src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue   | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue
index 456f2430c..c09761aaa 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue
@@ -825,8 +825,8 @@ export default {
       let routeUrl = this.$router.resolve({
         name: "OtherStandardDetails",
         params: {
-          id: item.id,
-          pageType: "INLAND_STAND"
+          id: item.id || item.standId,
+          pageType: item.standType + '_STAND'
         }
       });
       window.open(routeUrl.href, "_blank");
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
index a2415001b..bb37f80bd 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
@@ -925,8 +925,8 @@ export default {
       let routeUrl = this.$router.resolve({
         name: "OtherStandardDetails",
         params: {
-          id: item.id,
-          pageType: "INLAND_STAND"
+          id: item.id || item.standId,
+          pageType: item.standType + '_STAND'
         }
       });
       window.open(routeUrl.href, "_blank");
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
index afa588c31..4c6689c4e 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
@@ -832,8 +832,8 @@ export default {
       let routeUrl = this.$router.resolve({
         name: "OtherStandardDetails",
         params: {
-          id: item.id,
-          pageType: "INLAND_STAND"
+          id: item.id || item.standId,
+          pageType: item.standType + '_STAND'
         }
       });
       window.open(routeUrl.href, "_blank");
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue
index b5eed52c5..622a7657e 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue
@@ -832,8 +832,8 @@ export default {
       let routeUrl = this.$router.resolve({
         name: "OtherStandardDetails",
         params: {
-          id: item.id,
-          pageType: "INLAND_STAND"
+          id: item.id || item.standId,
+          pageType: item.standType + '_STAND'
         }
       });
       window.open(routeUrl.href, "_blank");
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue
index 42373edfc..ef94c6db9 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue
@@ -824,8 +824,8 @@ export default {
       let routeUrl = this.$router.resolve({
         name: "OtherStandardDetails",
         params: {
-          id: item.id,
-          pageType: "INLAND_STAND"
+          id: item.id || item.standId,
+          pageType: item.standType + '_STAND'
         }
       });
       window.open(routeUrl.href, "_blank");

From a8efb3aae2a9f6846a656d0471f2cc47197a5e06 Mon Sep 17 00:00:00 2001
From: zhangyichen <5277314+zacty@user.noreply.gitee.com>
Date: Thu, 7 Apr 2022 17:07:59 +0800
Subject: [PATCH 09/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2052445=20=E6=B5=B7?=
 =?UTF-8?q?=E5=A4=96=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84:=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E7=95=8C=E9=9D=A2,=E5=8F=91=E5=B8=83=E7=A8=BF?=
 =?UTF-8?q?=E9=82=A3=E4=B8=80=E8=A1=8C=E6=8B=89=E5=AE=BD=20=E8=AE=A9?=
 =?UTF-8?q?=E5=90=8E=E9=9D=A2=E7=9A=84=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/details/otherStandardDetails/index.vue | 16 +++++++++++-----
 .../foreignStandardsAndRegulations/index.vue     | 11 +++--------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index b86d6a15d..e6dd6ee42 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -64,15 +64,15 @@
                         sarStandardsInfoEO.standEnName || '-'
                       }}</span></p>
                     <!--发布稿（必读）-->
-                    <template v-for="(child, childIndex) in item.child1">
-                      <div class="files-titles" style="border-bottom: 1px solid #E5E5E5">
+                    <template v-for="(child, childIndex) in item.child1" v-if="child.value && child.value.length > 0">
+                      <p class="files-titles" style="border-bottom: 1px solid #E5E5E5">
                         <label style="float: left">{{ child.attrName }}</label>
                         <template v-if="child.value && child.value.length > 0">
                           <!--                          单个文件时-->
                           <div style="position: relative;margin-left: 214px; line-height: 32px">
                             <div v-for="(file, fileIndex) in child1Func(child.value)" style="display: flex;">
                           <span v-if="child.value && child.value.length > 0 && child.value.length === 1" style="display: flex; align-items: center;">
-                            <a style="font-size: 16px;color: #409EFF;cursor: pointer;"
+                            <a style="font-size: 16px;color: #409EFF;cursor: pointer;display: inline-block"
                                @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
                                :title="file.oldFileName">{{ file.oldFileName | ellipsis50}}</a>
                             <i
@@ -251,7 +251,13 @@
                             <template v-if="child.value === null">-</template>
                           </p>
                         </template>
-                      </div>
+                      </p>
+
+
+
+
+
+
                       <p class="half" style="margin-left: -48px">
                         <label style=" margin-right: 150px;"
                                title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。"
@@ -3907,7 +3913,7 @@ export default {
   a {
     overflow: hidden;
     text-overflow: ellipsis;
-    width: calc(~'100% - 40px');
+    max-width: 780px;
     white-space: nowrap;
     display: block;
   }
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index 1f8e3a39b..62fa258af 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -101,7 +101,7 @@
                     class="common-button-primary"
                     size="mini"
                     v-btn-permission="'366c89d1c54465faca96aaed26a158b1'"
-                    @click="searchBtnClick(standCommonlySearch, 1)">
+                    @click="searchBtnClick(standCommonlySearch)">
                     查询
                   </el-button>
                   <el-button
@@ -2707,7 +2707,6 @@ export default {
       this.modalShowRoleFlag = true
     },
     checkedRole2(data) {
-      console.log(data, '哈哈哈哈')
       let idList = ''
       let nameList = ''
       data.forEach(item => {
@@ -2718,7 +2717,6 @@ export default {
         idList += item.id
         nameList += item.name
       })
-      console.log(nameList , '额鹅鹅鹅饿')
       if (this.drawerTitle === '选择我司署名人') {
         this.sarStandardsInfoEO['WSSMR'] = nameList
       } else if (this.drawerTitle === '选择责任工程师') {
@@ -3147,8 +3145,8 @@ export default {
       this.getDomesticStandardTable()
     },
     // 点击搜索按钮
-    searchBtnClick(type) {
-      this.getDomesticStandardTable(undefined ,type)
+    searchBtnClick() {
+      this.getDomesticStandardTable()
     },
     // 搜索
     getDomesticStandardTableBtn(item) {
@@ -4017,9 +4015,6 @@ export default {
           }
           if ((this.stahndinfoList.length === 0 || this.stahndinfoList === []) && this.standCommonlySearch.page !== 1) {
             this.pageChange(1)
-          }
-          if (type === 1) {
-
           }
           this.stahndinfoList = res.data.list
           this.total = res.data.count

From 96b74e7bcb173db10d96df2dfed9b5a168a91e37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Thu, 7 Apr 2022 17:18:29 +0800
Subject: [PATCH 10/13] =?UTF-8?q?51985=20=E6=A0=87=E5=87=86=E6=8B=86?=
 =?UTF-8?q?=E5=88=86-=E6=8B=86=E5=88=86-=E5=88=A0=E9=99=A4=EF=BC=8C?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A450=E6=9D=A1=20=E5=88=A0?=
 =?UTF-8?q?=E9=99=A46=E6=AC=A1=E4=B9=8B=E5=90=8E=EF=BC=8C=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
index f62e038e5..e75101f69 100644
--- a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
+++ b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
@@ -1506,6 +1506,8 @@ export default {
         }, res => {
           if (res.data) {
             this.batchDeleteItem()
+          } else if(this.selectedList != null && this.selectedList.length > 20){
+             this.$message.warning('单次最多删除20个条款')
           } else {
             this.deleteItemsModal = true
           }

From 56faab2a7090b59c239350d59fe7d33c44e7e228 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Thu, 7 Apr 2022 17:39:30 +0800
Subject: [PATCH 11/13] =?UTF-8?q?52449=20=E5=BE=81=E6=B1=82=E6=84=8F?=
 =?UTF-8?q?=E8=A7=81--=E4=BB=BB=E5=8A=A1=E5=88=86=E5=8F=91=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=EF=BC=8C=E6=89=8B=E6=9C=BA=E7=AB=AF=E6=89=93=E4=B8=8D?=
 =?UTF-8?q?=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/phone/bzzqyj/step2.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step2.vue b/src/pages/processCenter/pages/phone/bzzqyj/step2.vue
index 6225edc9c..9af50f9d4 100644
--- a/src/pages/processCenter/pages/phone/bzzqyj/step2.vue
+++ b/src/pages/processCenter/pages/phone/bzzqyj/step2.vue
@@ -165,7 +165,7 @@
     import axios from "axios";
 
     export default {
-        name: "bzzqyjStep2",
+        name: "phoneBzzqyjStep2",
         data() {
             return {
                 drawerModal: false,

From 058e7492ef2db985c5390f4bfa794c722aa449b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Thu, 7 Apr 2022 17:48:15 +0800
Subject: [PATCH 12/13] =?UTF-8?q?52451=20=E3=80=90=E6=89=8B=E6=9C=BA?=
 =?UTF-8?q?=E7=AB=AF=E3=80=91=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=20=E6=8A=8A=E5=AE=A1=E6=89=B9=E4=BA=BA=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E6=94=B9=E6=88=90=E6=84=8F=E8=A7=81=E5=AE=A1=E6=89=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/phone/bzzqyj/step4-1.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step4-1.vue b/src/pages/processCenter/pages/phone/bzzqyj/step4-1.vue
index 2fbd9eba5..244f6d99e 100644
--- a/src/pages/processCenter/pages/phone/bzzqyj/step4-1.vue
+++ b/src/pages/processCenter/pages/phone/bzzqyj/step4-1.vue
@@ -3,7 +3,7 @@
         <!--    标准调研流程-->
         <ProcessHeaderPhone toggle>
             <template slot="proName">标准征求意见流程</template>
-            <template slot="proNode">审批人审批</template>
+            <template slot="proNode">意见审批</template>
         </ProcessHeaderPhone>
         <div class="headerTabs">
             <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

From dd58d319d6a699fb32d8c08fc612f549db04d222 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Thu, 7 Apr 2022 17:58:49 +0800
Subject: [PATCH 13/13] =?UTF-8?q?=E3=80=90=E6=89=8B=E6=9C=BA=E7=AB=AF?=
 =?UTF-8?q?=E3=80=91=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=20=E7=82=B9=E9=A9=B3=E5=9B=9E=E6=B2=A1=E5=8F=8D=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/phone/bzzqyj/step4-1.vue            | 38 ++++++++++---------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step4-1.vue b/src/pages/processCenter/pages/phone/bzzqyj/step4-1.vue
index 244f6d99e..51e09cd22 100644
--- a/src/pages/processCenter/pages/phone/bzzqyj/step4-1.vue
+++ b/src/pages/processCenter/pages/phone/bzzqyj/step4-1.vue
@@ -396,26 +396,28 @@
                     }
                 })
             },
-            handleSubmitNo() {
-                if (this.commentText41) {
-                    var json = this.json
-                    json.spFlag = '1'
-                    json.commentText = this.commentText41
-                    this.$http.post('lawss/activiti/completeTask', {
-                        json: JSON.stringify(json),
-                        taskId: this.taskIds,
-                        userId: this.$store.getters.userInfo.userId
-                    }, {}, res => {
-                        if (res.success) {
-                            this.$message.success('提交成功')
-                            this.$router.push('/processCenter')
-                        }
-                    })
-                } else {
-                    this.$message.warning('请输入反馈意见')
+          handleSubmitNo() {
+            if (this.commentText41) {
+              this.isSubmit = true
+              var json = this.json
+              json.spFlag = '1'
+              json.commentText = this.commentText41
+              this.$http.post('lawss/activiti/completeTask', {
+                json: JSON.stringify(json),
+                taskId: this.taskIds,
+                userId: this.$store.getters.userInfo.userId
+              }, {}, res => {
+                if (res.success) {
+                  this.$message.success('提交成功')
+                  this.$router.push('/processCenter')
+                  this.isSubmit = false
                 }
+              })
+            } else {
+              this.$message.warning('请输入反馈意见')
+            }
 
-            },
+          },
             getData() {
                 return new Promise((resolve, reject) => {
                     inboundLiaisonDetail({