From 3315b54e1020a2f7ab29a1281535fb43a5abd479 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Thu, 17 Mar 2022 19:58:54 +0800
Subject: [PATCH] feat: There is no way the,

---
 .../details/otherLawsStandDetails/index.vue   |  5 ++-
 .../foreignRegulationsDatabase/index.vue      | 36 ++++++++++---------
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/src/pages/details/otherLawsStandDetails/index.vue b/src/pages/details/otherLawsStandDetails/index.vue
index e33853d64..cb0fe24ab 100644
--- a/src/pages/details/otherLawsStandDetails/index.vue
+++ b/src/pages/details/otherLawsStandDetails/index.vue
@@ -56,7 +56,7 @@
                     <p class="half"><label style=" margin-right: 157px;">信息简报</label><span>{{ sarStandardsInfoEO.lawsBulletin || '-' }}</span></p>
                     <p class="half"><label style=" margin-right: 157px;">适用区域</label><span>{{ sarStandardsInfoEO.lawsSyqy || '-' }}</span></p>
                     <p class="half"><label style=" margin-right: 157px;">适用车型</label><span>{{ sarStandardsInfoEO.lawsSycx || '-' }}</span></p>
-                    <p class="half"><label style=" margin-right: 97px;">是否纳入认证清单</label><span>{{ sarStandardsInfoEO.isRelateAccess || '-' }}</span></p>
+                    <p class="half"><label style=" margin-right: 97px;">是否纳入认证清单</label><span>{{ sarStandardsInfoEO.isRelateAccess === '1' ? '是' : (sarStandardsInfoEO.isRelateAccess ? '否':'-')}}</span></p>
                     <p class="half"><label style=" margin-right: 97px;">福田转发通知文号</label><span>{{ sarStandardsInfoEO.lawsNotisyncNum || '-' }}</span></p>
                     <p class="half"><label style=" margin-right: 192px;">年度</label><span>{{ sarStandardsInfoEO.lawsYear || '-' }}</span></p>
                     <p class="half"><label style=" margin-right: 192px;">标签</label><span>{{ sarStandardsInfoEO.lawsLabel || '-' }}</span></p>
@@ -150,7 +150,6 @@
                       <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{ file.oldFileName }}</a>
                       <i title="下载" @click="downloadFile(file.id)" class="icon-download" v-btn-permission="''"/>
                       <i title="下载带水印" @click="downloadFileByWater(file.id, file.fileSuffix)" class="icon-download2" v-btn-permission="''"/>
-                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
                     </p>
                     <!--                <el-button-->
                     <!--                  @click="showItemsModel(child.attrField)"-->
@@ -2404,7 +2403,7 @@ export default {
             display: inline-block;
             width: calc(~'100% - 225px');
             & > .files-title{
-              width: calc(~'100% - 120px');
+              /*width: calc(~'100% - 120px');*/
               min-height: 50px;
               line-height: 50px;
               font-size: 16px;
diff --git a/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue b/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
index 662f81ffc..2762bd95d 100644
--- a/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
+++ b/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
@@ -2859,6 +2859,24 @@
           _this: this
         }, res => {
           const item = res.data || {}
+          this.sarLawsStandEO = JSON.parse(JSON.stringify(item))
+          console.log(this.sarLawsStandEO)
+          this.sarLawsStandEO["XCSJBUSS"] = this.dateFormatter()
+          let subClass = item.standSubclass
+          this.sarLawsStandEO.standSubclass = subClass
+          if (this.sarLawsStandEO.issueTime != null && this.sarLawsStandEO.issueTime !== '') {
+            this.sarLawsStandEO.issueTime = new Date(this.sarLawsStandEO.issueTime)
+          }
+          if (this.sarLawsStandEO.putTime != null && this.sarLawsStandEO.putTime !== '') {
+            this.sarLawsStandEO.putTime = new Date(this.sarLawsStandEO.putTime)
+          }
+          Object.keys(item.attrInfoMap || {}).forEach((key) => {
+            if (item.attrInfoMap[key]) {
+              // this.sarStandardsInfoEO[key] = item.attrInfoMap[key]
+              this.$set(this.sarLawsStandEO, key, item.attrInfoMap[key])
+            }
+          })
+          this.sarLawsStandEO['id'] = item.id
           this.drawerTitle = '修改政策标准'
           this.modalshowflag = true
           this.resolveFormFieldList(true)
@@ -2892,23 +2910,6 @@
               this.dynamicFormField = displayLocation
               this.loading = false
             })
-            this.sarLawsStandEO = JSON.parse(JSON.stringify(item))
-            this.sarLawsStandEO["XCSJBUSS"] = this.dateFormatter()
-            let subClass = item.standSubclass
-            this.sarLawsStandEO.standSubclass = subClass
-            if (this.sarLawsStandEO.issueTime != null && this.sarLawsStandEO.issueTime !== '') {
-              this.sarLawsStandEO.issueTime = new Date(this.sarLawsStandEO.issueTime)
-            }
-            if (this.sarLawsStandEO.putTime != null && this.sarLawsStandEO.putTime !== '') {
-              this.sarLawsStandEO.putTime = new Date(this.sarLawsStandEO.putTime)
-            }
-            Object.keys(item.attrInfoMap || {}).forEach((key) => {
-              if (item.attrInfoMap[key]) {
-                // this.sarStandardsInfoEO[key] = item.attrInfoMap[key]
-                this.$set(this.sarLawsStandEO, key, item.attrInfoMap[key])
-              }
-            })
-            this.sarLawsStandEO['id'] = item.id
             if (state === 'show') {
               this.formdisableflag = true
             } else {
@@ -2922,6 +2923,7 @@
               this.sarLawsStandEO.orgName = item.responsibleUnitShow
             }
           })
+          console.log(this.sarLawsStandEO)
         })
       },
       // 部门树结构，通过id，查出对应的树节点