From 662d241358174e91590d4729ca5224656bf65207 Mon Sep 17 00:00:00 2001
From: shen_yan_pu <1975145892@qq.com>
Date: Mon, 26 Jul 2021 14:21:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B8=85=E5=8D=95=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=88=97=E8=A1=A8=E6=B8=85=E7=A9=BA=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E3=80=81=E7=BC=96=E8=BE=91=E9=A1=B5?=
 =?UTF-8?q?=E7=9A=84=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/addEdit.vue                         | 36 ++++++++++------
 .../pages/details.vue                         | 42 +++++++++++++++----
 .../pages/otherAddEit.vue                     | 36 ++++++++++------
 .../pages/projectAddEit.vue                   | 36 ++++++++++------
 4 files changed, 102 insertions(+), 48 deletions(-)

diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index 96f578574..77f06915a 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -237,13 +237,13 @@
           >
           </el-table-column>
           <el-table-column
-              prop="code"
+              prop="standNumber"
+              show-overflow-tooltip
               fixed="left"
               width="180px"
               label="标准号">
             <template slot-scope="scope">
-              <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
-              <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</a>
+              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</a>
             </template>
           </el-table-column>
           <el-table-column
@@ -370,12 +370,13 @@
             align="center">
         </el-table-column>
         <el-table-column
+            prop="standNumber"
+            show-overflow-tooltip
             width="180px"
             fixed="left"
             label="标准号">
           <template slot-scope="scope">
-            <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
-            <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</a>
+            <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</a>
           </template>
         </el-table-column>
         <el-table-column
@@ -1357,15 +1358,17 @@ export default {
           roundButton: true,
           type: 'warning'
         }).then(() => {
-          // i   全部对象数组的下标
-          // s   选中对象数组的下标
-          for (var s in this.sarAccessInfoListArry) {
-            for (var i in this.sarAccessInfoList) {
-              if (this.sarAccessInfoListArry[s].uuid === this.sarAccessInfoList[i].uuid) {
-                this.sarAccessInfoList.splice(i, 1)
-              }
+          let exits = []
+          this.sarAccessInfoListArry.map(item => {
+            let index
+            index = this.sarAccessInfoList.findIndex(items => {
+              return items.id = item
+            })
+            if (index > -1) {
+              this.sarAccessInfoList.splice(index, 1)
             }
-          }
+            exits.push(item)
+          })
           this.sarAccessInfoListArry = []
           this.$refs.entryTable.clearSelection()
         }).catch(() => {})
@@ -1467,6 +1470,13 @@ export default {
     selectLawsStands () {
       StandardsInfoPage(this.sarAccessInfoSearch).then(res =>{
         this.sarAccessInfoSearchList = res.data.list
+        this.sarAccessInfoSearchList.forEach(item => {
+          if (item.standYear === null) {
+            item.standNumber = item.standSortShow + ' ' + item.standNumber
+          } else {
+            item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
+          }
+        })
         this.drawerTotal = res.data.list.length
       }, e => {
       })
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
index 3d3213f1e..32b738445 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
@@ -117,10 +117,10 @@
           </el-button>
         </el-form>
         <div v-if="!showSelectBox">
-          <el-form  :model="standardForm" class="label-input-form" label-width="108px" inline>
-            <el-form-item label="英文名称"  class="search-item">
+          <el-form  :model="standardFormList" class="label-input-form" label-width="108px" inline>
+            <el-form-item label="中文名称"  class="search-item">
               <el-input
-                v-model="standardForm.standName"
+                v-model="standardFormList.standName"
                 placeholder="请输入"
                 :maxlength="100"
                 size="small"
@@ -129,7 +129,7 @@
             <el-form-item label="适用车型" class="labelBox"  label-width="61px">
               <el-select
                 class="showBox"
-                v-model="standardForm.typeApplicable"
+                v-model="standardFormList.typeApplicable"
                 placeholder="请选择"
                 filterable
                 size="small"
@@ -145,7 +145,7 @@
             <el-form-item label="能源类型"  >
               <el-select
                 class="showBox"
-                v-model="standardForm.nylx"
+                v-model="standardFormList.nylx"
                 placeholder="请选择"
                 filterable
                 size="small"
@@ -161,7 +161,7 @@
             <el-form-item label="责任部门"  >
               <el-select
                 class="showBox"
-                v-model="standardForm.zrbm"
+                v-model="standardFormList.zrbm"
                 placeholder="请选择"
                 filterable
                 size="small"
@@ -177,7 +177,7 @@
             <el-form-item label="适用产品线"  >
               <el-select
                 class="showBox"
-                v-model="standardForm.sycpx"
+                v-model="standardFormList.sycpx"
                 placeholder="请选择"
                 filterable
                 size="small"
@@ -428,6 +428,13 @@ export default {
         page: 1,
         Size: this.$store.getters.userInfo.configContent
       },
+      standardFormList: {
+        standNumber: '',
+        standName: '',
+        responseUnit: '',
+        page: 1,
+        Size: this.$store.getters.userInfo.configContent
+      },
       page: 1,
       // pageSize: this.$store.getters.userInfo.configContent,
       total: 0,
@@ -493,6 +500,7 @@ export default {
     // 根据准入id查询标准法规详情
     selectInfobyAccid() {
       this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", {
+        ...this.standardFormList,
         ...this.standardForm,
         id: this.pageId,
       }, {
@@ -507,8 +515,24 @@ export default {
 
     back() {
       this.$router.push({
-        name: "AccessStandardsAndRegulations"
-      });
+        name: 'AccessStandardsAndRegulations',
+      })
+     /* if (this.sarAccessEO.sortKey === '1') {
+        this.$router.push({
+          name: 'AccessStandardsAndRegulations',
+          menuName: '国家/地区清单'
+        })
+      } else if(this.sarAccessEO.sortKey === '2') {
+        this.$router.push({
+          name: 'AccessStandardsAndRegulations',
+          menuName: '项目类清单'
+        })
+      } else {
+        this.$router.push({
+          name: 'AccessStandardsAndRegulations',
+          menuName: '其他清单'
+        })
+      }*/
       // this.$router.push(this.$store.state.detailMap)
       // this.$store.commit('setDetailMap', '')
     },
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
index f8c391e79..0677f2e9d 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
@@ -211,13 +211,13 @@
           >
           </el-table-column>
           <el-table-column
-            prop="code"
+            prop="standNumber"
+            show-overflow-tooltip
             fixed="left"
             width="180px"
             label="标准号">
             <template slot-scope="scope">
-              <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
-              <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</a>
+              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</a>
             </template>
           </el-table-column>
           <el-table-column
@@ -338,12 +338,13 @@
           align="center">
         </el-table-column>
         <el-table-column
+          prop="standNumber"
+          show-overflow-tooltip
           width="180px"
           fixed="left"
           label="标准号">
           <template slot-scope="scope">
-            <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
-            <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</a>
+            <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</a>
           </template>
         </el-table-column>
         <el-table-column
@@ -1187,15 +1188,17 @@ export default {
           roundButton: true,
           type: 'warning'
         }).then(() => {
-          // i   全部对象数组的下标
-          // s   选中对象数组的下标
-          for (var s in this.sarAccessInfoListArry) {
-            for (var i in this.sarAccessInfoList) {
-              if (this.sarAccessInfoListArry[s].uuid === this.sarAccessInfoList[i].uuid) {
-                this.sarAccessInfoList.splice(i, 1)
-              }
+          let exits = []
+          this.sarAccessInfoListArry.map(item => {
+            let index
+            index = this.sarAccessInfoList.findIndex(items => {
+              return items.id = item
+            })
+            if (index > -1) {
+              this.sarAccessInfoList.splice(index, 1)
             }
-          }
+            exits.push(item)
+          })
           this.sarAccessInfoListArry = []
           this.$refs.entryTable.clearSelection()
         }).catch(() => {})
@@ -1278,6 +1281,13 @@ export default {
         _this: this
       }, res =>{
         this.sarAccessInfoSearchList = res.data.list
+        this.sarAccessInfoSearchList.forEach(item => {
+          if (item.standYear === null) {
+            item.standNumber = item.standSortShow + ' ' + item.standNumber
+          } else {
+            item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
+          }
+        })
         this.drawerTotal = res.data.list.length
       }, e => {
 
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
index 3c8704868..d636411a5 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
@@ -215,13 +215,13 @@
           >
           </el-table-column>
           <el-table-column
-            prop="code"
+            prop="standNumber"
+            show-overflow-tooltip
             fixed="left"
             width="180px"
             label="标准号">
             <template slot-scope="scope">
-              <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
-              <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</a>
+              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</a>
             </template>
           </el-table-column>
           <el-table-column
@@ -342,12 +342,13 @@
           align="center">
         </el-table-column>
         <el-table-column
+          prop="standNumber"
+          show-overflow-tooltip
           width="180px"
           fixed="left"
           label="标准号">
           <template slot-scope="scope">
-            <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
-            <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</a>
+            <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</a>
           </template>
         </el-table-column>
         <el-table-column
@@ -1185,15 +1186,17 @@ export default {
           roundButton: true,
           type: 'warning'
         }).then(() => {
-          // i   全部对象数组的下标
-          // s   选中对象数组的下标
-          for (var s in this.sarAccessInfoListArry) {
-            for (var i in this.sarAccessInfoList) {
-              if (this.sarAccessInfoListArry[s].uuid === this.sarAccessInfoList[i].uuid) {
-                this.sarAccessInfoList.splice(i, 1)
-              }
+          let exits = []
+          this.sarAccessInfoListArry.map(item => {
+            let index
+            index = this.sarAccessInfoList.findIndex(items => {
+              return items.id = item
+            })
+            if (index > -1) {
+              this.sarAccessInfoList.splice(index, 1)
             }
-          }
+            exits.push(item)
+          })
           this.sarAccessInfoListArry = []
           this.$refs.entryTable.clearSelection()
         }).catch(() => {})
@@ -1276,6 +1279,13 @@ export default {
         _this: this
       }, res =>{
         this.sarAccessInfoSearchList = res.data.list
+        this.sarAccessInfoSearchList.forEach(item => {
+          if (item.standYear === null) {
+            item.standNumber = item.standSortShow + ' ' + item.standNumber
+          } else {
+            item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
+          }
+        })
         this.drawerTotal = res.data.list.length
       }, e => {