From b5a03548c7cc5c97a525a46fe7349f71012f5378 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Fri, 7 Jan 2022 16:10:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=B7=E5=A4=96=E6=97=A5=E6=9C=9F=20?=
 =?UTF-8?q?=E6=96=87=E6=9C=AC=E7=8A=B6=E6=80=81=E5=B1=95=E7=A4=BA=20=20?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=B1=9E=E6=80=A7=E7=AE=A1=E7=90=86=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E6=97=A5=E6=9C=9F=E7=9A=84=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/standLawsAttrManage/index.vue       |  2 +-
 .../foreignStandardsAndRegulations/index.vue  | 31 +++++++------------
 2 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/src/pages/config/pages/standLawsAttrManage/index.vue b/src/pages/config/pages/standLawsAttrManage/index.vue
index 60b75bec1..456f4dea9 100644
--- a/src/pages/config/pages/standLawsAttrManage/index.vue
+++ b/src/pages/config/pages/standLawsAttrManage/index.vue
@@ -103,7 +103,7 @@
         <!--            <div v-if="scope.row.enable === '1'">未启用</div>-->
         <!--          </template>-->
         <!--        </el-table-column>-->
-        <el-table-column prop="creationTime" label="创建时间" sortable>
+        <el-table-column prop="creationTime" label="创建时间" >
         </el-table-column>
         <!--        <el-table-column-->
         <!--          fixed="right"-->
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index f8bb9b35a..197d52269 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -269,12 +269,12 @@
               <template slot-scope="scope">
                 <!--                {{ formatIssueDate(scope.row.putTime) }}-->
                 <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
-                    scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-'
+                    scope.row.SSRQ
                   }}</span>
                 <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
-                    scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-'
+                    scope.row.SSRQ
                   }}</span>
-                <span v-else style="color: #333333">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
+                <span v-else style="color: #333333">{{ scope.row.SSRQ }}</span>
 
               </template>
             </el-table-column>
@@ -285,13 +285,13 @@
               label="新车型实施日期">
               <template slot-scope="scope">
                 <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
-                    scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-'
+                    scope.row.XCXSSRQ
                   }}</span>
                 <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
-                    scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-'
+                    scope.row.XCXSSRQ
                   }}</span>
                 <span v-else style="color: #333333">{{
-                    scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-'
+                    scope.row.XCXSSRQ
                   }}</span>
               </template>
             </el-table-column>
@@ -302,13 +302,13 @@
               label="在产车实施日期">
               <template slot-scope="scope">
                 <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
-                    scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-'
+                    scope.row.ZCCSSRQ
                   }}</span>
                 <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
-                    scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-'
+                    scope.row.ZCCSSRQ
                   }}</span>
                 <span v-else style="color: #333333">{{
-                    scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-'
+                    scope.row.ZCCSSRQ
                   }}</span>
               </template>
             </el-table-column>
@@ -2591,7 +2591,6 @@ export default {
       this.modalShowFlag3 = false
     },
     popoverHideModel(checkedIds, checkedData, isShow, isLoadChild, topId) {
-      console.log(checkedData)
       if (checkedData  && checkedData.length != 0) {
         if (checkedData.length > 0) {
           this.sarStandardsInfoEO.DYBXH = checkedData.map(item => item.model).join(",")
@@ -2613,7 +2612,6 @@ export default {
       })
     },
     choiceZRRS (type, title, id) {
-      console.log('2077',title)
       this.nodeList = []
       this.nodeList.push(id)
       this.userType = type
@@ -2621,7 +2619,6 @@ export default {
       this.modalShowRoleFlag = true
     },
     checkedRole2 (data) {
-      console.log('1712',this.drawerTitle)
       let idList = ''
       let nameList = ''
       data.forEach( item => {
@@ -2874,7 +2871,6 @@ export default {
         this.$nextTick(() => {
           Promise.all([this.queryDisplayLocation()]).then((values) => {
             const [displayLocation] = values
-            console.log('2717', displayLocation)
             const formFieldList = this.formFieldList
             this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item))
             this.defaultCheckedKeys = [this.sarStandardsInfoEO.standSystem];
@@ -2929,7 +2925,6 @@ export default {
               })
             })
             this.dynamicFormField = displayLocation
-            console.log('2771',this.dynamicFormField)
             this.loading = false
           })
         })
@@ -3366,7 +3361,6 @@ export default {
             const formFieldList = this.formFieldList
             formFieldList.forEach((field) => {
               displayLocation.forEach((location) => {
-                console.log(location)
                 let value = dynamicFormField[field.attrField]
                 if (value && typeof value === 'number') {
                   value = this.$dateFormat(value, 'yyyy-MM-dd')
@@ -3810,11 +3804,8 @@ export default {
       // // 自定义属性字段高级搜索处理
       //advanceSearchVOStr
       const advanceSearchVOList = [];
-      console.log('4333',this.advanceSearchMapping)
       for (let key in this.advanceSearchMapping) {
-        console.log('key',key)
         const value = this.advanceSearchMapping[key];
-        console.log('value',value)
         if (value !== null && value !== '' && (key === 'NYLX' || key === 'SYRZ' || key === 'SYCPX' || (item.CLLX&&item.CLLX.length>0)) ){
           advanceSearchVOList.push({
             connect: "and",
@@ -5103,10 +5094,10 @@ export default {
     this.$http.get('sys/dictype/getDicTypeListCode', '', {
       _this: this
     }, res => {
+      this.setMap(res.data.WBZTCLASS)
       this.allSelectOptions = res.data || {}
       this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
       this.standNatureOptions = res.data.SARPROPERTY // 标准性质
-      this.standStateOptions = res.data.WBZTCLASS // 文本状态
       this.standSystemOptions = res.data.BZTXCLASS // 标准体系
       this.categoryOptions.options = res.data.NYLXCLASS // 能源类型
       this.applyAuthOptions.options = res.data.SYRZCLASS // 适用认证
@@ -5127,11 +5118,11 @@ export default {
       this.nylxOptions.options = res.data.NYLXCLASS;//能源类型
       this.syrzOptions.options = res.data.SYRZCLASS;//适用认证
       this.gkglbmOptions = res.data.GKGLBM;//归口管理部门
+      this.standStateOptions = res.data.WBZTCLASS // 文本状态
       // 模块结构单元变型号
       this.dybxhOptions.options = res.data.DYBXH
 
       this.getGzzOption()
-      this.setMap(this.standStateOptions)
     }, e => {
     })
     this.getDomesticStandardTable()