From 82932ea2ed266bfe44729f47426c58b7e41a5023 Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Fri, 10 Dec 2021 14:52:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E4=BC=9A=E5=8F=82=E4=BC=9A=E3=80=81?=
 =?UTF-8?q?=E5=85=A5=E4=BC=9A=E3=80=81=E4=BC=9A=E5=90=8E=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=90=8D=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=B8=85=E5=8D=95=E5=AE=9E?=
 =?UTF-8?q?=E6=96=BD=E6=97=A5=E6=9C=9F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzhHd-rh/step1.vue     |  4 +-
 .../pages/creatProcess/bzhHh-hh/step1.vue     | 12 ++--
 .../pages/creatProcess/bzhHy-ch/step1.vue     |  4 +-
 .../pages/addEdit.vue                         | 63 +++++++++++++------
 .../pages/otherAddEit.vue                     | 42 ++++++++++---
 .../pages/projectAddEit.vue                   | 41 +++++++++---
 6 files changed, 120 insertions(+), 46 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
index df1f01387..e9fd7f355 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
@@ -564,12 +564,12 @@ export default {
           this.newDataList = this.fileTextList
           this.newDataList.push({
             id: res.data.attId,
-            name: res.data.standName
+            name: res.data.name
           })
         } else {
           this.newDataList.push({
             id: res.data.attId,
-            name: res.data.standName
+            name: res.data.name
           })
         }
         this.fileListData.fileText = this.newDataList
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue
index 948bbc6d6..1bb287d22 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue
@@ -375,12 +375,12 @@ export default {
           this.newDataList = this.reData
             this.newDataList.push({
               id: res.data.attId,
-              name: res.data.standName
+              name: res.data.name
           })
         } else {
             this.newDataList.push({
               id: res.data.attId,
-              name: res.data.standName
+              name: res.data.name
             })
         }
 
@@ -449,12 +449,12 @@ export default {
           this.newThemeFile = this.themeData
           this.newThemeFile.push({
             id: res.data.attId,
-            name: res.data.standName
+            name: res.data.name
           })
         } else {
           this.newDataList.push({
             id: res.data.attId,
-            name: res.data.standName
+            name: res.data.name
           })
         }
         this.themeDataList.meetingFile = this.newThemeFile
@@ -510,12 +510,12 @@ export default {
           this.newOtherFile = this.hh_pageData.otherFileList
           this.newOtherFile.push({
             id: res.data.attId,
-            name: res.data.standName
+            name: res.data.name
           })
         } else {
           this.newOtherFile.push({
             id: res.data.attId,
-            name: res.data.standName
+            name: res.data.name
           })
         }
         this.hh_pageData.otherFileList = this.newOtherFile
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue
index c8efb7e7f..11f73fd78 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue
@@ -487,12 +487,12 @@ export default {
           this.newDataList = this.ch_pageData.fileTextList
           this.newDataList.push({
             id: res.data.attId,
-            name: res.data.standName
+            name: res.data.name
           })
         } else {
           this.newDataList.push({
             id: res.data.attId,
-            name: res.data.standName
+            name: res.data.name
           })
         }
         this.ch_pageData.fileTextList = this.newDataList
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index 39bb29fce..79b6974d5 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -368,7 +368,7 @@
             align="center"
             label="适用产品线">
         </el-table-column>
-        <el-table-column
+<!--        <el-table-column
             show-overflow-tooltip
             prop="cycvppsbm"
             width="210px"
@@ -395,7 +395,7 @@
             align="center"
             width="210px"
             label="卡车VPPS中文名称">
-        </el-table-column>
+        </el-table-column>-->
         <el-table-column width="240" align="center" fixed="right" label="操作">
           <template slot-scope="scope">
             <el-button
@@ -463,6 +463,7 @@
 
     <el-drawer
         title="编辑清单条目"
+        :before-close='cancelInfo'
         :visible.sync="drawerEdit"
         :wrapperClosable="false"
         size="800px"
@@ -486,7 +487,7 @@
         <el-form-item label="标准实施日期" prop="putTime">
           <el-date-picker
               v-model.trim="editRowData.ssrq"
-              type="date"
+              type="dates"
               value-format="yyyy-MM-dd"
               placeholder="选择日期">
           </el-date-picker>
@@ -494,7 +495,7 @@
         <el-form-item label="在产车实施日期" prop="zccssrqgj">
           <el-date-picker
               v-model.trim="editRowData.zccssrqgj"
-              type="date"
+              type="dates"
               value-format="yyyy-MM-dd"
               placeholder="选择日期">
           </el-date-picker>
@@ -502,7 +503,7 @@
         <el-form-item label="新车型实施日期" prop="xcxssrqgj">
           <el-date-picker
               v-model.trim="editRowData.xcxssrqgj"
-              type="date"
+              type="dates"
               value-format="yyyy-MM-dd"
               placeholder="选择日期">
           </el-date-picker>
@@ -513,7 +514,7 @@
         <el-form-item label="适用产品线" prop="sycpx">
           <el-input v-model.trim="editRowData.sycpx" :disabled="true"/>
         </el-form-item>
-        <el-form-item label="乘用车VPPS编码" prop="cycvppsbm">
+<!--        <el-form-item label="乘用车VPPS编码" prop="cycvppsbm">
           <el-input v-model.trim="editRowData.cycvppsbm" :disabled="true"/>
         </el-form-item>
         <el-form-item label="乘用车VPPS中文名称" prop="cycvppscn">
@@ -524,7 +525,7 @@
         </el-form-item>
         <el-form-item label="卡车VPPS中文名称" prop="kccvppscn">
           <el-input v-model.trim="editRowData.kccvppscn" :disabled="true"/>
-        </el-form-item>
+        </el-form-item>-->
       </el-form>
       <div class="demo-drawer-footer">
         <el-button
@@ -914,6 +915,7 @@ export default {
       allSelectOptions: {},
       dynamicFormField: [], // 动态数据
       uuid: '',
+      rowList: {}
     }
   },
   created() {
@@ -1257,7 +1259,6 @@ export default {
             this.$message.warning('请勿添加重复数据')
           } else {
             this.sarAccessInfoList.push(item)
-            console.log('1270',this.sarAccessInfoList)
             // this.$refs.accessTypeSelect.clearSelection()
             this.$refs.entryTable.clearSelection()
             this.$refs.searchTable.clearSelection()
@@ -1294,18 +1295,41 @@ export default {
     },
     // 编辑按钮
     editTghisRow(row) {
+      // 用来储存取消时原来的数据，防止取消时修改
+      localStorage.setItem('obj', JSON.stringify(row))
+
       this.rowList = row
       this.editRowData = this.rowList
-      this.editRowData.standNumber = this.rowList.standNumber
+      if (this.editRowData.ssrq !== null) {
+        this.editRowData.ssrq = this.editRowData.ssrq.split(',')
+      }
+      if (this.editRowData.zccssrqgj !== null) {
+        this.editRowData.zccssrqgj = this.editRowData.zccssrqgj.split(',')
+      }
+      if (this.editRowData.xcxssrqgj !== null) {
+        this.editRowData.xcxssrqgj = this.editRowData.xcxssrqgj.split(',')
+      }
       this.drawerEdit = true
     },
     // 抽屉取消按钮
     cancelInfo() {
+      let Item = JSON.parse(localStorage.getItem('obj'))
+      this.editRowData.ssrq = Item.ssrq
+      this.editRowData.xcxssrqgj = Item.xcxssrqgj
+      this.editRowData.zccssrqgj = Item.zccssrqgj
       this.drawerEdit = false
     },
     // 抽屉提交按钮
     saveInfo() {
-      this.rowList = this.editRowData
+      if (this.editRowData.ssrq !== null) {
+        this.editRowData.ssrq = this.editRowData.ssrq.join(',')
+      }
+      if (this.editRowData.xcxssrqgj !== null){
+        this.editRowData.xcxssrqgj = this.editRowData.xcxssrqgj.join(',')
+      }
+      if (this.editRowData.zccssrqgj !== null){
+        this.editRowData.zccssrqgj = this.editRowData.zccssrqgj.join(',')
+      }
       this.drawerEdit = false
     },
     // 点击清单条目导入按钮事件
@@ -1377,23 +1401,25 @@ export default {
             if (this.sarAccessInfoList[i].ssrq === null || this.sarAccessInfoList[i].ssrq === undefined) {
               rowlist1.push(this.sarAccessInfoList[i].ssrq = '-')
             } else {
-              rowlist1.push(this.sarAccessInfoList[i].ssrq.toString())
+              rowlist1.push(this.sarAccessInfoList[i].ssrq)
             }
             if (this.sarAccessInfoList[i].xcxssrqgj === null || this.sarAccessInfoList[i].xcxssrqgj === undefined) {
               rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
             } else {
-              rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
+              rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj)
             }
             if (this.sarAccessInfoList[i].zccssrqgj === null || this.sarAccessInfoList[i].zccssrqgj === undefined) {
               rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '-')
             } else {
-              rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
+              rowlist2.push(this.sarAccessInfoList[i].zccssrqgj)
             }
           }
+          console.log(rowlist1)
           rowlist = rowlist.join(',')
-          rowlist1 = rowlist1.join(',')
-          rowlist2 = rowlist2.join(',')
-          rowlist3 = rowlist3.join(',')
+          rowlist1 = rowlist1.join(';')
+          console.log(rowlist1)
+          rowlist2 = rowlist2.join(';')
+          rowlist3 = rowlist3.join(';')
           let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO))
           sarAccessEO.inforlist = rowlist
           sarAccessEO.inforlist1 = rowlist1
@@ -1586,7 +1612,6 @@ export default {
     //   })
     // },
     pageInfo() {
-      console.log('1598',this.sarAccessInfoSearch)
       if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND' || this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND'){
         StandardsInfoPage(this.sarAccessInfoSearch).then(res => {
           this.sarAccessInfoSearchList = res.data.list
@@ -1629,7 +1654,6 @@ export default {
         this.$http.get('lawss/sarLawsInfo/page', this.sarAccessInfoSearch, {
           _this: this,
         }, res => {
-          console.log('1640',res)
           this.sarAccessInfoSearchList = res.data.list
           this.drawerTotal = res.data.count
         }, e => {
@@ -2433,6 +2457,9 @@ export default {
     background: #ffffff;
     text-align: right;
   }
+  /deep/.el-date-editor.el-input {
+    width: 100%;
+  }
 }
 
 .labelBox {
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
index f1a84b880..f31d2b44a 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
@@ -341,7 +341,7 @@
           align="center"
           label="适用产品线">
         </el-table-column>
-        <el-table-column
+<!--        <el-table-column
           show-overflow-tooltip
           prop="cycvppsbm"
           width="210px"
@@ -368,7 +368,7 @@
           align="center"
           width="210px"
           label="卡车VPPS中文名称">
-        </el-table-column>
+        </el-table-column>-->
         <el-table-column width="240" align="center"  fixed="right"  label="操作">
           <template slot-scope="scope">
             <el-button
@@ -430,6 +430,7 @@
       title="编辑清单条目"
       :visible.sync="drawerEdit"
       :wrapperClosable="false"
+      :before-close='cancelInfo'
       size="800px"
     >
       <el-form :modal="editRowData" label-position="left" ref="editRowData" label-width="150px" style="margin: 20px">
@@ -478,7 +479,7 @@
         <el-form-item label="适用产品线" prop="sycpx">
           <el-input v-model.trim="editRowData.sycpx" :disabled="true"/>
         </el-form-item>
-        <el-form-item label="乘用车VPPS编码" prop="cycvppsbm">
+<!--        <el-form-item label="乘用车VPPS编码" prop="cycvppsbm">
           <el-input v-model.trim="editRowData.cycvppsbm" :disabled="true"/>
         </el-form-item>
         <el-form-item label="乘用车VPPS中文名称" prop="cycvppscn">
@@ -489,7 +490,7 @@
         </el-form-item>
         <el-form-item label="卡车VPPS中文名称" prop="kccvppscn">
           <el-input v-model.trim="editRowData.kccvppscn" :disabled="true"/>
-        </el-form-item>
+        </el-form-item>-->
       </el-form>
       <div class="demo-drawer-footer">
         <el-button
@@ -1228,18 +1229,41 @@ export default {
     },
     // 编辑按钮
     editTghisRow(row) {
+      // 用来储存取消时原来的数据，防止取消时修改
+      localStorage.setItem('obj', JSON.stringify(row))
+
       this.rowList = row
       this.editRowData = this.rowList
-      this.editRowData.standNumber = this.rowList.standNumber
+      if (this.editRowData.ssrq !== null) {
+        this.editRowData.ssrq = this.editRowData.ssrq.split(',')
+      }
+      if (this.editRowData.zccssrqgj !== null) {
+        this.editRowData.zccssrqgj = this.editRowData.zccssrqgj.split(',')
+      }
+      if (this.editRowData.xcxssrqgj !== null) {
+        this.editRowData.xcxssrqgj = this.editRowData.xcxssrqgj.split(',')
+      }
       this.drawerEdit = true
     },
     // 抽屉取消按钮
     cancelInfo() {
+      let Item = JSON.parse(localStorage.getItem('obj'))
+      this.editRowData.ssrq = Item.ssrq
+      this.editRowData.xcxssrqgj = Item.xcxssrqgj
+      this.editRowData.zccssrqgj = Item.zccssrqgj
       this.drawerEdit = false
     },
     // 抽屉提交按钮
     saveInfo() {
-      this.rowList = this.editRowData
+      if (this.editRowData.ssrq !== null) {
+        this.editRowData.ssrq = this.editRowData.ssrq.join(',')
+      }
+      if (this.editRowData.xcxssrqgj !== null){
+        this.editRowData.xcxssrqgj = this.editRowData.xcxssrqgj.join(',')
+      }
+      if (this.editRowData.zccssrqgj !== null){
+        this.editRowData.zccssrqgj = this.editRowData.zccssrqgj.join(',')
+      }
       this.drawerEdit = false
     },
     // 点击清单条目导入按钮事件
@@ -1324,9 +1348,9 @@ export default {
             }
           }
           rowlist = rowlist.join(',')
-          rowlist1 = rowlist1.join(',')
-          rowlist2 = rowlist2.join(',')
-          rowlist3 = rowlist3.join(',')
+          rowlist1 = rowlist1.join(';')
+          rowlist2 = rowlist2.join(';')
+          rowlist3 = rowlist3.join(';')
           let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO))
           sarAccessEO.inforlist = rowlist
           sarAccessEO.inforlist1 = rowlist1
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
index 708ee19a7..628777636 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
@@ -399,7 +399,7 @@
             align="center"
             label="适用产品线">
         </el-table-column>
-        <el-table-column
+<!--        <el-table-column
             show-overflow-tooltip
             prop="cycvppsbm"
             width="210px"
@@ -426,7 +426,7 @@
             align="center"
             width="210px"
             label="卡车VPPS中文名称">
-        </el-table-column>
+        </el-table-column>-->
         <el-table-column width="240" align="center" fixed="right" label="操作">
           <template slot-scope="scope">
             <el-button
@@ -494,6 +494,7 @@
     <el-drawer
         title="编辑清单条目"
         :visible.sync="drawerEdit"
+        :before-close='cancelInfo'
         :wrapperClosable="false"
         size="800px"
     >
@@ -543,7 +544,7 @@
         <el-form-item label="适用产品线" prop="sycpx">
           <el-input v-model.trim="editRowData.sycpx" :disabled="true"/>
         </el-form-item>
-        <el-form-item label="乘用车VPPS编码" prop="cycvppsbm">
+<!--        <el-form-item label="乘用车VPPS编码" prop="cycvppsbm">
           <el-input v-model.trim="editRowData.cycvppsbm" :disabled="true"/>
         </el-form-item>
         <el-form-item label="乘用车VPPS中文名称" prop="cycvppscn">
@@ -554,7 +555,7 @@
         </el-form-item>
         <el-form-item label="卡车VPPS中文名称" prop="kccvppscn">
           <el-input v-model.trim="editRowData.kccvppscn" :disabled="true"/>
-        </el-form-item>
+        </el-form-item>-->
       </el-form>
       <div class="demo-drawer-footer">
         <el-button
@@ -1227,18 +1228,40 @@ export default {
     },
     // 编辑按钮
     editTghisRow(row) {
+      // 用来储存取消时原来的数据，防止取消时修改
+      localStorage.setItem('obj', JSON.stringify(row))
       this.rowList = row
       this.editRowData = this.rowList
-      this.editRowData.standNumber = this.rowList.standNumber
+      if (this.editRowData.ssrq !== null) {
+        this.editRowData.ssrq = this.editRowData.ssrq.split(',')
+      }
+      if (this.editRowData.zccssrqgj !== null) {
+        this.editRowData.zccssrqgj = this.editRowData.zccssrqgj.split(',')
+      }
+      if (this.editRowData.xcxssrqgj !== null) {
+        this.editRowData.xcxssrqgj = this.editRowData.xcxssrqgj.split(',')
+      }
       this.drawerEdit = true
     },
     // 抽屉取消按钮
     cancelInfo() {
+      let Item = JSON.parse(localStorage.getItem('obj'))
+      this.editRowData.ssrq = Item.ssrq
+      this.editRowData.xcxssrqgj = Item.xcxssrqgj
+      this.editRowData.zccssrqgj = Item.zccssrqgj
       this.drawerEdit = false
     },
     // 抽屉提交按钮
     saveInfo() {
-      this.rowList = this.editRowData
+      if (this.editRowData.ssrq !== null) {
+        this.editRowData.ssrq = this.editRowData.ssrq.join(',')
+      }
+      if (this.editRowData.xcxssrqgj !== null){
+        this.editRowData.xcxssrqgj = this.editRowData.xcxssrqgj.join(',')
+      }
+      if (this.editRowData.zccssrqgj !== null){
+        this.editRowData.zccssrqgj = this.editRowData.zccssrqgj.join(',')
+      }
       this.drawerEdit = false
     },
     // 点击清单条目导入按钮事件
@@ -1324,9 +1347,9 @@ export default {
             }
           }
           rowlist = rowlist.join(',')
-          rowlist1 = rowlist1.join(',')
-          rowlist2 = rowlist2.join(',')
-          rowlist3 = rowlist3.join(',')
+          rowlist1 = rowlist1.join(';')
+          rowlist2 = rowlist2.join(';')
+          rowlist3 = rowlist3.join(';')
           let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO))
           sarAccessEO.inforlist = rowlist
           sarAccessEO.inforlist1 = rowlist1