From 6dce1e13bb608832cca5d9a062f0cb0db1f25b31 Mon Sep 17 00:00:00 2001
From: "wangxiahui@91isoft.com" <140316hui>
Date: Fri, 24 Sep 2021 14:42:13 +0800
Subject: [PATCH 01/21] =?UTF-8?q?=E6=9C=BA=E6=9E=84=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E7=BC=A9=E6=94=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../config/pages/mechanismManage/index.vue    | 37 +++++++++++--------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/src/pages/config/pages/mechanismManage/index.vue b/src/pages/config/pages/mechanismManage/index.vue
index 07bfb775a..39572377a 100644
--- a/src/pages/config/pages/mechanismManage/index.vue
+++ b/src/pages/config/pages/mechanismManage/index.vue
@@ -394,22 +394,29 @@ export default {
 }
 </style>
 <style lang="less" scoped>
-/deep/.el-select__tags {
-  overflow-x: hidden;
-}
-/deep/.width-all{
-  width: 100%;
-}
-.filter-tree {
-  height: calc(~'100% - 50px')
-}
-.laws-tree{
-  /deep/.clearable {
-    top: 20px;
+#mechanism-manage{
+  height: 100%;
+  .content {
+    height: calc(~'100% - 105px - 56px')
+  }
+  /deep/.el-select__tags {
+    overflow-x: hidden;
+  }
+  /deep/.width-all{
+    width: 100%;
+  }
+  .filter-tree {
+    height: calc(~'100% - 50px')
+  }
+  .laws-tree{
+    /deep/.clearable {
+      top: 20px;
+    }
+  }
+  .add-form-item {
+    display: flex;
   }
 }
-.add-form-item {
-  display: flex;
-}
+
 
 </style>

From ced7e8f0e2d7c94d0fe339468eccf3baf6ee5974 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Fri, 24 Sep 2021 14:42:36 +0800
Subject: [PATCH 02/21] commit

---
 .../processCenter/pages/creatProcess/bzqdfb/step3.vue     | 3 +++
 src/sysConfig/index.js                                    | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
index 9a78bbfad..9abd10346 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
@@ -779,6 +779,7 @@ export default {
      * @description: 动态表单读取
      */
     getFormFieldList (item) {
+      console.log(item.commentText);
       this.$nextTick(() => {
         this.listForm = JSON.parse(JSON.stringify(item))
         if(item.form === undefined){
@@ -791,9 +792,11 @@ export default {
           this.listForm.jlUserId = item.jlUserId
           this.listForm.zrUserId = item.zrUserId
           this.fileInfoList = item.fileName
+          this.commentText = item.commentText
          } else {
           this.listForm = item.form
           this.dataList = item.form.dataList
+          this.commentText = item.commentText
           this.listForm.dataList = item.form.dataList
           this.fileInfoList = item.form.fileName
         }
diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js
index d324fb6a3..49e4ae8d4 100644
--- a/src/sysConfig/index.js
+++ b/src/sysConfig/index.js
@@ -4,10 +4,10 @@
  * @date: 2018-09-04 17:47:46
  */
 // 服务器地址
-// const devIp = '62.234.136.153'
-// const devInterfacePORT = '8033'
-const devIp = '192.168.10.247'
-const devInterfacePORT = '9999'
+const devIp = '62.234.136.153'
+const devInterfacePORT = '8033'
+// const devIp = '192.168.10.247'
+// const devInterfacePORT = '9999'
 // 云端端口号
 const DEV_CLOUD_RES_INTERFACE_PORT = '7777'
 const simpleFilePath = 'att/attFile/upload'

From 58f24945a1a45db47c27111dac3cc111c9a62d77 Mon Sep 17 00:00:00 2001
From: "wangxiahui@91isoft.com" <140316hui>
Date: Fri, 24 Sep 2021 14:56:56 +0800
Subject: [PATCH 03/21] =?UTF-8?q?=E5=9B=BD=E5=86=85=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E6=B3=95=E8=A7=84=E8=A1=A8=E6=A0=BC=E7=BC=A9=E6=94=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domesticStandardsAndRegulations/index.vue             | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 60d4ddc45..8182ef42f 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -4988,7 +4988,6 @@ export default {
   background: url('~@/assets/images/shangqi/img/none-file.png');
   background-size: 100% 100%;
 }
-
 /deep/ .is-show {
   position: relative;
   display: inline-block;
@@ -4997,7 +4996,12 @@ export default {
   background: url('~@/assets/images/shangqi/img/tree.png');
   background-size: 100% 100%;
 }
-
+  #domesticStandardDatabase{
+  height: 100%;
+  .content {
+    height: calc(~'100% - 105px - 56px')
+  }
+}
 /deep/ .tree-line {
   .el-tree-node {
     position: relative;

From a688302db7280e054a9c0db0a380c73c58697650 Mon Sep 17 00:00:00 2001
From: "wangxiahui@91isoft.com" <140316hui>
Date: Sun, 26 Sep 2021 10:16:24 +0800
Subject: [PATCH 04/21] =?UTF-8?q?=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B-=E8=A1=A8=E5=8D=95=E5=AE=BD=E5=BA=A6?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzzqyj/step1-9.vue              | 10 ++++++++--
 .../processCenter/pages/creatProcess/bzzqyj/step3.vue  |  4 ++--
 .../processCenter/pages/creatProcess/bzzqyj/step4.vue  |  5 +++--
 .../processCenter/pages/creatProcess/bzzqyj/step5.vue  |  3 ++-
 .../processCenter/pages/creatProcess/bzzqyj/step6.vue  |  3 ++-
 .../processCenter/pages/creatProcess/bzzqyj/step7.vue  |  3 ++-
 .../processCenter/pages/creatProcess/bzzqyj/step8.vue  |  3 ++-
 .../processCenter/pages/creatProcess/bzzqyj/step9.vue  |  3 ++-
 8 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue
index 4df65c385..ac73e57d7 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue
@@ -91,12 +91,15 @@
           </el-table-column>
           <el-table-column
             prop="chapterNumber"
+            align="center"
             label="章条编号"
-            width="170px">
+            width="101px">
           </el-table-column>
           <el-table-column
             prop="chapterName"
-            label="章节名称">
+            align="center"
+            label="章节名称"
+            width="200px">
           </el-table-column>
           <el-table-column
             align="center"
@@ -120,14 +123,17 @@
           </el-table-column>
           <el-table-column
             prop="department"
+            align="center"
             label="提出部门">
           </el-table-column>
           <el-table-column
             prop="responUserName"
+            align="center"
             label="提出人">
           </el-table-column>
           <el-table-column
             prop="state"
+            align="center"
             label="处理意见">
             <template slot-scope="scope">
               <div>{{ stateText(scope.row.state) }}</div>
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
index 1626963b2..7eac1c549 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
@@ -97,7 +97,7 @@
                             align="center"
                             sortable
                             label="章条编号"
-                            width="170px">
+                            width="101px">
                         <template slot-scope="scope">
                             <el-input style="margin: 10px 0;" v-model="scope.row.chapterNumber"></el-input>
                         </template>
@@ -106,7 +106,7 @@
                             prop="chapterName"
                             align="center"
                             label="章节名称"
-                            width="170px">
+                            width="200px">
                         <template slot-scope="scope">
                             <el-input style="margin: 10px 0;" v-model="scope.row.chapterName"></el-input>
                         </template>
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
index 00767eaed..6497f55c7 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
@@ -79,12 +79,13 @@
             align="center"
             sortable
             label="章条编号"
-            width="170px">
+            width="101px">
           </el-table-column>
           <el-table-column
             prop="chapterName"
             align="center"
-            label="章节名称">
+            label="章节名称"
+            width="200px">
           </el-table-column>
           <el-table-column
             align="center"
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
index b57526027..0dd5e2117 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
@@ -79,11 +79,12 @@
             align="center"
             sortable
             label="章条编号"
-            width="170px">
+            width="101px">
           </el-table-column>
           <el-table-column
             prop="chapterName"
             align="center"
+            width="200px"
             label="章节名称">
           </el-table-column>
           <el-table-column
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
index 54bebf7ab..1ab6f65f4 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
@@ -91,11 +91,12 @@
             align="center"
             sortable
             label="章条编号"
-            width="170px">
+            width="101px">
           </el-table-column>
           <el-table-column
             prop="chapterName"
             align="center"
+            width="200px"
             label="章节名称">
           </el-table-column>
           <el-table-column
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
index ca9b26a70..b9ae6a967 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
@@ -91,11 +91,12 @@
             align="center"
             label="章条编号"
             sortable
-            width="170px">
+            width="101px">
           </el-table-column>
           <el-table-column
             prop="chapterName"
             align="center"
+            width="200px"
             label="章节名称">
           </el-table-column>
           <el-table-column
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
index 7df9e4741..860c866a5 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
@@ -91,11 +91,12 @@
             sortable
             align="center"
             label="章条编号"
-            width="170px">
+            width="101px">
           </el-table-column>
           <el-table-column
             prop="chapterName"
             align="center"
+            width="200px"
             label="章节名称">
           </el-table-column>
           <el-table-column
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
index 1b6a68ca8..8194e5389 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
@@ -91,11 +91,12 @@
             align="center"
             sortable
             label="章条编号"
-            width="170px">
+            width="101px">
           </el-table-column>
           <el-table-column
             prop="chapterName"
             align="center"
+            width="200px"
             label="章节名称">
           </el-table-column>
           <el-table-column

From c6d4363b7a68b4b5e0b3da394b39b41043dd3fa3 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Sun, 26 Sep 2021 10:20:57 +0800
Subject: [PATCH 05/21] =?UTF-8?q?=E5=9B=BD=E5=86=85=E6=A0=87=E5=87=86=20?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=90=8E=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domesticStandardsAndRegulations/index.vue                | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index e7402b426..ff5ee884d 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -3193,7 +3193,10 @@ export default {
 
         }
       }
-      this.getDomesticStandardTable(this.tableFlag)
+      // this.getDomesticStandardTable(this.tableFlag)
+      //搜索后排序,应该以被搜索后的数据排序
+      this.getDomesticStandardTable(this.standCommonlySearch)
+
     },
     // 修改成表格样式后，选择项勾选改变
     standSelectChange(data) {

From 951b4c84aa1571c09e2c4d039e9004fd56defcec Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Sun, 26 Sep 2021 10:32:50 +0800
Subject: [PATCH 06/21] =?UTF-8?q?=20=E9=85=8D=E7=BD=AE=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E6=9C=BA=E6=9E=84=E7=AE=A1=E7=90=86=20=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=90=8E=20=E7=82=B9=E5=87=BB=E7=AC=AC=E4=B8=89=E9=A1=B5=20?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=B8=85=E7=A9=BA=E5=BA=94=E8=AF=A5=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E5=88=B0=E7=AC=AC=E4=B8=80=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/config/pages/mechanismManage/index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/config/pages/mechanismManage/index.vue b/src/pages/config/pages/mechanismManage/index.vue
index 39572377a..657381bd8 100644
--- a/src/pages/config/pages/mechanismManage/index.vue
+++ b/src/pages/config/pages/mechanismManage/index.vue
@@ -200,6 +200,7 @@ export default {
         uname: "",
         email: ""
       }
+      this.page = 1
       this.getData()
     },
     resetFormPost () {

From 08893b630a476448b3ca20b183df7d0d4129538c Mon Sep 17 00:00:00 2001
From: "wangxiahui@91isoft.com" <140316hui>
Date: Sun, 26 Sep 2021 11:07:05 +0800
Subject: [PATCH 07/21] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=86=85=E5=A1=AB?=
 =?UTF-8?q?=E5=86=99=E8=A1=A8=E5=8D=95=E7=9A=84=E5=AE=BD=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../processCenter/pages/creatProcess/bzjd/step1-6.vue  |  8 ++++----
 .../processCenter/pages/creatProcess/bzjd/step3.vue    | 10 +++++-----
 .../processCenter/pages/creatProcess/bzjd/step4.vue    |  8 ++++----
 .../processCenter/pages/creatProcess/bzjd/step5.vue    |  8 ++++----
 .../processCenter/pages/creatProcess/bzjd/step6.vue    |  8 ++++----
 .../processCenter/pages/creatProcess/xmpg/step1-7.vue  |  8 ++++----
 .../processCenter/pages/creatProcess/xmpg/step4.vue    |  8 ++++----
 .../processCenter/pages/creatProcess/xmpg/step5.vue    |  8 ++++----
 .../processCenter/pages/creatProcess/xmpg/step6.vue    |  8 ++++----
 .../processCenter/pages/creatProcess/xmpg/step7.vue    |  8 ++++----
 .../pages/creatProcess/xmpg2/step1-12.vue              |  8 ++++----
 .../processCenter/pages/creatProcess/xmpg2/step10.vue  |  8 ++++----
 .../processCenter/pages/creatProcess/xmpg2/step11.vue  |  8 ++++----
 .../processCenter/pages/creatProcess/xmpg2/step12.vue  |  8 ++++----
 .../processCenter/pages/creatProcess/xmpg2/step6.vue   |  8 ++++----
 .../processCenter/pages/creatProcess/xmpg2/step7.vue   |  8 ++++----
 .../processCenter/pages/creatProcess/xmpg2/step8.vue   |  8 ++++----
 .../processCenter/pages/creatProcess/xmpg2/step9.vue   |  8 ++++----
 18 files changed, 73 insertions(+), 73 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue
index afb3e869b..da92e0dd8 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue
@@ -163,7 +163,7 @@
         <el-table-column
           show-overflow-tooltip
           prop="technicalRequir"
-          width="150"
+          width="200"
           label="核心技术要求"
           align="center">
         </el-table-column>
@@ -196,13 +196,13 @@
         <el-table-column
           show-overflow-tooltip
           prop="complianceState"
-          width="150"
+          width="200"
           label="合规性分析"
           align="center">
         </el-table-column>
         <el-table-column
           prop="newData"
-          width="250"
+          width="150"
           label="新车型实施日期"
           align="center">
           <template slot-scope="scope">
@@ -211,7 +211,7 @@
         </el-table-column>
         <el-table-column
           prop="onlineData"
-          width="250"
+          width="150"
           label="在产车型实施日期"
           align="center">
           <template slot-scope="scope">
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
index 1a539e346..cd911c792 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
@@ -167,7 +167,7 @@
                 <el-table-column
                         v-if="!form.itemsNum1"
                         prop="technicalRequir"
-                        width="150"
+                        width="200"
                         label="核心技术要求"
                         align="center">
                     <template slot-scope="scope">
@@ -211,7 +211,7 @@
                 </el-table-column>
                 <el-table-column
                         prop="complianceState"
-                        width="150"
+                        width="200"
                         label="合规性分析"
                         align="center">
                     <template slot-scope="scope">
@@ -222,7 +222,7 @@
                 </el-table-column>
                 <el-table-column
                         prop="newData"
-                        width="250"
+                        width="150"
                         label="新车型实施日期"
                         align="center">
                     <template slot-scope="scope">
@@ -235,7 +235,7 @@
                 </el-table-column>
                 <el-table-column
                         prop="onlineData"
-                        width="250"
+                        width="150"
                         label="在产车型实施日期"
                         align="center">
                     <template slot-scope="scope">
@@ -364,7 +364,7 @@
                 :wrapperClosable="false"
                 size="800px">
             <div class="demo-drawer-content">
-                <el-form :model="plForm" class="label-input-form" ref="plForm" label-width="150">
+                <el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150">
                     <el-formItem label="核心技术要求" prop="technicalRequir" class="add-form-item"  v-if="!form.itemsNum1">
                         <el-input
                                 v-model="plForm.technicalRequir"
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
index 47f1c8eb5..fd6bf598a 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
@@ -162,7 +162,7 @@
                 <el-table-column
                         show-overflow-tooltip
                         prop="technicalRequir"
-                        width="150"
+                        width="200"
                         label="核心技术要求"
                         align="center">
                 </el-table-column>
@@ -195,13 +195,13 @@
                 <el-table-column
                         show-overflow-tooltip
                         prop="complianceState"
-                        width="150"
+                        width="200"
                         label="合规性分析"
                         align="center">
                 </el-table-column>
                 <el-table-column
                         prop="newData"
-                        width="250"
+                        width="150"
                         label="新车型实施日期"
                         align="center">
                     <template slot-scope="scope">
@@ -210,7 +210,7 @@
                 </el-table-column>
                 <el-table-column
                         prop="onlineData"
-                        width="250"
+                        width="150"
                         label="在产车型实施日期"
                         align="center">
                     <template slot-scope="scope">
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
index b4cccc98a..75aaef624 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
@@ -162,7 +162,7 @@
                 <el-table-column
                         show-overflow-tooltip
                         prop="technicalRequir"
-                        width="150"
+                        width="200"
                         label="核心技术要求"
                         align="center">
                 </el-table-column>
@@ -195,13 +195,13 @@
                 <el-table-column
                         show-overflow-tooltip
                         prop="complianceState"
-                        width="150"
+                        width="200"
                         label="合规性分析"
                         align="center">
                 </el-table-column>
                 <el-table-column
                         prop="newData"
-                        width="250"
+                        width="150"
                         label="新车型实施日期"
                         align="center">
                     <template slot-scope="scope">
@@ -210,7 +210,7 @@
                 </el-table-column>
                 <el-table-column
                         prop="onlineData"
-                        width="250"
+                        width="150"
                         label="在产车型实施日期"
                         align="center">
                     <template slot-scope="scope">
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
index 02f61090d..7a491372d 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
@@ -163,7 +163,7 @@
                 <el-table-column
                         show-overflow-tooltip
                         prop="technicalRequir"
-                        width="150"
+                        width="200"
                         label="核心技术要求"
                         align="center">
                 </el-table-column>
@@ -196,13 +196,13 @@
                 <el-table-column
                         show-overflow-tooltip
                         prop="complianceState"
-                        width="150"
+                        width="200"
                         label="合规性分析"
                         align="center">
                 </el-table-column>
                 <el-table-column
                         prop="newData"
-                        width="250"
+                        width="150"
                         label="新车型实施日期"
                         align="center">
                     <template slot-scope="scope">
@@ -211,7 +211,7 @@
                 </el-table-column>
                 <el-table-column
                         prop="onlineData"
-                        width="250"
+                        width="150"
                         label="在产车型实施日期"
                         align="center">
                     <template slot-scope="scope">
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue
index 1503278e3..e2aa94f61 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue
@@ -197,7 +197,7 @@
               <el-table-column
                 prop="noCompliance"
                 align="center"
-                width="160"
+                width="170"
                 label="不合规项目">
               </el-table-column>
               <el-table-column
@@ -209,7 +209,7 @@
               <el-table-column
                 prop="completionTime"
                 align="center"
-                width="160"
+                width="120"
                 label="完成时间">
                 <template slot-scope="scope">
                   <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
@@ -233,7 +233,7 @@
               <el-table-column
                 prop="zcNoCompliance"
                 align="center"
-                width="160"
+                width="170"
                 label="不合规项目">
               </el-table-column>
               <el-table-column
@@ -245,7 +245,7 @@
               <el-table-column
                 prop="zcCompletionTime"
                 align="center"
-                width="160"
+                width="120"
                 label="完成时间">
                 <template slot-scope="scope">
                   <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
index 5ec52be90..d72382a6c 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
@@ -204,7 +204,7 @@
               <el-table-column
                 prop="researchNonCompliance"
                 align="center"
-                width="160"
+                width="170"
                 label="不合规项目">
                 <template slot-scope="scope">
                   <el-input
@@ -230,7 +230,7 @@
               <el-table-column
                 prop="researchCompletionTime"
                 align="center"
-                width="160"
+                width="120"
                 label="完成时间">
                 <template slot-scope="scope">
                   <el-date-picker
@@ -265,7 +265,7 @@
               <el-table-column
                 prop="productionNonCompliance"
                 align="center"
-                width="160"
+                width="170"
                 label="不合规项目">
                 <template slot-scope="scope">
                   <el-input
@@ -291,7 +291,7 @@
               <el-table-column
                 prop="productionCompletionTime"
                 align="center"
-                width="160"
+                width="120"
                 label="完成时间">
                 <template slot-scope="scope">
                   <el-date-picker
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
index 63016166a..f816c2c8d 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
@@ -197,7 +197,7 @@
               <el-table-column
                 prop="noCompliance"
                 align="center"
-                width="160"
+                width="170"
                 label="不合规项目">
               </el-table-column>
               <el-table-column
@@ -209,7 +209,7 @@
               <el-table-column
                 prop="completionTime"
                 align="center"
-                width="160"
+                width="120"
                 label="完成时间">
                 <template slot-scope="scope">
                   <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
@@ -233,7 +233,7 @@
               <el-table-column
                 prop="zcNoCompliance"
                 align="center"
-                width="160"
+                width="170"
                 label="不合规项目">
               </el-table-column>
               <el-table-column
@@ -245,7 +245,7 @@
               <el-table-column
                 prop="zcCompletionTime"
                 align="center"
-                width="160"
+                width="120"
                 label="完成时间">
                 <template slot-scope="scope">
                   <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
index 4a07183ba..a373a9aa7 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
@@ -197,7 +197,7 @@
               <el-table-column
                 prop="noCompliance"
                 align="center"
-                width="160"
+                width="170"
                 label="不合规项目">
               </el-table-column>
               <el-table-column
@@ -209,7 +209,7 @@
               <el-table-column
                 prop="completionTime"
                 align="center"
-                width="160"
+                width="120"
                 label="完成时间">
                 <template slot-scope="scope">
                   <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
@@ -233,7 +233,7 @@
               <el-table-column
                 prop="zcNoCompliance"
                 align="center"
-                width="160"
+                width="170"
                 label="不合规项目">
               </el-table-column>
               <el-table-column
@@ -245,7 +245,7 @@
               <el-table-column
                 prop="zcCompletionTime"
                 align="center"
-                width="160"
+                width="120"
                 label="完成时间">
                 <template slot-scope="scope">
                   <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
index f5258a732..62697053e 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
@@ -197,7 +197,7 @@
               <el-table-column
                 prop="noCompliance"
                 align="center"
-                width="160"
+                width="170"
                 label="不合规项目">
               </el-table-column>
               <el-table-column
@@ -209,7 +209,7 @@
               <el-table-column
                 prop="completionTime"
                 align="center"
-                width="160"
+                width="120"
                 label="完成时间">
                 <template slot-scope="scope">
                   <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
@@ -233,7 +233,7 @@
               <el-table-column
                 prop="zcNoCompliance"
                 align="center"
-                width="160"
+                width="170"
                 label="不合规项目">
               </el-table-column>
               <el-table-column
@@ -245,7 +245,7 @@
               <el-table-column
                 prop="zcCompletionTime"
                 align="center"
-                width="160"
+                width="120"
                 label="完成时间">
                 <template slot-scope="scope">
                   <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue
index 6b92f296e..2f29fa097 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue
@@ -127,7 +127,7 @@
               <el-table-column
                 prop="noCompliance"
                 align="center"
-                width="160"
+                width="170"
                 label="不合规项目">
               </el-table-column>
               <el-table-column
@@ -139,7 +139,7 @@
               <el-table-column
                 prop="completionTime"
                 align="center"
-                width="160"
+                width="120"
                 label="完成时间">
                 <template slot-scope="scope">
                   <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
@@ -163,7 +163,7 @@
               <el-table-column
                 prop="zcNoCompliance"
                 align="center"
-                width="160"
+                width="170"
                 label="不合规项目">
               </el-table-column>
               <el-table-column
@@ -175,7 +175,7 @@
               <el-table-column
                 prop="zcCompletionTime"
                 align="center"
-                width="160"
+                width="120"
                 label="完成时间">
                 <template slot-scope="scope">
                   <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
index 4342f13f5..9b8150cf1 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
@@ -130,7 +130,7 @@
               <el-table-column
                 prop="noCompliance"
                 align="center"
-                width="160"
+                width="170"
                 label="不合规项目">
               </el-table-column>
               <el-table-column
@@ -142,7 +142,7 @@
               <el-table-column
                 prop="completionTime"
                 align="center"
-                width="160"
+                width="120"
                 label="完成时间">
                 <template slot-scope="scope">
                   <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format("YYYY-MM-DD") : ""
@@ -167,7 +167,7 @@
               <el-table-column
                 prop="zcNoCompliance"
                 align="center"
-                width="160"
+                width="170"
                 label="不合规项目">
               </el-table-column>
               <el-table-column
@@ -179,7 +179,7 @@
               <el-table-column
                 prop="zcCompletionTime"
                 align="center"
-                width="160"
+                width="120"
                 label="完成时间">
                 <template slot-scope="scope">
                   <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format("YYYY-MM-DD") : ""
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
index 17a656598..2cb6a9e8a 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
@@ -130,7 +130,7 @@
               <el-table-column
                 prop="noCompliance"
                 align="center"
-                width="160"
+                width="170"
                 label="不合规项目">
               </el-table-column>
               <el-table-column
@@ -142,7 +142,7 @@
               <el-table-column
                 prop="completionTime"
                 align="center"
-                width="160"
+                width="120"
                 label="完成时间">
                 <template slot-scope="scope">
                   <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format("YYYY-MM-DD") : ""
@@ -167,7 +167,7 @@
               <el-table-column
                 prop="zcNoCompliance"
                 align="center"
-                width="160"
+                width="170"
                 label="不合规项目">
               </el-table-column>
               <el-table-column
@@ -179,7 +179,7 @@
               <el-table-column
                 prop="zcCompletionTime"
                 align="center"
-                width="160"
+                width="120"
                 label="完成时间">
                 <template slot-scope="scope">
                   <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format("YYYY-MM-DD") : ""
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
index 0cea001ee..85982828e 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
@@ -130,7 +130,7 @@
               <el-table-column
                 prop="noCompliance"
                 align="center"
-                width="160"
+                width="170"
                 label="不合规项目">
               </el-table-column>
               <el-table-column
@@ -142,7 +142,7 @@
               <el-table-column
                 prop="completionTime"
                 align="center"
-                width="160"
+                width="120"
                 label="完成时间">
                 <template slot-scope="scope">
                   <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format("YYYY-MM-DD") : ""
@@ -167,7 +167,7 @@
               <el-table-column
                 prop="zcNoCompliance"
                 align="center"
-                width="160"
+                width="170"
                 label="不合规项目">
               </el-table-column>
               <el-table-column
@@ -179,7 +179,7 @@
               <el-table-column
                 prop="zcCompletionTime"
                 align="center"
-                width="160"
+                width="120"
                 label="完成时间">
                 <template slot-scope="scope">
                   <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format("YYYY-MM-DD") : ""
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
index 59fd39824..1c84428e5 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
@@ -144,7 +144,7 @@
               <el-table-column
                 prop="researchNonCompliance"
                 align="center"
-                width="160"
+                width="170"
                 label="不合规项目">
                 <template slot-scope="scope">
                   <el-input
@@ -170,7 +170,7 @@
               <el-table-column
                 prop="researchCompletionTime"
                 align="center"
-                width="160"
+                width="120"
                 label="完成时间">
                 <template slot-scope="scope">
                   <el-date-picker
@@ -205,7 +205,7 @@
               <el-table-column
                 prop="productionNonCompliance"
                 align="center"
-                width="160"
+                width="170"
                 label="不合规项目">
                 <template slot-scope="scope">
                   <el-input
@@ -231,7 +231,7 @@
               <el-table-column
                 prop="productionCompletionTime"
                 align="center"
-                width="160"
+                width="120"
                 label="完成时间">
                 <template slot-scope="scope">
                   <el-date-picker
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
index 709a05580..4aef6ba14 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
@@ -130,7 +130,7 @@
               <el-table-column
                 prop="noCompliance"
                 align="center"
-                width="160"
+                width="170"
                 label="不合规项目">
               </el-table-column>
               <el-table-column
@@ -142,7 +142,7 @@
               <el-table-column
                 prop="completionTime"
                 align="center"
-                width="160"
+                width="120"
                 label="完成时间">
                 <template slot-scope="scope">
                   <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format("YYYY-MM-DD") : ""
@@ -167,7 +167,7 @@
               <el-table-column
                 prop="zcNoCompliance"
                 align="center"
-                width="160"
+                width="170"
                 label="不合规项目">
               </el-table-column>
               <el-table-column
@@ -179,7 +179,7 @@
               <el-table-column
                 prop="zcCompletionTime"
                 align="center"
-                width="160"
+                width="120"
                 label="完成时间">
                 <template slot-scope="scope">
                   <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format("YYYY-MM-DD") : ""
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
index 84550855c..d4121b273 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
@@ -130,7 +130,7 @@
               <el-table-column
                       prop="noCompliance"
                       align="center"
-                      width="160"
+                      width="170"
                       label="不合规项目">
               </el-table-column>
               <el-table-column
@@ -142,7 +142,7 @@
               <el-table-column
                       prop="completionTime"
                       align="center"
-                      width="160"
+                      width="120"
                       label="完成时间">
                 <template slot-scope="scope">
                   <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
@@ -166,7 +166,7 @@
               <el-table-column
                       prop="zcNoCompliance"
                       align="center"
-                      width="160"
+                      width="170"
                       label="不合规项目">
               </el-table-column>
               <el-table-column
@@ -178,7 +178,7 @@
               <el-table-column
                       prop="zcCompletionTime"
                       align="center"
-                      width="160"
+                      width="120"
                       label="完成时间">
                 <template slot-scope="scope">
                   <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
index 761e6fadf..b9f09d6b6 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
@@ -130,7 +130,7 @@
               <el-table-column
                 prop="noCompliance"
                 align="center"
-                width="160"
+                width="170"
                 label="不合规项目">
               </el-table-column>
               <el-table-column
@@ -142,7 +142,7 @@
               <el-table-column
                 prop="completionTime"
                 align="center"
-                width="160"
+                width="120"
                 label="完成时间">
                 <template slot-scope="scope">
                   <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format("YYYY-MM-DD") : ""
@@ -167,7 +167,7 @@
               <el-table-column
                 prop="zcNoCompliance"
                 align="center"
-                width="160"
+                width="170"
                 label="不合规项目">
               </el-table-column>
               <el-table-column
@@ -179,7 +179,7 @@
               <el-table-column
                 prop="zcCompletionTime"
                 align="center"
-                width="160"
+                width="120"
                 label="完成时间">
                 <template slot-scope="scope">
                   <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format("YYYY-MM-DD") : ""

From 99f32073871d9221ba8ccf5b4d5b4f88238d12bb Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Sun, 26 Sep 2021 11:21:31 +0800
Subject: [PATCH 08/21] =?UTF-8?q?=20=E9=85=8D=E7=BD=AE=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E8=A7=92=E8=89=B2=E7=AE=A1=E7=90=86=20=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=94=B9=E4=B8=BA=E9=85=8D=E7=BD=AE=E6=B3=95?=
 =?UTF-8?q?=E8=A7=84=E5=BA=93=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/config/pages/roleManage/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/config/pages/roleManage/index.vue b/src/pages/config/pages/roleManage/index.vue
index 98d193cec..88fb7c8ed 100644
--- a/src/pages/config/pages/roleManage/index.vue
+++ b/src/pages/config/pages/roleManage/index.vue
@@ -38,7 +38,7 @@
                    class="common-button-primary add-button"
                    @click="roleAddData"
                    v-btn-permission="'bb2571b08179edb36880aae169cb2e54'"
-                   size="mini">配置数据权限
+                   size="mini">配置法规库权限
         </el-button>
         <el-button type="primary"
                    class="common-button-primary add-button"

From 138557770b4cb79ffd1e856e45be90c2cb559f02 Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Sun, 26 Sep 2021 11:30:29 +0800
Subject: [PATCH 09/21] =?UTF-8?q?=E4=BC=98=E5=8C=96table=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E8=BF=87=E5=A4=9A=E9=80=A0=E6=88=90=E5=8D=A1=E9=A1=BF=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/xmpg2/step6.vue        | 179 ++++++++++--------
 1 file changed, 104 insertions(+), 75 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
index 1c84428e5..aa5ffa79c 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
@@ -49,11 +49,12 @@
           </div>
         </div>
         <el-table
-          :data="dataList"
-          style="width: 100%; border: 1px solid #cccccc"
+          :data="dataList.slice((currentPage - 1) * pageSize, currentPage * pageSize ) "
+          style="width: 100%; border: 1px solid #cccccc;height: 400px"
           row-key="standId"
           height="70%"
           border
+          highlight-current-row
           @selection-change="selectStandChange"
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
           fontWeight: 'bold'}"
@@ -72,7 +73,8 @@
           >
             <template slot-scope="scope">
               <a v-if="scope.row.standYear" class="table-jump"
-                 @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber
+                 @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{
+                  scope.row.standNumber
                 }}-{{ scope.row.standYear }}</a>
               <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSort }}
                 {{ scope.row.standNumber }}</a>
@@ -243,18 +245,26 @@
               </el-table-column>
             </el-table-column>
           </el-table-column>
-<!--          以后全选可能用-->
-<!--          <el-table-column-->
-<!--              prop="productionCompletionTime"-->
-<!--              align="center"-->
-<!--              fixed="right"-->
-<!--              width="160"-->
-<!--              label="操作">-->
-<!--            <template slot-scope="scope">-->
-<!--              <el-button style="width: 98%" size="small" type="primary" @click="">{{ "批量编辑" }}</el-button>-->
-<!--            </template>-->
-<!--          </el-table-column>-->
+          <!--          以后全选可能用-->
+          <!--          <el-table-column-->
+          <!--              prop="productionCompletionTime"-->
+          <!--              align="center"-->
+          <!--              fixed="right"-->
+          <!--              width="160"-->
+          <!--              label="操作">-->
+          <!--            <template slot-scope="scope">-->
+          <!--              <el-button style="width: 98%" size="small" type="primary" @click="">{{ "批量编辑" }}</el-button>-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
         </el-table>
+        <el-pagination
+          layout="total,sizes, prev, pager, next"
+          background
+          :page-sizes="[20, 40, 60]"
+          :total="total"
+          @current-change="handleCurrentChange"
+        >
+        </el-pagination>
       </div>
       <div>
         <el-collapse accordion>
@@ -353,77 +363,80 @@
     </ProcessFooter>
     <!-- 福田全公司选人解决方案 -->
     <Role-tree
-        check-box
-        :is-title="drawerTitle"
-        :is-visible.sync="drawerModal"
-        @checkedRole="checkedTransferRole"
-        :nodeList="nodeList"
+      check-box
+      :is-title="drawerTitle"
+      :is-visible.sync="drawerModal"
+      @checkedRole="checkedTransferRole"
+      :nodeList="nodeList"
     ></Role-tree>
     <el-drawer
-        title="批量填写"
-        :visible.sync="modalshowflag"
-        :wrapperClosable="false"
-        size="800px">
+      title="批量填写"
+      :visible.sync="modalshowflag"
+      :wrapperClosable="false"
+      size="800px">
       <div class="demo-drawer-content">
         <el-form :model="batchEditForm" class="label-input-form" ref="projectComplianceForm" label-width="150">
           <el-divider><span><b>在研产品</b></span></el-divider>
-          <el-formItem label="合规原因" class="add-form-item" >
+          <el-formItem label="合规原因" class="add-form-item">
             <el-input
-                v-model="batchEditForm.complianceReasons"
-                placeholder="请输入合规原因"
+              v-model="batchEditForm.complianceReasons"
+              placeholder="请输入合规原因"
             ></el-input>
           </el-formItem>
-          <el-form-item label="不合规项目" class="add-form-item" >
+          <el-form-item label="不合规项目" class="add-form-item">
             <el-input
-                v-model="batchEditForm.noCompliance"
-                placeholder="请输入不合规项目"
+              v-model="batchEditForm.noCompliance"
+              placeholder="请输入不合规项目"
             ></el-input>
           </el-form-item>
-          <el-form-item label="不合规应对措施" class="add-form-item" >
+          <el-form-item label="不合规应对措施" class="add-form-item">
             <el-input
-                v-model="batchEditForm.countermeasures"
-                placeholder="请输入不合规应对措施"
+              v-model="batchEditForm.countermeasures"
+              placeholder="请输入不合规应对措施"
             ></el-input>
           </el-form-item>
-          <el-form-item label="完成时间" class="add-form-item" >
+          <el-form-item label="完成时间" class="add-form-item">
             <el-date-picker
-                v-model="batchEditForm.completionTime"
-                type="date"
-                placeholder="选择日期">
+              v-model="batchEditForm.completionTime"
+              type="date"
+              placeholder="选择日期">
             </el-date-picker>
           </el-form-item>
           <br>
           <el-divider><span><b>在产产品</b></span></el-divider>
-          <el-formItem label="合规原因" class="add-form-item" >
+          <el-formItem label="合规原因" class="add-form-item">
             <el-input
-                v-model="batchEditForm.zcComplianceReasons"
-                placeholder="请输入合规原因"
+              v-model="batchEditForm.zcComplianceReasons"
+              placeholder="请输入合规原因"
             ></el-input>
           </el-formItem>
-          <el-form-item label="不合规项目" class="add-form-item" >
+          <el-form-item label="不合规项目" class="add-form-item">
             <el-input
-                v-model="batchEditForm.zcNoCompliance"
-                placeholder="请输入不合规项目"
+              v-model="batchEditForm.zcNoCompliance"
+              placeholder="请输入不合规项目"
             ></el-input>
           </el-form-item>
-          <el-form-item label="不合规应对措施" class="add-form-item" >
+          <el-form-item label="不合规应对措施" class="add-form-item">
             <el-input
-                v-model="batchEditForm.zcCountermeasures"
-                placeholder="请输入不合规应对措施"
+              v-model="batchEditForm.zcCountermeasures"
+              placeholder="请输入不合规应对措施"
             ></el-input>
           </el-form-item>
-          <el-form-item label="完成时间" class="add-form-item" >
+          <el-form-item label="完成时间" class="add-form-item">
             <el-date-picker
-                v-model="batchEditForm.zcCompletionTime"
-                type="date"
-                placeholder="选择日期">
+              v-model="batchEditForm.zcCompletionTime"
+              type="date"
+              placeholder="选择日期">
             </el-date-picker>
           </el-form-item>
         </el-form>
       </div>
       <div class="demo-drawer-footer">
-        <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveBatchEditForm">确定</el-button>
-        <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancelBatchEditForm">取消</el-button>
+        <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveBatchEditForm">
+          确定
+        </el-button>
+        <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancelBatchEditForm">取消
+        </el-button>
       </div>
     </el-drawer>
   </div>
@@ -433,7 +446,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import { inboundLiaisonDetail, saveTaskForPub ,changeAssigneeNew } from "api/process";
+import {inboundLiaisonDetail, saveTaskForPub, changeAssigneeNew} from "api/process";
 
 export default {
   name: "xmpg2Step6",
@@ -444,30 +457,33 @@ export default {
   },
   data() {
     return {
-      nodeList:[],
+      total: 0,
+      currentPage: 1,
+      pageSize: 20,
+      nodeList: [],
       isTransfer: false,
       // 调整处理人抽屉状态
       drawerModal: false,
       batchEditForm: {
         // 在研产品
         // 合规
-        complianceReasons :'',
+        complianceReasons: '',
         // 不合规
-        noCompliance :'',
+        noCompliance: '',
         // 应对措施
-        countermeasures :'',
+        countermeasures: '',
         // 完成时间
-        completionTime :'',
+        completionTime: '',
 
         // 在产产品
         // 合规
-        zcComplianceReasons :'',
+        zcComplianceReasons: '',
         // 不合规
-        zcNoCompliance:'',
+        zcNoCompliance: '',
         // 应对措施
-        zcCountermeasures:'',
+        zcCountermeasures: '',
         // 完成时间
-        zcCompletionTime:''
+        zcCompletionTime: ''
       },
       hasChildren: true,
       active: "1",
@@ -519,7 +535,7 @@ export default {
   },
   methods: {
     //确认转办
-    checkedTransferRole (data) {
+    checkedTransferRole(data) {
       this.assigneeNewLoading = true
       changeAssigneeNew({
         taskId: this.$route.query.taskIds, // 任务id
@@ -539,7 +555,7 @@ export default {
       })
     },
     // 请求转换流程图
-    processNum (row) {
+    processNum(row) {
       axios.request({
         url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
         responseType: 'blob',
@@ -554,7 +570,7 @@ export default {
       })
     },
     //转办事件
-    handleTransfer(){
+    handleTransfer() {
       this.drawerModal = true
       this.drawerTitle = '转办处理人'
       this.selectPeople = row
@@ -563,8 +579,8 @@ export default {
     saveBatchEditForm() {
 
       // console.log(this.selectList)
-      for( let a = 0; a < this.dataList.length; a++) {
-        for ( let b = 0; b < this.selectList.length; b++) {
+      for (let a = 0; a < this.dataList.length; a++) {
+        for (let b = 0; b < this.selectList.length; b++) {
           if (this.dataList[a].id === this.selectList[b]) {
             //合规
             this.dataList[a].complianceReasons = this.batchEditForm.complianceReasons
@@ -582,9 +598,9 @@ export default {
             this.dataList[a].zcCountermeasures = this.batchEditForm.zcCountermeasures
             //完成时间
             this.dataList[a].zcCompletionTime = this.batchEditForm.zcCompletionTime
-          }else {
-            for (let i=0;i<this.dataList[a].children.length;i++){
-              if (this.dataList[a].children[i].id === this.selectList[b]){
+          } else {
+            for (let i = 0; i < this.dataList[a].children.length; i++) {
+              if (this.dataList[a].children[i].id === this.selectList[b]) {
                 //合规
                 this.dataList[a].children[i].complianceReasons = this.batchEditForm.complianceReasons
                 //不合规
@@ -696,7 +712,6 @@ export default {
           pId: this.pId
         }).then(res => {
           if (res) {
-            console.log(res.mesg);
             const processForm = JSON.parse(res.mesg);
             this.getFormFieldList(processForm);
           }
@@ -713,15 +728,27 @@ export default {
           this.listForm.prcName = this.prcName;
           this.listForm["id"] = item.id;
           // this.listForm.dataList = item.dataList;
-          this.dataList = this.listForm.dataList;
-          console.log(this.dataList);
+          this.dataList = this.listForm.dataList[0].children
+          this.dataList.map(item => {
+            this.$set(item, 'standName', this.listForm.dataList[0].standName)
+            this.$set(item, 'standEnName', this.listForm.dataList[0].standEnName)
+            this.$set(item, 'standYear', this.listForm.dataList[0].standYear)
+            this.$set(item, 'standSort', this.listForm.dataList[0].standSort)
+            this.$set(item, 'standNumber', this.listForm.dataList[0].standNumber)
+          })
+          this.total = this.listForm.dataList[0].children.length;
         } else {
           this.listForm = item.form;
-          this.dataList = item.form.dataList;
+          this.dataList = item.form.dataList[0].children
+          this.total = item.form.dataList[0].children.length;
         }
 
       });
     },
+    // 分页
+    handleCurrentChange(currentPage) {
+      this.currentPage = currentPage;
+    },
     //保存事件
     handleSave() {
       this.saveLoading = true;
@@ -874,10 +901,12 @@ export default {
   .demo-drawer-content {
     margin-top: 10px;
   }
-  /deep/.el-table th > .cell{
+
+  /deep/ .el-table th > .cell {
     font-size: 12px;
   }
-  /deep/.el-table thead.is-group th{
+
+  /deep/ .el-table thead.is-group th {
     padding: 0px;
   }
 }

From a922336fc174480a845782c77a94427143ca024d Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Sun, 26 Sep 2021 15:00:59 +0800
Subject: [PATCH 10/21] =?UTF-8?q?=E5=BD=93=E5=89=8D=E7=9A=84=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=E6=98=AF=E4=B8=8D=E5=85=81=E8=AE=B8=E6=9B=B4=E6=94=B9?=
 =?UTF-8?q?=E7=88=B6=E7=BA=A7=E8=8A=82=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/config/pages/roleManage/index.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/config/pages/roleManage/index.vue b/src/pages/config/pages/roleManage/index.vue
index 88fb7c8ed..16ea6e2fd 100644
--- a/src/pages/config/pages/roleManage/index.vue
+++ b/src/pages/config/pages/roleManage/index.vue
@@ -195,7 +195,8 @@
                       placeholder="请输入角色名称"
                       clearable></el-input>
           </el-form-item>
-          <el-form-item label="上级角色" prop="parentId" label-width="100px" class="add-form-item">
+<!--          当前的需求是不允许更改父级节点-->
+          <el-form-item v-show="this.type === 1" label="上级角色" prop="parentId" label-width="100px" class="add-form-item">
             <el-input v-model="addForm.parentId" style="display: none;"
                       clearable></el-input>
             <el-input v-model="addForm.parent"

From e9336e0e52537b416ec548f0f9f302b7bbbec62e Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Sun, 26 Sep 2021 15:38:36 +0800
Subject: [PATCH 11/21] =?UTF-8?q?=20=E9=85=8D=E7=BD=AE=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E5=B1=9E=E6=80=A7=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?-=20=E6=96=B0=E5=A2=9E=E3=80=81=E7=BC=96=E8=BE=91=E9=83=BD?=
 =?UTF-8?q?=E5=81=9A=E5=BF=85=E5=A1=AB=E9=A1=B9=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../attributeCustom/components/stand.vue      | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/pages/config/pages/attributeCustom/components/stand.vue b/src/pages/config/pages/attributeCustom/components/stand.vue
index 0ea9cfe17..064c370f2 100644
--- a/src/pages/config/pages/attributeCustom/components/stand.vue
+++ b/src/pages/config/pages/attributeCustom/components/stand.vue
@@ -104,7 +104,7 @@
           label-width="150px"
         >
           <input v-model="attributeEO.id" v-show="false">
-          <el-form-item label="所属模块" class="add-form-item">
+          <el-form-item label="所属模块" prop="sarType" class="add-form-item">
             <el-select
               v-model="attributeEO.sarType"
               placeholder="请选择"
@@ -118,13 +118,13 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="属性字段"  class="add-form-item" :class="{'form-item-disabled': addOrEdit === 'edit'}">
+          <el-form-item label="属性字段" prop="attrField"  class="add-form-item" :class="{'form-item-disabled': addOrEdit === 'edit'}">
             <el-input v-model.trim="attributeEO.attrField" :disabled="addOrEdit === 'edit'" placeholder="请输入属性字段" clearable/>
           </el-form-item>
-          <el-form-item label="属性名称" class="add-form-item">
+          <el-form-item label="属性名称" prop="attrName" class="add-form-item">
             <el-input v-model.trim="attributeEO.attrName" placeholder="请输入属性名称" clearable/>
           </el-form-item>
-          <el-form-item label="属性类型" class="add-form-item" :class="{'form-item-disabled': addOrEdit === 'edit'}">
+          <el-form-item label="属性类型" prop="attrType" class="add-form-item" :class="{'form-item-disabled': addOrEdit === 'edit'}">
             <el-select v-model="attributeEO.attrType" placeholder="请选择" :disabled="addOrEdit === 'edit'" filterable>
               <el-option
                 v-for="item in attrTypeOptions"
@@ -134,7 +134,7 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="选项值"  class="add-form-item" v-if="attributeEO.attrType === 'SEL_OPTION' || attributeEO.attrType === 'SEL_OPTS'">
+          <el-form-item label="选项值" prop="selVal" class="add-form-item" v-if="attributeEO.attrType === 'SEL_OPTION' || attributeEO.attrType === 'SEL_OPTS'">
             <el-select v-model="attributeEO.selVal" placeholder="请选择"  filterable>
               <el-option
                 v-for="item in relateDicIdOptions"
@@ -149,18 +149,18 @@
           <!--                  <Option v-for="opt in isMustOptions" :key="opt.value" :value="opt.value">{{ opt.label }}</Option>-->
           <!--                </Select>-->
           <!--              </el-form-item>-->
-          <el-form-item label="字段长度" class="add-form-item">
+          <el-form-item label="字段长度" prop="attrLen" class="add-form-item">
             <el-input v-model.number="attributeEO.attrLen" :disabled="addOrEdit === 'edit'" placeholder="只允许输入正整数" number  :maxlength="4"/>
           </el-form-item>
-          <el-form-item label="展示顺序" class="add-form-item">
+          <el-form-item label="展示顺序" prop="orderNum" class="add-form-item">
             <el-input v-model.number="attributeEO.orderNum" placeholder="只允许输入正整数" number  :maxlength="3"/>
           </el-form-item>
-          <el-form-item label="是否必填"  class="add-form-item">
+          <el-form-item label="是否必填" prop="isMust" class="add-form-item">
             <el-select v-model="attributeEO.isMust">
               <el-option v-for="opt in isMustOptions" :key="opt.value" :value="opt.value" :label="opt.label">{{ opt.label }}</el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="是否展示" class="add-form-item">
+          <el-form-item label="是否展示" prop="isShowImp" class="add-form-item">
             <el-select v-model="attributeEO.isShowImp">
               <el-option
                 v-for="opt in isMustOptions"
@@ -170,7 +170,7 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="展示区域"  class="add-form-item" v-if="attributeEO.isShowImp === '0'">
+          <el-form-item label="展示区域" prop="showRegionId" class="add-form-item" v-if="attributeEO.isShowImp === '0'">
             <el-select v-model="attributeEO.showRegionId">
               <el-option
                 v-for="opt in showRegionOptions"

From 3357d049c8b2759f91d9db8c418558d8759467e2 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Sun, 26 Sep 2021 15:47:39 +0800
Subject: [PATCH 12/21] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzrk/step1.vue         | 26 ++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index a23a5d758..c2548b25e 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -1238,7 +1238,27 @@
             TreeSelectNew
         },
         data () {
-            return {
+          const validateQcdw = (rule, value, callback) => {
+            if(this.form.standInData === '0'){
+              if (value === null ||  value.length === 0) {
+                callback(new Error('请选择起草单位！'))
+              } else {
+                callback()
+              }
+            }
+            callback()
+          };
+          const validateCysd = (rule, value, callback) => {
+            if(this.form.standInData === '0'){
+              if (value === '') {
+                callback(new Error('请选择我司参与深度！'))
+              } else {
+                callback()
+              }
+            }
+            callback()
+          }
+          return {
               fileList: [],
               caFileList: [],
               FBGBJBDFileList: [],
@@ -1477,10 +1497,10 @@
                         { required: true, message: '请选择标准发布日期', trigger: 'change' }
                     ],
                     qcdw: [
-                        { required: true, message: '请选择起草单位', trigger: 'change' }
+                        { required: true, message: '请选择起草单位', validator: validateQcdw, trigger: 'change' }
                     ],
                     cysd: [
-                        { required: true, message: '请选择我司参与深度', trigger: 'change' }
+                        { required: true, message: '请选择我司参与深度', validator: validateCysd, trigger: 'change' }
                     ],
                 },
                 zrUserIds: [], // 选择多个会签责任人

From 5999bb94943f826403f04c5128eb4bc97ee804cd Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Sun, 26 Sep 2021 16:14:57 +0800
Subject: [PATCH 13/21] =?UTF-8?q?=20=E9=85=8D=E7=BD=AE=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E5=B1=9E=E6=80=A7=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?-=E5=B1=95=E7=A4=BA=E5=8C=BA=E5=9F=9F=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E4=BF=AE=E6=94=B9=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E5=90=8E=E6=8F=90=E4=BA=A4=E5=87=BA=E7=8E=B0=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?=E5=8F=B7=E7=9A=84=E6=8F=90=E7=A4=BA=20=E5=BA=94=E8=AF=A5?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=8F=90=E7=A4=BA=E7=9B=B4=E6=8E=A5=E8=83=BD?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=90=E5=8A=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/config/pages/attributeCustom/components/stand.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/config/pages/attributeCustom/components/stand.vue b/src/pages/config/pages/attributeCustom/components/stand.vue
index 064c370f2..e2b1d1dc8 100644
--- a/src/pages/config/pages/attributeCustom/components/stand.vue
+++ b/src/pages/config/pages/attributeCustom/components/stand.vue
@@ -269,7 +269,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="排序号" prop="showIndex" class="add-form-item">
-          <el-input v-model="displayLocationDialogFormData.showIndex" placeholder="请输入排序号"></el-input>
+          <el-input v-model.number="displayLocationDialogFormData.showIndex" placeholder="请输入排序号"></el-input>
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -333,7 +333,7 @@ export default {
         showIndex: [
           { required: true, message: '排序号不能为空且为正整数', trigger: 'blur'},
           { type: 'string', validator: this.verify.validStandNumInCompile2, trigger: 'blur'},
-          { min: 0, max: 999, message: '请输入0-999之间的整数', trigger: 'blur' }
+          { type: 'number', min: 0, max: 999, message: '请输入0-999之间的整数', trigger: 'blur' }
         ]
       },
       attributeDataLoading: false,

From c4a1137a2932a5d8ea411dd60021d9a99577bde7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Sun, 26 Sep 2021 16:58:20 +0800
Subject: [PATCH 14/21] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E9=80=89=E4=B8=AD?=
 =?UTF-8?q?=E7=AC=AC=E4=B8=80=E4=B8=AA=E8=8A=82=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/config/pages/mechanismManage/index.vue | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/pages/config/pages/mechanismManage/index.vue b/src/pages/config/pages/mechanismManage/index.vue
index 657381bd8..db6253225 100644
--- a/src/pages/config/pages/mechanismManage/index.vue
+++ b/src/pages/config/pages/mechanismManage/index.vue
@@ -12,6 +12,8 @@
           :data="treeData"
           :props="defaultProps"
           default-expand-all
+          :current-node-key="nodeKeyId"
+          node-key="id"
           :filter-node-method="filterNode"
           highlight-current
           ref="tree"
@@ -166,6 +168,7 @@ export default {
   name: 'MechanismManage',
   data () {
     return {
+      nodeKeyId:'',
       searchForm: {
         uname:"",
         email:""
@@ -279,8 +282,12 @@ export default {
         _this: this,
         loading: 'treeLoading'
       }, res => {
-        console.log(res);
         this.treeData = res.data
+        console.log(this.treeData);
+        this.nodeKeyId = this.treeData[0].id
+        this.$nextTick(function () {
+          this.$refs.tree.setCurrentKey(this.nodeKeyId)
+        })
         this.id = res.data[0].id
         this.getData()
       }, e => {

From c0fd82980ac0ed5bbd4db7cf15d7a72201cc9179 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Mon, 27 Sep 2021 11:26:18 +0800
Subject: [PATCH 15/21] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=E8=87=AA=E5=AE=9A=E4=B9=89=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../attributeCustom/components/stand.vue      | 85 +++++++++----------
 1 file changed, 42 insertions(+), 43 deletions(-)

diff --git a/src/pages/config/pages/attributeCustom/components/stand.vue b/src/pages/config/pages/attributeCustom/components/stand.vue
index e2b1d1dc8..0d1d711d4 100644
--- a/src/pages/config/pages/attributeCustom/components/stand.vue
+++ b/src/pages/config/pages/attributeCustom/components/stand.vue
@@ -2,8 +2,8 @@
 <template>
   <div class="attribute-custom v-class">
     <div class="action-bar1">
-      <el-button class="common-button-primary add-button" size="mini" v-btn-permission="''" type="primary" @click="showAddModel"><i class="iconfont">&#xe84e;</i>新增</el-button>
-      <el-button class="common-button-default" size="small" v-btn-permission="''" @click="showDisplayLocationDialog">展示区域管理</el-button>
+      <el-button size="mini" style="margin-right: 5px" class="common-button-primary add-button"  type="primary" @click="showAddModel"><i class="iconfont">&#xe84e;</i>新增</el-button>
+      <el-button size="small" class="common-button-default"  @click="showDisplayLocationDialog">展示区域管理</el-button>
     </div>
     <loading :loading="attributeDataLoading">数据处理中</loading>
     <div class="content">
@@ -74,16 +74,16 @@
           <template slot-scope="scope">
             <div @click.stop style="display: inline-block">
               <el-dropdown trigger="click" @command="handleCommand">
-<i class="iconfont">&#xe61e;</i>
+                <i class="iconfont">&#xe61e;</i>
                 <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item v-btn-permission="''" :command="[scope.row, '编辑']">编辑</el-dropdown-item>
-                  <el-dropdown-item v-btn-permission="''" :disabled="scope.row.isEdit==='1'" :command="[scope.row, '删除']">删除</el-dropdown-item>
+                  <el-dropdown-item v-btn-permission="'PTH96GYZT6SQZE9H8XCF'" :command="[scope.row, '编辑']">编辑</el-dropdown-item>
+                  <el-dropdown-item :disabled="scope.row.isEdit==='1'" :command="[scope.row, '删除']">删除</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
             </div>
           </template>
         </el-table-column>
-    </el-table>
+      </el-table>
     </div>
     <pagination :total="total" :pageChange="pageNo" :pageSizeChange="pageSize" @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
     <!-- 新建抽屉-->
@@ -118,7 +118,7 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="属性字段" prop="attrField"  class="add-form-item" :class="{'form-item-disabled': addOrEdit === 'edit'}">
+          <el-form-item label="属性字段" prop="attrField" class="add-form-item" :class="{'form-item-disabled': addOrEdit === 'edit'}">
             <el-input v-model.trim="attributeEO.attrField" :disabled="addOrEdit === 'edit'" placeholder="请输入属性字段" clearable/>
           </el-form-item>
           <el-form-item label="属性名称" prop="attrName" class="add-form-item">
@@ -135,7 +135,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="选项值" prop="selVal" class="add-form-item" v-if="attributeEO.attrType === 'SEL_OPTION' || attributeEO.attrType === 'SEL_OPTS'">
-            <el-select v-model="attributeEO.selVal" placeholder="请选择"  filterable>
+            <el-select v-model="attributeEO.selVal" placeholder="请选择" :disabled="addOrEdit === 'edit'" filterable>
               <el-option
                 v-for="item in relateDicIdOptions"
                 :label="item.label"
@@ -188,8 +188,8 @@
         </el-form>
       </div>
       <div id="roleFormButton" class="demo-drawer-footer">
-        <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveInfo()">提交</el-button>
-        <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancelModel">取消</el-button>
+        <el-button round class="common-button-primary" icon="el-icon-check" type="primary" @click="saveInfo()">提交</el-button>
+        <el-button round class="common-button-default" icon="el-icon-close" @click="cancelModel">取消</el-button>
       </div>
     </el-drawer>
 
@@ -199,7 +199,7 @@
       width="400px"
     >
       <div style="margin-bottom: 10px;">
-        <el-button size="mini" class="common-button-primary add-button" v-btn-permission="'e128da8f053dd19113e75772f2c70f29'" type="primary" icon="add" @click="showAddDisplayLocationDialog(undefined)">新增</el-button>
+        <el-button round class="common-button-primary add-button" type="primary" icon="add" @click="showAddDisplayLocationDialog(undefined)">新增</el-button>
       </div>
       <el-table
         :loading="displayLocationDialogTableConfig.loading"
@@ -228,10 +228,10 @@
           <template slot-scope="scope">
             <div @click.stop style="display: inline-block">
               <el-dropdown trigger="click" @command="handleCommand2">
-<i class="iconfont">&#xe61e;</i>
+                <i class="iconfont">&#xe61e;</i>
                 <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item v-btn-permission="'2a788bca1cca66384e97f8ff722d4232'" :command="[scope.row, '修改']">修改</el-dropdown-item>
-                  <el-dropdown-item v-btn-permission="'116a3f339f3600e639271d0073045912'" :disabled="scope.row.validFlag===1" :command="[scope.row, '删除']">删除</el-dropdown-item>
+                  <el-dropdown-item :command="[scope.row, '修改']">修改</el-dropdown-item>
+                  <el-dropdown-item :disabled="scope.row.validFlag===1" :command="[scope.row, '删除']">删除</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
             </div>
@@ -273,8 +273,8 @@
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button size="mini" class="common-button-default" @click="handleDisplayLocationFormDialogReset('displayLocationDialogForm')">取 消</el-button>
-        <el-button size="mini" class="common-button-primary" type="primary" @click="handleDisplayLocationFormDialogSubmit('displayLocationDialogForm')">确 定</el-button>
+        <el-button round class="common-button-default" @click="handleDisplayLocationFormDialogReset('displayLocationDialogForm')">取 消</el-button>
+        <el-button round class="common-button-primary" type="primary" @click="handleDisplayLocationFormDialogSubmit('displayLocationDialogForm')">确 定</el-button>
       </span>
     </el-dialog>
   </div>
@@ -319,7 +319,6 @@ export default {
       },
       displayLocationDialogFormData: {
         areaName: '',
-        sarType: '',
         showIndex: ''
       },
       displayLocationDialogFormRules: {
@@ -331,8 +330,7 @@ export default {
           {required: true, message: '所属模块不能为空', trigger: 'change'}
         ],
         showIndex: [
-          { required: true, message: '排序号不能为空且为正整数', trigger: 'blur'},
-          { type: 'string', validator: this.verify.validStandNumInCompile2, trigger: 'blur'},
+          { type: 'number', required: true, message: '请输入排序号', trigger: 'blur' },
           { type: 'number', min: 0, max: 999, message: '请输入0-999之间的整数', trigger: 'blur' }
         ]
       },
@@ -353,7 +351,7 @@ export default {
         showRegionId: '',
         selVal: '',
         isSearch: '1',
-        sarType: 'STAND',
+        sarType: '',
         isWarn: '1'
       },
       attrTypeOptions: [
@@ -461,7 +459,7 @@ export default {
       this.$confirm('确认删除该条数据？', {
         title: '确认删除',
         confirmButtonClass: 'common-button-primary',
-        roundButton: false,
+        roundButton: true,
         callback: (action, instance) => {
           if (action === 'confirm') {
             const {id} = data
@@ -561,7 +559,7 @@ export default {
     queryDisplayLocationList (sarType) {
       return new Promise((resolve, reject) => {
         this.$http.get('lawssBase/utArea/getAreaList', {
-          sarType: sarType
+          sarType: sarType || 'INLAND_STAND'
         }, {
           _this: this
         }, res => {
@@ -589,17 +587,17 @@ export default {
     },
     getAttrByPage () {
       this.$http.get('lawss/sarStandAttrDetails/page', {
-        page: this.pageNo,
-        pageSize: this.pageSize,
-        sarType: this.sarType
-      }, {
-        _this: this,
-        loading: 'attributeDataLoading'
-      },
-      res => {
-        this.attributeList = res.data.list
-        this.total = res.data.count
-      }, e => {})
+          page: this.pageNo,
+          pageSize: this.pageSize,
+          sarType: this.sarType
+        }, {
+          _this: this,
+          loading: 'attributeDataLoading'
+        },
+        res => {
+          this.attributeList = res.data.list
+          this.total = res.data.count
+        }, e => {})
       this.$refs.selections.clearSelection()
     },
     async showAddModel () {
@@ -609,7 +607,6 @@ export default {
       this.addOrEdit = 'add'
       this.attributeTitle = '新增'
       this.showInfoModal = true
-      this.attributeEO = {}
       this.$nextTick(() => {
         this.$refs['attributeEO'].resetFields()
       })
@@ -660,7 +657,7 @@ export default {
         this.$confirm('确认删除选中数据？', {
           title: '提示',
           confirmButtonClass: 'common-button-primary',
-          roundButton: false,
+          roundButton: true,
           callback: (action, instance) => {
             if (action === 'confirm') {
               this.$http.put('lawss/sarStandAttrDetails/deleteByIds', {
@@ -679,13 +676,13 @@ export default {
     },
     getDictionarySelList () {
       this.$http.get('sys/dictionary/getDictionaryCodeSelList', {
-        sarType: this.sarType
-      }, {
-        _this: this
-      },
-      res => {
-        this.relateDicIdOptions = res.data
-      }, e => {})
+          sarType: this.sarType
+        }, {
+          _this: this
+        },
+        res => {
+          this.relateDicIdOptions = res.data
+        }, e => {})
     },
     getAttrTypeText (type) {
       let texts = ''
@@ -725,7 +722,9 @@ export default {
       this.addOrEdit = 'edit'
       this.attributeTitle = '编辑'
       this.showInfoModal = true
-      this.attributeEO = JSON.parse(JSON.stringify(params))
+      this.$nextTick(() => {
+        this.attributeEO = JSON.parse(JSON.stringify(params))
+      })
     },
     handleTableDelete (params) {
       this.selectedList = []

From 8c953d4c578e4ec48893419ad938f3c6483da81f Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Mon, 27 Sep 2021 11:30:50 +0800
Subject: [PATCH 16/21] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E5=B1=9E=E6=80=A7=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?-=20=E6=96=B0=E5=A2=9E=E3=80=81=E7=BC=96=E8=BE=91=E9=83=BD?=
 =?UTF-8?q?=E5=81=9A=E5=BF=85=E5=A1=AB=E9=A1=B9=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/attributeCustom/components/stand.vue   | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/pages/config/pages/attributeCustom/components/stand.vue b/src/pages/config/pages/attributeCustom/components/stand.vue
index 0d1d711d4..72c7c39fa 100644
--- a/src/pages/config/pages/attributeCustom/components/stand.vue
+++ b/src/pages/config/pages/attributeCustom/components/stand.vue
@@ -76,7 +76,7 @@
               <el-dropdown trigger="click" @command="handleCommand">
                 <i class="iconfont">&#xe61e;</i>
                 <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item v-btn-permission="'PTH96GYZT6SQZE9H8XCF'" :command="[scope.row, '编辑']">编辑</el-dropdown-item>
+                  <el-dropdown-item :command="[scope.row, '编辑']">编辑</el-dropdown-item>
                   <el-dropdown-item :disabled="scope.row.isEdit==='1'" :command="[scope.row, '删除']">删除</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
@@ -188,8 +188,8 @@
         </el-form>
       </div>
       <div id="roleFormButton" class="demo-drawer-footer">
-        <el-button round class="common-button-primary" icon="el-icon-check" type="primary" @click="saveInfo()">提交</el-button>
-        <el-button round class="common-button-default" icon="el-icon-close" @click="cancelModel">取消</el-button>
+        <el-button class="common-button-primary" icon="el-icon-check" type="primary" @click="saveInfo()">提交</el-button>
+        <el-button class="common-button-default" icon="el-icon-close" @click="cancelModel">取消</el-button>
       </div>
     </el-drawer>
 
@@ -199,7 +199,7 @@
       width="400px"
     >
       <div style="margin-bottom: 10px;">
-        <el-button round class="common-button-primary add-button" type="primary" icon="add" @click="showAddDisplayLocationDialog(undefined)">新增</el-button>
+        <el-button class="common-button-primary add-button" type="primary" icon="add" @click="showAddDisplayLocationDialog(undefined)">新增</el-button>
       </div>
       <el-table
         :loading="displayLocationDialogTableConfig.loading"
@@ -273,8 +273,8 @@
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button round class="common-button-default" @click="handleDisplayLocationFormDialogReset('displayLocationDialogForm')">取 消</el-button>
-        <el-button round class="common-button-primary" type="primary" @click="handleDisplayLocationFormDialogSubmit('displayLocationDialogForm')">确 定</el-button>
+        <el-button class="common-button-default" @click="handleDisplayLocationFormDialogReset('displayLocationDialogForm')">取 消</el-button>
+        <el-button class="common-button-primary" type="primary" @click="handleDisplayLocationFormDialogSubmit('displayLocationDialogForm')">确 定</el-button>
       </span>
     </el-dialog>
   </div>
@@ -459,7 +459,7 @@ export default {
       this.$confirm('确认删除该条数据？', {
         title: '确认删除',
         confirmButtonClass: 'common-button-primary',
-        roundButton: true,
+        roundButton: false,
         callback: (action, instance) => {
           if (action === 'confirm') {
             const {id} = data
@@ -657,7 +657,7 @@ export default {
         this.$confirm('确认删除选中数据？', {
           title: '提示',
           confirmButtonClass: 'common-button-primary',
-          roundButton: true,
+          roundButton: false,
           callback: (action, instance) => {
             if (action === 'confirm') {
               this.$http.put('lawss/sarStandAttrDetails/deleteByIds', {

From f81ab35af54ef691be092e320ef50f7c13a3233a Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Mon, 27 Sep 2021 11:51:20 +0800
Subject: [PATCH 17/21] =?UTF-8?q?=E8=AF=A6=E6=83=85=20=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/details/otherStandardDetails/index.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 008854ce6..80504faf1 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -2883,9 +2883,9 @@
         const dynamicFormField = standEO ? standEO.attrInfoMap : {}
         formFieldList.forEach((field) => {
           // 相关流程权限
-          if (field.attrField === 'XGLC' && !this.$_has('6A52PZCAX8BAUUJ2TSQ4')) {
-            return
-          }
+          // if (field.attrField === 'XGLC' && !this.$_has('6A52PZCAX8BAUUJ2TSQ4')) {
+          //   return
+          // }
           displayLocation.forEach((location) => {
             location.isShowImp = '0'
             if (dynamicFormField) {

From 57959deded037fcbfc3ba6a1c9822e36f2b31844 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Mon, 27 Sep 2021 14:18:15 +0800
Subject: [PATCH 18/21] commit

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

diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
index afe271d7d..14a1d2888 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
@@ -569,7 +569,7 @@
               style="width: 100%"
               border
               ref="table"
-              height="100%"
+              height="90%"
               :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
               @selection-change="selectThree"

From 94829a1d52b3495a487eca7655b5e9b83d5683f2 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Mon, 27 Sep 2021 14:58:31 +0800
Subject: [PATCH 19/21] commit

---
 .../standardForComments/pags/consultationDetails.vue            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
index a11b88d1f..741a5976c 100644
--- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
@@ -389,7 +389,7 @@ export default {
       })
     },
     handleQueryPdf(file){
-      window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + file.id))
+      window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + file.attId))
     }
   },
   mounted() {

From dc999348547bf88f15be5e85660a4292a947fde0 Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Mon, 27 Sep 2021 15:06:23 +0800
Subject: [PATCH 20/21] =?UTF-8?q?=E6=B8=85=E5=8D=95=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../accessStandardsAndRegulations/page/listOfCountries.vue   | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
index 8a2829bbf..559b588d5 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
@@ -374,18 +374,15 @@ export default {
       });
     }
   },
-  created() {
-    this.searchSarAccess();
-  },
   mounted() {
     // 分页查询数据
-    this.searchSarAccess();
     // 从数据库中查询各下拉框数据
     this.$http.get("sys/dictype/getDicTypeListCode", "", {
       _this: this
     }, res => {
       this.countryOptions = res.data.COUNTRY;
       this.setMap(this.countryOptions);
+      this.searchSarAccess();
     }, e => {
     });
   }

From a8bcbd16dc88026affbedb072c2631fe492727fe Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Mon, 27 Sep 2021 15:38:18 +0800
Subject: [PATCH 21/21] commit

---
 src/pages/searchCenter/pages/standardSearch.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue
index f2e3f566c..0285c1bb9 100644
--- a/src/pages/searchCenter/pages/standardSearch.vue
+++ b/src/pages/searchCenter/pages/standardSearch.vue
@@ -243,7 +243,7 @@
                                     <div class="AllBoxTitle">
                                         <span v-html="item.indexType === 'stand' ? '国内标准法规' : (item.indexType === 'FOREIGN' ? '海外标准法规' : (item.indexType === 'laws' ? '国内外政策' : (item.indexType === 'bussstand' ? '企业标准' : (item.indexType === 'items' ? '数据化条目' : '动态&资料'))))" class="typetext"></span>
                                         <span style="cursor:pointer;" class="AllBoxText" v-html="item.title" @click="toPage(item)"></span>
-                                        <span @click="checkItems(item)" class="more" style="cursor: pointer; position: absolute; right: 5px;">更多</span>
+                                        <span @click="checkItems(item)" class="more" style="cursor: pointer; position: absolute; right: 5px;">详情</span>
                                     </div>
                                     <div class="AllBoxContent" v-html="item.textContent"></div>
                                     <div v-if="item.indexType !== 'items' && item.indexType !== 'msgdyinfo'" class="AllTime">