From 78a4160bc90898d9018a5bbd798bc3cb5b9509d5 Mon Sep 17 00:00:00 2001
From: yangzijiao <yangzijiao@123.com>
Date: Wed, 21 Jul 2021 10:39:42 +0800
Subject: [PATCH 1/6] Merge branch 'develop-1' of
 D:\yuedi\laws-system-front-FOTON with conflicts.

---
 package-lock.json | 195 +++++++++++++++++++++-------------------------
 vue.config.js     |   2 +-
 2 files changed, 90 insertions(+), 107 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b81c194e8..3d1e87236 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3619,23 +3619,6 @@
             "upath": "^1.1.1"
           }
         },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npm.taobao.org/color-convert/download/color-convert-2.0.1.tgz",
-          "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npm.taobao.org/color-name/download/color-name-1.1.4.tgz",
-          "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
-          "dev": true,
-          "optional": true
-        },
         "commander": {
           "version": "2.20.3",
           "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
@@ -4581,94 +4564,6 @@
             }
           }
         },
-        "vue-loader-v16": {
-          "version": "npm:vue-loader@16.3.0",
-          "resolved": "https://registry.nlark.com/vue-loader/download/vue-loader-16.3.0.tgz",
-          "integrity": "sha1-LxleS6D7DiY1ltaDDfF9Gjbok2w=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "chalk": "^4.1.0",
-            "hash-sum": "^2.0.0",
-            "loader-utils": "^2.0.0"
-          },
-          "dependencies": {
-            "ansi-styles": {
-              "version": "4.3.0",
-              "resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-4.3.0.tgz?cache=0&sync_timestamp=1618995651629&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-styles%2Fdownload%2Fansi-styles-4.3.0.tgz",
-              "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "color-convert": "^2.0.1"
-              }
-            },
-            "big.js": {
-              "version": "5.2.2",
-              "resolved": "https://registry.nlark.com/big.js/download/big.js-5.2.2.tgz",
-              "integrity": "sha1-ZfCvOC9Xi83HQr2cKB6cstd2gyg=",
-              "dev": true,
-              "optional": true
-            },
-            "chalk": {
-              "version": "4.1.1",
-              "resolved": "https://registry.nlark.com/chalk/download/chalk-4.1.1.tgz",
-              "integrity": "sha1-yAs/qyi/Y3HmhjMl7uZ+YYt35q0=",
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "ansi-styles": "^4.1.0",
-                "supports-color": "^7.1.0"
-              }
-            },
-            "emojis-list": {
-              "version": "3.0.0",
-              "resolved": "https://registry.npm.taobao.org/emojis-list/download/emojis-list-3.0.0.tgz",
-              "integrity": "sha1-VXBmIEatKeLpFucariYKvf9Pang=",
-              "dev": true,
-              "optional": true
-            },
-            "has-flag": {
-              "version": "4.0.0",
-              "resolved": "https://registry.npm.taobao.org/has-flag/download/has-flag-4.0.0.tgz",
-              "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
-              "dev": true,
-              "optional": true
-            },
-            "json5": {
-              "version": "2.2.0",
-              "resolved": "https://registry.npm.taobao.org/json5/download/json5-2.2.0.tgz",
-              "integrity": "sha1-Lf7+cgxrpSXZ69kJlQ8FFTFsiaM=",
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "minimist": "^1.2.5"
-              }
-            },
-            "loader-utils": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-2.0.0.tgz",
-              "integrity": "sha1-5MrOW4FtQloWa18JfhDNErNgZLA=",
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "big.js": "^5.2.2",
-                "emojis-list": "^3.0.0",
-                "json5": "^2.1.2"
-              }
-            },
-            "supports-color": {
-              "version": "7.2.0",
-              "resolved": "https://registry.nlark.com/supports-color/download/supports-color-7.2.0.tgz?cache=0&sync_timestamp=1622293630895&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsupports-color%2Fdownload%2Fsupports-color-7.2.0.tgz",
-              "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "has-flag": "^4.0.0"
-              }
-            }
-          }
-        },
         "vue-style-loader": {
           "version": "4.1.2",
           "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.2.tgz",
@@ -9313,7 +9208,7 @@
     },
     "image-size": {
       "version": "0.5.5",
-      "resolved": "https://registry.nlark.com/image-size/download/image-size-0.5.5.tgz",
+      "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz",
       "integrity": "sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=",
       "dev": true,
       "optional": true
@@ -13622,6 +13517,94 @@
       "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.22.4.tgz",
       "integrity": "sha512-XLI5s0AdqMP2Lf4I4CmdmOq8kjb5DDFGR77wAuxCfpEuYSfhTRyyx6MetgZMiL6Lxa0DasjBOiOcciU3NkL3/Q=="
     },
+    "vue-loader-v16": {
+      "version": "npm:vue-loader@16.3.3",
+      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.3.3.tgz",
+      "integrity": "sha512-/1GzCuQ6MRORbC+leKTKoTGtpQt60bYe0gDGEextSteA2OM+v201FPha5jzmjQzVhRcwieZeUvezAtG5a/e5cw==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "chalk": "^4.1.0",
+        "hash-sum": "^2.0.0",
+        "loader-utils": "^2.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true,
+          "optional": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true,
+          "optional": true
+        },
+        "hash-sum": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-2.0.0.tgz",
+          "integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==",
+          "dev": true,
+          "optional": true
+        },
+        "loader-utils": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
+          "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^2.1.2"
+          }
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
+      }
+    },
     "vue-router": {
       "version": "3.4.0",
       "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.4.0.tgz",
diff --git a/vue.config.js b/vue.config.js
index 40b40d896..dcab907a6 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -86,7 +86,7 @@ module.exports = {
         }
       },
       '/onlyOffice': {
-        target: 'http://172.20.10.2:8888',
+        target: 'http://10.96.10.171',
         changeOrigin: true,
         pathRewrite: {
           '^/onlyOffice': '/api'

From 1d296d876afe6034b97ee59d8a570670a08b443d Mon Sep 17 00:00:00 2001
From: liuhuaizhi <liuhuaizhi@91isoft.com>
Date: Wed, 21 Jul 2021 13:23:45 +0800
Subject: [PATCH 2/6] fix:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

5677 车型项目库--查看页面 添加按钮改成调取按钮，
点击【调取】进入，该页面需要加检索条件（参考期望），选择一个标准点击添加，查看页面没有数据
---
 .../pages/details.vue                         | 67 +++++++++++++++++--
 1 file changed, 63 insertions(+), 4 deletions(-)

diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
index 221351fb2..5345d5663 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
@@ -25,12 +25,12 @@
           <el-row style="margin-top: 10px">
             <el-col :span="5">项目经理: <span class="valueColor">{{ localProEO.projectManager }} </span></el-col>
             <el-col :span="5" :push="1"> 项目计划开始时间: <span class="valueColor">{{ localProEO.projectStartDate}}</span></el-col>
-            <el-col :span="5" :push="2">项目计划完成时间: <span class="valueColor">{{localProEO.projectEndDate  }} </span></el-col>
+            <el-col :span="5" :push="2">项目计划完成时间: <span class="valueColor">{{l`ocalProEO.projectEndDate  }} </span></el-col>
           </el-row>
         </div>
       </el-card>
       <div class="action-bar">
-        <el-button plain class="common-button-primary" size="mini" @click="addList">添加</el-button>
+        <el-button plain class="common-button-primary" size="mini" @click="addList">调取</el-button>
         <el-button plain class="common-button-primary" size="mini" @click="deleteList">批量删除</el-button>
         <el-button class="common-button-default export-button"
                    size="mini" @click="exportStandard"
@@ -143,6 +143,42 @@
       <div class="demo-drawer-content">
         <div style="position: absolute;bottom: 48px;top:16px;left: 0;right: 0">
           <div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
+            <!-- 顶部工具栏 -->
+            <table-tools-bar>
+              <div slot="left">
+                <div class="search-area">
+                  <el-form :model="standCommonlySearch" inline class="label-input-form">
+                    <el-formItem label="标准号/名称" prop="standNumber" class="search-item">
+                      <el-input v-model="standCommonlySearch.standNumber" placeholder="根据标准号/名称查找" clearable/>
+                    </el-formItem>
+                    <el-formItem label="标准类别" prop="standSort" class="search-item">
+                      <el-select v-model="standCommonlySearch.standSort" placeholder="根据标准类别查找" clearable>
+                        <el-option v-for="opt in standSortOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label }}
+                        </el-option>
+                      </el-select>
+                    </el-formItem>
+                    <el-formItem label="标准来源" prop="standType" class="search-item">
+                      <el-select v-model="standCommonlySearch.standType" placeholder="根据标准来源查找" clearable>
+                        <el-option value="INLAND" key="1" label="国内标准"></el-option>
+                        <el-option value="FOREIGN" key="2" label="海外标准"></el-option>
+                      </el-select>
+                    </el-formItem>
+                    <el-formItem class="search-item btn-box">
+                      <el-button
+                        type="primary"
+                        size="mini"
+                        class="common-button-primary"
+
+                        @click="search">查询</el-button>
+                      <el-button
+                        class="common-button-default"
+                        size="mini"
+                        @click="clearSearch">清空</el-button>
+                    </el-formItem>
+                  </el-form>
+                </div>
+              </div>
+            </table-tools-bar>
             <el-table
                 :data="standardData"
                 tooltip-effect="dark"
@@ -233,6 +269,12 @@ export default {
   },
   data () {
     return {
+      standSortOptions: [],
+      standCommonlySearch: {
+        standSort: '',
+        standNumber: '',
+        standType: ''
+      },
       size: this.$store.getters.userInfo.configContent,
       pageSizeNo: this.$store.getters.userInfo.configContent,
       pageSize: this.$store.getters.userInfo.configContent,
@@ -260,6 +302,19 @@ export default {
     }
   },
   methods: {
+    // 搜索
+    search() {
+      this.pageNo = 1
+      this.pageSizeNo = this.$store.getters.userInfo.configContent;
+      this.addList()
+    },
+    clearSearch() {
+      this.pageNo = 1
+      this.standCommonlySearch.standSort = ''
+      this.standCommonlySearch.standNumber = ''
+      this.standCommonlySearch.standType = ''
+      this.addList()
+    },
     pageChange(page) {
       this.page = page;
       this.selectionList();
@@ -285,7 +340,10 @@ export default {
     addList() {
       this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
         page:this.pageNo,
-        pageSize:this.pageSizeNo
+        pageSize:this.pageSizeNo,
+        standSort: this.standCommonlySearch.standSort,
+        standNumber: this.standCommonlySearch.standNumber,
+        standType: this.standCommonlySearch.standType
       }, {
         _this:this,
       }, res => {
@@ -555,6 +613,7 @@ export default {
         _this: this,
         loading: 'loading'
       }, res => {
+        this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
         this.showLocalProductData(this.getLocalPro)
       }, e => {
       })
@@ -750,4 +809,4 @@ export default {
 .demo-drawer-content {
      margin-top: 10px;
 }
-</style>
\ No newline at end of file
+</style>

From 1d7c837dcd0b1463286df41d26a626979ff0e65c Mon Sep 17 00:00:00 2001
From: liuhuaizhi <liuhuaizhi@91isoft.com>
Date: Wed, 21 Jul 2021 13:40:00 +0800
Subject: [PATCH 3/6] fix:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

5677 车型项目库--查看页面 添加按钮改成调取按钮，
点击【调取】进入，该页面需要加检索条件（参考期望），选择一个标准点击添加，查看页面没有数据
---
 .../localProductsOrProjectLibrary/pages/details.vue             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
index 5345d5663..88ed4d9b9 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
@@ -25,7 +25,7 @@
           <el-row style="margin-top: 10px">
             <el-col :span="5">项目经理: <span class="valueColor">{{ localProEO.projectManager }} </span></el-col>
             <el-col :span="5" :push="1"> 项目计划开始时间: <span class="valueColor">{{ localProEO.projectStartDate}}</span></el-col>
-            <el-col :span="5" :push="2">项目计划完成时间: <span class="valueColor">{{l`ocalProEO.projectEndDate  }} </span></el-col>
+            <el-col :span="5" :push="2">项目计划完成时间: <span class="valueColor">{{localProEO.projectEndDate  }} </span></el-col>
           </el-row>
         </div>
       </el-card>

From 59fee2f22428631cd346cb86ac624fd1acf317ec Mon Sep 17 00:00:00 2001
From: yangzijiao <yangzijiao@123.com>
Date: Wed, 21 Jul 2021 13:56:18 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=E5=AD=97=E6=AE=B5=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/addEdit.vue                         |  1 -
 .../pages/otherAddEit.vue                     | 37 ++++++++++++++++---
 .../pages/projectAddEit.vue                   | 34 +++++++++++++++--
 3 files changed, 63 insertions(+), 9 deletions(-)

diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index 9a8810380..8b3390df2 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -459,7 +459,6 @@
             <el-button
               class="common-button-default"
               type="danger"
-              style="margin-left: 0px"
               size="small" @click="moveDown(scope.$index, scope.row)"
               v-if="!disabledFlag"
             >下移</el-button>
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
index 28e717fee..213a15d12 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
@@ -211,17 +211,26 @@
             prop="issueTime"
             sortable
             label="发布日期">
+            <template slot-scope="scope">
+               <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}</span>
+            </template>
           </el-table-column>
           <el-table-column
-            prop="xcxssrq"
+            prop="xcxssrqgj"
             sortable
             label="新车型实施日期">
+              <template slot-scope="scope">
+                  <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
+              </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
-            prop="zccssrq"
+            prop="zccssrqgj"
             sortable
             label="在产车实施日期">
+              <template slot-scope="scope">
+                  <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
+              </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
@@ -362,6 +371,9 @@
           width="210px"
           align="center"
           label="在产车实施日期">
+            <template slot-scope="scope">
+                <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
+            </template>
         </el-table-column>
         <el-table-column
           prop="xcxssrqgj"
@@ -369,6 +381,9 @@
           align="center"
           width="210px"
           label="新车型实施日期">
+            <template slot-scope="scope">
+                <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
+            </template>
         </el-table-column>
         <el-table-column
           show-overflow-tooltip
@@ -418,7 +433,7 @@
           width="210px"
           label="卡车VPPS中文名称">
         </el-table-column>
-        <el-table-column>
+        <el-table-column width="150">
           <template slot-scope="scope">
             <el-button
               class="common-button-default"
@@ -539,6 +554,7 @@ export default {
       nylxMap: {},
       zrbmMap: {},
       sycpxMap: {},
+      zrbmOptions: [],
       selectSearch : [],
       // 新增、编辑 基础信息字段
       sarAccessEO: {
@@ -1242,8 +1258,19 @@ export default {
         _this: this
       }, res =>{
         this.sarAccessInfoSearchList = res.data.list
-        this.$nextTick(() => {
-        })
+        this.sarAccessInfoSearchList.forEach(item => {
+            this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
+            this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+            this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
+            this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
+            this.$set(item, 'nylx', item.attrInfoMap.NYLX)
+            this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
+            this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
+            this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
+            this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
+            this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
+          })
+          console.log(this.sarAccessInfoSearchList)
       }, e => {
 
       })
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
index db97c6e44..f388000db 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
@@ -211,17 +211,26 @@
             prop="issueTime"
             sortable
             label="发布日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}</span>
+            </template>
           </el-table-column>
           <el-table-column
-            prop="xcxssrq"
+            prop="xcxssrqgj"
             sortable
             label="新车型实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
-            prop="zccssrq"
+            prop="zccssrqgj"
             sortable
             label="在产车实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
@@ -362,6 +371,9 @@
           width="210px"
           align="center"
           label="在产车实施日期">
+          <template slot-scope="scope">
+            <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
+          </template>
         </el-table-column>
         <el-table-column
           prop="xcxssrqgj"
@@ -369,6 +381,9 @@
           align="center"
           width="210px"
           label="新车型实施日期">
+          <template slot-scope="scope">
+            <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
+          </template>
         </el-table-column>
         <el-table-column
           show-overflow-tooltip
@@ -429,7 +444,6 @@
             <el-button
               class="common-button-default"
               type="danger"
-              style="margin-left: 0px"
               size="small" @click="moveDown(scope.$index, scope.row)"
               v-if="!disabledFlag"
             >下移</el-button>
@@ -540,6 +554,7 @@ export default {
       nylxMap: {},
       zrbmMap: {},
       sycpxMap: {},
+      zrbmOptions: [],
       selectSearch : [],
       // 新增、编辑 基础信息字段
       sarAccessEO: {
@@ -1244,6 +1259,19 @@ export default {
         _this: this
       }, res =>{
         this.sarAccessInfoSearchList = res.data.list
+        this.sarAccessInfoSearchList.forEach(item => {
+          this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
+          this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+          this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
+          this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
+          this.$set(item, 'nylx', item.attrInfoMap.NYLX)
+          this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
+          this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
+          this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
+          this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
+          this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
+        })
+        console.log(this.sarAccessInfoSearchList)
       }, e => {
 
       })

From e220e9c1f4ff32486fc5a725ae9f3475fe5b107e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Wed, 21 Jul 2021 15:46:24 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E8=AF=84=E4=BC=B0=E5=8F=8A=E6=9C=AA?=
 =?UTF-8?q?=E7=AC=A6=E5=90=88bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzqdfb/step1.vue       |   9 +-
 .../pages/creatProcess/xmpg/step2.vue         |   2 +-
 .../pages/creatProcess/xmpg/step3.vue         | 132 ++++++++++++++----
 .../pages/creatProcess/xmpg/step4.vue         |   4 +-
 .../pages/creatProcess/xmpg/step5.vue         |   2 +-
 .../pages/creatProcess/xmpg/step6.vue         |   2 +-
 .../pages/creatProcess/xmpg/step7.vue         |   2 +-
 .../nonConfomity/pages/historicalData.vue     |  24 +++-
 .../pages/rectificationDatabase.vue           |  19 ++-
 9 files changed, 153 insertions(+), 43 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
index 4a1f06106..cdf384538 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
@@ -1064,6 +1064,7 @@ export default {
     //提交事件
     handleSubmit() {
       let json = this.listForm;
+      console.log(this.fileInfoList.join(','));
       this.listForm.fileId = this.fileInfoList.join(',')
       this.listForm.fileName =  this.fileListName.join(',')
       // let json = Object.assign(this.listForm, this.roleForm)
@@ -1110,9 +1111,11 @@ export default {
     // 删除上传的文件
     delFileInfo(file, fileList) {
       this.fileInfoList = fileList
+      let middle = []
       fileList.forEach(item => {
-        this.fileListName = item.name
+        middle.push(item.name)
       })
+      this.fileListName = middle
     },
     fileUpload () {
       this.fileMadel = true
@@ -1120,9 +1123,11 @@ export default {
     // 上传文件成功回调
     uploadBackSuccess (res, file, fileList) {
       if (res.ok) {
+        let middle = []
         fileList.forEach(item => {
-          this.fileListName = item.name
+          middle.push(item.name)
         })
+        this.fileListName =  middle
         this.fileInfoList = fileList
         this.fileInfoList[this.fileInfoList.length - 1].id = res.data.id
         this.$message.success('上传成功')
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
index b09a5622e..3643f6062 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
@@ -111,7 +111,7 @@
     </div>
 
     <div class="content" v-show="active === '3'">
-      <div class="flow-list">
+      <div class="flow-list" style="height: 100%">
         <el-table
           height="100%"
           ref="selection"
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
index 8e3caa019..70146884e 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
@@ -120,22 +120,56 @@
             label="落实人">
             <template slot-scope="scope,text" v-if="showColumn">
               <div>
-                <div @click="choiceZRR(scope,'implementer', '选择落实人', roleForm.implementer)">
+                <div @click="choiceZRRS(scope)">
                   {{ listForm.breakdownList[scope.$index].implementer == null ? "请选择落实人" : listForm.breakdownList[scope.$index].implementer
                   }}
                 </div>
+                <!--                <div @click="choiceZRR(scope,'implementer', '选择落实人', roleForm.implementer)">-->
+                <!--                  {{ listForm.breakdownList[scope.$index].implementer == null ? "请选择落实人" : listForm.breakdownList[scope.$index].implementer-->
+                <!--                  }}-->
+                <!--                </div>-->
               </div>
             </template>
           </el-table-column>
         </el-table>
         <!--    选择责任人-->
+        <!--        <el-drawer-->
+        <!--          :title="drawerTitle"-->
+        <!--          :visible.sync="modalshowflag"-->
+        <!--          :wrapperClosable="false"-->
+        <!--          size="800px">-->
+        <!--          <el-tree-->
+        <!--            v-if="modalshowflag"-->
+        <!--            style="height: 100%; overflow: auto;"-->
+        <!--            node-key="id"-->
+        <!--            class="filter-tree"-->
+        <!--            :data="treeData"-->
+        <!--            :props="defaultProps"-->
+        <!--            :default-checked-keys="nodeList"-->
+        <!--            highlight-current-->
+        <!--            check-strictly-->
+        <!--            @check="drawerCheck"-->
+        <!--            default-expand-all-->
+        <!--            :expand-on-click-node="false"-->
+        <!--            show-checkbox-->
+        <!--            ref="tree">-->
+        <!--          </el-tree>-->
+        <!--          <div id="roleFormButton" class="demo-drawer-footer">-->
+        <!--            <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary"-->
+        <!--                       @click="saveUserInfo">-->
+        <!--              确定-->
+        <!--            </el-button>-->
+        <!--            <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo">取消-->
+        <!--            </el-button>-->
+        <!--          </div>-->
+        <!--        </el-drawer>-->
         <el-drawer
-          :title="drawerTitle"
-          :visible.sync="modalshowflag"
+          title="选择责任部门对接人"
+          :visible.sync="modalshowflag2"
           :wrapperClosable="false"
           size="800px">
           <el-tree
-            v-if="modalshowflag"
+            v-if="modalshowflag2"
             style="height: 100%; overflow: auto;"
             node-key="id"
             class="filter-tree"
@@ -144,26 +178,25 @@
             :default-checked-keys="nodeList"
             highlight-current
             check-strictly
-            @check="drawerCheck"
             default-expand-all
             :expand-on-click-node="false"
             show-checkbox
-            ref="tree">
+            ref="tree2">
           </el-tree>
-          <div id="roleFormButton" class="demo-drawer-footer">
+          <div id="roleFormButton2" class="demo-drawer-footer">
             <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary"
-                       @click="saveUserInfo">
-              确定
+                       @click="saveUserInfo2">确定
             </el-button>
-            <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo">取消
+            <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo2">取消
             </el-button>
           </div>
         </el-drawer>
+
       </div>
     </div>
 
     <div class="content" v-show="active === '3'">
-      <div class="flow-list">
+      <div class="flow-list" style="height: 100%">
         <el-table
           height="100%"
           ref="selection"
@@ -260,6 +293,7 @@ export default {
       showColumn: true,
       drawerTitle: "", //drawer标题
       modalshowflag: false, // drawer开关
+      modalshowflag2: false,
       treeData: [], // 人员数据
       nodeList: [],
       defaultProps: {
@@ -296,6 +330,7 @@ export default {
         qualityEngineer: "", //质量工程师
         breakdownList: [{    //分解单数据
           implementer: "",
+          implementerId:'',
           applyArctic: "",
           busStandCover: "",
           claimType: "",
@@ -308,6 +343,7 @@ export default {
         }],
         dataList: [{
           implementer: "",
+          implementerId:'',
           projectLine: "", //产品线
           uname: "",//产品线责任人
           distributePerson: "", //分发责任人
@@ -331,7 +367,8 @@ export default {
         }]
       },
       roleForm: {
-        implementer: ""
+        implementer: "",
+        implementerId: "",
       },
       choiceForm: {}, //选择标准清单列表
       user1: "",
@@ -374,6 +411,11 @@ export default {
         });
       });
     },
+
+    createItemId() {
+      return Number(Math.random().toString().substr(3,18) + Date.now()).toString(36);
+    },
+
     /**
      * @description: 动态表单读取
      */
@@ -387,7 +429,7 @@ export default {
       for (let i = 0; i < item.pepdtos.length; i++) {
         for (let j = 0; j < item.pepdtos[i].breakdownList.length; j++) {
           this.listForm.breakdownList.push({
-            itemId: new Date().getTime(),
+            itemId: this.createItemId(),
             itemsName: item.pepdtos[i].breakdownList[j].itemsName,
             itemNum: item.pepdtos[i].breakdownList[j].itemsNum,
             responsibleEngineer: item.pepdtos[i].breakdownList[j].responsibleEngineer,
@@ -410,38 +452,70 @@ export default {
         }
       }
     },
-    saveUserInfo() {
-      if (this.type === "implementer") {
+    // saveUserInfo() {
+    //   if (this.type === "implementer") {
+    //     // 如果有勾选的项
+    //     if (this.selectList.length) {
+    //       this.listForm.breakdownList.forEach((item, index) => {
+    //         if (this.selectList.includes(item.itemId)) {
+    //           this.listForm.breakdownList[index].implementerId = this.roleRow.id;
+    //           this.listForm.breakdownList[index].implementer = this.roleRow.name;
+    //         }
+    //       });
+    //     } else {
+    //       this.listForm.breakdownList[this.dsadadadsada].implementerId = this.roleRow.id;
+    //       this.listForm.breakdownList[this.dsadadadsada].implementer = this.roleRow.name;
+    //     }
+    //     this.listForm.implementer = this.roleRow.name;
+    //     this.showColumn = false;
+    //     this.$nextTick(() => {
+    //       this.showColumn = true;
+    //     });
+    //   }
+    //   this.modalshowflag = false;
+    // },
+    saveUserInfo2 () {
+        var idList = "";
+        var nameList = "";
+        this.$refs.tree2.getCheckedNodes().concat(this.$refs.tree2.getHalfCheckedNodes()).forEach(item => {
+          if (nameList.length > 0) {
+            nameList += ",";
+            idList += ",";
+          }
+          idList += item.id;
+          nameList += item.name;
+        });
         // 如果有勾选的项
         if (this.selectList.length) {
           this.listForm.breakdownList.forEach((item, index) => {
+            console.log(item.itemId);
+            console.log(index);
             if (this.selectList.includes(item.itemId)) {
-              this.listForm.breakdownList[index].implementerId = this.roleRow.id;
-              this.listForm.breakdownList[index].implementer = this.roleRow.name;
+              this.listForm.breakdownList[index].implementerId = idList;
+              this.listForm.breakdownList[index].implementer = nameList;
             }
           });
         } else {
-          this.listForm.breakdownList[this.dsadadadsada].implementerId = this.roleRow.id;
-          this.listForm.breakdownList[this.dsadadadsada].implementer = this.roleRow.name;
+          this.listForm.breakdownList[this.dsadadadsada].implementerId = idList;
+          this.listForm.breakdownList[this.dsadadadsada].implementer = nameList;
         }
-        this.listForm.implementer = this.roleRow.name;
+        this.listForm.implementer = nameList;
         this.showColumn = false;
         this.$nextTick(() => {
           this.showColumn = true;
         });
-      }
-      this.modalshowflag = false;
+      this.modalshowflag2 = false;
     },
-    cancleUserInfo() {
-      this.modalshowflag = false;
+    cancleUserInfo2() {
+      this.modalshowflag2 = false;
     },
-    choiceZRR(scope, type, title, id) {
+    choiceZRRS(scope) {
       if (scope != null) this.dsadadadsada = scope.$index;
       this.nodeList = [];
-      this.nodeList.push(id);
-      this.type = type;
-      this.drawerTitle = title;
-      this.modalshowflag = true;
+      if (this.roleForm.implementer.length > 0) {
+        this.nodeList = this.roleForm.implementer.split(",");
+      }
+      this.modalshowflag2 = true;
     },
     getTree() {
       this.$http.get("SarInstitution/institution/institutionAndUser", {}, {}, res => {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
index a0d0d502b..a26e77563 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
@@ -271,9 +271,9 @@
     </div>
 
     <div class="content" v-show="active === '3'">
-      <div class="flow-list">
+      <div class="flow-list" style="height:100%">
         <el-table
-          height="800px"
+          height="100%"
           ref="selection"
           :data="detailData"
           tooltip-effect="dark"
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
index 60b351613..1dc390e5a 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
@@ -228,7 +228,7 @@
     </div>
 
     <div class="content" v-show="active === '3'">
-      <div class="flow-list">
+      <div class="flow-list" style="height: 100%">
         <el-table
           height="100%"
           ref="selection"
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
index 284d243f7..c5b0bb69a 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
@@ -228,7 +228,7 @@
     </div>
 
     <div class="content" v-show="active === '3'">
-      <div class="flow-list">
+      <div class="flow-list" style="height: 100%">
         <el-table
           height="100%"
           ref="selection"
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
index 67779eb12..607b70c25 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
@@ -228,7 +228,7 @@
     </div>
 
     <div class="content" v-show="active === '3'">
-      <div class="flow-list">
+      <div class="flow-list" style="height: 100%">
         <el-table
           height="100%"
           ref="selection"
diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue b/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue
index faa0c9a52..da111f143 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue
@@ -92,6 +92,7 @@
         <el-table-column
           prop="standId"
           width="180px"
+          align="center"
           label="标准编号">
           <template slot-scope="scope">
             <a @click="detailsStandard(scope.row)" class="table-jump">{{ scope.row.standId }}</a>
@@ -100,6 +101,7 @@
         <el-table-column
           prop="standName"
           width="180px"
+          align="center"
           label="标准名称">
           <template slot-scope="scope">
             <a @click="detailsStandard(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
@@ -107,42 +109,56 @@
         </el-table-column>
         <el-table-column
           prop="itemsNum"
+          width="150"
+          align="center"
           label="条款号">
         </el-table-column>
         <el-table-column
         prop="itemsName"
+        width="150"
+        align="center"
         label="条款名称">
       </el-table-column>
         <el-table-column
           prop="productLine"
+          width="150"
+          align="center"
           label="产品线">
         </el-table-column>
         <el-table-column
           prop="productName"
+          width="150"
+          align="center"
           label="项目名称">
         </el-table-column>
         <el-table-column
           prop="responsibleUnit"
+          width="150"
+          align="center"
           label="责任部门">
         </el-table-column>
         <el-table-column
           prop="dutyEngineer"
-          width="150px"
+          width="150"
+          align="center"
           label="责任工程师">
         </el-table-column>
         <el-table-column
           prop="authEngineer"
-          width="150px"
+          width="150"
+          align="center"
           label="认证工程师">
         </el-table-column>
         <el-table-column
           prop="qaEngineer"
-          width="150px"
+          width="150"
+          align="center"
           label="质量工程师">
         </el-table-column>
         <el-table-column
         prop="actualCloseTime"
-        width="150px"
+        width="150"
+        align="center"
         sortable
         label="实际关闭时间">
         <template slot-scope="scope">{{(scope.row.actualCloseTime ? scope.row.actualCloseTime.substring(0, 11): '')}}</template>
diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
index d664ec02e..49ff416ad 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
@@ -117,9 +117,12 @@
               fixed="left"
               width="180"
               label="标准编号">
+<!--              <template slot-scope="scope">-->
+<!--                <a @click="detailsStandard(scope.row)" class="table-jump">{{ scope.row.standId }}</a>-->
+<!--&lt;!&ndash;                {{ scope.row.standId }}&ndash;&gt;-->
+<!--              </template>-->
               <template slot-scope="scope">
-                <a @click="detailsStandard(scope.row)" class="table-jump">{{ scope.row.standId }}</a>
-<!--                {{ scope.row.standId }}-->
+                <a  class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standId }}</a>
               </template>
             </el-table-column>
             <el-table-column
@@ -568,6 +571,18 @@ export default {
     openEditModal(item) {
       console.log(item)
     },
+    // 点击查看
+    handlePreview (item) {
+      let routeUrl = this.$router.resolve({
+        name: 'OtherStandardDetails',
+        params: {
+          //gslh3tgg7kot97ay5oz0
+          id: item.id,
+          pageType: item.standType + '_STAND'
+        }
+      })
+      window.open(routeUrl.href, '_blank')
+    },
     detailsStandard (item) {
       this.$http.post('lawss/sarTestItem/validateStandNumber', {
         standnumber: item.standNum

From cf30193ceb739ffab0940c70c686b05db6491046 Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Wed, 21 Jul 2021 16:25:17 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E5=9B=9E=E6=98=BE=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=EF=BC=81=EF=BC=81=EF=BC=81=EF=BC=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/creatProcess/xmpg/step3.vue | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
index 70146884e..22b171a3f 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
@@ -505,6 +505,13 @@ export default {
           this.showColumn = true;
         });
       this.modalshowflag2 = false;
+      //不要删除 By 宋伟佳
+      console.log(this.$refs.multipleTable.clearSelection())
+        this.$nextTick(() => {
+            for(var i=0;i<this.$refs.multipleTable.length;i++){
+                this.$refs.multipleTable[i].clearSelection();
+            }
+        })
     },
     cancleUserInfo2() {
       this.modalshowflag2 = false;