From 377a72f38a46f10fdfde6ed1a36f82f4a14f24e7 Mon Sep 17 00:00:00 2001
From: shen_yan_pu <1975145892@qq.com>
Date: Mon, 16 Aug 2021 09:54:27 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=97=E8=A1=A8=E6=B8=85=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/addEdit.vue                              | 10 +++++++++-
 .../pages/otherAddEit.vue                          | 10 +++++++++-
 .../pages/projectAddEit.vue                        | 14 +++++++++++++-
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index c591e0cb6..039d01430 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -178,6 +178,7 @@
               show-overflow-tooltip
               fixed="left"
               width="180px"
+              align="center"
               label="标准号">
             <template slot-scope="scope">
               <span @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</span>
@@ -185,6 +186,7 @@
           </el-table-column>
           <el-table-column
               prop="standName"
+              align="center"
               label="标准名称"
           >
             <template slot-scope="scope">
@@ -194,6 +196,7 @@
           <el-table-column
               prop="issueTime"
               sortable
+              align="center"
               label="发布日期">
             <template slot-scope="scope">
               <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}</span>
@@ -202,6 +205,7 @@
           <el-table-column
               prop="xcxssrqgj"
               sortable
+              align="center"
               label="新车型实施日期">
             <template slot-scope="scope">
               <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
@@ -211,6 +215,7 @@
               show-overflow-tooltip
               prop="zccssrqgj"
               sortable
+              align="center"
               label="在产车实施日期">
             <template slot-scope="scope">
               <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
@@ -220,6 +225,7 @@
               show-overflow-tooltip
               prop="textStatus"
               width="120px"
+              align="center"
               label="文本状态">
             <template slot-scope="scope">
               <span>{{ textStatusMap[scope.row.textStatus] }}</span>
@@ -268,6 +274,7 @@
             show-overflow-tooltip
             width="180px"
             fixed="left"
+            align="center"
             label="标准号">
           <template slot-scope="scope">
             <a  @click="handlePreview(scope.row)">{{ scope.row.standNumber }}</a>
@@ -276,6 +283,7 @@
         <el-table-column
             prop="standName"
             label="标准名称"
+            align="center"
             width="260px"
         >
           <template slot-scope="scope">
@@ -380,7 +388,7 @@
           width="210px"
           label="卡车VPPS中文名称">
         </el-table-column>
-        <el-table-column width="240" align="center" label="操作">
+        <el-table-column width="240" align="center"  fixed="right"  label="操作">
           <template slot-scope="scope">
             <el-button
               class="common-button-default"
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
index a3ced34d9..02cf97be5 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
@@ -163,6 +163,7 @@
             show-overflow-tooltip
             fixed="left"
             width="180px"
+            align="center"
             label="标准号">
             <template slot-scope="scope">
               <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</a>
@@ -170,6 +171,7 @@
           </el-table-column>
           <el-table-column
             prop="standName"
+            align="center"
             label="标准名称"
           >
             <template slot-scope="scope">
@@ -178,6 +180,7 @@
           </el-table-column>
           <el-table-column
             prop="issueTime"
+            align="center"
             sortable
             label="发布日期">
             <template slot-scope="scope">
@@ -187,6 +190,7 @@
           <el-table-column
             prop="xcxssrqgj"
             sortable
+            align="center"
             label="新车型实施日期">
               <template slot-scope="scope">
                   <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
@@ -195,6 +199,7 @@
           <el-table-column
             show-overflow-tooltip
             prop="zccssrqgj"
+            align="center"
             sortable
             label="在产车实施日期">
               <template slot-scope="scope">
@@ -204,6 +209,7 @@
           <el-table-column
             show-overflow-tooltip
             prop="textStatus"
+            align="center"
             width="120px"
             label="文本状态">
             <template slot-scope="scope">
@@ -251,6 +257,7 @@
           prop="standNumber"
           show-overflow-tooltip
           width="180px"
+          align="center"
           fixed="left"
           label="标准号">
           <template slot-scope="scope">
@@ -259,6 +266,7 @@
         </el-table-column>
         <el-table-column
           prop="standName"
+          align="center"
           label="标准名称"
           width="260px"
         >
@@ -364,7 +372,7 @@
           width="210px"
           label="卡车VPPS中文名称">
         </el-table-column>
-        <el-table-column width="240" align="center" label="操作">
+        <el-table-column width="240" align="center"  fixed="right"  label="操作">
           <template slot-scope="scope">
             <el-button
               class="common-button-default"
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
index b08eac349..5a49379e3 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
@@ -200,6 +200,7 @@
             prop="standNumber"
             show-overflow-tooltip
             fixed="left"
+            align="center"
             width="180px"
             label="标准号">
             <template slot-scope="scope">
@@ -208,6 +209,7 @@
           </el-table-column>
           <el-table-column
             prop="standName"
+            align="center"
             label="标准名称"
           >
             <template slot-scope="scope">
@@ -216,17 +218,20 @@
           </el-table-column>
           <el-table-column
             prop="typeApplicable"
+            align="center"
             label="适用车型"
           >
           </el-table-column>
           <el-table-column
             prop="syrz"
+            align="center"
             label="适用认证"
           >
           </el-table-column>
           <el-table-column
             prop="issueTime"
             sortable
+            align="center"
             label="发布日期">
             <template slot-scope="scope">
               <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}</span>
@@ -235,6 +240,7 @@
           <el-table-column
             prop="xcxssrqgj"
             sortable
+            align="center"
             label="新车型实施日期">
             <template slot-scope="scope">
               <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
@@ -244,6 +250,7 @@
             show-overflow-tooltip
             prop="zccssrqgj"
             sortable
+            align="center"
             label="在产车实施日期">
             <template slot-scope="scope">
               <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
@@ -253,6 +260,7 @@
             show-overflow-tooltip
             prop="textStatus"
             width="120px"
+            align="center"
             label="文本状态">
             <template slot-scope="scope">
               <span>{{ textStatusMap[scope.row.textStatus] }}</span>
@@ -300,6 +308,7 @@
           show-overflow-tooltip
           width="180px"
           fixed="left"
+          align="center"
           label="标准号">
           <template slot-scope="scope">
             <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</a>
@@ -308,6 +317,7 @@
         <el-table-column
           prop="standName"
           label="标准名称"
+          align="center"
           width="260px"
         >
           <template slot-scope="scope">
@@ -412,7 +422,7 @@
           width="210px"
           label="卡车VPPS中文名称">
         </el-table-column>
-        <el-table-column width="240" align="center" label="操作">
+        <el-table-column width="240" align="center" fixed="right" label="操作">
           <template slot-scope="scope">
             <el-button
               class="common-button-default"
@@ -1376,6 +1386,7 @@ export default {
       }, e => {
       })
     },
+    //  查询按钮
     selectLawsStands () {
       if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
         this.sarAccessInfoSearch.standType = 'INLAND'
@@ -1402,6 +1413,7 @@ export default {
       }, e => {
       })
     },
+    // 高级查询-查询按钮
     selectBtn() {
       if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
         this.sarAccessInfoSearch.standType = 'INLAND'

From 795c722ebcc1304458949c2ed0362bfe847cc4cd Mon Sep 17 00:00:00 2001
From: shen_yan_pu <1975145892@qq.com>
Date: Mon, 16 Aug 2021 11:27:02 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=97=E8=A1=A8=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzqdfb/step1.vue       |  4 ----
 .../pages/addEdit.vue                         | 20 ++++++++++---------
 .../pages/otherAddEit.vue                     | 19 +++++++++---------
 .../pages/projectAddEit.vue                   | 20 +++++++++++--------
 4 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
index d9fbcfd23..b30151c13 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
@@ -994,8 +994,6 @@ export default {
     },
     // 点击批量删除事件
     deleteList() {
-      console.log(this.selectList);
-      console.log(this.dataList);
       if (this.selectList.length < 1) {
         this.$message.warning("请选择一条数据进行删除");
       } else {
@@ -1011,10 +1009,8 @@ export default {
             index = this.dataList.findIndex(items => {
               return items.id === item;
             });
-            console.log(index);
             if (index > -1) {
               this.dataList.splice(index, 1);
-              console.log(this.dataList);
             }
             exits.push(item);
           });
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index 039d01430..5355d49b4 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -177,8 +177,8 @@
               prop="code"
               show-overflow-tooltip
               fixed="left"
-              width="180px"
               align="center"
+              width="180px"
               label="标准号">
             <template slot-scope="scope">
               <span @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</span>
@@ -641,6 +641,7 @@ export default {
       zrbmOptions: [], // 责任部门
       categoryOptions: [], // 能源类型
       energyKindOptions: [], // 能源种类list
+      CycxOptions: [],
       sycpxOptions: [], // 适用产品线
       applyArcticOptions: [], // 基础车型 适用车型list
       /** ******************************/
@@ -900,7 +901,7 @@ export default {
       // 责任部门数据字典
       this.zrbmOptions = res.data.ZRBMCLASS
       // 能源类型数据字典
-      this.energyKindOptions = res.data.ENERGYTYPES
+      this.CycxOptions = res.data.CLLX
       // this.categoryOptions = res.data.NYLXCLASS // 能源类型
       // 适用车型数据字典
       this.applyArcticOptions = res.data.PRODUCTTYPE
@@ -1235,10 +1236,10 @@ export default {
     },
     // 清单条目 table select事件
     sarAccessInfoSelect (selectData) {
-      this.sarAccessInfoListArry = selectData
-     /* let sarAccessInfoListArryId =  []
-      for(let i=0; i<this.selectData.length; i++){
-      }*/
+      this.sarAccessInfoListArry = []
+      for (let i = 0; i < selectData.length; i++) {
+        this.sarAccessInfoListArry.push(selectData[i].id);
+      }
     },
     // 点击取消按钮 返回事件
     backCancal () {
@@ -1493,10 +1494,10 @@ export default {
         // 适用车型转换
         if (item.typeApplicable !== null) {
           let k = (item.typeApplicable || "").split(',')
-          for (let i in this.energyKindOptions) {
+          for (let i in this.CycxOptions) {
             for (let m = 0; m< k.length; m++) {
-              if (this.energyKindOptions[i].value === k[m]) {
-                k[m]  = this.energyKindOptions[i].label
+              if (this.CycxOptions[i].value === k[m]) {
+                k[m]  = this.CycxOptions[i].label
               }
               item.typeApplicable = k.join(',')
             }
@@ -2039,6 +2040,7 @@ export default {
       this.regionOptions = res.data.REGION // 基础信息 区域list
       this.applyArcticOptions = res.data.PRODUCTTYPE // 基础车型 适用车型list
       this.energyKindOptions = res.data.ENERGYTYPES // 能源种类list
+      this.CycxOptions = res.data.CLLX
       this.drawerCountryOptions = res.data.COUNTRY // 国家、地区list
       this.applyOptions = res.data.COUNTRY  //适用区域list
       this.standNatureOptions = res.data.SARPROPERTY // 新增 标准性质
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
index 02cf97be5..0dcf834b2 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
@@ -621,6 +621,7 @@ export default {
       zrbmOptions: [], // 责任部门
       categoryOptions: [], // 能源类型
       energyKindOptions: [], // 能源种类list
+      CycxOptions: [],
       sycpxOptions: [], // 适用产品线
       applyArcticOptions: [], // 基础车型 适用车型list
       /** ******************************/
@@ -881,7 +882,7 @@ export default {
       // 责任部门数据字典
       this.zrbmOptions = res.data.ZRBMCLASS
       // 能源类型数据字典
-      this.energyKindOptions = res.data.ENERGYTYPES
+      this.CycxOptions = res.data.CLLX
       // this.categoryOptions = res.data.NYLXCLASS // 能源类型
       // 适用车型数据字典
       this.applyArcticOptions = res.data.PRODUCTTYPE
@@ -1207,7 +1208,10 @@ export default {
     },
     // 清单条目 table select事件
     sarAccessInfoSelect (selectData) {
-      this.sarAccessInfoListArry = selectData
+      this.sarAccessInfoListArry = []
+      for (let i = 0; i < selectData.length; i++) {
+        this.sarAccessInfoListArry.push(selectData[i].id);
+      }
     },
     // 点击取消按钮 返回事件
     backCancal () {
@@ -1461,10 +1465,10 @@ export default {
         // 适用车型转换
         if (item.typeApplicable !== null) {
           let k = (item.typeApplicable || "").split(',')
-          for (let i in this.energyKindOptions) {
+          for (let i in this.CycxOptions) {
             for (let m = 0; m< k.length; m++) {
-              if (this.energyKindOptions[i].value === k[m]) {
-                k[m]  = this.energyKindOptions[i].label
+              if (this.CycxOptions[i].value === k[m]) {
+                k[m]  = this.CycxOptions[i].label
               }
               item.typeApplicable = k.join(',')
             }
@@ -2018,6 +2022,7 @@ export default {
       this.regionOptions = res.data.REGION // 基础信息 区域list
       this.applyArcticOptions = res.data.PRODUCTTYPE || [] // 基础车型 适用车型list
       this.energyKindOptions = res.data.ENERGYTYPES || [] // 能源种类list
+      this.CycxOptions = res.data.CLLX // 能源种类list
       this.drawerCountryOptions = res.data.COUNTRY // 国家、地区list
       this.applyOptions = res.data.COUNTRY  //适用区域list
       this.standNatureOptions = res.data.SARPROPERTY // 新增 标准性质
@@ -2032,10 +2037,6 @@ export default {
       this.textStatusOptions = res.data.WBZTCLASS
       this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
       this.setMap(this.textStatusOptions)
-      this.setMap(this.zrbmOptions)
-      this.setMap(this.categoryOptions)
-      this.setMap(this.sycpxOptions)
-      this.setMap(this.energyKindOptions)
       this.getGzzOption()
     }, e => {
     })
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
index 5a49379e3..3a31323d0 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
@@ -18,7 +18,7 @@
                 size="small"
               >
                 <el-option
-                  v-for="item in energyKindOptions"
+                  v-for="item in CycxOptions"
                   :value="item.value"
                   :key="item.value"
                   :label="item.label"
@@ -134,7 +134,7 @@
               size="small"
             >
               <el-option
-                v-for="item in energyKindOptions"
+                v-for="item in CycxOptions"
                 :value="item.value"
                 :key="item.value"
                 :label="item.label"
@@ -284,7 +284,6 @@
         <el-button
           class="common-button-default delete-button"
           size="mini" @click="deleteSelectSarAccessInfo"
-          v-if="!disabledFlag"
           v-btn-permission="''"
         ><i class="iconfont">&#xe61b;</i>删除</el-button>
       </div>
@@ -670,6 +669,7 @@ export default {
       zrbmOptions: [], // 责任部门
       categoryOptions: [], // 能源类型
       energyKindOptions: [], // 能源种类list
+      CycxOptions: [],
       sycpxOptions: [], // 适用产品线
       applyArcticOptions: [], // 基础车型 适用车型list
       syrzOptions: [],
@@ -936,7 +936,7 @@ export default {
       // 责任部门数据字典
       this.zrbmOptions = res.data.ZRBMCLASS
       // 能源类型数据字典
-      this.energyKindOptions = res.data.ENERGYTYPES
+      this.CycxOptions = res.data.CLLX
       // this.categoryOptions = res.data.NYLXCLASS // 能源类型
       // 适用车型数据字典
       this.applyArcticOptions = res.data.PRODUCTTYPE
@@ -1180,7 +1180,10 @@ export default {
     },
     // 清单条目 table select事件
     sarAccessInfoSelect (selectData) {
-      this.sarAccessInfoListArry = selectData
+      this.sarAccessInfoListArry = []
+      for (let i = 0; i < selectData.length; i++) {
+        this.sarAccessInfoListArry.push(selectData[i].id);
+      }
     },
     // 点击取消按钮 返回事件
     backCancal () {
@@ -1304,10 +1307,10 @@ export default {
         // 适用车型转换
         if (item.typeApplicable !== null) {
           let k = (item.typeApplicable || "").split(',')
-          for (let i in this.energyKindOptions) {
+          for (let i in this.CycxOptions) {
             for (let m = 0; m< k.length; m++) {
-              if (this.energyKindOptions[i].value === k[m]) {
-                k[m]  = this.energyKindOptions[i].label
+              if (this.CycxOptions[i].value === k[m]) {
+                k[m]  = this.CycxOptions[i].label
               }
               item.typeApplicable = k.join(',')
             }
@@ -1929,6 +1932,7 @@ export default {
       this.regionOptions = res.data.REGION // 基础信息 区域list
       this.applyArcticOptions = res.data.PRODUCTTYPE || [] // 基础车型 适用车型list
       this.energyKindOptions = res.data.ENERGYTYPES || [] // 能源种类list
+      this.CycxOptions = res.data.CLLX || [] // 能源种类list
       this.drawerCountryOptions = res.data.COUNTRY // 国家、地区list
       this.applyOptions = res.data.COUNTRY  //适用区域list
       this.standNatureOptions = res.data.SARPROPERTY // 新增 标准性质