From a4c3a759dbc1d737e416e49d838440ac4fe303d0 Mon Sep 17 00:00:00 2001
From: yangzijiao <yangzijiao@123.com>
Date: Mon, 26 Jul 2021 17:04:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/addEdit.vue                         | 25 +++++++++++--------
 .../pages/details.vue                         | 18 ++++++++-----
 .../pages/otherAddEit.vue                     |  2 +-
 .../pages/projectAddEit.vue                   |  4 +--
 4 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index 77f06915a..cd7aa0210 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="standNumber"
+              prop="code"
               show-overflow-tooltip
               fixed="left"
               width="180px"
               label="标准号">
             <template slot-scope="scope">
-              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</a>
+              <a @click="handlePreview(scope.row)" class="table-jump">{{scope.row.standSortShow}} {{ scope.row.standNumber }}-{{scope.row.standYear}}</a>
             </template>
           </el-table-column>
           <el-table-column
@@ -370,13 +370,13 @@
             align="center">
         </el-table-column>
         <el-table-column
-            prop="standNumber"
+            prop="code"
             show-overflow-tooltip
             width="180px"
             fixed="left"
             label="标准号">
           <template slot-scope="scope">
-            <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</a>
+            <a  @click="handlePreview(scope.row)">{{scope.row.standSortShow}} {{ scope.row.standNumber }}-{{scope.row.standYear}}</a>
           </template>
         </el-table-column>
         <el-table-column
@@ -676,6 +676,7 @@ export default {
       editRowData: {
         id: '',
         standName: '',
+        standSortShow:'',
         standEnName: '',
         typeApplicable: '',
         nylx: '',
@@ -715,7 +716,7 @@ export default {
         ],
         detailedListName: [
           {required: true, message: '清单名称不能为空', trigger: 'blur'},
-          {type: 'string', max: 100, message: '表单名称不能超过100个字符', trigger: 'blur'}
+          {type: 'string', max: 100, message: '清单名称不能超过100个字符', trigger: 'blur'}
         ]
       },
       disabledFlag: false,
@@ -740,7 +741,7 @@ export default {
       dataSourceOptions: [
         {value: 'INLAND_STAND', label: '国内标准法规'},
         {value: 'FOREIGN_STAND', label: '海外标准法规'},
-        {value: 'FOREIGN_LAWS', label: '国内外政策'},
+        //{value: 'FOREIGN_LAWS', label: '国内外政策'},
         // {value: 'BUSINESS', label: '企业标准 '},
         {value: 'TEMP', label: '标准法规清单 '}
       ],
@@ -877,6 +878,7 @@ export default {
         // country: 'CN', // 适用区域
         standSort: '', // 标准类别
         standNumber: '', // 标准编号
+        standSortShow:'',
         standYear: '', // 标准年份
         standName: '', // 中文名称
         standEnName: '', // 英文名称
@@ -897,6 +899,7 @@ export default {
         // country: 'CN', // 适用区域
         standSort: '', // 标准类别
         standNumber: '', // 标准编号
+        standSortShow:'',
         standYear: '', // 标准年份
         standName: '', // 中文名称
         standEnName: '', // 英文名称
@@ -1322,7 +1325,7 @@ export default {
     editTghisRow(row) {
       this.rowList = row
       this.editRowData = this.rowList
-      this.editRowData.standNumber = this.rowList.standSortShow + this.rowList.standNumber
+      this.editRowData.standNumber = this.rowList.standSortShow + this.rowList.standNumber + '-' + this.rowList.standYear
       this.drawerEdit = true
     },
     // 抽屉取消按钮
@@ -1452,7 +1455,7 @@ export default {
               loading: 'loadData'
             }, res => {
               if (res.ok) {
-                this.$message.success('编辑成功')
+                //this.$message.success('编辑成功')
                 this.isNext = true
                 this.$router.push({
                   name: 'AccessStandardsAndRegulations'
@@ -1896,12 +1899,12 @@ export default {
       })
     },
     // 点击查看
-    handlePreview (item) {
-      let routerName = item.sarType === 'FOREIGN_LAWS' ? 'OtherLawsDetails' : 'OtherStandardDetails'
+    handlePreview (data) {
+      let routerName = data.sarType === 'FOREIGN_LAWS' ? 'OtherLawsDetails' : 'OtherStandardDetails'
       let routeUrl = this.$router.resolve({
         name: routerName,
         params: {
-          id: item.resId,
+          id: data.id,
           pageType: this.sarAccessInfoSearch.dataSource
         }
       })
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
index 32b738445..5ed5e64f2 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
@@ -212,14 +212,13 @@
             align="center">
           </el-table-column>
           <el-table-column
-            prop="standNumber"
+            prop="code"
             fixed="left"
             width="180px"
             align="center"
             label="标准号">
             <template slot-scope="scope">
-              <a v-if="scope.row.resId" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standNumber }}</a>
-              <span v-else>{{ scope.row.standNumber }}</span>
+              <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standNumber }}</a>
             </template>
           </el-table-column>
           <el-table-column
@@ -227,12 +226,18 @@
             label="中文名称"
             width="180px"
           >
+            <template slot-scope="scope">
+              <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
+            </template>
           </el-table-column>
           <el-table-column
             prop="standEnName"
             align="center"
             width="180px"
             label="英文名称">
+            <template slot-scope="scope">
+              <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standEnName }}</a>
+            </template>
           </el-table-column>
           <el-table-column
             prop="typeApplicable"
@@ -656,12 +661,13 @@ export default {
       window.location.href = "/api/att/attFile/downloadFile?fileId=" + attId
     },
     // 点击查看
-    handlePreview(item) {
+    handlePreview(data) {
+      debugger
       let routeUrl = this.$router.resolve({
         name: "OtherStandardDetails",
         params: {
-          id: item.resId,
-          pageType: item.sarType
+          id: data.id,
+          pageType: data.sarType
         }
       });
       window.open(routeUrl.href, "_blank");
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
index 0677f2e9d..ecc960290 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
@@ -577,7 +577,7 @@ export default {
           {required: true, message: '国内/海外不能为空', trigger: 'change'}
         ],
         detailedList: [
-          {required: true, message: '清单类别不能为空', trigger: 'change'}
+          {required: true, message: '清单类别不能为空', trigger: 'blur'}
         ],
         detailedListName: [
           {required: true, message: '清单名称不能为空', trigger: 'blur'},
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
index d636411a5..3f0e84dbf 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
@@ -572,11 +572,11 @@ export default {
         ],
         projectName: [
           {required: true, message: '项目名称不能为空', trigger: 'blur'},
-          {type: 'string', max: 100, message: '表单名称不能超过100个字符', trigger: 'blur'}
+          {type: 'string', max: 100, message: '项目名称不能超过100个字符', trigger: 'blur'}
         ],
         detailedListName: [
           {required: true, message: '清单名称不能为空', trigger: 'blur'},
-          {type: 'string', max: 100, message: '表单名称不能超过100个字符', trigger: 'blur'}
+          {type: 'string', max: 100, message: '清单名称不能超过100个字符', trigger: 'blur'}
         ]
       },
       disabledFlag: false,