From 4e015ea45f55b438e06c5a1962bbfc9996e9e6b2 Mon Sep 17 00:00:00 2001
From: "396572590@qq.com" <liuchao>
Date: Mon, 27 Jun 2022 13:27:16 +0800
Subject: [PATCH 1/6] feat: There is no way the, bug #55708

---
 src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue
index 003ac380d..c1f0c13b9 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue
@@ -22,7 +22,7 @@
                 <template style="width: 10%">
                     <el-table
                             :data="historyData"
-                            height="250"
+                            :height="tablePHeight"
                             border
                             :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
                             style="width: 10%;float: left;margin-right: 20px;">
@@ -32,7 +32,7 @@
                                 label="质量评价人"
                                 min-width="100%">
                             <template slot-scope="scope">
-                                <div @click="ccc(scope.row)">{{scope.row.userName}}-{{scope.row.taskInfo}}</div>
+                                <div @click="ccc(scope.row)" style="cursor: pointer">{{scope.row.userName}}-{{scope.row.taskInfo}}</div>
                             </template>
                         </el-table-column>
                     </el-table>

From 1e5f1fbf6ca06c17b74e45b5065d68dd2181b052 Mon Sep 17 00:00:00 2001
From: "396572590@qq.com" <liuchao>
Date: Mon, 27 Jun 2022 16:37:15 +0800
Subject: [PATCH 2/6] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20IE?=
 =?UTF-8?q?=20=E4=B8=8D=E5=85=BC=E5=AE=B9=20=E6=8F=90=E7=A4=BA=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/index.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/index.html b/public/index.html
index 968506054..9658d8771 100644
--- a/public/index.html
+++ b/public/index.html
@@ -9,6 +9,7 @@
     <meta http-equiv="Cache-Control" content="no-cache, must-revalidate">
     <meta http-equiv="expires" content="0">
     <title>标准法规管理系统</title>
+    <script src="static/polyfill/proxy.min.js"></script>
     <style>
       .logo {
         position: absolute;
@@ -24,8 +25,8 @@
         width: 100%;
         height: 100%;
         background: url("static/images/BG.png");
-        background-size: 100% 100%;  //
-        background-repeat: no-repeat;  //
+        background-size: 100% 100%;
+        background-repeat: no-repeat;
         background-attachment: fixed;
       }
       #headerId {margin:0;}
@@ -33,7 +34,6 @@
       .inner-header {height:65vh;width:100%;margin:0;padding:0;}
       .flex {display:flex;flex-direction:column;justify-content:center;align-items:center;text-align:center;}
     </style>
-    <script src="static/polyfill/proxy.min.js"></script>
     <!--     vconsole调试工具-->
 <!--    <script src="https://cdn.bootcss.com/vConsole/3.3.4/vconsole.min.js"></script>-->
 <!--    <script type="text/javascript">-->

From 989df9d52724d8cf1db66187841ee7ada48c491e Mon Sep 17 00:00:00 2001
From: "396572590@qq.com" <liuchao>
Date: Mon, 27 Jun 2022 16:49:04 +0800
Subject: [PATCH 3/6] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20bug?=
 =?UTF-8?q?=20#55855=20=E6=8F=90=E9=97=AE=E6=8C=89=E9=92=AE=E6=94=BE?=
 =?UTF-8?q?=E5=88=B0=E6=88=91=E7=9A=84=E6=8F=90=E9=97=AE=E9=87=8C=E9=9D=A2?=
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 efd2df19f..441f7146a 100644
--- a/src/pages/personal/pages/my-questions/index.vue
+++ b/src/pages/personal/pages/my-questions/index.vue
@@ -19,7 +19,7 @@
          <el-button size="mini"  @click="delSearch">清空</el-button>
        </el-form-item>
        <el-form-item>
-         <el-button size="mini" type="primary" @click="queBtn">提问</el-button>
+         <el-button v-if="activeName === 'myQue'" size="mini" type="primary" @click="queBtn">提问</el-button>
        </el-form-item>
      </el-form>
    </div>

From 5a748d0d67caeb3e78acfcebfe0ae7f8b2f22a6c Mon Sep 17 00:00:00 2001
From: "396572590@qq.com" <liuchao>
Date: Tue, 28 Jun 2022 09:54:40 +0800
Subject: [PATCH 4/6] feat: There is no way the, bug #56107

---
 .../components/EnterpriseStandardDatabase.vue                   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index 174930b93..4c639fbde 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -1728,7 +1728,7 @@ export default {
         {value: 'buss1_2',label: '技术标准-修订'},
         {value: 'buss2_1',label: '产品标准-制定'},
         {value: 'buss2_2',label: '产品标准-修订'},
-        {value: 'buss2_3',label: '产品标准-修订'},
+        {value: 'buss2_3',label: '产品标准-修改'},
       ],
       QCBFC: false,  //C类标准展示备案日期
       replaceLawsNumModel: false,

From daf0a4196c785fa65961ceb5564712fe43aec7f3 Mon Sep 17 00:00:00 2001
From: "396572590@qq.com" <liuchao>
Date: Tue, 28 Jun 2022 11:50:43 +0800
Subject: [PATCH 5/6] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?=
 =?UTF-8?q?=E4=BC=81=E6=A0=87=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/EnterpriseStandardDatabase.vue                   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index 4c639fbde..9b78b021f 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -2425,7 +2425,7 @@ export default {
       nodeList3: [],
       nodeListZRBM: [],
       modalshowflagZRBM: false,
-      addOrUPdateFlag: 1, // 新增：1， 修改：2
+      addOrUPdateFlag: 2, // 新增：1， 修改：2
       modalshowflag: false,
       standSubclassConfigOptions: [], // 企标细类下拉框-所有数据
       collectBtn: false,

From 655e13d717d53f33da3fde4b8bae05559b216cb2 Mon Sep 17 00:00:00 2001
From: "396572590@qq.com" <liuchao>
Date: Tue, 28 Jun 2022 15:01:32 +0800
Subject: [PATCH 6/6] feat: There is no way the, bug #55699

---
 .../pages/phone/qbzxdjhgk/step2.vue              | 14 ++++++++------
 .../pages/phone/qbzxdjhgk/step3.vue              | 12 ++++++++++++
 .../pages/phone/qbzxdjhgk/step4.vue              | 12 ++++++++++++
 .../pages/phone/qbzxdjhgk/step5.vue              | 16 +++++++++++++++-
 4 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/src/pages/processCenter/pages/phone/qbzxdjhgk/step2.vue b/src/pages/processCenter/pages/phone/qbzxdjhgk/step2.vue
index 88f533b92..34e278ec2 100644
--- a/src/pages/processCenter/pages/phone/qbzxdjhgk/step2.vue
+++ b/src/pages/processCenter/pages/phone/qbzxdjhgk/step2.vue
@@ -127,6 +127,7 @@ export default {
       type: '',
       commentText: '',
       qbfsForm: {},
+      LXDList:[],
       isTransfer: false,
       isSubmit: false,
       saveLoading: false,
@@ -220,13 +221,14 @@ export default {
       })
     },
     assemble(ids,names){
-      let list= new Array();
-      let idArray=ids.split(',');
-      let nameArray=names.split(',');
-      for(let i=0; i<idArray.length; i++){
-        list.push({id:idArray[i],name:nameArray[i]});
+      let list= [];
+      if(ids && ids !== '' && names && names !== ''){
+        let idArray=ids.split(',');
+        let nameArray=names.split(',');
+        for(let i=0; i<idArray.length; i++){
+          list.push({id:idArray[i],name:nameArray[i]});
+        }
       }
-
       return list;
     },
     handleTabs(name){
diff --git a/src/pages/processCenter/pages/phone/qbzxdjhgk/step3.vue b/src/pages/processCenter/pages/phone/qbzxdjhgk/step3.vue
index 4d7bc3838..34f12d1a0 100644
--- a/src/pages/processCenter/pages/phone/qbzxdjhgk/step3.vue
+++ b/src/pages/processCenter/pages/phone/qbzxdjhgk/step3.vue
@@ -127,6 +127,7 @@ export default {
       type: '',
       commentText: '',
       qbfsForm: {},
+      LXDList:[],
       isTransfer: false,
       isSubmit: false,
       saveLoading: false,
@@ -219,6 +220,17 @@ export default {
         this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName);
       })
     },
+    assemble(ids,names){
+      let list= [];
+      if(ids && ids !== '' && names && names !== ''){
+        let idArray=ids.split(',');
+        let nameArray=names.split(',');
+        for(let i=0; i<idArray.length; i++){
+          list.push({id:idArray[i],name:nameArray[i]});
+        }
+      }
+      return list;
+    },
     handleTabs(name){
       this.active = name
     },
diff --git a/src/pages/processCenter/pages/phone/qbzxdjhgk/step4.vue b/src/pages/processCenter/pages/phone/qbzxdjhgk/step4.vue
index 8947abc82..59188bad2 100644
--- a/src/pages/processCenter/pages/phone/qbzxdjhgk/step4.vue
+++ b/src/pages/processCenter/pages/phone/qbzxdjhgk/step4.vue
@@ -127,6 +127,7 @@ export default {
       type: '',
       commentText: '',
       qbfsForm: {},
+      LXDList:[],
       isTransfer: false,
       isSubmit: false,
       saveLoading: false,
@@ -218,6 +219,17 @@ export default {
         this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName);
       })
     },
+    assemble(ids,names){
+      let list= [];
+      if(ids && ids !== '' && names && names !== ''){
+        let idArray=ids.split(',');
+        let nameArray=names.split(',');
+        for(let i=0; i<idArray.length; i++){
+          list.push({id:idArray[i],name:nameArray[i]});
+        }
+      }
+      return list;
+    },
     handleTabs(name){
       this.active = name
     },
diff --git a/src/pages/processCenter/pages/phone/qbzxdjhgk/step5.vue b/src/pages/processCenter/pages/phone/qbzxdjhgk/step5.vue
index 751c14171..dbb8a992c 100644
--- a/src/pages/processCenter/pages/phone/qbzxdjhgk/step5.vue
+++ b/src/pages/processCenter/pages/phone/qbzxdjhgk/step5.vue
@@ -127,6 +127,7 @@ export default {
       type: '',
       commentText: '',
       qbfsForm: {},
+      LXDList:[],
       isTransfer: false,
       isSubmit: false,
       saveLoading: false,
@@ -218,6 +219,17 @@ export default {
         this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName);
       })
     },
+    assemble(ids,names){
+      let list= [];
+      if(ids && ids !== '' && names && names !== ''){
+        let idArray=ids.split(',');
+        let nameArray=names.split(',');
+        for(let i=0; i<idArray.length; i++){
+          list.push({id:idArray[i],name:nameArray[i]});
+        }
+      }
+      return list;
+    },
     handleTabs(name){
       this.active = name
     },
@@ -267,7 +279,9 @@ export default {
       this.isSubmit = true
       this.qbfsForm.bzfgbzFlag = '0'
       this.qbfsForm.planStatus = '未开始'
-      this.qbfsForm.area = this.qbfsForm.area.join(',')
+      if(this.qbfsForm.area && this.qbfsForm.length > 0){
+        this.qbfsForm.area = this.qbfsForm.area.join(',')
+      }
       this.qbfsForm.commentText = this.commentText
       let json = JSON.stringify(this.qbfsForm);
       this.$http.post('lawss/activiti/completeTask', {