From fc9a331ab3eaabbb52b019707cf2eaa262c140bc Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Tue, 30 Nov 2021 15:05:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E6=B8=85=E5=8D=95=E8=83=BD?=
 =?UTF-8?q?=E5=B8=A6=E5=85=A5=E6=8F=90=E4=BA=A4=E4=BC=81=E6=A0=87=E5=92=8C?=
 =?UTF-8?q?=E6=94=BF=E7=AD=96=E4=BA=86=EF=BC=88=E8=83=BD=E6=9F=A5=E8=83=BD?=
 =?UTF-8?q?=E6=8F=90=EF=BC=8C=E7=BC=96=E8=BE=91=E5=B7=AE=E7=82=B9=E6=84=8F?=
 =?UTF-8?q?=E6=80=9D=EF=BC=8C=E6=98=BE=E7=A4=BA=E7=9A=84=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E4=B9=9F=E4=B8=8D=E5=A4=AA=E5=85=A8=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/projectAddEit.vue                   | 161 +++++++++++++-----
 1 file changed, 123 insertions(+), 38 deletions(-)

diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
index 30f61579a..caaf87e51 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
@@ -211,7 +211,7 @@
               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.standNumber || scope.row.lawsNumber || scope.row.standCode}}</a>
             </template>
           </el-table-column>
           <el-table-column
@@ -220,7 +220,7 @@
               label="标准名称"
           >
             <template slot-scope="scope">
-              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName || scope.row.lawsName}}</a>
             </template>
           </el-table-column>
           <el-table-column
@@ -250,7 +250,8 @@
               align="center"
               label="新车型实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
+              <span v-if="scope.row.xcxssrqgj">{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
+              <span v-else-if="scope.row.putTime">{{ scope.row.putTime ? $moment(scope.row.putTime).format('YYYY-MM-DD') : '' }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -270,7 +271,7 @@
               align="center"
               label="文本状态">
             <template slot-scope="scope">
-              <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+              <span>{{ textStatusMap[scope.row.textStatus] || scope.row.standStatusShow}}</span>
             </template>
           </el-table-column>
         </el-table>
@@ -327,7 +328,7 @@
             align="center"
             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.standNumber || scope.row.lawsNumber || scope.row.standCode}}</a>
           </template>
         </el-table-column>
         <el-table-column
@@ -337,7 +338,7 @@
             width="260px"
         >
           <template slot-scope="scope">
-            <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+            <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName || scope.row.lawsName }}</a>
           </template>
         </el-table-column>
         <el-table-column
@@ -381,7 +382,7 @@
           <template slot-scope="scope">
             <span v-if="scope.row.zccssrqgj === null || scope.row.zccssrqgj === ''">
             </span>
-            <span v-else>{{ scope.row.zccssrqgj.slice(0, 10) }}</span>
+<!--            <span v-else>{{ scope.row.zccssrqgj.slice(0, 10) }}</span>-->
           </template>
         </el-table-column>
         <el-table-column
@@ -393,7 +394,7 @@
           <template slot-scope="scope">
             <span v-if="scope.row.xcxssrqgj === null || scope.row.xcxssrqgj === ''">
             </span>
-            <span v-else>{{ scope.row.xcxssrqgj.slice(0, 10) }}</span>
+<!--            <span v-else>{{ scope.row.xcxssrqgj.slice(0, 10) }}</span>-->
           </template>
         </el-table-column>
         <el-table-column
@@ -719,8 +720,8 @@ export default {
       dataSourceOptions: [
         {value: 'INLAND_STAND', label: '国内标准法规'},
         {value: 'FOREIGN_STAND', label: '海外标准法规'},
-        // {value: 'FOREIGN_LAWS', label: '国内外政策'},
-        // {value: 'BUSINESS', label: '企业标准 '},
+        {value: 'FOREIGN_LAWS', label: '国内外政策'},
+        {value: 'BUSINESS', label: '企业标准 '},
         // {value: 'TEMP', label: '标准法规清单 '}
       ],
       // 新增、编辑 数据搜索字段
@@ -1096,6 +1097,66 @@ export default {
       } else if (val === 'FOREIGN_STAND') {
         this.selectLawsStands()
         // 国内外政策可查字段
+      }else if (val === 'FOREIGN_LAWS'){
+        this.twoOptions=[
+          {
+            label: '适用车辆类型',
+            value: 'SYCLLX',
+            type: 'SEL_OPTION',
+            disabled: false
+          }, {
+            label: '政策编号',
+            value: 'LAWS_NUMBER',
+            type: 'INPUT',
+            disabled: false
+          }, {
+            label: '中文名称',
+            value: 'LAWS_NAME',
+            type: 'INPUT',
+            disabled: false
+          }, {
+            label: '英文名称',
+            value: 'LAWS_EN_NAME',
+            type: 'INPUT',
+            disabled: false
+          }, {
+            label: '个性化标签',
+            value: 'GXHBQXX',
+            type: 'SEL_OPTION',
+            disabled: false
+          }, {
+            label: '新车型实施日期(文本)',
+            value: 'XCXSSRQ',
+            type: 'DATE_PIC_OPTS',
+            disabled: false
+          }, {
+            label: '在产车实施日期(文本)',
+            value: 'ZCCSSRQ',
+            type: 'DATE_PIC_OPTS',
+            disabled: false
+          }, {
+            label: '维护工程师',
+            value: 'ZCGCS',
+            type: 'SEL_OPTION',
+            selVal: "USERLIST",
+            disabled: false
+          }
+        ]
+        // 标准法规清单可查字段
+      }else {
+        this.twoOptions=[
+          {
+            label: '清单名称',
+            value: 'ACCESS_CONTENT',
+            type: 'INPUT',
+            disabled: false
+          }, {
+            label: '国家地区',
+            value: 'COUNTRY',
+            type: 'SEL_OPTION',
+            disabled: false
+          }
+        ]
       }
     },
     /**
@@ -1258,17 +1319,17 @@ export default {
           let rowlist3 = []
           for (let i = 0; i < this.sarAccessInfoList.length; i++) {
             rowlist.push(this.sarAccessInfoList[i].id)
-            if (this.sarAccessInfoList[i].ssrq === null) {
+            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())
             }
-            if (this.sarAccessInfoList[i].xcxssrqgj === null) {
+            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())
             }
-            if (this.sarAccessInfoList[i].zccssrqgj === null) {
+            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())
@@ -1542,41 +1603,65 @@ export default {
     },
     // 查询数据搜索 table 数据
     pageInfo() {
-      StandardsInfoPage(this.sarAccessInfoSearch).then(res => {
-        this.sarAccessInfoSearchList = res.data.list
+      if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND' || this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND'){
+        StandardsInfoPage(this.sarAccessInfoSearch).then(res => {
+          this.sarAccessInfoSearchList = res.data.list
 
-        //为空转换
-        for (let i = 0; i < this.sarAccessInfoSearchList.length; i++) {
-          //适用车型为空
-          if (this.sarAccessInfoSearchList[i].attrInfoMap.CLLX === '[]'){
-            this.sarAccessInfoSearchList[i].attrInfoMap.CLLX = null
+          //为空转换
+          for (let i = 0; i < this.sarAccessInfoSearchList.length; i++) {
+            //适用车型为空
+            if (this.sarAccessInfoSearchList[i].attrInfoMap.CLLX === '[]'){
+              this.sarAccessInfoSearchList[i].attrInfoMap.CLLX = null
+            }
+            //适用认证为空
+            if (this.sarAccessInfoSearchList[i].attrInfoMap.SYRZ === '[]'){
+              this.sarAccessInfoSearchList[i].attrInfoMap.SYRZ = null
+            }
           }
-          //适用认证为空
-          if (this.sarAccessInfoSearchList[i].attrInfoMap.SYRZ === '[]'){
-            this.sarAccessInfoSearchList[i].attrInfoMap.SYRZ = null
-          }
-        }
-        this.sarAccessInfoSearchList.forEach(item => {
-          if (item.standYear === null) {
-            item.standNumber = item.standSortShow + ' ' + item.standNumber
-          } else {
-            item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
-          }
-          this.addWord(item)
+          this.sarAccessInfoSearchList.forEach(item => {
+            if (item.standYear === null) {
+              item.standNumber = item.standSortShow + ' ' + item.standNumber
+            } else {
+              item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
+            }
+            this.addWord(item)
+          })
+          this.changeText(this.sarAccessInfoSearchList)
+          this.drawerTotal = res.data.count
+        }, e => {
         })
-        this.changeText(this.sarAccessInfoSearchList)
-        this.drawerTotal = res.data.count
-      }, e => {
-      })
+      }else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_LAWS'){
+        this.$http.get('lawss/sarLawsInfo/page', this.sarAccessInfoSearch, {
+          _this: this,
+        }, res => {
+          console.log('1640',res)
+          this.sarAccessInfoSearchList = res.data.list
+        }, e => {
+        })
+      }else if (this.sarAccessInfoSearch.dataSource === 'BUSINESS'){
+        this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', this.sarAccessInfoSearch, {
+          _this: this,
+        }, res => {
+          console.log('1648',res)
+          this.sarAccessInfoSearchList = res.data.list
+        }, e => {
+        })
+      }
     },
     //  查询按钮
     selectLawsStands() {
       if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
         this.sarAccessInfoSearch.standType = 'INLAND'
         this.pageInfo()
-      } else {
+      } else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND') {
         this.sarAccessInfoSearch.standType = 'FOREIGN'
         this.pageInfo()
+      }else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_LAWS') {
+        this.sarAccessInfoSearch.standType = 'LAWS'
+        this.pageInfo()
+      }else if (this.sarAccessInfoSearch.dataSource === 'BUSINESS') {
+        this.sarAccessInfoSearch.standType = 'BUSINESS'
+        this.pageInfo()
       }
     },
     /** 高级查询查询按钮*/
@@ -1608,7 +1693,7 @@ export default {
     },
     // 数据搜索table判断checked状态
     selectable(row) {
-      return row.isRelateAccess === '1'
+      return row.isRelateAccess === '1' || row.isRelateAccess === undefined
     },
     // 数据搜索 table select事件
     sarAccessInfoSearchSelect(val) {