From ee2b2bc53c0ef3ff5eed22e743588ee1fa147668 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Mon, 27 Dec 2021 10:18:08 +0800
Subject: [PATCH 01/10] commit

---
 .../pages/creatProcess/bzdy/step1-9.vue       |  3 ---
 .../pages/creatProcess/bzdy/step2.vue         |  3 ---
 .../pages/creatProcess/bzdy/step3.vue         |  3 ---
 .../pages/creatProcess/bzdy/step4.vue         | 13 ++++------
 .../pages/creatProcess/bzdy/step5.vue         |  3 ---
 .../pages/creatProcess/bzdy/step6.vue         |  3 ---
 .../pages/creatProcess/bzdy/step7.vue         |  3 ---
 .../pages/creatProcess/bzdy/step8.vue         |  3 ---
 .../pages/creatProcess/bzdy/step9.vue         |  3 ---
 .../pages/creatProcess/bzjd/step1-6.vue       |  3 ---
 .../pages/creatProcess/bzjd/step2.vue         |  3 ---
 .../pages/creatProcess/bzjd/step3.vue         |  3 ---
 .../pages/creatProcess/bzjd/step4.vue         |  3 ---
 .../pages/creatProcess/bzjd/step5.vue         |  3 ---
 .../pages/creatProcess/bzjd/step6.vue         |  3 ---
 .../pages/creatProcess/bzzqyj/step1-9.vue     |  3 ---
 .../pages/creatProcess/bzzqyj/step2.vue       |  3 ---
 .../pages/creatProcess/bzzqyj/step3.vue       |  3 ---
 .../pages/creatProcess/bzzqyj/step4-1.vue     |  3 ---
 .../pages/creatProcess/bzzqyj/step4-2.vue     |  3 ---
 .../pages/creatProcess/bzzqyj/step4.vue       |  3 ---
 .../pages/creatProcess/bzzqyj/step5.vue       |  3 ---
 .../pages/creatProcess/bzzqyj/step6.vue       |  3 ---
 .../pages/creatProcess/bzzqyj/step7.vue       |  3 ---
 .../domesticStandardsAndRegulations/index.vue | 26 ++++++++++++-------
 .../enterpriseStandardPlan/index.vue          |  7 +++++
 26 files changed, 28 insertions(+), 87 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1-9.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1-9.vue
index 959e597f7..4d7b783d8 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step1-9.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1-9.vue
@@ -127,20 +127,17 @@
           prop="name"
           label="任务步骤"
           align="center"
-          sortable="custom"
         >
         </el-table-column>
         <el-table-column
           prop="assignee"
           label="任务受理人"
           align="center"
-          sortable="custom"
         >
         </el-table-column>
         <el-table-column
                 prop="createTime"
                 label="创建时间"
-                sortable="custom"
                 align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue
index e5a93ffe6..2214ef06d 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue
@@ -117,20 +117,17 @@
                         prop="name"
                         label="任务步骤"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="assignee"
                         label="任务受理人"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="createTime"
                         label="创建时间"
-                        sortable="custom"
                         align="center">
                     <template slot-scope="scope">
                         <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue
index 41c58074a..cf40474f6 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue
@@ -155,20 +155,17 @@
                         prop="name"
                         label="任务步骤"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="assignee"
                         label="任务受理人"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="createTime"
                         label="创建时间"
-                        sortable="custom"
                         align="center">
                     <template slot-scope="scope">
                         <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue
index e2f749862..1e1404123 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue
@@ -155,20 +155,17 @@
                         prop="name"
                         label="任务步骤"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="assignee"
                         label="任务受理人"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="createTime"
                         label="创建时间"
-                        sortable="custom"
                         align="center">
                     <template slot-scope="scope">
                         <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
@@ -374,14 +371,14 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
-                        this.form.dyhz = data.form ? data.form.dyhz : ''
+                        this.form.dyhz = data.form ? data.form.dyhz : data.dyhz
                         this.form.title = data.title || data.form.title
                         this.form.date = data.date || data.form.date
                         this.json = data || data.form
-                        this.form.file = data.form ? data.form.fileId : ''
-                        this.form.fileName = data.form ? data.form.fileName : ''
-                        this.form.fileId = data.form ? data.form.fileId : ''
-                        this.form.modelList = data.form ? data.form.modelList : []
+                        this.form.file = data.form ? data.form.fileId : data.fileId
+                        this.form.fileName = data.form ? data.form.fileName : data.fileName
+                        this.form.fileId = data.form ? data.form.fileId : data.fileId
+                        this.form.modelList = data.form ? data.form.modelList : data.modelList
                         this.form.fjList = data.fjList || data.form.fjList
                     }).catch(e => {
                     })
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue
index 6db8ba6af..cc0740c08 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue
@@ -145,20 +145,17 @@
                         prop="name"
                         label="任务步骤"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="assignee"
                         label="任务受理人"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="createTime"
                         label="创建时间"
-                        sortable="custom"
                         align="center">
                     <template slot-scope="scope">
                         <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue
index d8819f8f6..2c98a83d7 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue
@@ -140,20 +140,17 @@
                         prop="name"
                         label="任务步骤"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="assignee"
                         label="任务受理人"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="createTime"
                         label="创建时间"
-                        sortable="custom"
                         align="center">
                     <template slot-scope="scope">
                         <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue
index 836fcb971..3c71b2cfb 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue
@@ -140,20 +140,17 @@
                         prop="name"
                         label="任务步骤"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="assignee"
                         label="任务受理人"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="createTime"
                         label="创建时间"
-                        sortable="custom"
                         align="center">
                     <template slot-scope="scope">
                         <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue
index fe192f15f..cb00031b9 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue
@@ -140,20 +140,17 @@
                         prop="name"
                         label="任务步骤"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="assignee"
                         label="任务受理人"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="createTime"
                         label="创建时间"
-                        sortable="custom"
                         align="center">
                     <template slot-scope="scope">
                         <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue
index 66f0438e5..98493163f 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue
@@ -140,20 +140,17 @@
                         prop="name"
                         label="任务步骤"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="assignee"
                         label="任务受理人"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="createTime"
                         label="创建时间"
-                        sortable="custom"
                         align="center">
                     <template slot-scope="scope">
                         <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue
index aafc9d383..b6e667a05 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue
@@ -277,20 +277,17 @@
           prop="name"
           label="任务步骤"
           align="center"
-          sortable="custom"
         >
         </el-table-column>
         <el-table-column
           prop="assignee"
           label="任务受理人"
           align="center"
-          sortable="custom"
         >
         </el-table-column>
         <el-table-column
                 prop="createTime"
                 label="创建时间"
-                sortable="custom"
                 align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
index ee3227eb8..05b0560ca 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
@@ -189,20 +189,17 @@
                         prop="name"
                         label="任务步骤"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="assignee"
                         label="任务受理人"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="createTime"
                         label="创建时间"
-                        sortable="custom"
                         align="center">
                     <template slot-scope="scope">
                         <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
index 87b561ae8..7dcd95813 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
@@ -220,20 +220,17 @@
                         prop="name"
                         label="任务步骤"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="assignee"
                         label="任务受理人"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="createTime"
                         label="创建时间"
-                        sortable="custom"
                         align="center">
                     <template slot-scope="scope">
                         <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
index f0aed891c..1715d4c56 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
@@ -212,20 +212,17 @@
                         prop="name"
                         label="任务步骤"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="assignee"
                         label="任务受理人"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="createTime"
                         label="创建时间"
-                        sortable="custom"
                         align="center">
                     <template slot-scope="scope">
                         <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
index 108fbe7e2..2c5abc2da 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
@@ -212,20 +212,17 @@
                         prop="name"
                         label="任务步骤"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="assignee"
                         label="任务受理人"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="createTime"
                         label="创建时间"
-                        sortable="custom"
                         align="center">
                     <template slot-scope="scope">
                         <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
index 0def5a232..06c2d27d1 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
@@ -213,20 +213,17 @@
                         prop="name"
                         label="任务步骤"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="assignee"
                         label="任务受理人"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="createTime"
                         label="创建时间"
-                        sortable="custom"
                         align="center">
                     <template slot-scope="scope">
                         <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue
index 8cf8df4d6..0a2f22706 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue
@@ -169,20 +169,17 @@
           prop="name"
           label="任务步骤"
           align="center"
-          sortable="custom"
         >
         </el-table-column>
         <el-table-column
           prop="assignee"
           label="任务受理人"
           align="center"
-          sortable="custom"
         >
         </el-table-column>
         <el-table-column
                 prop="createTime"
                 label="创建时间"
-                sortable="custom"
                 align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
index 60936b0b4..94ef10e6d 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
@@ -117,20 +117,17 @@
           prop="name"
           label="任务步骤"
           align="center"
-          sortable="custom"
         >
         </el-table-column>
         <el-table-column
           prop="assignee"
           label="任务受理人"
           align="center"
-          sortable="custom"
         >
         </el-table-column>
         <el-table-column
                 prop="createTime"
                 label="创建时间"
-                sortable="custom"
                 align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
index b58c86f1c..5f2f1667c 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
@@ -204,20 +204,17 @@
                         prop="name"
                         label="任务步骤"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="assignee"
                         label="任务受理人"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="createTime"
                         label="创建时间"
-                        sortable="custom"
                         align="center">
                     <template slot-scope="scope">
                         <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue
index cceba22a9..de5aa2f41 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue
@@ -183,20 +183,17 @@
                         prop="name"
                         label="任务步骤"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="assignee"
                         label="任务受理人"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="createTime"
                         label="创建时间"
-                        sortable="custom"
                         align="center">
                     <template slot-scope="scope">
                         <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue
index a8714fdf8..b60ee3a97 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue
@@ -175,20 +175,17 @@
                         prop="name"
                         label="任务步骤"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="assignee"
                         label="任务受理人"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="createTime"
                         label="创建时间"
-                        sortable="custom"
                         align="center">
                     <template slot-scope="scope">
                         <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
index d5f99098f..6cf213fce 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
@@ -211,20 +211,17 @@
           prop="name"
           label="任务步骤"
           align="center"
-          sortable="custom"
         >
         </el-table-column>
         <el-table-column
           prop="assignee"
           label="任务受理人"
           align="center"
-          sortable="custom"
         >
         </el-table-column>
         <el-table-column
                 prop="createTime"
                 label="创建时间"
-                sortable="custom"
                 align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
index 54daa4d59..7982461c2 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
@@ -206,20 +206,17 @@
                 prop="name"
                 label="任务步骤"
                 align="center"
-                sortable="custom"
         >
         </el-table-column>
         <el-table-column
                 prop="assignee"
                 label="任务受理人"
                 align="center"
-                sortable="custom"
         >
         </el-table-column>
         <el-table-column
                 prop="createTime"
                 label="创建时间"
-                sortable="custom"
                 align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
index 15563e9e9..fe5447b44 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
@@ -195,20 +195,17 @@
           prop="name"
           label="任务步骤"
           align="center"
-          sortable="custom"
         >
         </el-table-column>
         <el-table-column
           prop="assignee"
           label="任务受理人"
           align="center"
-          sortable="custom"
         >
         </el-table-column>
         <el-table-column
                 prop="createTime"
                 label="创建时间"
-                sortable="custom"
                 align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
index 125af3db2..fc799148d 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
@@ -195,20 +195,17 @@
           prop="name"
           label="任务步骤"
           align="center"
-          sortable="custom"
         >
         </el-table-column>
         <el-table-column
           prop="assignee"
           label="任务受理人"
           align="center"
-          sortable="custom"
         >
         </el-table-column>
         <el-table-column
                 prop="createTime"
                 label="创建时间"
-                sortable="custom"
                 align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 257249ee6..a4f5b087e 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -1053,22 +1053,27 @@
               <el-table-column
                   prop="issueTime"
                   label="发布日期"
-                  sortable="custom"
                   width="120"
                   align="center">
                 <template slot-scope="scope">
                   {{ formatIssueDate(scope.row.issueTime) }}
                 </template>
               </el-table-column>
+<!--              <el-table-column-->
+<!--                  prop="XCXSSRQ"-->
+<!--                  label="实施日期"-->
+<!--                  sortable="custom"-->
+<!--                  width="120"-->
+<!--                  align="center">-->
+<!--                <template slot-scope="scope">-->
+<!--                  <span>{{ formatText(scope.row.XCXSSRQ) }}</span>-->
+<!--                </template>-->
+<!--              </el-table-column>-->
               <el-table-column
-                  prop="XCXSSRQ"
-                  label="实施日期"
-                  sortable="custom"
-                  width="120"
-                  align="center">
-                <template slot-scope="scope">
-                  <span>{{ formatText(scope.row.XCXSSRQ) }}</span>
-                </template>
+                      prop="ssrq"
+                      label="实施日期"
+                      width="120"
+                      align="center">
               </el-table-column>
               <el-table-column
                   prop="textStatus"
@@ -4381,6 +4386,7 @@ export default {
           }
         }
         this.configStandList = res.data.list
+        console.log(this.configStandList);
         this.configTotal = res.data.count
         this.selectConfigStand = []
       }, e => {
@@ -5971,7 +5977,7 @@ export default {
   .el-drawer__wrapper {
     .demo-drawer-content {
       .drawer-content {
-        //height: calc(~'100% - 52px - 56px');
+        height: calc(~'100% - 52px - 56px');
         flex: auto;
         display: flex;
         flex-direction: column;
diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
index 6c044911b..2d6ec22f6 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
@@ -268,6 +268,7 @@
                                                         clearable
                                                         v-model="addForm.unitName"
                                                         placeholder="请选择起草责任单位"
+                                                        readonly
                                                         @click.native="choiceZRBM(addForm.unit)">
                                                 </el-input>
 
@@ -492,6 +493,9 @@
                 this.QCDWmodal = true
             },
             choiceZRR (type, title, id) {
+                if (this.DrawerType === 'see') {
+                    return
+                }
                 this.nodeList = []
                 this.nodeList.push(id)
                 this.type = type
@@ -503,6 +507,9 @@
                 this.addForm.wgLeaderName = data[0].name
             },
             choiceZRRS (type, title, id) {
+                if (this.DrawerType === 'see') {
+                    return
+                }
                 this.type = type
                 this.drawerTitle = title
                 this.nodeList2 = []

From 292c91acf69bde647abf24381dc3e969861624a6 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Mon, 27 Dec 2021 10:45:02 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B=20-?=
 =?UTF-8?q?=20=E5=8A=A0=E4=B8=80=E4=B8=AA=E5=AD=97=E6=AE=B5=20-=20?=
 =?UTF-8?q?=E6=88=91=E5=8F=B8=E5=8F=82=E4=B8=8E=E5=88=B6=E6=A0=87=E6=8E=92?=
 =?UTF-8?q?=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzrk/step1.vue              | 14 ++++++++++++++
 .../pages/creatProcess/bzrk/step4.vue              | 14 ++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index 27e97489d..98d416e6a 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -745,6 +745,17 @@
                                         ></el-option>
                                     </el-select>
                                 </el-form-item>
+                              <el-form-item v-show="form.standInData === '0'" label="我司参与制标排名" prop="cyzbpm" class="add-form-item form-item-disabled">
+                                <el-select :popper-append-to-body="false" v-model="form.cyzbpm" placeholder="请选择我司参与制标排名" clearable>
+                                  <el-option
+                                      v-for="item in cyzbpmOptions"
+                                      placeholder="请选择"
+                                      :key="item.value"
+                                      :value="item.value"
+                                      :label="item.label"
+                                  ></el-option>
+                                </el-select>
+                              </el-form-item>
                             </el-col>
                         </el-row>
                     </div>
@@ -1511,6 +1522,7 @@
                     qcdw: [], // 起草单位
                     wssmr: [], // 我司署名人
                     cysd: '', // 我司参与深度
+                    cyzbpm:[],// 我司参与制标排名
                     cllx: [], // 适用车型
                     nylx: [],// 能源类型
                     sycpx: [],// 适用产品线
@@ -1616,6 +1628,7 @@
                   options:[]
                 }, // 适用认证
                 cysdOptions: [], // 我司参与深度
+                cyzbpmOptions:[], // 我司参与制标排名
                 cbcdOptions: [], // 采标程度
                 wssmrOptions: [], // 我司署名人
                 sycpxOptions: {
@@ -2978,6 +2991,7 @@
                 this.categoryOptions.options = res.data.NYLXCLASS // 能源类型
                 this.applyAuthOptions.options = res.data.SYRZCLASS // 适用认证
                 this.cysdOptions = res.data.WSCYSD // 我司参与深度
+                this.cyzbpmOptions = res.data.CYZBPM // 我司参与制标排名
                 this.wssmrOptions = res.data.WSSMR // 我司署名人
                 this.sycpxOptions.options = res.data.SYCPXCLASS // 适用产品线
                 this.zrbmOptions.options = res.data.ZRBMCLASS // 责任部门
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
index 43fcc191e..01984b937 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
@@ -946,6 +946,17 @@
                     ></el-option>
                   </el-select>
                 </el-form-item>
+                <el-form-item v-show="form.standInData === '0'" label="我司参与制标排名" prop="cyzbpm" class="add-form-item form-item-disabled">
+                  <el-select :popper-append-to-body="false" v-model="form.cyzbpm" placeholder="请选择我司参与制标排名" clearable>
+                    <el-option
+                        v-for="item in cyzbpmOptions"
+                        placeholder="请选择"
+                        :key="item.value"
+                        :value="item.value"
+                        :label="item.label"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
               </el-col>
             </el-row>
           </div>
@@ -1574,6 +1585,7 @@ export default {
         qcdw: '', // 起草单位
         wssmr: '', // 我司署名人
         cysd: '', // 我司参与深度
+        cyzbpm:[],// 我司参与制标排名
         cllx: '', // 适用车型
         nylx: '',// 能源类型
         sycpx: '',// 适用产品线
@@ -1623,6 +1635,7 @@ export default {
         options:[]
       }, // 适用认证
       cysdOptions: [], // 我司参与深度
+      cyzbpmOptions:[], // 我司参与制标排名
       wssmrOptions: [], // 我司署名人
       qcdwOptions: [], // 起草单位
       sycpxOptions: {
@@ -2579,6 +2592,7 @@ export default {
       this.categoryOptions.options = res.data.NYLXCLASS // 能源类型
       this.applyAuthOptions.options = res.data.SYRZCLASS // 适用认证
       this.cysdOptions = res.data.WSCYSD // 我司参与深度
+      this.cyzbpmOptions = res.data.CYZBPM // 我司参与制标排名
       this.wssmrOptions = res.data.WSSMR // 我司署名人
       this.qcdwOptions = res.data.QCDW // 起草单位
       this.sycpxOptions.options = res.data.SYCPXCLASS // 适用产品线

From 95badff27bc02e9d61d3651f5bb327074f8568ba 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 Dec 2021 10:52:42 +0800
Subject: [PATCH 03/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzqdfb/step1.vue       | 12 +++++-
 .../pages/creatProcess/bzqdfb/step3.vue       |  8 ++++
 .../pages/addEdit.vue                         |  1 +
 .../pages/details.vue                         | 38 ++++++++++++-------
 src/sysConfig/index.js                        | 23 +++++------
 5 files changed, 53 insertions(+), 29 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
index f29da4ab8..61f2e77f2 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
@@ -1057,7 +1057,7 @@ export default {
         this.listForm.commentText = this.commentText
         this.listForm.fileName = this.fileInfoList
         this.listForm.dataList = this.dataList
-        var json = Object.assign(this.listForm, this.roleForm);
+        let json = Object.assign(this.listForm, this.roleForm);
         this.$refs["qdfbForm"].validate((valid) => {
           if (valid) {
             this.$refs["Form"].validate((valid) => {
@@ -1237,7 +1237,7 @@ export default {
         this.standList.map(item => {
           let newStand = false;
           for (let itemKey of this.dataList) {
-            if (item.id == itemKey.id) {
+            if (item.id === itemKey.id) {
               newStand = true;
               break;
             }
@@ -1246,6 +1246,14 @@ export default {
             this.$message.warning("请勿重复添加数据");
           } else {
             this.dataList.push(item);
+            this.dataList.forEach(item => {
+              if(item.XCXSSRQ === null){
+                item.XCXSSRQ = ''
+              }
+              if(item.ZCCSSRQ === null){
+                item.ZCCSSRQ = ''
+              }
+            })
             exits.push(item.id);
           }
         });
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
index 6e7bdb10f..9fd6c6eb4 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
@@ -616,6 +616,14 @@ export default {
             _this.$message.warning("请勿重复添加数据");
           } else {
             _this.dataList.push(item);
+            _this.dataList.forEach(item => {
+              if(item.XCXSSRQ === null){
+                item.XCXSSRQ = ''
+              }
+              if(item.ZCCSSRQ === null){
+                item.ZCCSSRQ = ''
+              }
+            })
           }
         });
         this.standardData = []
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index 68685d1fc..195afb22c 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -445,6 +445,7 @@
         </el-form-item>
         <el-form-item label="标准实施日期" prop="putTime">
           <el-date-picker
+              clearable
               v-model.trim="editRowData.ssrq"
               type="dates"
               value-format="yyyy-MM-dd"
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
index e7dc5fc86..a1ba62a88 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
@@ -172,12 +172,6 @@
             align="center"
             width="210px"
             label="标准实施日期">
-            <template slot-scope="scope">
-              <span v-if="scope.row.ssrq === null">
-                {{ scope.row.ssrq }}
-              </span>
-              <span v-else>{{ scope.row.ssrq.slice(0, 10) }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
@@ -610,18 +604,34 @@ export default {
     // 导出确定功能
     //确认导出
     exportTestItem() {
-      if (this.saveExportType === "apart") {
-        if (this.selectedList != null && this.selectedList != "") {
+      if(this.sarAccessEO.sortKey === '1'){
+        if (this.saveExportType === "apart") {
+          if (this.selectedList != null && this.selectedList != "") {
+            const exportURL = interfaceUrl + "sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?" + "type=" + 1 +
+              "exportType" + this.saveExportType + "&ids=" + this.selectedList.join(",") + "&exportName=" + this.exportName;
+            window.open(exportURL);
+            this.$message.success("导出信息成功");
+          }
+        } else if (this.saveExportType === "all") {
+          const exportURL = interfaceUrl + "sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?" + "type=" + 1 +
+            "exportType" + this.saveExportType + "&id=" + this.pageId + "&exportName=" + this.exportName;
+          window.open(exportURL);
+          this.$message.success("导出信息成功");
+        }
+      }else{
+        if (this.saveExportType === "apart") {
+          if (this.selectedList != null && this.selectedList != "") {
+            const exportURL = interfaceUrl + "sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?" +
+              "exportType" + this.saveExportType + "&ids=" + this.selectedList.join(",") + "&exportName=" + this.exportName;
+            window.open(exportURL);
+            this.$message.success("导出信息成功");
+          }
+        } else if (this.saveExportType === "all") {
           const exportURL = interfaceUrl + "sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?" +
-            "exportType" + this.saveExportType + "&ids=" + this.selectedList.join(",") + "&exportName=" + this.exportName;
+            "exportType" + this.saveExportType + "&id=" + this.pageId + "&exportName=" + this.exportName;
           window.open(exportURL);
           this.$message.success("导出信息成功");
         }
-      } else if (this.saveExportType === "all") {
-        const exportURL = interfaceUrl + "sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?" +
-          "exportType" + this.saveExportType + "&id=" + this.pageId + "&exportName=" + this.exportName;
-        window.open(exportURL);
-        this.$message.success("导出信息成功");
       }
       this.exportModelFlag = false;
       this.selectedList = [];
diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js
index 1ba8b30d7..8c83dc101 100644
--- a/src/sysConfig/index.js
+++ b/src/sysConfig/index.js
@@ -7,22 +7,20 @@
 // const devIp = '39.98.140.126'
 // const devInterfacePORT = '10005'
 // const devIp = '192.168.10.248'
+// const devInterfacePORT = '9999'
+const devIp = '192.168.10.70'
+const devInterfacePORT = '4202'
 // const devIp = '62.234.136.153'
-// const devInterfacePORT = '8033'
-const devIp = '10.19.11.243'
-const devInterfacePORT = '4304'
+// const devInterfacePORT = '8038'
 // 配置 idm 认证
 const ssoLogin = 'http://sso.foton.com.cn/oauth2.0/authorize?client_id=app_slrs&response_type=code&redirect_uri='
 // 配置 前端服务
-const devWebUrl = 'https://srms.foton.com.cn/#/'
+const devWebUrl = 'http://62.234.136.153:8038/#/'
 // webLoginType : idm (线上统一登录) 、 webLoginType: dev (测试环境登录)
 const webLoginType = 'dev'
 
 // 配置onlyOffice 前端服务
-const onlyOfficeUrl = 'http://10.100.5.116:8088'
-
-// 配置 kkFileView 前端服务
-const kkFileViewUrl = 'https://srms.foton.com.cn/preview'
+const onlyOfficeUrl = 'http://127.0.0.1:8080'
 
 // 云端端口号
 const DEV_CLOUD_RES_INTERFACE_PORT = '7777'
@@ -46,10 +44,10 @@ const processPort = '17210'
 
  *****************************************************************/
 // 生产环境配置
-// const prodIp = '62.234.136.153'
-// const prodInterfacePORT = '8033'
-const prodIp = 'srms.foton.com.cn'
-const prodInterfacePORT = ''
+const prodIp = '62.234.136.153'
+const prodInterfacePORT = '8033'
+// const prodIp = 'slrs.foton.com.cn'
+// const prodInterfacePORT = ''
 
 // 判断环境
 const serverIP = process.env.NODE_ENV === 'production' ? prodIp : devIp
@@ -62,7 +60,6 @@ module.exports = {
     ssoLoginUrlDev: ssoLogin + devWebUrl,
     ssoLoginUrl: ssoLogin,
     onlyOfficeUrl: onlyOfficeUrl,
-    kkFileViewUrl: kkFileViewUrl,
     devWebUrl: devWebUrl,
     serverUrl: 'http://' + serverIP, // 服务器IP地址
     interfaceUrl: 'http://' + serverIP + ':' + interfacePORT + '/api/', // 服务器端接口访问地址,

From f589cd8000b501f37af70e04d940b7845e9aa64d 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 Dec 2021 10:56:01 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qbzxdjhgk/component/establish.vue         | 146 ++++++++++++++----
 .../pages/details.vue                         |   4 +-
 2 files changed, 121 insertions(+), 29 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
index 8981da546..6bed46d34 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
@@ -24,20 +24,60 @@
           <el-option label="完成" value="完成"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item prop="reviseStatus" label="制修订状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
-        <el-select  v-model="qbfsForm.reviseStatus" placeholder="请选择制修订状态">
+      <el-form-item prop="reviseStatus" label="制修订状态" style="width: 100%; margin-right:10px"
+                    class="add-form-item form-item-disabled">
+        <el-select v-model="qbfsForm.reviseStatus" placeholder="请选择制修订状态">
           <el-option label="制定完成" value="制定完成"></el-option>
           <el-option label="制定中" value="制定中"></el-option>
           <el-option label="未制定" value="未制定"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item prop="drafterName" label="起草人" style="width: 100%; margin-right:10px"  class="add-form-item form-item-disabled">
+      <el-form-item prop="standScope" label="标准范围" style="width: 100%; margin-right:10px"
+                    class="add-form-item form-item-disabled">
+        <el-select v-model="qbfsForm.standScope" placeholder="请选择标准范围">
+          <el-option label="N1" value="N1"></el-option>
+          <el-option label="N2" value="N2"></el-option>
+          <el-option label="N3" value="N3"></el-option>
+          <el-option label="M1" value="M1"></el-option>
+          <el-option label="M2" value="M2"></el-option>
+          <el-option label="M3" value="M3"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item prop="useStand" label="是否采用标准" style="width: 100%; margin-right:10px"
+                    class="add-form-item form-item-disabled">
+        <el-select @change="useStandChange"  v-model="qbfsForm.useStand" placeholder="请选择是否采用标准">
+          <el-option label="是" value="yes"></el-option>
+          <el-option label="否" value="no"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item v-if="!useShow" prop="indexBasis" label="简述指标依据" style="width: 100%; margin-right:10px"
+                    class="add-form-item form-item-disabled">
+        <el-input
+          type="textarea"
+          v-model="qbfsForm.indexBasis"
+          placeholder="请输入指标依据"
+          :maxlength="500"/>
+      </el-form-item>
+<!--      <el-form-item prop="useStand" label="采用何种标准" style="width: 100%; margin-right:10px"-->
+<!--                    class="add-form-item form-item-disabled">-->
+<!--        <el-select v-model="qbfsForm.useStand" placeholder="请选择采用何种标准">-->
+<!--          <el-option-->
+<!--            v-for="item in useOptions"-->
+<!--            :key="item.value"-->
+<!--            :label="item.label"-->
+<!--            :value="item.value">-->
+<!--          </el-option>-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
+      <el-form-item prop="drafterName" label="起草人" style="width: 100%; margin-right:10px"
+                    class="add-form-item form-item-disabled">
         <el-input v-model="qbfsForm.drafter" style="display: none;"></el-input>
         <el-input v-model="qbfsForm.drafterName" placeholder="请选择起草人" readonly
                   @click.native="choiceZRRS('1')">
         </el-input>
       </el-form-item>
-      <el-form-item prop="resPersonName" label="评审责任人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+      <el-form-item prop="resPersonName" label="评审责任人" style="width: 100%; margin-right:10px"
+                    class="add-form-item form-item-disabled">
         <el-input v-model="qbfsForm.resPerson" style="display: none;"></el-input>
         <el-input v-model="qbfsForm.resPersonName" placeholder="请选择评审责任人"
                   @click.native="choiceZRRS('2')">
@@ -109,7 +149,7 @@
 
 <script>
 import ProcessTitle from "process/components/ProcessTitle";
-import MechanismTree from '@/components/mechanismTree'
+import MechanismTree from "@/components/mechanismTree";
 
 export default {
   name: "establish",
@@ -120,6 +160,7 @@ export default {
   props: ['message'],
   data(){
     return {
+      useShow: false,
       modalshowflagZRBM: false,
       nodeListZRBM: [],
       drawerTitle2: '',
@@ -131,44 +172,92 @@ export default {
       nodeList: [],
       qcdwOptions: [],
       qbfsForm: {
-        type: '5',
-        unit: '', // 单位
-        unitName: '',
-        esName: '', // 企标名称
-        planStatus: '', // 计划状态
-        reviseStatus: '', // 制修订状态
-        resPerson: '', // 评审责任人
-        resPersonName: '',
-        wgLeader: '', // 工作组组长
-        wgLeaderName: '',
-        draftTime: '', // 计划标准初稿完成时间
-        releaseTime: '', // 计划标准发布时间
-        drafter: '', // 起草人
-        drafterName: '',
-        newReason: '', //新增原因
+        type: "5",
+        unit: "", // 单位
+        unitName: "",
+        esName: "", // 企标名称
+        planStatus: "", // 计划状态
+        reviseStatus: "", // 制修订状态
+        standScope: "", //标准范围
+        useStand: "", //采用何种标准
+        indexBasis: '',  //指标依据
+        resPerson: "", // 评审责任人
+        resPersonName: "",
+        wgLeader: "", // 工作组组长
+        wgLeaderName: "",
+        draftTime: "", // 计划标准初稿完成时间
+        releaseTime: "", // 计划标准发布时间
+        drafter: "", // 起草人
+        drafterName: "",
+        newReason: "" //新增原因
         // remarks: '', // 备注
       },
+      useOptions: [
+        {
+          value: "ISO",
+          label: "ISO"
+        }, {
+          value: "ESE",
+          label: "ESE"
+        }, {
+          value: "EC/EEC",
+          label: "EC/EEC"
+        }, {
+          value: "IEC",
+          label: "IEC"
+        }, {
+          value: "GB",
+          label: "GB"
+        }, {
+          value: "GB/T",
+          label: "GB/T"
+        }, {
+          value: "QC/T",
+          label: "QC/T"
+        }, {
+          value: "JT/T",
+          label: "JT/T"
+        }, {
+          value: "HJ",
+          label: "HJ"
+        }, {
+          value: "TB",
+          label: "团标"
+        },{
+          value: "QT",
+          label: "其他"
+        },
+        ],
       qbfsFormRules: {
         unit: [
-          {required: true, message: '请选择起草单位', trigger: 'change'},
+          { required: true, message: "请选择起草单位", trigger: "change" }
         ],
         esName: [
-          {required: true, message: '请输入企标名称', trigger: 'blur'},
+          { required: true, message: "请输入企标名称", trigger: "blur" }
         ],
         planStatus: [
-          {required: true, message: '请选择计划状态', trigger: 'blur'},
+          { required: true, message: "请选择计划状态", trigger: "blur" }
         ],
         reviseStatus: [
-          {required: true, message: '请选择制修订状态', trigger: 'blur'},
+          { required: true, message: "请选择制修订状态", trigger: "blur" }
+        ],
+        standScope: [
+          { required: true, message: "请选择标准范围", trigger: "blur" }
+        ],
+        useStand: [
+          { required: true, message: "请选择采用何种标准", trigger: "blur" }
+        ],
+        indexBasis: [
+          { required: true, message: "请输入指标依据", trigger: "blur" }
         ],
         resPersonName: [
-          {required: true, message: '请输入评审责任人', trigger: 'blur'},
+          { required: true, message: "请输入评审责任人", trigger: "blur" }
         ],
         wgLeaderName: [
-          {required: true, message: '请输入工作组组长', trigger: 'blur'},
+          { required: true, message: "请输入工作组组长", trigger: "blur" }
         ],
         draftTime: [
-          {required: true, message: '请输入计划标准初稿完成时间', trigger: 'blur'},
+          { required: true, message: "请输入计划标准初稿完成时间", trigger: "blur" }
         ],
         releaseTime: [
           {required: true, message: '请输入计划标准发布时间', trigger: 'blur'},
@@ -205,6 +294,9 @@ export default {
      })
   },
   methods: {
+    useStandChange(){
+       this.useShow = !this.useShow
+    },
     choiceZRBM(type, title, id) {
       this.nodeListZRBM = []
       this.nodeListZRBM.push(id)
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
index a1ba62a88..ffd3b9d75 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
@@ -608,13 +608,13 @@ export default {
         if (this.saveExportType === "apart") {
           if (this.selectedList != null && this.selectedList != "") {
             const exportURL = interfaceUrl + "sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?" + "type=" + 1 +
-              "exportType" + this.saveExportType + "&ids=" + this.selectedList.join(",") + "&exportName=" + this.exportName;
+              "&exportType" + this.saveExportType + "&ids=" + this.selectedList.join(",") + "&exportName=" + this.exportName;
             window.open(exportURL);
             this.$message.success("导出信息成功");
           }
         } else if (this.saveExportType === "all") {
           const exportURL = interfaceUrl + "sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?" + "type=" + 1 +
-            "exportType" + this.saveExportType + "&id=" + this.pageId + "&exportName=" + this.exportName;
+            "&exportType" + this.saveExportType + "&id=" + this.pageId + "&exportName=" + this.exportName;
           window.open(exportURL);
           this.$message.success("导出信息成功");
         }

From b9dd1aa1cd38b9dc579edf104c710b6bb9d2782f Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Mon, 27 Dec 2021 10:59:07 +0800
Subject: [PATCH 05/10] =?UTF-8?q?=E6=B5=B7=E5=A4=96=20-=20=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=20-=20=E5=8A=A0=E4=BA=86=E4=B8=AA=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index f5d615690..8fd05fba9 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -57,6 +57,7 @@
                       <span v-else>{{ sarStandardsInfoEO.standSort + ' ' + sarStandardsInfoEO.standNumber }}</span>
                     </p>
                     <!--                <p><label style=" margin-right: 150px;">标准年份</label><span>{{ sarStandardsInfoEO.standYear || '-' }}</span></p>-->
+                    <!--发布稿（必读）-->
                     <template v-for="(child, childIndex) in item.child1">
                       <p class="files-title">
                         <label style=" margin-right: 164px;">{{ child.attrName }}</label>

From 1ed9a7dbaeb0c07f6cb37323528e28419e1a387d Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Mon, 27 Dec 2021 13:55:40 +0800
Subject: [PATCH 06/10] commit

---
 src/assets/styles/newStyle.less               | 14 ++++++++
 .../pages/creatProcess/bzdy/step1.vue         | 34 ++++++++++++++-----
 .../pages/creatProcess/bzjd/step1-1.vue       |  2 +-
 .../pages/creatProcess/bzjd/step1-6.vue       |  2 +-
 .../pages/creatProcess/bzjd/step1.vue         |  2 +-
 .../pages/creatProcess/bzjd/step2.vue         |  2 +-
 .../pages/creatProcess/bzjd/step3.vue         |  2 +-
 .../pages/creatProcess/bzjd/step4.vue         |  2 +-
 .../pages/creatProcess/bzjd/step5.vue         |  2 +-
 .../pages/creatProcess/bzjd/step6.vue         |  2 +-
 .../domesticStandardsAndRegulations/index.vue |  1 -
 .../components/EnterpriseStandardDatabase.vue |  1 -
 12 files changed, 48 insertions(+), 18 deletions(-)

diff --git a/src/assets/styles/newStyle.less b/src/assets/styles/newStyle.less
index d5e16a9ed..0f2f85177 100644
--- a/src/assets/styles/newStyle.less
+++ b/src/assets/styles/newStyle.less
@@ -1,4 +1,18 @@
 // 设置查询区域
+.itemsTextBox {
+  min-height: 300px;
+  max-height: 500px;
+  overflow: auto;
+  line-height: 20px;
+  td {
+    border: 1px solid #606266;
+    text-align: center;
+  }
+  /deep/ td {
+    border: 1px solid #606266;
+    text-align: center;
+  }
+}
 .search-area{
   display: flex;
   justify-content: space-between;
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
index d0bb9d7a5..09f159301 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
@@ -144,7 +144,7 @@
                   <h4>责任部门对接人</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.dockUserList" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.dockUserName" :title="roleForm.dockUserName" placeholder="选择责任人" readonly="readonly" @click.native="choiceZRRS">
+                    <el-input v-model="roleForm.dockUserName" :title="roleForm.dockUserName" placeholder="选择责任部门对接人" readonly="readonly" @click.native="choiceZRRS('1')">
                     </el-input>
                   </div>
                 </el-form-item>
@@ -167,7 +167,8 @@
                   <h4>技术管理中心主任</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.directorUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.directorUserName" placeholder="选择技术管理中心主任" readonly="readonly"  @click.native="choiceZRR('directorUser', '选择技术管理中心主任', roleForm.directorUser)"></el-input>
+<!--                    <el-input v-model="roleForm.directorUserName" placeholder="选择技术管理中心主任" readonly="readonly"  @click.native="choiceZRR('directorUser', '选择技术管理中心主任', roleForm.directorUser)"></el-input>-->
+                    <el-input v-model="roleForm.directorUserName" placeholder="选择技术管理中心主任" readonly="readonly"  @click.native="choiceZRRS('2')"></el-input>
                   </div>
                 </el-form-item>
               </el-card>
@@ -197,7 +198,7 @@
     >
     </ProcessFooter>
     <Role-tree
-            is-title="选择责任部门对接人"
+            :is-title="drawerTitle2"
             :is-visible.sync="modalshowflag2"
             @checkedRole="checkedRole2"
             :nodeList="nodeList2"
@@ -262,6 +263,8 @@ export default {
   name: "bzdyStep1",
   data() {
     return {
+      drawerTitle2: '',
+      type2: '',
       bpnId: '',
       foldFormFlag: false,
       fileMadel2: false,
@@ -362,8 +365,14 @@ export default {
         idList += item.id
         nameList += item.name
       })
-      this.roleForm.dockUserList = idList
-      this.roleForm.dockUserName = nameList
+      if (this.type2 === '1') {
+        this.roleForm.dockUserList = idList
+        this.roleForm.dockUserName = nameList
+      } else {
+        this.roleForm.directorUser = idList
+        this.roleForm.directorUserName = nameList
+      }
+
     },
     checkedRole (data) {
       if (this.type === 'dockUser') {
@@ -380,10 +389,19 @@ export default {
         this.roleForm.presidentUserName = data[0].name
       }
     },
-    choiceZRRS () {
+    choiceZRRS (type) {
+      this.type2 = type
       this.nodeList2 = []
-      if ( this.roleForm.dockUserList.length > 0) {
-        this.nodeList2 = this.roleForm.dockUserList.split(',')
+      if (type === '1') {
+        this.drawerTitle2 = '选择责任部门对接人'
+        if ( this.roleForm.dockUserList.length > 0) {
+          this.nodeList2 = this.roleForm.dockUserList.split(',')
+        }
+      } else {
+        this.drawerTitle2 = '选择技术管理中心主任'
+        if ( this.roleForm.directorUser.length > 0) {
+          this.nodeList2 = this.roleForm.directorUser.split(',')
+        }
       }
       this.modalshowflag2 = true
     },
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
index a22438391..734a2b504 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
@@ -420,7 +420,7 @@
                 title="查看条款内容"
                 :visible.sync="itermsConditionsFlag"
                 size="800px">
-            <div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
+            <div class="itemsTextBox" v-html="itermsConditionsTitle"></div>
             <div slot="footer">
                 <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
             </div>
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue
index b6e667a05..63914643d 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue
@@ -323,7 +323,7 @@
       title="查看条款内容"
       :visible.sync="itermsConditionsFlag"
       size="800px">
-      <div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
+      <div class="itemsTextBox" v-html="itermsConditionsTitle"></div>
       <div slot="footer">
         <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
       </div>
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
index fe95f97af..57a19019e 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
@@ -424,7 +424,7 @@
       title="查看条款内容"
       :visible.sync="itermsConditionsFlag"
       size="800px">
-      <div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
+      <div class="itemsTextBox" v-html="itermsConditionsTitle"></div>
       <div slot="footer">
         <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭
         </el-button>
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
index 05b0560ca..227a57450 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
@@ -260,7 +260,7 @@
                 title="查看条款内容"
                 :visible.sync="itermsConditionsFlag"
                 size="800px">
-            <div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
+            <div class="itemsTextBox" v-html="itermsConditionsTitle"></div>
             <div slot="footer">
                 <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
             </div>
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
index 7dcd95813..f3b763caf 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
@@ -417,7 +417,7 @@
                 title="查看条款内容"
                 :visible.sync="itermsConditionsFlag"
                 size="800px">
-            <div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
+            <div class="itemsTextBox" v-html="itermsConditionsTitle"></div>
             <div slot="footer">
                 <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
             </div>
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
index 1715d4c56..14234cacd 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
@@ -272,7 +272,7 @@
                 title="查看条款内容"
                 :visible.sync="itermsConditionsFlag"
                 size="800px">
-            <div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
+            <div class="itemsTextBox" v-html="itermsConditionsTitle"></div>
             <div slot="footer">
                 <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
             </div>
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
index 2c5abc2da..465385560 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
@@ -277,7 +277,7 @@
                 title="查看条款内容"
                 :visible.sync="itermsConditionsFlag"
                 size="800px">
-            <div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
+            <div class="itemsTextBox" v-html="itermsConditionsTitle"></div>
             <div slot="footer">
                 <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
             </div>
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
index 06c2d27d1..f95bc408c 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
@@ -276,7 +276,7 @@
                 title="查看条款内容"
                 :visible.sync="itermsConditionsFlag"
                 size="800px">
-            <div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
+            <div class="itemsTextBox" v-html="itermsConditionsTitle"></div>
             <div slot="footer">
                 <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
             </div>
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index a4f5b087e..22f470a00 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -4324,7 +4324,6 @@ export default {
       formData.startIssueTime = formData.issueTime?formData.issueTime[0]:null
       formData.endIssueTime = formData.issueTime?formData.issueTime[1]:null
       formData.issueTime = null
-
       this.loading = true
       this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, {
         _this: this, loading: 'loading'
diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index e1053c5d7..4de7326ed 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -271,7 +271,6 @@
       </div>
         <!--表格-->
       <div class="content">
-
         <el-table
           ref="selection"
           :data="standinfoList"

From 75b99eabaeacf636d30d112aed56f411c438fdf8 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Mon, 27 Dec 2021 13:59:35 +0800
Subject: [PATCH 07/10] commit

---
 .../pages/creatProcess/bzdy/step1-1.vue       | 30 ++++++++++++++-----
 .../pages/creatProcess/bzdy/step1.vue         |  1 -
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue
index 714e09912..97fad8e2b 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue
@@ -144,7 +144,7 @@
                                     <h4>责任部门对接人</h4>
                                     <div style="margin-top: 10px;width: 300px;">
                                         <el-input v-model="roleForm.dockUserList" style="display: none;"></el-input>
-                                        <el-input v-model="roleForm.dockUserName" placeholder="选择责任人" @click.native="choiceZRRS">
+                                        <el-input v-model="roleForm.dockUserName" placeholder="选择责任人" @click.native="choiceZRRS('1')">
                                         </el-input>
                                     </div>
                                 </el-form-item>
@@ -167,7 +167,7 @@
                                     <h4>技术管理中心主任</h4>
                                     <div style="margin-top: 10px;width: 300px;">
                                         <el-input v-model="roleForm.directorUser" style="display: none;"></el-input>
-                                        <el-input v-model="roleForm.directorUserName" placeholder="选择技术管理中心主任" @click.native="choiceZRR('directorUser', '选择技术管理中心主任', roleForm.directorUser)"></el-input>
+                                        <el-input v-model="roleForm.directorUserName" placeholder="选择技术管理中心主任" @click.native="choiceZRRS('2')"></el-input>
                                     </div>
                                 </el-form-item>
                             </el-card>
@@ -196,7 +196,7 @@
         >
         </ProcessFooter>
         <Role-tree
-                is-title="选择责任部门对接人"
+                :is-title="drawerTitle2"
                 :is-visible.sync="modalshowflag2"
                 @checkedRole="checkedRole2"
                 :nodeList="nodeList2"
@@ -261,6 +261,8 @@
         name: "bzdyStep1-1",
         data() {
             return {
+                drawerTitle2: '',
+                type2: '',
                 foldFormFlag: false,
                 fileMadel2: false,
                 nodeList: [],
@@ -370,8 +372,13 @@
                     idList += item.id
                     nameList += item.name
                 })
-                this.roleForm.dockUserList = idList
-                this.roleForm.dockUserName = nameList
+                if (this.type2 === '1') {
+                    this.roleForm.dockUserList = idList
+                    this.roleForm.dockUserName = nameList
+                } else {
+                    this.roleForm.directorUser = idList
+                    this.roleForm.directorUserName = nameList
+                }
             },
             checkedRole (data) {
                 if (this.type === 'dockUser') {
@@ -389,9 +396,18 @@
                 }
             },
             choiceZRRS () {
+                this.type2 = type
                 this.nodeList2 = []
-                if ( this.roleForm.dockUserList.length > 0) {
-                    this.nodeList2 = this.roleForm.dockUserList.split(',')
+                if (type === '1') {
+                    this.drawerTitle2 = '选择责任部门对接人'
+                    if ( this.roleForm.dockUserList.length > 0) {
+                        this.nodeList2 = this.roleForm.dockUserList.split(',')
+                    }
+                } else {
+                    this.drawerTitle2 = '选择技术管理中心主任'
+                    if ( this.roleForm.directorUser.length > 0) {
+                        this.nodeList2 = this.roleForm.directorUser.split(',')
+                    }
                 }
                 this.modalshowflag2 = true
             },
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
index 09f159301..2ae9cd88d 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
@@ -372,7 +372,6 @@ export default {
         this.roleForm.directorUser = idList
         this.roleForm.directorUserName = nameList
       }
-
     },
     checkedRole (data) {
       if (this.type === 'dockUser') {

From 3a082e4593b6a0b6bb85b42f8ccaf02f89343a44 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Mon, 27 Dec 2021 14:04:12 +0800
Subject: [PATCH 08/10] =?UTF-8?q?=E6=B5=B7=E5=A4=96=20-=20=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=20-=20=E6=A0=87=E5=87=86=E5=8F=B7=E3=80=81=E4=B8=AD?=
 =?UTF-8?q?=E6=96=87=E5=90=8D=E7=A7=B0=E3=80=81=E8=8B=B1=E6=96=87=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E3=80=81=E5=8F=91=E5=B8=83=E7=A8=BF=E3=80=81=E4=BF=AE?=
 =?UTF-8?q?=E8=AE=A2=E6=9C=AC=EF=BC=8C=E5=8B=98=E8=AF=AF=E4=BB=B6=EF=BC=8C?=
 =?UTF-8?q?=E5=A2=9E=E8=A1=A5=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../details/otherStandardDetails/index.vue    | 197 +++++++++++++++++-
 1 file changed, 191 insertions(+), 6 deletions(-)

diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 8fd05fba9..6d73b5859 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -57,6 +57,12 @@
                       <span v-else>{{ sarStandardsInfoEO.standSort + ' ' + sarStandardsInfoEO.standNumber }}</span>
                     </p>
                     <!--                <p><label style=" margin-right: 150px;">标准年份</label><span>{{ sarStandardsInfoEO.standYear || '-' }}</span></p>-->
+                    <p><label style=" margin-right: 150px;">中文名称</label><span>{{
+                        sarStandardsInfoEO.standName || '-'
+                      }}</span></p>
+                    <p v-if="activeState"><label style=" margin-right: 150px;">英文名称</label><span>{{
+                        sarStandardsInfoEO.standEnName || '-'
+                      }}</span></p>
                     <!--发布稿（必读）-->
                     <template v-for="(child, childIndex) in item.child1">
                       <p class="files-title">
@@ -100,12 +106,135 @@
                         <template v-if="child.value === null">-</template>
                       </p>
                     </template>
-                    <p><label style=" margin-right: 150px;">中文名称</label><span>{{
-                        sarStandardsInfoEO.standName || '-'
-                      }}</span></p>
-                    <p v-if="activeState"><label style=" margin-right: 150px;">英文名称</label><span>{{
-                        sarStandardsInfoEO.standEnName || '-'
-                      }}</span></p>
+                    <!--修订本-->
+                    <template v-for="(child, childIndex) in item.child5">
+                      <p class="files-title">
+                        <label style=" margin-right: 164px;">{{ child.attrName }}</label>
+                        <template v-if="child.value && child.value.length > 0"
+                                  v-for="(file, fileIndex) in child5Func(child.value)">
+                          <span>
+                          <a style="font-size: 16px;color: #409EFF;cursor: pointer"
+                             @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
+                             :title="file.oldFileName">{{ file.oldFileName }}</a>
+                          <i
+                              title="下载"
+                              @click="downloadFile(file.id)"
+                              class="icon-download"
+                              v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
+                          />
+                          <i
+                              title="下载带水印"
+                              @click="downloadFileByWater(file.id, file.fileSuffix)"
+                              class="icon-download2"
+                              v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
+                          />
+                            <!--                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
+                          </span>
+                          <el-button
+                              v-if="child.attrField === itemNam "
+                              v-for="(itemNam,index) in itemExistList"
+                              :key="index"
+                              @click="showItemsModel(child.attrField)"
+                              class="decomposition-btn"
+                              style="right:62px"
+                              icon="icon-separate"
+                          >标准分解单
+                          </el-button>
+                          <el-button v-if="child.value && child.value.length > 1"
+                                     style="color:#409EFF;border: 1px solid #409EFF;background: rgba(64, 158, 255, 0.1);"
+                                     class="decomposition-btn" icon="icon-relation" @click="relateEvent1(child.value)">
+                            更多
+                          </el-button>
+                        </template>
+                        <template v-if="child.value === null">-</template>
+                      </p>
+                    </template>
+                    <!--勘误件-->
+                    <template v-for="(child, childIndex) in item.child4">
+                      <p class="files-title">
+                        <label style=" margin-right: 164px;">{{ child.attrName }}</label>
+                        <template v-if="child.value && child.value.length > 0"
+                                  v-for="(file, fileIndex) in child4Func(child.value)">
+                          <span>
+                          <a style="font-size: 16px;color: #409EFF;cursor: pointer"
+                             @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
+                             :title="file.oldFileName">{{ file.oldFileName }}</a>
+                          <i
+                              title="下载"
+                              @click="downloadFile(file.id)"
+                              class="icon-download"
+                              v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
+                          />
+                          <i
+                              title="下载带水印"
+                              @click="downloadFileByWater(file.id, file.fileSuffix)"
+                              class="icon-download2"
+                              v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
+                          />
+                            <!--                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
+                          </span>
+                          <el-button
+                              v-if="child.attrField === itemNam "
+                              v-for="(itemNam,index) in itemExistList"
+                              :key="index"
+                              @click="showItemsModel(child.attrField)"
+                              class="decomposition-btn"
+                              style="right:62px"
+                              icon="icon-separate"
+                          >标准分解单
+                          </el-button>
+                          <el-button v-if="child.value && child.value.length > 1"
+                                     style="color:#409EFF;border: 1px solid #409EFF;background: rgba(64, 158, 255, 0.1);"
+                                     class="decomposition-btn" icon="icon-relation" @click="relateEvent1(child.value)">
+                            更多
+                          </el-button>
+                        </template>
+                        <template v-if="child.value === null">-</template>
+                      </p>
+                    </template>
+                    <!--增补件（必读）-->
+                    <template v-for="(child, childIndex) in item.child3">
+                      <p class="files-title">
+                        <label style=" margin-right: 164px;">{{ child.attrName }}</label>
+                        <template v-if="child.value && child.value.length > 0"
+                                  v-for="(file, fileIndex) in child3Func(child.value)">
+                          <span>
+                          <a style="font-size: 16px;color: #409EFF;cursor: pointer"
+                             @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
+                             :title="file.oldFileName">{{ file.oldFileName }}</a>
+                          <i
+                              title="下载"
+                              @click="downloadFile(file.id)"
+                              class="icon-download"
+                              v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
+                          />
+                          <i
+                              title="下载带水印"
+                              @click="downloadFileByWater(file.id, file.fileSuffix)"
+                              class="icon-download2"
+                              v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
+                          />
+                            <!--                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
+                          </span>
+                          <el-button
+                              v-if="child.attrField === itemNam "
+                              v-for="(itemNam,index) in itemExistList"
+                              :key="index"
+                              @click="showItemsModel(child.attrField)"
+                              class="decomposition-btn"
+                              style="right:62px"
+                              icon="icon-separate"
+                          >标准分解单
+                          </el-button>
+                          <el-button v-if="child.value && child.value.length > 1"
+                                     style="color:#409EFF;border: 1px solid #409EFF;background: rgba(64, 158, 255, 0.1);"
+                                     class="decomposition-btn" icon="icon-relation" @click="relateEvent1(child.value)">
+                            更多
+                          </el-button>
+                        </template>
+                        <template v-if="child.value === null">-</template>
+                      </p>
+                    </template>
                     <p class="half">
                       <label style=" margin-right: 150px;"
                              title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。"
@@ -377,7 +506,9 @@
                   v-for="(child, childIndex) in item.one"
                   v-if="child.isShowImp === '0' && item.label == '过程稿件'"
               >
+<!--                增补件（必读）和勘误件不放在过程稿件里了-->
                 <div
+                    v-show="child.attrField !== 'ZBJBD' && child.attrField !== 'KWJ'"
                     :key="child.id"
                     :class="'modular-item half'"
                 >
@@ -1940,6 +2071,7 @@ export default {
   watch: {},
   methods: {
     child1Func(child1) {
+      console.log('1943',child1)
       const list = []
       if (child1 && child1.length > 1) {
         list.push(child1[0])
@@ -1947,6 +2079,33 @@ export default {
       }
       return child1
     },
+    child3Func(child3) {
+      console.log('1943',child3)
+      const list = []
+      if (child3 && child3.length > 1) {
+        list.push(child3[0])
+        return list
+      }
+      return child3
+    },
+    child4Func(child4) {
+      console.log('1943',child4)
+      const list = []
+      if (child4 && child4.length > 1) {
+        list.push(child4[0])
+        return list
+      }
+      return child4
+    },
+    child5Func(child5) {
+      console.log('1943',child5)
+      const list = []
+      if (child5 && child5.length > 1) {
+        list.push(child5[0])
+        return list
+      }
+      return child5
+    },
     handleChange(val) {
       console.log('1724', val)
     },
@@ -3479,7 +3638,9 @@ export default {
       displayLocation.forEach(location => {
         // 动态属性字段-FBGBJBD 单独添加至基础信息
         const list = displayLocation.filter(item => item.label === '过程稿件');
+        console.log('3535',list)
         if (location.label === '基础信息' && list && list.length > 0) {
+          //发布稿必读
           if (!list[0].child) {
             location['child1'] = []
           } else {
@@ -3487,6 +3648,30 @@ export default {
             location['child1'] = childList
 
           }
+          //增补件必读
+          if (!list[0].child) {
+            location['child3'] = []
+          } else {
+            const childList = list[0].child.filter(item => item.attrField === 'ZBJBD');
+            location['child3'] = childList
+
+          }
+          //勘误件
+          if (!list[0].child) {
+            location['child4'] = []
+          } else {
+            const childList = list[0].child.filter(item => item.attrField === 'KWJ');
+            location['child4'] = childList
+
+          }
+          //修订本
+          if (!list[0].child) {
+            location['child5'] = []
+          } else {
+            const childList = list[0].child.filter(item => item.attrField === 'XDB');
+            location['child5'] = childList
+
+          }
         }
         // 动态属性字段-SYRZ 单独添加至基础信息
         const list2 = displayLocation.filter(item => item.label === '适用范围');

From 030fef30fc69c4a6ab69e28ca858e27e1d6abc8e 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 Dec 2021 14:05:13 +0800
Subject: [PATCH 09/10] =?UTF-8?q?=E6=B8=85=E5=8D=95=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzqdfb/step1-1.vue     | 10 +++
 .../pages/creatProcess/bzqdfb/step1.vue       |  2 +
 .../pages/creatProcess/bzqdfb/step3.vue       |  2 +-
 .../pages/addEdit.vue                         | 69 +++++++++----------
 4 files changed, 45 insertions(+), 38 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
index 75225cd91..3d6f1cccd 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
@@ -1315,6 +1315,14 @@ export default {
             this.$message.warning("请勿重复添加数据");
           } else {
             this.dataList.push(item);
+            this.dataList.forEach(item => {
+              if(item.XCXSSRQ === null){
+                item.XCXSSRQ = ''
+              }
+              if(item.ZCCSSRQ === null){
+                item.ZCCSSRQ = ''
+              }
+            })
             exits.push(item.id);
           }
         });
@@ -1368,11 +1376,13 @@ export default {
             this.dataList.forEach(item => {
               if(item.xcxssrqgj === 'undefined' ||item.xcxssrqgj === '-' ||  item.xcxssrqgj === 'null'){
                 item.xcxssrqgj = ''
+                this.$set(item, "XCXSSRQ", item.xcxssrqgj)
               }else{
                 this.$set(item, "XCXSSRQ", item.xcxssrqgj)
               }
               if(item.zccssrqgj === 'undefined' || item.zccssrqgj === '-'|| item.zccssrqgj === 'null'){
                 item.zccssrqgj = ''
+                this.$set(item, "ZCCSSRQ", item.zccssrqgj)
               }else{
                 this.$set(item, "ZCCSSRQ", item.zccssrqgj)
               }
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
index 61f2e77f2..412e435de 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
@@ -1308,11 +1308,13 @@ export default {
               this.dataList.forEach(item => {
                 if(item.xcxssrqgj === 'undefined' ||item.xcxssrqgj === '-' ||  item.xcxssrqgj === 'null'){
                   item.xcxssrqgj = ''
+                  this.$set(item, "XCXSSRQ", item.xcxssrqgj)
                 }else{
                   this.$set(item, "XCXSSRQ", item.xcxssrqgj)
                 }
                 if(item.zccssrqgj === 'undefined' || item.zccssrqgj === '-'|| item.zccssrqgj === 'null'){
                   item.zccssrqgj = ''
+                  this.$set(item, "ZCCSSRQ", item.zccssrqgj)
                 }else{
                   this.$set(item, "ZCCSSRQ", item.zccssrqgj)
                 }
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
index 9fd6c6eb4..8dfd0b84c 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
@@ -815,7 +815,7 @@ export default {
       this.listForm.commentText = this.commentText
       this.listForm.dataList = this.dataList
       const json = JSON.stringify(this.listForm);
-      this.isSubmit = true
+      // this.isSubmit = true
       this.$http.post('lawss/activiti/completeTask', {
         taskIds: this.taskIds,
         userId: this.userId,
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index 195afb22c..f5a470933 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -454,18 +454,20 @@
         </el-form-item>
         <el-form-item label="在产车实施日期" prop="zccssrqgj">
           <el-date-picker
-              v-model.trim="editRowData.zccssrqgj"
-              type="dates"
-              value-format="yyyy-MM-dd"
-              placeholder="选择日期">
+            clearable
+            v-model.trim="editRowData.zccssrqgj"
+            type="dates"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="新车型实施日期" prop="xcxssrqgj">
           <el-date-picker
-              v-model.trim="editRowData.xcxssrqgj"
-              type="dates"
-              value-format="yyyy-MM-dd"
-              placeholder="选择日期">
+            clearable
+            v-model.trim="editRowData.xcxssrqgj"
+            type="dates"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="责任部门" prop="zrbm">
@@ -1162,46 +1164,25 @@ export default {
     addSarAccess() {
       //判断是否是清单类型
       if (this.selectedAccInfoSearchList.length > 0) {
-
-        //为空转换
-        for (let i = 0; i < this.selectedAccInfoSearchList.length; i++) {
-          //适用车型为空
-          if (this.selectedAccInfoSearchList[i].typeApplicable === "[]"){
-            this.selectedAccInfoSearchList[i].typeApplicable = null
-          }
-          //能源类型为空
-          if (this.selectedAccInfoSearchList[i].nylx === "[]"){
-            this.selectedAccInfoSearchList[i].nylx = null
-          }
-          //责任部门为空
-          if (this.selectedAccInfoSearchList[i].zrbm === "[]"){
-            this.selectedAccInfoSearchList[i].zrbm = null
-          }
-          //试用产品线为空
-          if (this.selectedAccInfoSearchList[i].sycpx === "[]"){
-            this.selectedAccInfoSearchList[i].sycpx = null
-          }
-        }
-
         // 追加字段
         this.selectedAccInfoSearchList.map(item => {
           let addList;
           addList = this.sarAccessInfoList.findIndex(items => {
-            return items.id === item.id
-          })
+            return items.id === item.id;
+          });
           if (addList > -1) {
             // this.$refs.accessTypeSelect.clearSelection()
-            this.$refs.entryTable.clearSelection()
+            this.$refs.entryTable.clearSelection();
             this.$refs.searchTable.clearSelection()
             this.$message.warning('请勿添加重复数据')
           } else {
             this.sarAccessInfoList.push(item)
             this.sarAccessInfoList.forEach(item => {
-              this.$set(item, 'xcxssrqgj', item.xcxssrq)
-              this.$set(item, 'zccssrqgj', item.zccssrq)
-              if(item.attrInfoCaseMap !== undefined){
-                this.$set(item, 'typeApplicable', item.attrInfoCaseMap.cllx)
-                this.$set(item, 'nylx', item.attrInfoCaseMap.nylx)
+              this.$set(item, "xcxssrqgj", item.xcxssrq);
+              this.$set(item, "zccssrqgj", item.zccssrq);
+              if (item.attrInfoCaseMap !== undefined) {
+                this.$set(item, "typeApplicable", item.attrInfoCaseMap.cllx);
+                this.$set(item, "nylx", item.attrInfoCaseMap.nylx);
               }
               // 能源类型转换
               if (item.nylx !== null) {
@@ -1231,6 +1212,20 @@ export default {
             // this.$refs.accessTypeSelect.clearSelection()
             this.$refs.entryTable.clearSelection()
             this.$refs.searchTable.clearSelection()
+            this.sarAccessInfoList.forEach(item => {
+              if(item.nylx === '[]'){
+                item.nylx = ''
+              }
+              if(item.typeApplicable === '[]'){
+                item.typeApplicable = ''
+              }
+              if(item.zrbm === '[]'){
+                item.zrbm = ''
+              }
+              if(item.sycpx === '[]'){
+                item.sycpx = ''
+              }
+            })
           }
         })
       } else {

From 60378fe6a10811f5419a82660a30ce7608f17278 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Mon, 27 Dec 2021 14:56:41 +0800
Subject: [PATCH 10/10] =?UTF-8?q?=E6=B5=B7=E5=A4=96=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=20-=201.=E6=96=87=E6=9C=AC=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?-=E5=A2=9E=E5=8A=A0=E2=80=9C=E4=BF=AE=E8=AE=A2=E6=9C=AC?=
 =?UTF-8?q?=E2=80=9D=202.=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF-=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E8=A6=81=E4=BC=9A=E7=AD=BE=EF=BC=8C=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E2=80=9C=E5=90=A6=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzrk/step1.vue         | 25 +++++++++++-
 .../pages/creatProcess/bzrk/step4.vue         | 38 +++++++++++++++++++
 2 files changed, 62 insertions(+), 1 deletion(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index 5db2f67a3..09d2cf8f8 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -418,6 +418,29 @@
                                       </div>
                                   </div>
                                 </el-form-item>
+                              <el-form-item v-show="form.standInData === '1'" label="修订本" prop="xdb" class="add-form-item form-item-disabled">
+                                <el-input
+                                    disabled
+                                    style="display: none;"
+                                    v-model="form.xdbName"
+                                    clearable
+                                ></el-input>
+                                <div style="display: flex;justify-content: space-between">
+                                  <div style="width: 80%;">
+                                    <div v-for="(item,index) in xdbFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
+                                  </div>
+                                  <div style="width: 20%;">
+                                    <el-button
+                                        type="primary"
+                                        class="common-button-primary"
+                                        size="mini"
+                                        style="margin-left: 10px; margin-top: 11px; float: right;"
+                                        @click="fileUpload('xdb')">
+                                      <i class="el-icon-upload el-icon--right"></i>
+                                    </el-button>
+                                  </div>
+                                </div>
+                              </el-form-item>
 <!--          ************************************* 2021/11/9 把"解读文件"改为"相关文件"*************************************-->
                               <el-form-item v-show="form.standInData === '0'" label="相关文件" prop="jdwj" class="add-form-item form-item-disabled">
  <!--         ************************************** 2021/11/9 把"解读文件"改为"相关文件"*************************************-->
@@ -1692,7 +1715,7 @@
                         standNature: '', // 标准性质
                         standEnName: '', // 英文名称
                         standName: '', // 中文名称
-                        signFlag: '1', // 是否需要会签
+                        signFlag: '2', // 是否需要会签
                         issueTime: '', // 发布时间
                         isRelateAccess: '', // 是否纳入认证清单
                         standSystem: '',// 标准体系
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
index f46799a0a..53882e2c9 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
@@ -624,6 +624,29 @@
                     </div>
                   </div>
                 </el-form-item>
+                <el-form-item v-show="form.standInData === '1'" label="修订本" prop="xdb" class="add-form-item form-item-disabled">
+                  <el-input
+                      disabled
+                      style="display: none;"
+                      v-model="form.xdbName"
+                      clearable
+                  ></el-input>
+                  <div style="display: flex;justify-content: space-between">
+                    <div style="width: 80%;">
+                      <div v-for="(item,index) in xdbFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
+                    </div>
+                    <div style="width: 20%;">
+                      <el-button
+                          type="primary"
+                          class="common-button-primary"
+                          size="mini"
+                          style="margin-left: 10px; margin-top: 11px; float: right;"
+                          @click="fileUpload('xdb')">
+                        <i class="el-icon-upload el-icon--right"></i>
+                      </el-button>
+                    </div>
+                  </div>
+                </el-form-item>
                 <!--          ************************************* 2021/11/9 把"解读文件"改为"相关文件"*************************************-->
                 <el-form-item v-show="form.standInData === '0'" label="相关文件" prop="jdwj" class="add-form-item form-item-disabled">
                   <!--          ************************************* 2021/11/9 把"解读文件"改为"相关文件"*************************************-->
@@ -1415,6 +1438,7 @@ export default {
       jdwjFileList: [],
       zbjbdFileList: [],
       kwjFileList: [],
+      xdbFileList: [],
       glwjFileList: [],
       textStatus:'',//文本状态
       textStatusMap: {}, // 文本状态id与name对应
@@ -2133,6 +2157,9 @@ export default {
           case 'kwj':
             this.kwjFileList=fileList;
             break;
+          case 'xdb':
+            this.xdbFileList=fileList;
+            break;
           case 'ca':
             this.caFileList=fileList;
             break;
@@ -2170,6 +2197,9 @@ export default {
         case 'kwj':
           this.kwjFileList=fileList;
           break;
+        case 'xdb':
+          this.xdbFileList=fileList;
+          break;
         case 'ca':
           this.caFileList=fileList;
           break;
@@ -2201,6 +2231,8 @@ export default {
         this.fileList=this.zbjbdFileList;
       }else if (type==='kwj'){
         this.fileList=this.kwjFileList;
+      }else if (type==='xdb'){
+        this.fileList=this.xdbFileList;
       }else if (type==='glwj'){
         this.fileList=this.glwjFileList;
       }
@@ -2401,6 +2433,9 @@ export default {
           case 'kwj':
             this.getFileList(value,this.kwjFileList);
             break;
+          case 'xdb':
+            this.getFileList(value,this.xdbFileList);
+            break;
           case 'jdwj':
             this.getFileList(value,this.jdwjFileList);
             break;
@@ -2504,6 +2539,9 @@ export default {
       this.form.kwj=this.kwjFileList.map(item => item.response.data.id).join(",")
       this.form.kwjName=this.kwjFileList.map(item => item.name).join(",")
 
+      this.form.kwj=this.xdbFileList.map(item => item.response.data.id).join(",")
+      this.form.kwjName=this.xdbFileList.map(item => item.name).join(",")
+
       this.form.ca=this.caFileList.map(item => item.response.data.id).join(",")
       this.form.caName=this.caFileList.map(item => item.name).join(",")