From f1318d05e0dac6fc6a814f47ea3217e53f502857 Mon Sep 17 00:00:00 2001
From: hanshaozhuang <hanshaozhuang>
Date: Wed, 22 Jun 2022 13:38:42 +0800
Subject: [PATCH 01/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2055827=20=E6=9C=BA?=
 =?UTF-8?q?=E6=9E=84=E7=AE=A1=E7=90=86-=E6=8A=80=E6=9C=AF=E5=A7=94?=
 =?UTF-8?q?=E5=91=98=E4=BC=9A=EF=BC=8C=E5=A7=94=E5=91=98=E6=9B=B4=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E6=88=90=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/mechanismManage/pages/committee.vue       | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/pages/config/pages/mechanismManage/pages/committee.vue b/src/pages/config/pages/mechanismManage/pages/committee.vue
index 20038fd01..778cef6ee 100644
--- a/src/pages/config/pages/mechanismManage/pages/committee.vue
+++ b/src/pages/config/pages/mechanismManage/pages/committee.vue
@@ -65,7 +65,7 @@
             align="center"
           />
           <el-table-column
-            prop="committeeDeputy"
+            prop="committeeDeputyName"
             label="副主任"
             align="center"
           />
@@ -111,15 +111,22 @@
                 @click.native="choiceZRR('committeeDirector', '选择主任', addForm.committeeDirector)"
               />
             </el-form-item>
+            <el-form-item label="副主任" prop="committeeDeputy" label-width="100px" class="add-form-item">
+              <el-input
+                v-model="addForm.committeeDeputy"
+                placeholder="请选择副主任"
+                @click.native="choiceZRR('committeeDeputy', '选择副主任', addForm.committeeDeputy)"
+              />
+            </el-form-item>
             <el-form-item label="秘书长" prop="committeeSecretary" label-width="100px" class="add-form-item">
               <el-input v-model="addForm.committeeSecretaryName"
                         placeholder="请选择秘书长"
                         @click.native="choiceZRR('committeeSecretary', '选择秘书长', addForm.committeeSecretary)"
                         clearable></el-input>
             </el-form-item>
-            <el-form-item label="委员" prop="committor" label-width="100px" class="add-form-item">
+            <el-form-item label="成员" prop="committor" label-width="100px" class="add-form-item">
               <el-input v-model="addForm.committor"
-                        placeholder="请选择委员"
+                        placeholder="请选择成员"
                         @click.native="choiceZRRS"
                         clearable></el-input>
             </el-form-item>

From 3b5d4673fee2783b6991738e7f8637c4169af7b9 Mon Sep 17 00:00:00 2001
From: "396572590@qq.com" <liuchao>
Date: Wed, 22 Jun 2022 13:43:22 +0800
Subject: [PATCH 02/11] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20bu?=
 =?UTF-8?q?g=20#55743=20=E4=BC=81=E6=A0=87C=E7=B1=BB=E6=A0=87=E5=87=86=20?=
 =?UTF-8?q?=E6=89=8D=E5=8F=AF=E6=98=BE=E7=A4=BA=E5=A4=87=E6=A1=88=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../details/otherBussStandardDetails/index.vue     | 14 +++++---------
 .../components/EnterpriseStandardDatabase.vue      |  5 +++++
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue
index dd53790ec..e6509d179 100644
--- a/src/pages/details/otherBussStandardDetails/index.vue
+++ b/src/pages/details/otherBussStandardDetails/index.vue
@@ -366,15 +366,13 @@
                               title="下载"
                               @click="downloadFile(file.id)"
                               class="icon-download"
-                              v-btn-permission="QFTP ? '7f13a22a53f9f76f56f5193f9a04389d' : '9882f477aad895ec56a7464f3e9c0b11'"
-                            />
+                              v-btn-permission="QFTP ? '7f13a22a53f9f76f56f5193f9a04389d' : '9882f477aad895ec56a7464f3e9c0b11'"></i>
                             <i
                               title="下载带水印"
                               v-show="file.fileSuffix === 'pdf' || file.fileSuffix === 'PDF'"
                               @click="downloadFileByWater(file.id, file.fileSuffix)"
                               class="icon-download2"
-                              v-btn-permission="QFTP ? '6dbbd2d6b808cc0f02b22c97e9d34c54' : '9bab2662fbd9d0507b39be813371a597'"
-                            />
+                              v-btn-permission="QFTP ? '6dbbd2d6b808cc0f02b22c97e9d34c54' : '9bab2662fbd9d0507b39be813371a597'"></i>
                                 <!--                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
                             </span>
                               <!--                          多个文件-->
@@ -387,14 +385,12 @@
                                 title="下载"
                                 @click="downloadFile(file.id)"
                                 class="icon-download"
-                                v-btn-permission="QFTP ? '7f13a22a53f9f76f56f5193f9a04389d' : '9882f477aad895ec56a7464f3e9c0b11'"
-                              />
+                                v-btn-permission="QFTP ? '7f13a22a53f9f76f56f5193f9a04389d' : '9882f477aad895ec56a7464f3e9c0b11'"></i>
                               <i
                                 title="下载带水印"
                                 @click="downloadFileByWater(file.id, file.fileSuffix)"
                                 class="icon-download2"
-                                v-btn-permission="QFTP ? '6dbbd2d6b808cc0f02b22c97e9d34c54' : '9bab2662fbd9d0507b39be813371a597'"
-                              />
+                                v-btn-permission="QFTP ? '6dbbd2d6b808cc0f02b22c97e9d34c54' : '9bab2662fbd9d0507b39be813371a597'"></i>
                             </span>
                                 <!--                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
                               </div>
@@ -430,7 +426,7 @@
                         v-for="(child, childIndex) in item.child"
                         v-if="child.isShowImp === '0'"
                     >
-                      <p class="half">
+                      <p class="half" v-if="sarStandardsInfoEO.standSort && sarStandardsInfoEO.standSort.indexOf('QCBFC') !== -1 && child.attrField === 'BARQ'">
                         <label style=" margin-right: 150px;" :title="child.attrName">{{child.attrName}}</label>
                         <span :title="child.value || '-'">
                           <template v-if="child.value">
diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index c7dd0689f..6390bcbd7 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -5163,6 +5163,11 @@ export default {
     }
   },
   watch: {
+    'sarBussionessStandEO.standSort':{
+      handler:function(val){
+        this.QCBFC = !!(val && val.indexOf("QCBFC") !== -1);
+      }
+    },
     'sarBussionessStandEO.QCDW'(val) {
       this.filterData(val);
     },

From 479ce1d96984f447bfdbab8bb24231e95297878b Mon Sep 17 00:00:00 2001
From: hanshaozhuang <hanshaozhuang>
Date: Wed, 22 Jun 2022 15:04:08 +0800
Subject: [PATCH 03/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2055800=20=E3=80=90?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E3=80=91=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=EF=BC=8C=E6=B5=81=E7=A8=8B=E5=8F=91=E8=B5=B7?=
 =?UTF-8?q?=20=E5=BA=95=E9=83=A8=E7=9A=84UI=E5=BE=80=E4=B8=8B=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index b4394d287..25b42394f 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -1237,6 +1237,7 @@
       size="800px"
       :visible.sync="standardDrawer"
       direction="rtl"
+      class="search-drawer"
       :before-close="handleReviseDrawerClose">
       <div class="standard-content">
         <div class="content">
@@ -3644,4 +3645,9 @@ export default {
     }
   }
 }
+.search-drawer{
+  .demo-drawer-footer{
+    height: 8%;
+  }
+}
 </style>

From fc762b321fcfc577ab1f97d886ca5c7b0b24cd1d Mon Sep 17 00:00:00 2001
From: hanshaozhuang <hanshaozhuang>
Date: Wed, 22 Jun 2022 15:08:33 +0800
Subject: [PATCH 04/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2055823=20=E3=80=90?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E3=80=91=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=EF=BC=8C=E5=9B=BD=E5=86=85=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=8C=E6=96=B0=E5=A2=9E=E4=B9=8B=E5=90=8E?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=B5=B7=E5=A4=96=E7=9A=84=E5=86=8D=E6=AC=A1?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=96=B0=E5=A2=9E=20=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E5=B0=B1=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=A4=9F=E9=AB=98=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzrk/step1.vue         | 44 +++++++++----------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index 25b42394f..03be5748b 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -3621,31 +3621,31 @@ export default {
   }
 }
 
-.standard-content {
-  height: 100%;
-  padding: 10px 0 0;
-
-  .content {
-    height: 100%;
-    display: flex;
-    flex-direction: column;
-    padding: 0 10px;
-
-    .standard-table-wrap {
-      flex: auto;
-      overflow-y: auto;
-    }
-
-    .pagination {
-      position: static;
-
-      /deep/ .pagination-slot {
-        padding: 0;
+.search-drawer{
+  .standard-content {
+    height: 92%;
+    padding: 10px 0 0;
+    
+    .content {
+      height: 100%;
+      display: flex;
+      flex-direction: column;
+      padding: 0 10px;
+      
+      .standard-table-wrap {
+        flex: auto;
+        overflow-y: auto;
+      }
+      
+      .pagination {
+        position: static;
+        
+        /deep/ .pagination-slot {
+          padding: 0;
+        }
       }
     }
   }
-}
-.search-drawer{
   .demo-drawer-footer{
     height: 8%;
   }

From 868cdcb871621e5b9beb96284d0f9c74cb84ee0a Mon Sep 17 00:00:00 2001
From: "396572590@qq.com" <liuchao>
Date: Wed, 22 Jun 2022 16:01:11 +0800
Subject: [PATCH 05/11] feat: There is no way the, bug #55745 #55786

---
 .../pages/creatProcess/qbrk-product/step13.vue           | 9 ++-------
 .../processCenter/pages/creatProcess/qbrk/step13.vue     | 3 ++-
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
index 3563153bd..cb96c2e4f 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
@@ -1085,13 +1085,6 @@
                     }
                 }
             },
-            'form.standSort': {
-                handler (val) {
-                    if (val !== '' && val !== null && typeof (val) !== 'undefined') {
-                        this.getStandInfoByReviseStatus("")
-                    }
-                }
-            },
             filterText(val) {
                 this.$refs.tree.filter(val);
             },
@@ -2459,6 +2452,7 @@
                                     this.form.commentText = this.formTongGuo.commentText
                                     this.form.approvalOpinion = this.formTongGuo.approvalOpinion
                                     this.form.topId = this.pId
+                                    this.form.reviseStatus = 'buss2_'+this.form.standStatus
                                     const json = JSON.stringify(this.form);
                                     this.$http.post('lawss/activiti/completeTask', {
                                         taskIds: this.taskIds,
@@ -2649,6 +2643,7 @@
                         this.form.standNumber = standSn
                         this.form.standYear = year // 待带入立项标准
                         this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
+                        console.log(this.form)
                         if(type === '1'){
                             this.isSubmit = false
                             this.saveLoading = false
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
index 018bb827c..809266cee 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
@@ -2486,6 +2486,7 @@
                                 this.form.commentText = this.formTongGuo.commentText
                                 this.form.approvalOpinion = this.formTongGuo.approvalOpinion
                                 this.form.topId = this.pId
+                                this.form.reviseStatus = 'buss1_'+this.form.reviseStatus
                                 const json = JSON.stringify(this.form);
                                 this.$http.post('lawss/activiti/completeTask', {
                                     taskIds: this.taskIds,
@@ -2705,7 +2706,7 @@
                         _this: this
                     }, res => {
                         const obj = res.data
-                        let standSn = (obj === null ||  obj.newStandSn === null) ? '001' : obj.newStandSn
+                        let standSn = (obj === null ||  obj.newStandSn === null) ? '2280' : obj.newStandSn
                         this.form.standSn = standSn
                         this.form.standNumber = standSn
                         this.form.standYear = this.regDate(year) // 待带入立项标准

From 5f512ffdbf814b6ed146039634a63f4b1a3ce7e6 Mon Sep 17 00:00:00 2001
From: hanshaozhuang <hanshaozhuang>
Date: Wed, 22 Jun 2022 16:16:59 +0800
Subject: [PATCH 06/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2056002=20=E6=88=91?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E7=AD=94-=E9=97=AE=E7=AD=94=E5=BA=93?=
 =?UTF-8?q?=E8=AE=A2=E9=98=85=E7=9A=84=E6=95=B0=E6=8D=AE=EF=BC=8C=E6=88=91?=
 =?UTF-8?q?=E7=9A=84=E8=AE=A2=E9=98=85=E6=B2=A1=E6=9C=89=E8=AE=A2=E9=98=85?=
 =?UTF-8?q?=E6=88=90=E5=8A=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/personal/pages/my-questions/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/personal/pages/my-questions/index.vue b/src/pages/personal/pages/my-questions/index.vue
index 0cab2d610..a6abfb1d9 100644
--- a/src/pages/personal/pages/my-questions/index.vue
+++ b/src/pages/personal/pages/my-questions/index.vue
@@ -557,7 +557,7 @@
                   暂无数据
                 </div>
               </div>
-              <div style="height: 100%" v-else-if="activeType === 'FOREIGN'">
+              <div style="height: 100%" v-else-if="activeType === 'INLAND'">
                 <el-tabs
                   class="question-box"
                   type="border-card"

From 4f59ce709733e2fb854df6fd46165de23dac06a2 Mon Sep 17 00:00:00 2001
From: hanshaozhuang <hanshaozhuang>
Date: Wed, 22 Jun 2022 16:58:24 +0800
Subject: [PATCH 07/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2055986=20=E3=80=90?=
 =?UTF-8?q?30=E5=8F=B7=E9=9C=80=E8=A7=A3=E5=86=B3=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E3=80=91=E7=BC=BA=E5=B0=91=E6=8A=80=E6=9C=AF=E5=A7=94=E5=91=98?=
 =?UTF-8?q?=E4=BC=9A=E3=80=81=E7=A6=8F=E7=94=B0=E6=A0=87=E5=87=86=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/mechanismManage/pages/committee.vue    | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/pages/config/pages/mechanismManage/pages/committee.vue b/src/pages/config/pages/mechanismManage/pages/committee.vue
index 778cef6ee..b30fec33e 100644
--- a/src/pages/config/pages/mechanismManage/pages/committee.vue
+++ b/src/pages/config/pages/mechanismManage/pages/committee.vue
@@ -113,7 +113,7 @@
             </el-form-item>
             <el-form-item label="副主任" prop="committeeDeputy" label-width="100px" class="add-form-item">
               <el-input
-                v-model="addForm.committeeDeputy"
+                v-model="addForm.committeeDeputyName"
                 placeholder="请选择副主任"
                 @click.native="choiceZRR('committeeDeputy', '选择副主任', addForm.committeeDeputy)"
               />
@@ -148,7 +148,7 @@
       ></Role-tree>
       <!--    多选择人-->
       <Role-tree
-        is-title="选择委员"
+        is-title="选择成员"
         :is-visible.sync="modalshowflag2"
         @checkedRole="drawerCheck2"
         :nodeList="nodeList2"
@@ -178,6 +178,8 @@ export default {
         committeeName: "", //委员会名称
         committeeDirector: "", //主任
         committeeDirectorName: "", //主任
+        committeeDeputy: '', // 副主任
+        committeeDeputyName: '', // 副主任
         committeeSecretary: "", //秘书长
         committeeSecretaryName: "", //秘书长
         committor: "", //委员
@@ -194,7 +196,7 @@ export default {
           { required: true, message: "请填写秘书长", trigger: "blur" }
         ],
         committor: [
-          { required: true, message: "请填写委员", trigger: "blur" }
+          { required: true, message: "请填写成员", trigger: "blur" }
         ]
 
       },
@@ -241,6 +243,8 @@ export default {
         committeeName: "", //委员会名称
         committeeDirector: "", //主任
         committeeDirectorName: "", //主任
+        committeeDeputy: '', // 副主任
+        committeeDeputyName: '', // 副主任
         committeeSecretary: "", //秘书长
         committeeSecretaryName: "", //秘书长
         committor: "", //委员
@@ -321,6 +325,8 @@ export default {
           committeeName: "", //委员会名称
           committeeDirector: "", //主任
           committeeDirectorName: "", //主任
+          committeeDeputy: '', // 副主任
+          committeeDeputyName: '', // 副主任
           committeeSecretary: "", //秘书长
           committeeSecretaryName: "", //秘书长
           committor: "", //委员
@@ -388,6 +394,10 @@ export default {
       } else if (this.type === "committeeSecretary") {
         this.addForm.committeeSecretary = data[0].id;
         this.addForm.committeeSecretaryName = data[0].name;
+      }else if (this.type === "committeeDeputy") {
+        console.log('data = ', data)
+        this.addForm.committeeDeputy = data[0].id;
+        this.addForm.committeeDeputyName = data[0].name;
       }
       this.modalshowflag = false;
     },

From acf5ad13744dedf6ba6e5f3110fc9d8c4a6a9aa8 Mon Sep 17 00:00:00 2001
From: hanshaozhuang <hanshaozhuang>
Date: Wed, 22 Jun 2022 16:59:44 +0800
Subject: [PATCH 08/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2055986=20=E3=80=90?=
 =?UTF-8?q?30=E5=8F=B7=E9=9C=80=E8=A7=A3=E5=86=B3=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E3=80=91=E7=BC=BA=E5=B0=91=E6=8A=80=E6=9C=AF=E5=A7=94=E5=91=98?=
 =?UTF-8?q?=E4=BC=9A=E3=80=81=E7=A6=8F=E7=94=B0=E6=A0=87=E5=87=86=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/config/pages/mechanismManage/pages/committee.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/pages/config/pages/mechanismManage/pages/committee.vue b/src/pages/config/pages/mechanismManage/pages/committee.vue
index b30fec33e..697a2df9c 100644
--- a/src/pages/config/pages/mechanismManage/pages/committee.vue
+++ b/src/pages/config/pages/mechanismManage/pages/committee.vue
@@ -270,6 +270,8 @@ export default {
         this.addForm.committeeDirectorName = this.committeeChangeList[0].committeeDirectorName;
         this.addForm.committeeSecretary = this.committeeChangeList[0].committeeSecretary;
         this.addForm.committeeSecretaryName = this.committeeChangeList[0].committeeSecretaryName;
+        this.addForm.committeeDeputy = this.committeeChangeList[0].committeeDeputy;
+        this.addForm.committeeDeputyName = this.committeeChangeList[0].committeeDeputyName;
       }
     },
     //批量删除

From a71567728c7a4eb4faafa056c364d1cb4a7d8786 Mon Sep 17 00:00:00 2001
From: hanshaozhuang <hanshaozhuang>
Date: Wed, 22 Jun 2022 17:12:32 +0800
Subject: [PATCH 09/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2055958=20=E3=80=90?=
 =?UTF-8?q?30=E5=8F=B7=E9=9C=80=E8=A7=A3=E5=86=B3=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E3=80=91=E6=B8=85=E5=8D=95=E7=A1=AE=E8=AE=A4=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
index e3d0c425f..c37628395 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
@@ -1367,7 +1367,7 @@ export default {
             }
           });
         } else {
-          return this.$message.warning("请完善基础信息");
+          return this.$message.warning("请选择清单");
         }
       });
     },

From fe353fd761075009718afc64ca8c5afff7bd8d6f Mon Sep 17 00:00:00 2001
From: "396572590@qq.com" <liuchao>
Date: Wed, 22 Jun 2022 18:13:24 +0800
Subject: [PATCH 10/11] feat: There is no way the, bug #55745 #55786 #55815

---
 .../pages/creatProcess/qbrk-product/step1.vue | 54 ++++++++--------
 .../creatProcess/qbrk-product/step13.vue      | 19 +++---
 .../pages/creatProcess/qbrk-product/step3.vue | 14 ++---
 .../pages/creatProcess/qbrk-product/step6.vue | 14 ++---
 .../creatProcess/qbrk-product/stepC3.vue      | 14 ++---
 .../creatProcess/qbrk-product/stepC6.vue      | 14 ++---
 .../pages/creatProcess/qbrk/step13.vue        |  3 +-
 .../components/EnterpriseStandardDatabase.vue | 61 +++++++++++++++++++
 8 files changed, 116 insertions(+), 77 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
index 202082132..ba033a478 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
@@ -82,7 +82,7 @@
 <!--                                </el-form-item>-->
                             </el-col>
                             <el-col :span="12">
-                                <el-form-item v-show="form.standStatus === '3'" class="add-form-item form-item-disabled" style="margin-left: -210px">
+                                <el-form-item v-show="form.standStatus === '2' || form.standStatus === '3'" class="add-form-item form-item-disabled" style="margin-left: -210px">
                                     <el-button
                                             type="primary"
                                             :loading="loadSarStandard"
@@ -1175,11 +1175,14 @@
                     page: 1,
                     pageSize: this.$store.getters.userInfo.configContent,
                     total: 0,
-                    standType: 'INLAND',
+                    standType: 'BUSINESS',
                     standSort: '',
                     standName: '',
                     standEnName: '',
-                    standNumber: ''
+                    standNumber: '',
+                    quoteIdList: '',
+                    validFlag: '0',
+                    menuId: 'nomenu',
                 },
                 tableData: {
                     // 标准表格数据
@@ -1551,7 +1554,7 @@
         },
         methods: {
             regDate(data){
-                if(this.form.DTQBBHBUSS !== undefined && this.form.DTQBBHBUSS !== null && this.form.DTQBBHBUSS.indexOf(data) !== -1){
+                if(this.form.standCode !== undefined && this.form.standCode !== null && this.form.standCode.indexOf(data) !== -1){
                     data = data + ' X'
                 }
                 return data
@@ -1570,10 +1573,6 @@
                     this.XGDFileList=[];
                     this.$refs['form'].resetFields()
                     this.form.standStatus = '2'
-                    if((this.form.standStatus === '2') && (this.form.BDTQBBHBUSS === undefined || this.form.BDTQBBHBUSS === '')) {
-                        this.$message.warning("请选择一条被代替企标编号")
-                        return
-                    }
                 }else if(this.form.standStatus === '3' ){
                     if(type !== 'dr'){
                         this.FBGBUSSFileList=[];
@@ -1627,7 +1626,7 @@
                         this.isSubmit = true
                         this.saveLoading = true
                     }
-                    this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss2_1'}, {
+                    this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss2_1',standSort:this.form.standSort}, {
                         _this: this
                     }, res => {
                         const obj = res.data
@@ -2062,11 +2061,11 @@
                               this.QTWJBUSSFileList=[]
                               this.GLWJBUSSFileList=[]
                               this.XGDFileList=[]
+                              let standStatus = this.form.standStatus
                               const json = Object.assign(bringData, bringData.attrInfoMap);
                               this.form = JSON.parse(JSON.stringify(json))
                               this.form.prcNum = this.prcNum
                               this.form.prcName = this.prcName
-                              this.form.standStatus = "3"
                               this.form.QCRBUSSID = ''
                               this.form.standNum =''
                               this.form.planId=''
@@ -2089,7 +2088,21 @@
                               this.XGDFileList=this.assemble(this.form.XGD,this.form.XGDName);
                               this.standardDrawer = false
                               this.verifySarStandard = true
-                              this.getStandInfoByReviseStatus('dr')
+                              if(standStatus && standStatus === '2'){
+                                let date = new Date();
+                                let year = date.getFullYear();
+                                this.form.standStatus = "2"
+                                this.form.standNum = this.form.standNumber
+                                this.form.standSn = this.form.standNum
+                                this.form.standNumber = this.form.standNum
+                                this.form.standYear = this.regDate(year)
+                                this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
+                                this.getStandInfoByReviseStatus()
+                                }else {
+                                this.form.standStatus = "3"
+                                this.getStandInfoByReviseStatus('dr')
+                              }
+                                console.log(this.form)
                               this.$forceUpdate()
                             }
                             // 遍历对象初始化文件信息
@@ -2208,7 +2221,11 @@
             },
             getDomesticStandardTable () {
                 this.loadSarStandard = true
-                this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', this.standardSearchForm, {}, res => {
+                console.log(this.standardSearchForm)
+                this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', this.standardSearchForm, {
+                    _this: this,
+                    loading: 'replaceLoading'
+                }, res => {
                     this.loadSarStandard = false
                     if (res.ok) {
                         this.tableData.standardData = res.data.list
@@ -2514,13 +2531,6 @@
                     this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',')
                 }else if(this.replaceLawType === 'BDTQBBHBUSS'){
                     this.form.BDTQBBHBUSS = this.filterSetData(textArr.join(','))
-                    this.form.standNum = this.filterSetData(textArr2.join(','))
-                    if(this.form.BDTQBBHBUSS !== undefined && this.form.BDTQBBHBUSS !== null){
-                        this.form.standSn = this.form.standNum
-                        this.form.standNumber = this.form.standNum
-                        this.form.standYear = this.regDate(year)
-                        this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
-                    }
                 }else {
                     this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',')
                 }
@@ -2927,12 +2937,8 @@
                 // test
                 this.isSubmit = false
                 this.saveLoading = false
-                if((this.form.standStatus === '2') && (this.form.BDTQBBHBUSS === undefined || this.form.BDTQBBHBUSS === '')) {
-                    this.$message.warning("请选择一条被代替企标编号")
-                    return
-                }
 
-                if((this.form.standStatus === '3') && (this.standardCheckedList === undefined ||this.standardCheckedList.length === 0)) {
+                if((this.form.standStatus === '3' || this.form.standStatus === '2') && (this.standardCheckedList === undefined ||this.standardCheckedList.length === 0)) {
                     this.$message.warning("请选择一条企标标准")
                     return
                 }
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
index cb96c2e4f..cd5cdad18 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
@@ -2453,6 +2453,7 @@
                                     this.form.approvalOpinion = this.formTongGuo.approvalOpinion
                                     this.form.topId = this.pId
                                     this.form.reviseStatus = 'buss2_'+this.form.standStatus
+                                    this.form.textStatusBuss = '6jnqba2mby'
                                     const json = JSON.stringify(this.form);
                                     this.$http.post('lawss/activiti/completeTask', {
                                         taskIds: this.taskIds,
@@ -2606,7 +2607,7 @@
                 }
             },
             regDate(data){
-                if(this.form.DTQBBHBUSS !== undefined && this.form.DTQBBHBUSS !== null && this.form.DTQBBHBUSS.indexOf(data) !== -1){
+                if(this.form.standCode !== undefined && this.form.standCode !== null && this.form.standCode.indexOf(data) !== -1){
                     data = data + ' X'
                 }
                 return data
@@ -2617,16 +2618,10 @@
                 if(this.form.standStatus === '2'){
                     this.form.id = ""
                     this.formKey++
-                    if((this.form.standStatus === '2') && (this.form.BDTQBBHBUSS === undefined || this.form.BDTQBBHBUSS === '')) {
-                        this.$message.warning("请选择一条被代替企标编号")
-                        return
-                    }
-                    if(this.form.DTQBBHBUSS !== undefined && this.form.DTQBBHBUSS !== null){
-                        this.form.standSn = this.form.standNum
-                        this.form.standNumber = this.form.standNum
-                        this.form.standYear = this.regDate(year)
-                        this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
-                    }
+                    this.form.standSn = this.form.standNum
+                    this.form.standNumber = this.form.standNum
+                    this.form.standYear = this.regDate(year)
+                    this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
                     this.formKey++
                 }else if(this.form.standStatus === '1' ){
                     this.form.id = ""
@@ -2634,7 +2629,7 @@
                         this.isSubmit = true
                         this.saveLoading = true
                     }
-                    this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss2_1'}, {
+                    this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss2_1',standSort:this.form.standSort}, {
                         _this: this
                     }, res => {
                         const obj = res.data
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue
index 442b23596..d978da12a 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue
@@ -1137,16 +1137,10 @@
                 if(this.form.standStatus === '2'){
                     this.form.id = ""
                     this.formKey++
-                    if((this.form.standStatus === '2') && (this.form.BDTQBBHBUSS === undefined || this.form.BDTQBBHBUSS === '')) {
-                        this.$message.warning("请选择一条被代替企标编号")
-                        return
-                    }
-                    if(this.form.DTQBBHBUSS !== undefined && this.form.DTQBBHBUSS !== null){
-                        this.form.standSn = this.form.standNum
-                        this.form.standNumber = this.form.standNum
-                        this.form.standYear = this.regDate(year)
-                        this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
-                    }
+                    this.form.standSn = this.form.standNum
+                    this.form.standNumber = this.form.standNum
+                    this.form.standYear = this.regDate(year)
+                    this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
                     this.formKey++
                 }else if(this.form.standStatus === '1' ){
                     this.form.id = ""
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue
index c2eb0f80c..8a5f6397d 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue
@@ -1216,16 +1216,10 @@
                 if(this.form.standStatus === '2'){
                     this.form.id = ""
                     this.formKey++
-                    if((this.form.standStatus === '2') && (this.form.BDTQBBHBUSS === undefined || this.form.BDTQBBHBUSS === '')) {
-                        this.$message.warning("请选择一条被代替企标编号")
-                        return
-                    }
-                    if(this.form.DTQBBHBUSS !== undefined && this.form.DTQBBHBUSS !== null){
-                        this.form.standSn = this.form.standNum
-                        this.form.standNumber = this.form.standNum
-                        this.form.standYear = this.regDate(year)
-                        this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
-                    }
+                    this.form.standSn = this.form.standNum
+                    this.form.standNumber = this.form.standNum
+                    this.form.standYear = this.regDate(year)
+                    this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
                     this.formKey++
                 }else if(this.form.standStatus === '1' ){
                     this.form.id = ""
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue
index 105f9373d..cff34d637 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue
@@ -1137,16 +1137,10 @@
                 if(this.form.standStatus === '2'){
                     this.form.id = ""
                     this.formKey++
-                    if((this.form.standStatus === '2') && (this.form.BDTQBBHBUSS === undefined || this.form.BDTQBBHBUSS === '')) {
-                        this.$message.warning("请选择一条被代替企标编号")
-                        return
-                    }
-                    if(this.form.DTQBBHBUSS !== undefined && this.form.DTQBBHBUSS !== null){
-                        this.form.standSn = this.form.standNum
-                        this.form.standNumber = this.form.standNum
-                        this.form.standYear = this.regDate(year)
-                        this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
-                    }
+                    this.form.standSn = this.form.standNum
+                    this.form.standNumber = this.form.standNum
+                    this.form.standYear = this.regDate(year)
+                    this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
                     this.formKey++
                 }else if(this.form.standStatus === '1' ){
                     this.form.id = ""
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue
index 9d39ed11d..8fd1fb3e3 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue
@@ -1226,16 +1226,10 @@
                 if(this.form.standStatus === '2'){
                     this.form.id = ""
                     this.formKey++
-                    if((this.form.standStatus === '2') && (this.form.BDTQBBHBUSS === undefined || this.form.BDTQBBHBUSS === '')) {
-                        this.$message.warning("请选择一条被代替企标编号")
-                        return
-                    }
-                    if(this.form.DTQBBHBUSS !== undefined && this.form.DTQBBHBUSS !== null){
-                        this.form.standSn = this.form.standNum
-                        this.form.standNumber = this.form.standNum
-                        this.form.standYear = this.regDate(year)
-                        this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
-                    }
+                    this.form.standSn = this.form.standNum
+                    this.form.standNumber = this.form.standNum
+                    this.form.standYear = this.regDate(year)
+                    this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
                     this.formKey++
                 }else if(this.form.standStatus === '1' ){
                     this.form.id = ""
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
index 809266cee..1297948fb 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
@@ -2487,6 +2487,7 @@
                                 this.form.approvalOpinion = this.formTongGuo.approvalOpinion
                                 this.form.topId = this.pId
                                 this.form.reviseStatus = 'buss1_'+this.form.reviseStatus
+                                this.form.textStatusBuss = '6jnqba2mby'
                                 const json = JSON.stringify(this.form);
                                 this.$http.post('lawss/activiti/completeTask', {
                                     taskIds: this.taskIds,
@@ -2702,7 +2703,7 @@
                     this.form.standYear = this.regDate(year)
                     this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
                 }else {
-                    this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss1_'+this.form.reviseStatus}, {
+                    this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss1_'+this.form.reviseStatus,standSort:this.form.standSort}, {
                         _this: this
                     }, res => {
                         const obj = res.data
diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index 6390bcbd7..174930b93 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -420,6 +420,25 @@
                 </span>
             </template>
           </el-table-column>
+          <el-table-column
+                  show-overflow-tooltip
+                  prop="reviseStatus"
+                  label="企标制修订状态"
+                  width="120"
+          >
+
+            <template slot-scope="scope">
+                <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">
+                  {{ filterReviseStatus(scope.row.reviseStatus) }}
+                </span>
+              <span v-if="scope.row.standStatusShow === '参考'" style="color: #98E165">
+                  {{ filterReviseStatus(scope.row.reviseStatus) }}
+                </span>
+              <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">
+                  {{ filterReviseStatus(scope.row.reviseStatus) }}
+                </span>
+            </template>
+          </el-table-column>
 
           <el-table-column fixed="right"
                            v-if="isPermission('d9730d984627af948053df56a2db7997,dd4ea796dab7a01b105ba657b1968a84,a7a38a95ea374695fc3128037f6feccf')>0" label="收藏" align="center" width="50">
@@ -1190,6 +1209,16 @@
                     </el-option>
                   </el-select>
                 </el-form-item>
+                <el-form-item label="企标制修订状态" title="企标制修订状态" class="add-form-item form-item-disabled">
+                  <el-select v-model="sarBussionessSearch.reviseStatus" title="请选择" filterable clearable @change="getStandInfoByReviseStatus">
+                    <el-option
+                            v-for="item in opinionsStand"
+                            :key="item.value"
+                            :value="item.value"
+                            :label="item.label"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
                 <el-form-item label="发布日期" class="add-form-item form-item-disabled">
                   <el-datePicker v-model="sarBussionessSearch.issueTime"
                                  :editable="false"
@@ -1694,6 +1723,13 @@ export default {
   props: {},
   data() {
     return {
+      opinionsStand:[
+        {value: 'buss1_1',label: '技术标准-制定'},
+        {value: 'buss1_2',label: '技术标准-修订'},
+        {value: 'buss2_1',label: '产品标准-制定'},
+        {value: 'buss2_2',label: '产品标准-修订'},
+        {value: 'buss2_3',label: '产品标准-修订'},
+      ],
       QCBFC: false,  //C类标准展示备案日期
       replaceLawsNumModel: false,
       replaceLawType: '',
@@ -2450,6 +2486,31 @@ export default {
     }
   },
   methods: {
+    filterReviseStatus(data){
+      if(data){
+        if(data.indexOf("buss1_") !== -1){
+          if(data === 'buss1_1'){
+            return "制定"
+          }else if(data === 'buss1_2'){
+            return "修订"
+          }else {
+            return ""
+          }
+        }else if(data.indexOf("buss2_") !== -1){
+          if(data === 'buss2_1'){
+            return "制定"
+          }else if(data === 'buss2_2'){
+            return "修订"
+          }else if(data === 'buss2_3'){
+            return "修改"
+          }else {
+            return ""
+          }
+        }
+      }else {
+        return "";
+      }
+    },
     filterData(data){
         if(data.indexOf(",") !== -1){
             let permission = data.split(",");

From 56fbe151d7f79ab37d72c97c0cfd3ba7e491e595 Mon Sep 17 00:00:00 2001
From: "396572590@qq.com" <liuchao>
Date: Thu, 23 Jun 2022 10:36:56 +0800
Subject: [PATCH 11/11] feat: There is no way the, bug #55689

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

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
index c79a9f4a8..f21e9e5c1 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
@@ -2384,6 +2384,9 @@ export default {
           case 'glwj':
             this.glwjFileList = fileList
             break;
+          case 'zbjbd':
+            this.zbjbdFileList = fileList
+            break;
           default :
         }
         // console.log("caNmae",this.form.caName);