From 1218e89e57e5af3ae39762b28300d9472620b63c Mon Sep 17 00:00:00 2001
From: "wangxiahui@91isoft.com" <140316hui>
Date: Fri, 17 Dec 2021 11:26:05 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E5=8F=82=E4=BC=9A=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E7=AC=AC=E4=BA=8C=E6=AD=A5=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue
index f826a4d4f..8721d1575 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue
@@ -2,7 +2,7 @@
   <div class="bzchStep2">
     <ProcessHeader toggle>
       <template slot="proName">外部标准化协会参会流程</template>
-      <template slot="proNode">参会人员确认</template>
+      <template slot="proNode">提名入会代表</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

From 594ff6c282c65700b6d207b6cd7c2d3f328d9c37 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Fri, 17 Dec 2021 13:57:40 +0800
Subject: [PATCH 2/8] commit

---
 .../pages/creatProcess/bzzqyj/step3.vue        |  1 +
 .../pages/creatProcess/bzzqyj/step4.vue        |  1 +
 .../pags/consultationDetails.vue               | 18 ++++++++++++++++--
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
index 9def032ea..ae13ebd5d 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
@@ -574,6 +574,7 @@
                     id: id,
                     department: this.$store.getters.userInfo.upDeptName,
                     responUserName: this.$store.getters.userInfo.userName,
+                    responUser: this.$store.getters.userInfo.userId
                 }
                 this.data.push(json)
                 this.itemId = id
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
index f6513b873..4cf7f6896 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
@@ -496,6 +496,7 @@ export default {
         id: id,
         department: this.$store.getters.userInfo.upDeptName,
         responUserName: this.$store.getters.userInfo.userName,
+        responUser: this.$store.getters.userInfo.userId
       }
       this.data.push(json)
       this.itemId = id
diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
index 55900ad98..def0339eb 100644
--- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
@@ -35,7 +35,12 @@
                       @click="handleQueryPdf(file)"
                       :key="item">
                {{ file.name }}
-                    <el-button  type="primary" class="common-button-primary" size="mini" @click="downloadFile(file.attId)">下载</el-button>
+                  <el-button
+                          size="small"
+                          @click="downloadFile(file.attId)"
+                          icon="el-icon-download"
+                          style="height: 32px; margin-left: 5px;"
+                  ></el-button>
              </div>
             </div>
           </div>
@@ -51,7 +56,12 @@
                    @click="handleQueryPdf(file)"
                    :key="item">
                 {{ file.name }}
-                <el-button  type="primary" class="common-button-primary" size="mini" @click="downloadFile(file.attId)">下载</el-button>
+                <el-button
+                        size="small"
+                        @click="downloadFile(file.attId)"
+                        icon="el-icon-download"
+                        style="height: 32px; margin-left: 5px;"
+                ></el-button>
               </div>
             </div>
           </div>
@@ -73,6 +83,7 @@
         添加
       </el-button>
       <el-button type="primary" class="common-button-primary" size="mini"  @click="exportAll">导出</el-button>
+      <el-button type="primary" class="common-button-primary" size="mini"  @click="exportAll1">导出上报意见</el-button>
     </div>
     <div class="container">
       <el-table
@@ -309,6 +320,9 @@ export default {
     exportAll() {
       window.open('/api/slrs/sar-public-idea-all/tuallStand?cid=' + this.$route.query.item.cid)
     },
+    exportAll1() {
+      window.open('/api/slrs/sar-public-idea-all/tuallStand?type=1&cid=' + this.$route.query.item.id)
+    },
     getIdeaKey() {
       this.$http.get('slrs/sar-public-idea-all/checkIsShow', {
         endTime: this.form.endTime

From 1598241c8415cc69827d20e71d35f950576e92c2 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Fri, 17 Dec 2021 14:21:22 +0800
Subject: [PATCH 3/8] commit

---
 src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue | 2 +-
 src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue   | 2 +-
 src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
index df47e84dc..82dc0dcc3 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
@@ -723,7 +723,7 @@ export default {
     // 分页每页显示数改变后方法
     pageSizeChange(pageSize) {
       this.$store.getters.userInfo.configContent = pageSize
-      this.standCommonlySearch.size = pageSize
+      this.standCommonlySearch.pageSize = pageSize
       this.sarStandCompareHis()
     },
     /** 选择带入数据的方法操作
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
index a7f8eb4a7..e101cda51 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
@@ -719,7 +719,7 @@ export default {
     // 分页每页显示数改变后方法
     pageSizeChange(pageSize) {
       this.$store.getters.userInfo.configContent = pageSize
-      this.standCommonlySearch.size = pageSize
+      this.standCommonlySearch.pageSize = pageSize
       this.sarStandCompareHis()
     },
     /** 选择带入数据的方法操作
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue
index 24ba96755..05498d049 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue
@@ -503,6 +503,7 @@
                         this.form.modelList = data.modelList
                         this.form.modelNameList = data.modelNameList
                         this.form.bzfgId = data.bzfgId || ''
+                        this.form.bzfgName = data.bzfgName || ''
                         this.json = data
                         this.data = data.info || data.data
                     }).catch(e => {

From 351fe348d2fabbff8029d89e231d61bc7df1a373 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Fri, 17 Dec 2021 14:26:17 +0800
Subject: [PATCH 4/8] commit

---
 src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue | 2 +-
 src/pages/processCenter/pages/creatProcess/bzjd/step1.vue   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
index fd96c045c..39558d208 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
@@ -625,7 +625,7 @@
             },
             // 搜索
             sarStandCompareHisInfo() {
-                this.splitInfoPage = 1
+                this.standCommonlySearch.page = 1
                 this.sarStandCompareHis()
             },
             // 查询表格
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
index 27d9b6888..45ddda2dd 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
@@ -640,7 +640,7 @@ export default {
     },
     // 搜索
     sarStandCompareHisInfo() {
-      this.splitInfoPage = 1
+      this.standCommonlySearch.page = 1
       this.sarStandCompareHis()
     },
     // 查询表格

From 68d1eebf1fd3eca3a085a60e8050f187873fdb29 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Fri, 17 Dec 2021 14:39:59 +0800
Subject: [PATCH 5/8] commit

---
 src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue | 5 +----
 src/pages/processCenter/pages/creatProcess/bzjd/step1.vue   | 5 +----
 src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue | 6 +++---
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
index 39558d208..7d26ebcf5 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
@@ -617,10 +617,7 @@
             // 清空
             clearSearchStand () {
                 this.standCommonlySearch.page = 1
-                this.standCommonlySearch.start = ''
-                this.standCommonlySearch.end = ''
-                this.standCommonlySearch.categorg = ''
-                this.standCommonlySearch.cname = ''
+                this.standCommonlySearch.numOrName = ''
                 this.sarStandCompareHis()
             },
             // 搜索
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
index 45ddda2dd..8c9279251 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
@@ -632,10 +632,7 @@ export default {
     // 清空
     clearSearchStand() {
       this.standCommonlySearch.page = 1
-      this.standCommonlySearch.start = ''
-      this.standCommonlySearch.end = ''
-      this.standCommonlySearch.categorg = ''
-      this.standCommonlySearch.cname = ''
+      this.standCommonlySearch.numOrName = ''
       this.sarStandCompareHis()
     },
     // 搜索
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
index ae13ebd5d..aa41eeffa 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
@@ -703,9 +703,9 @@
                         } else {
                             this.form.fjListId = data.fjListId || data.form.fjListId
                         }
-                        this.form.textType = data.textType
-                        this.form.modelList = data.modelList
-                        this.form.modelNameList = data.modelNameList
+                        this.form.textType = data.textType || data.form.textType
+                        this.form.modelList = data.modelList || data.form.modelList
+                        this.form.modelNameList = data.modelNameList || data.form.modelNameList
                         this.form.cid = data.cid || data.form.cid
                         this.form.endTime = data.endTime || data.form.endTime
                         this.todoId = res.id

From 07c8850852b283c32abec02b729ab78e69817eb1 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Fri, 17 Dec 2021 14:45:29 +0800
Subject: [PATCH 6/8] commit

---
 .../processCenter/pages/creatProcess/bzzqyj/step4-1.vue     | 6 +++---
 .../processCenter/pages/creatProcess/bzzqyj/step4-2.vue     | 6 +++---
 src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue | 6 +++---
 src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue | 6 +++---
 src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue | 6 +++---
 src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue | 6 +++---
 src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue | 6 +++---
 src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue | 6 +++---
 8 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue
index 05498d049..285a5407a 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue
@@ -499,9 +499,9 @@
                         this.form.cid = data.cid || data.form.cid
                         this.form.endTime = data.endTime || data.form.endTime
                         this.form.cname = data.cname || data.form.cname
-                        this.form.textType = data.textType
-                        this.form.modelList = data.modelList
-                        this.form.modelNameList = data.modelNameList
+                        this.form.textType = data.textType || data.form.textType
+                        this.form.modelList = data.modelList || data.form.modelList
+                        this.form.modelNameList = data.modelNameList || data.form.modelNameList
                         this.form.bzfgId = data.bzfgId || ''
                         this.form.bzfgName = data.bzfgName || ''
                         this.json = data
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue
index 9bbcc251c..93d76a563 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue
@@ -483,9 +483,9 @@
                         this.form.cid = data.cid || data.form.cid
                         this.form.endTime = data.endTime || data.form.endTime
                         this.form.cname = data.cname || data.form.cname
-                        this.form.textType = data.textType
-                        this.form.modelList = data.modelList
-                        this.form.modelNameList = data.modelNameList
+                        this.form.textType = data.textType || data.form.textType
+                        this.form.modelList = data.modelList || data.form.modelList
+                        this.form.modelNameList = data.modelNameList || data.form.modelNameList
                         this.form.bzfgId = data.bzfgId || ''
                         this.json = data
                         this.data = data.info || data.data
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
index 4cf7f6896..a7f964180 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
@@ -693,9 +693,9 @@ export default {
           this.form.cid = data.cid || data.form.cid
           this.form.endTime = data.endTime || data.form.endTime
           this.form.cname = data.cname || data.form.cname
-          this.form.textType = data.textType
-          this.form.modelList = data.modelList
-          this.form.modelNameList = data.modelNameList
+          this.form.textType = data.textType || data.form.textType
+          this.form.modelList = data.modelList || data.form.modelList
+          this.form.modelNameList = data.modelNameList || data.form.modelNameList
           this.form.spId = data.spId || ''
           this.form.spName = data.spName || ''
           this.json = data
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
index dc18ccf8b..d3223b404 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
@@ -607,9 +607,9 @@
             this.form.cid = data.cid || data.form.cid;
             this.form.endTime = data.endTime || data.form.endTime;
             this.form.cname = data.cname || data.form.cname;
-            this.form.textType = data.textType
-            this.form.modelList = data.modelList
-            this.form.modelNameList = data.modelNameList
+            this.form.textType = data.textType || data.form.textType
+            this.form.modelList = data.modelList || data.form.modelList
+            this.form.modelNameList = data.modelNameList || data.form.modelNameList
             // this.oldData = JSON.parse(JSON.stringify(data.summaryList))
             // console.log(data);
             // data.summaryList.forEach(item => {
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
index b89f1b7f6..a626da29e 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
@@ -540,9 +540,9 @@ export default {
             }
           })
           this.json = data
-          this.form.textType = data.textType
-          this.form.modelList = data.modelList
-          this.form.modelNameList = data.modelNameList
+          this.form.textType = data.textType || data.form.textType
+          this.form.modelList = data.modelList || data.form.modelList
+          this.form.modelNameList = data.modelNameList || data.form.modelNameList
           this.data = arr
         }).catch(e => {
         });
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
index 4d0bb709f..7cac24107 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
@@ -536,9 +536,9 @@ export default {
               arr.push(item)
             }
           })
-          this.form.textType = data.textType
-          this.form.modelList = data.modelList
-          this.form.modelNameList = data.modelNameList
+          this.form.textType = data.textType || data.form.textType
+          this.form.modelList = data.modelList || data.form.modelList
+          this.form.modelNameList = data.modelNameList || data.form.modelNameList
           this.json = data
           this.data = arr
         }).catch(e => {
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
index d8ebf13aa..7e49ab043 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
@@ -537,9 +537,9 @@ export default {
             }
           })
           this.json = data
-          this.form.textType = data.textType
-          this.form.modelList = data.modelList
-          this.form.modelNameList = data.modelNameList
+          this.form.textType = data.textType || data.form.textType
+          this.form.modelList = data.modelList || data.form.modelList
+          this.form.modelNameList = data.modelNameList || data.form.modelNameList
           this.data = arr
         }).catch(e => {
         })
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
index 188fd08a2..7c17f52f5 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
@@ -537,9 +537,9 @@ export default {
             }
           })
           this.json = data
-          this.form.textType = data.textType
-          this.form.modelList = data.modelList
-          this.form.modelNameList = data.modelNameList
+          this.form.textType = data.textType || data.form.textType
+          this.form.modelList = data.modelList || data.form.modelList
+          this.form.modelNameList = data.modelNameList || data.form.modelNameList
           this.data = arr
         }).catch(e => {
         });

From 9805f424ea9a1cff0f5213ad6ce82e4e5de51aec Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Fri, 17 Dec 2021 16:01:26 +0800
Subject: [PATCH 7/8] commit

---
 src/components/mechanismTree/index.vue        |  3 +-
 .../pages/creatProcess/bzjd/step3.vue         |  1 +
 .../domesticStandardsAndRegulations/index.vue |  2 -
 .../enterpriseStandardPlan/index.vue          | 85 +++++++++++++------
 4 files changed, 64 insertions(+), 27 deletions(-)

diff --git a/src/components/mechanismTree/index.vue b/src/components/mechanismTree/index.vue
index a134dbbdd..2c83ad0be 100644
--- a/src/components/mechanismTree/index.vue
+++ b/src/components/mechanismTree/index.vue
@@ -26,8 +26,9 @@
           icon-class="icon-tree"
           :check-strictly="true"
           :current-node-key="nodeKeyId"
-          node-key="id"
+          node-key="name"
           :filter-node-method="filterNode"
+          :default-checked-keys="nodeList"
           highlight-current
           :auto-expand-parent="true"
           show-checkbox
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
index 84c33eb92..b8c140352 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
@@ -686,6 +686,7 @@
                     this.plForm.complianceState = ''
                     this.plForm.newData = ''
                     this.plForm.onlineData = ''
+                    this.plForm.applyArctic = ''
                     this.modalshowflag = true
                 } else {
                     this.$message.warning('请选择要编辑的数据')
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 19736a7f7..ba69c1c83 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -5497,8 +5497,6 @@ export default {
       this.sarStandardsInfoEO['ZRGCS'] = nameList;
     },
     choiceZRBM(type, title, id) {
-
-
       this.nodeListZRBM = []
       this.nodeListZRBM.push(id)
       this.drawerTitle = title
diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
index 7ad26bbaa..d3efa1e3c 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
@@ -258,30 +258,40 @@
                                         </el-form-item>
                                         <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" class="add-form-item" prop="unit" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
                                             <div style="display: flex;justify-content: space-between;align-items: center;">
-                                                <el-tooltip v-if="addForm.unit" class="item" effect="dark" :content="addForm.unit" placement="top-start">
-                                                    <el-input
-                                                            :disabled="DrawerType === 'see'"
-                                                            clearable
-                                                            v-model="addForm.unit"
-                                                            placeholder="选择或输入起草单位">
-                                                    </el-input>
-                                                </el-tooltip>
-                                                <div v-else>
-                                                    <el-input
-                                                            :disabled="DrawerType === 'see'"
-                                                            clearable
-                                                            v-model="addForm.unit"
-                                                            placeholder="选择或输入起草单位">
-                                                    </el-input>
-                                                </div>
-                                                <div>
-                                                    <el-button
-                                                            :disabled="DrawerType === 'see'"
-                                                            size="mini"
-                                                            type="primary"
-                                                            @click="QCDWClick"
-                                                            class="common-button-primary">手动查找</el-button>
-                                                </div>
+                                                <el-input
+                                                        :key="addForm.unit"
+                                                        :config="addForm"
+                                                        clearable
+                                                        v-model="addForm.unit"
+                                                        placeholder="请选择起草责任单位"
+                                                        @click.native="choiceZRBM(addForm.unit)">
+                                                </el-input>
+
+<!--                                                <el-tooltip v-if="addForm.unit" class="item" effect="dark" :content="addForm.unit" placement="top-start">-->
+<!--                                                    <el-input-->
+<!--                                                            :disabled="DrawerType === 'see'"-->
+<!--                                                            clearable-->
+<!--                                                            v-model="addForm.unit"-->
+
+<!--                                                            placeholder="选择或输入起草单位">-->
+<!--                                                    </el-input>-->
+<!--                                                </el-tooltip>-->
+<!--                                                <div v-else>-->
+<!--                                                    <el-input-->
+<!--                                                            :disabled="DrawerType === 'see'"-->
+<!--                                                            clearable-->
+<!--                                                            v-model="addForm.unit"-->
+<!--                                                            placeholder="选择或输入起草单位">-->
+<!--                                                    </el-input>-->
+<!--                                                </div>-->
+<!--                                                <div>-->
+<!--                                                    <el-button-->
+<!--                                                            :disabled="DrawerType === 'see'"-->
+<!--                                                            size="mini"-->
+<!--                                                            type="primary"-->
+<!--                                                            @click="QCDWClick"-->
+<!--                                                            class="common-button-primary">手动查找</el-button>-->
+<!--                                                </div>-->
                                             </div>
                                         </el-form-item>
                                     </el-form>
@@ -340,6 +350,12 @@
                     </el-button>
                 </div>
             </el-dialog>
+            <Mechanism-tree
+                    is-title="选择起草责任部门"
+                    :is-visible.sync="modalshowflagZRBM"
+                    :nodeList="nodeListZRBM"
+                    @checkedRole="drawerCheckZRBM"
+            />
         </div>
     </div>
 </template>
@@ -350,6 +366,9 @@
         components: {},
         data() {
             return {
+                modalshowflagZRBM: false,
+                nodeListZRBM: [],
+
                 QCDWmodal: false,
                 QCDWValue: [],
                 QCDWList: [],
@@ -425,6 +444,24 @@
         props: {},
         watch: {},
         methods: {
+            drawerCheckZRBM (data) {
+                let list = ''
+                for (let a = 0; a < data.length; a++) {
+                    if (list.length > 0) {
+                        list += ','
+                        list += data[a].name
+                    } else {
+                        list = data[a].name
+                    }
+                }
+                this.addForm.unit = list
+                this.modalshowflagZRBM = false
+            },
+            choiceZRBM(id) {
+                this.nodeListZRBM = []
+                this.nodeListZRBM = id.split(',')
+                this.modalshowflagZRBM = true
+            },
             QCDWOK () {
                 let arr1 = []
                 if (this.addForm.unit) {

From 93c30650d44754418e6bd1e617f7d34b79818235 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, 17 Dec 2021 16:02:37 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E8=A7=84=E8=8C=83=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/cywbbzzxd/step3.vue    | 303 ++++++++++++++++--
 .../pages/creatProcess/jrbzhxh/step2.vue      |  92 ++++--
 2 files changed, 341 insertions(+), 54 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue
index 13a80e735..6d988ab50 100644
--- a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue
@@ -37,12 +37,19 @@
                     placeholder="请输入标准编号"
                     clearable>
                   </el-input>
+                  <el-button
+                    type="primary"
+                    class="common-button-primary"
+                    size="mini"
+                    @click="showStand"
+                    style="position:absolute;top: 10px;right: 0;"
+                  >手动查找</el-button>
                 </el-form-item>
                 <el-form-item label="主持或参与" prop="hostOrTask" class="add-form-item ">
                   <div class="form-select">
                     <el-select v-model="wbbzform.hostOrTask" placeholder="请选择主持或参与">
                       <el-option
-                        v-for="item in associationOptions"
+                        v-for="item in participateOptions"
                         :key="item.value"
                         :label="item.label"
                         :value="item.value">
@@ -81,23 +88,18 @@
                     clearable>
                   </el-input>
                 </el-form-item>
-                <el-form-item label="标准类型" prop="standType" class="add-form-item ">
-                  <div class="form-select">
-                    <el-select v-model="wbbzform.standType" placeholder="请选择标准类型">
-                      <el-option
-                        v-for="item in associationOptions"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value">
-                      </el-option>
-                    </el-select>
-                  </div>
+                <el-form-item label="标准类别" prop="standType" class="add-form-item ">
+                  <el-input
+                    v-model="wbbzform.standType"
+                    placeholder="请输入标准类别"
+                    clearable>
+                  </el-input>
                 </el-form-item>
                 <el-form-item label="标准制修订" prop="standRevise" class="add-form-item ">
                   <div class="form-select">
                     <el-select v-model="wbbzform.standRevise" placeholder="请选择标准制修订">
                       <el-option
-                        v-for="item in associationOptions"
+                        v-for="item in standReviseOptions"
                         :key="item.value"
                         :label="item.label"
                         :value="item.value">
@@ -257,6 +259,134 @@
         <loading :loading="loading">流程列表加载中</loading>
       </div>
     </div>
+    <!--    添加标准抽屉-->
+    <el-drawer
+      title="添加标准"
+      :visible.sync="standModel"
+      size="900px"
+      custom-class="demo-drawer"
+    >
+      <div class="demo-drawer-content">
+        <div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
+          <div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
+            <div class="left">
+              <el-form :modal="standardSearch" :inline="true" class="label-input-form"
+                       style="margin-left:10px">
+                <el-form-item label="类型" class="search-item search-item-last">
+                  <el-select
+                    @change="typeChange"
+                    v-model="standardSearch.standType"
+                    placeholder="请选择"
+                    filterable
+                  >
+                    <el-option
+                      v-for="item in standardTypeOptions"
+                      :value="item.value"
+                      :key="item.value"
+                      :label="item.label"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="标准号/标准名称" class="search-item search-item-last">
+                  <el-input
+                    v-model="standardSearch.standNumber"
+                    placeholder="请输入标准号或标准名称"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item class="search-item btn-box">
+                  <el-button
+                    type="primary"
+                    class="common-button-primary"
+                    size="small"
+                    @click="getStandDataBtn">
+                    查询
+                  </el-button>
+                </el-form-item>
+                <el-form-item class="search-item btn-box">
+                  <el-button
+                    class="common-button-default"
+                    size="small"
+                    @click="clearStandSearch">清空
+                  </el-button>
+                </el-form-item>
+              </el-form>
+            </div>
+            <el-table
+              :data="standardData"
+              tooltip-effect="dark"
+              style="width: 100%"
+              border
+              ref="table"
+              class="table-height"
+              :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
+         fontWeight: 'bold', height: '48px'}"
+              @selection-change="selectThree"
+            >
+              <el-table-column
+                type="selection"
+                width="55"
+                align="center">
+              </el-table-column>
+              <el-table-column
+                prop="code"
+                align="center"
+                label="标准号">
+                <template slot-scope="scope">
+                  <a v-if="scope.row.standYear" class="table-jump"
+                     @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
+                      scope.row.standNumber
+                    }}-{{ scope.row.standYear }}</a>
+                  <a v-else @click="handlePreview(scope.row)" class="table-jump">{{
+                      scope.row.standSortShow
+                    }}
+                    {{ scope.row.standNumber }}</a>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="standName"
+                align="center"
+                label="标准名称"
+              >
+                <template slot-scope="scope">
+                  <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName || scope.row.standEnName }}</a>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="issueTime"
+                align="center"
+                label="发布日期">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="XCXSSRQ"
+                align="center"
+                label="新车型实施日期">
+              </el-table-column>
+              <el-table-column
+                show-overflow-tooltip
+                prop="ZCCSSRQ"
+                align="center"
+                label="在产车实施日期">
+              </el-table-column>
+            </el-table>
+          </div>
+          <pagination
+            :page="pageNo"
+            :pageSize="pageSizeNo"
+            :total="totalNo"
+            @pageChange="pageChangeNo"
+            @pageSizeChange="pageSizeChangeNo"
+          />
+        </div>
+      </div>
+      <div class="demo-drawer-footer">
+        <el-button size="mini" @click="cancelStand">取消</el-button>
+        <el-button type="primary" size="mini" @click="okStand">添加</el-button>
+      </div>
+    </el-drawer>
     <ProcessFooter
       show-save
       show-submit
@@ -295,6 +425,31 @@ export default {
       saveLoading: false,
       loading: false,
       detailData: [],  //审批历史信息
+      standardData: [],
+      standModel: false,
+      pageNo: 1,
+      pageSizeNo: this.$store.getters.userInfo.configContent,
+      totalNo: 0,
+      //查询添加标准相关数据
+      standardSearch: {
+        standType: "",
+        standNumber: "",
+        pageNo: 1,
+        pageSizeNo: this.$store.getters.userInfo.configContent
+      },
+      standardTypeOptions: [
+        {
+          value: "INLAND",
+          label: "国内标准法规",
+          item: "INLAND"
+        },
+        {
+          value: "FOREIGN",
+          label: "海外标准法规",
+          item: "FOREIGN"
+        }
+      ],
+      standList: [],
       wbbzform: {
         reportingUnit: "",
         standNumber: "",
@@ -319,21 +474,40 @@ export default {
       //   expenses: '',
       //   costBudget:'',
       // }], //参与人表格信息
-      associationOptions: [{
-        value: "选项1",
-        label: "1"
-      }, {
-        value: "选项2",
-        label: "2"
-      }, {
-        value: "选项3",
-        label: "3"
-      }]
+      participateOptions: [
+        {
+          value: '0',
+          label: '主持'
+        },
+        {
+          value: '2',
+          label: '参与'
+        },
+        {
+          value: '3',
+          label: 'N/A'
+        },
+      ],
+      standReviseOptions: [
+        {
+          value: '制定完成',
+          label: '制定完成'
+        },
+        {
+          value: '制定中',
+          label: '制定中'
+        },
+        {
+          value: '未制定',
+          label: '未制定'
+        },
+      ],
     };
   },
   mounted() {
     this.getData();
     this.processTable();
+    this.getStandData()
   },
   methods: {
     getData() {
@@ -383,6 +557,84 @@ export default {
     foldForm() {
       this.foldFormFlag = !this.foldFormFlag;
     },
+    showStand(){
+       this.standModel = true
+    },
+    //添加标准确定事件
+    okStand(){
+      if(this.standList.length < 1){
+        this.$message.warning('请至少选择一条标准')
+      }else if(this.standList.length > 1){
+        this.$message.warning('您只能选择一条标准进行添加')
+      }else{
+        this.wbbzform.standName = this.standList[0].standName || this.standList[0].standEnName
+        this.wbbzform.standType = this.standList[0].standSort
+        this.wbbzform.standNumber = this.standList[0].standSort + '\xa0\xa0 '+ this.standList[0].standNumber
+        this.standModel = false
+      }
+
+    },
+    //添加标准取消事件
+    cancelStand() {
+      this.standModel = false;
+    },
+    typeChange(type) {
+      this.standardSearch.standType = type;
+    },
+    clearStandSearch() {
+      this.standardSearch = {
+        standType: "",
+        standNumber: ""
+      };
+      this.getStandData();
+    },
+    getStandDataBtn(){
+      this.pageNo =1;
+      this.getStandData();
+    },
+    //查询项目下的标准
+    getStandData() {
+      this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageByWk1", {
+        standType: this.standardSearch.standType,
+        standNumber: this.standardSearch.standNumber,
+        page: this.pageNo,
+        pageSize: this.pageSizeNo
+      }, {
+        _this: this
+      }, res => {
+        this.standardData = res.data.list;
+        this.standardData.forEach(item => {
+          this.$set(item, "ZCCSSRQ", item.zccssrq);
+          this.$set(item, "XCXSSRQ", item.xcxssrq);
+        })
+        this.totalNo = res.data.count;
+      }, e => {
+      });
+    },
+    // 点击查看
+    handlePreview(item) {
+      let routeUrl = this.$router.resolve({
+        name: "OtherStandardDetails",
+        params: {
+          id: item.id,
+          pageType: "INLAND_STAND"
+        }
+      });
+      window.open(routeUrl.href, "_blank");
+    },
+    //添加标准select的改变
+    selectThree(data) {
+      this.standList = data;
+    },
+    pageChangeNo(page) {
+      this.pageNo = page;
+      this.getStandData();
+    },
+    pageSizeChangeNo(pageSize) {
+      this.pageSizeNo = this.$store.getters.userInfo.configContent;
+      this.getStandData();
+
+    },
     handleSave() {
     },
     //不备案
@@ -520,6 +772,9 @@ export default {
       background: #E6A23C;
     }
   }
-
+  .table-height{
+    height: calc(~'100% - 65px');
+    overflow: auto;
+  }
 }
 </style>
diff --git a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue
index eb2c12a78..edfd581ec 100644
--- a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue
@@ -33,37 +33,37 @@
                 </el-form-item>
                 <el-form-item label="协会名称" prop="associationName" class="add-form-item ">
                   <div class="form-select">
-                    <el-select v-model="wbbzform.associationName" placeholder="请选择协会名称">
+                    <el-select  @change="comityChange" v-model="wbbzform.associationName" placeholder="请选择协会名称">
                       <el-option
-                        v-for="item in associationOptions"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value">
+                        v-for="item in comityOptionsOne"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id">
                       </el-option>
                     </el-select>
-                    <el-select v-model="wbbzform.committee" placeholder="请选择分标委">
+                    <el-select v-if="wbbzform.associationName !== ''"   @change="comityChangeOne" v-model="wbbzform.committee" placeholder="请选择分标委">
                       <el-option
-                        v-for="item in associationOptions"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value">
+                        v-for="item in comityOptionsTwo"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id">
                       </el-option>
                     </el-select>
-                    <el-select v-model="wbbzform.workingGroup" placeholder="请选择工作组">
+                    <el-select v-if="wbbzform.associationName !== '' && wbbzform.committee !== ''"  v-model="wbbzform.workingGroup" placeholder="请选择工作组">
                       <el-option
-                        v-for="item in associationOptions"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value">
+                        v-for="item in comityOptionsOneThree"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id">
                       </el-option>
                     </el-select>
                   </div>
                 </el-form-item>
-                <el-form-item label="人员角色" prop="personnelRole" class="add-form-item ">
+                <el-form-item label="会员角色" prop="personnelRole" class="add-form-item ">
                   <div class="form-select">
                     <el-select v-model="wbbzform.personnelRole" placeholder="请选择会员角色">
                       <el-option
-                        v-for="item in associationOptions"
+                        v-for="item in comityRoleOptions"
                         :key="item.value"
                         :label="item.label"
                         :value="item.value">
@@ -122,7 +122,7 @@
           <el-table-column
             prop="workPeople"
             label="参与人"
-            width="150"
+            width="220"
             align="center">
             <template slot-scope="scope">
               <el-input  v-model="scope.row.workPeopleId" style="display: none;" readonly/>
@@ -132,6 +132,7 @@
           </el-table-column>
           <el-table-column
             prop="duties"
+            width="180"
             label="职务"
             align="center">
           </el-table-column>
@@ -149,20 +150,27 @@
           </el-table-column>
           <el-table-column
             prop="tenure"
+            width="200"
             label="任期"
             align="center">
           </el-table-column>
           <el-table-column
             prop="account"
             label="账户"
-            width="200"
+            width="300"
             align="center">
+            <template slot-scope="scope">
+                 <el-input v-model="scope.row.account" placeholder="请输入账户"></el-input>
+            </template>
           </el-table-column>
           <el-table-column
             prop="password"
             label="密码"
-            width="350"
+            width="300"
             align="center">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.password" placeholder="请输入密码"></el-input>
+            </template>
           </el-table-column>
         </el-table>
         <ProcessTitle>
@@ -349,6 +357,9 @@ export default {
       recordLoading: false,
       loading: false,
       modalshowflag: false,
+      comityOptionsOne: [],  //工作组数据
+      comityOptionsTwo: [],  //分标委数据
+      comityOptionsOneThree: [], //工作组数据
       drawerTitle: '',
       nodeList: [],
       uploadFileListPath: "api/att/attFile/upload", // 上传的地址
@@ -391,16 +402,12 @@ export default {
       associationData: [], //协会表格信息
       detailData: [], //审批历史信息
       selectedId: "",
-      associationOptions: [{
-        value: '选项1',
-        label: '1'
-      }, {
-        value: '选项2',
-        label: '2'
-      },{
-        value: '选项3',
-        label: '3'
-      }],
+      comityRoleOptions: [
+        {value: '0', label: '委员'},
+        {value: '1', label: '观察委员'},
+        {value: '2', label: '通讯委员'},
+        {value: '3', label: '成员'}
+      ],
     };
   },
   methods: {
@@ -683,8 +690,33 @@ export default {
       }
       return true;
     },
+    /** 获取分标委数据字典数据 */
+    comityChange() {
+      this.wbbzform.committee = ''
+      this.wbbzform.workingGroup = ''
+      this.comityOptionsOne.forEach(item => {
+        if (item.children !== null && item.id === this.wbbzform.associationName) {
+          this.comityOptionsTwo = item.children
+        }
+      })
+    },
+    /** 获取工作组字典数据 */
+    comityChangeOne() {
+      this.wbbzform.workingGroup = ''
+      this.comityOptionsTwo.forEach(item => {
+        if (item.children !== null && item.id === this.wbbzform.committee) {
+          this.comityOptionsOneThree = item.children
+        }
+      })
+    },
   },
   mounted() {
+    /*  获取标准法规工作组数据  */
+    this.$http.get('wg_work_group/researchData',{type:0},{
+      _this: this
+    }, res => {
+      this.comityOptionsOne = res.data.children
+    })
     this.bpnId = this.$route.query.bpnId
     if (this.bpnId !== undefined) {
       this.getDatas()