From d720c672ae7b9572039c2e89d5b86879d3e4f826 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Tue, 11 Jan 2022 13:52:09 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=81=E6=A0=87=E6=96=87=E6=9C=AC?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../otherBussStandardDetails/index.vue        | 31 ++++++++++++-------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue
index cdc948f50..4ef277c07 100644
--- a/src/pages/details/otherBussStandardDetails/index.vue
+++ b/src/pages/details/otherBussStandardDetails/index.vue
@@ -395,7 +395,7 @@
                     <p class="half">
                       <label style=" margin-right: 156px;"
                              title="“修订中”为现行有效版本；“已修订”标准的有效性需根据实际实施情况判定"
-                      >文本状态</label><span style="color: #409EFF;">{{ sarStandardsInfoEO.standStatusShow || '-' }}</span>
+                      >文本状态</label><span style="color: #409EFF;">{{ sarStandardsInfoEO.textStatusBuss || '-' }}</span>
                     </p>
                     <p class="half"><label style=" margin-right: 157px;">发布日期</label><span>{{ sarStandardsInfoEO.issueTime || '-' }}</span></p>
                     <p class="half" style=""><label style=" margin-right: 122px;">标准实施日期</label><span>{{ sarStandardsInfoEO.putTime || '-' }}</span></p>
@@ -1295,6 +1295,7 @@ export default {
   },
   data () {
     return {
+      textOptions: [],
       commentAverageScoreTag: '1',
       qualityFirstHistoryPeopleId: '',//质量评价最新评价的人的id
       dynamicFirstHistoryPeopleId: '',//动态评价最新评价的人的id
@@ -2155,6 +2156,11 @@ export default {
           _this: this
         }, res => {
           this.sarStandardsInfoEO = res.data || {}
+          this.textOptions.forEach(item => {
+            if(this.sarStandardsInfoEO.textStatusBuss === item.value){
+              this.sarStandardsInfoEO.textStatusBuss = item.label
+            }
+          })
           if (this.sarStandardsInfoEO.issueTime) {
             this.sarStandardsInfoEO.issueTime = this.sarStandardsInfoEO.issueTime.split(' ')[0]
           }
@@ -2870,6 +2876,18 @@ export default {
   async mounted () {
     //查询动态评价总平均分和质量评价总平均分
     let standId = this.$route.params.id
+    // 从数据库中查询各下拉框数据
+    this.$http.get('sys/dictype/getDicTypeListCode', '', {
+      _this: this
+    }, res => {
+      this.applyArcticOptions = res.data.ENERGYTYPES // 根据需求文档，产品类别对应标准属性中的“适用车型”
+      this.emergyKindOptions = res.data.ENERGYTYPES
+      this.requestOptions = res.data.REQUESTTYPE
+      this.textOptions = res.data.TEXTSTATUSBUSS //企标文本状态
+      this.mjOptions = res.data.MJ
+      this.STANDSOURCEREVISION = res.data.STANDSOURCEREVISION
+    }, e => {
+    })
     this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getScore', {lawId:standId}, {
       _this: this
     }, res => {
@@ -2912,17 +2930,6 @@ export default {
     this.sarStandardsInfoEO.id = this.$route.params.id
     this.getOrgTreeSource()
     this.standItemEO.standId = this.$route.params.id
-    // 从数据库中查询各下拉框数据
-    this.$http.get('sys/dictype/getDicTypeListCode', '', {
-      _this: this
-    }, res => {
-      this.applyArcticOptions = res.data.ENERGYTYPES // 根据需求文档，产品类别对应标准属性中的“适用车型”
-      this.emergyKindOptions = res.data.ENERGYTYPES
-      this.requestOptions = res.data.REQUESTTYPE
-      this.mjOptions = res.data.MJ
-      this.STANDSOURCEREVISION = res.data.STANDSOURCEREVISION
-    }, e => {
-    })
     Promise.all([this.queryDisplayLocation(), this.selectStandMessage(), this.getAddFormFieldList()]).then(async(values) => {
       const [displayLocation, {attrInfoMap: dynamicFormField}, formFieldList] = values
       // const relatedPlansRes = await this.queryRelatedPlans()

From 0aa0f1e1af2fb632d235bbf306b2207e149287ba Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Tue, 11 Jan 2022 14:35:45 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=BD=8D=E7=BD=AE?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/details/otherStandardDetails/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 83452e6b0..213874f4e 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -71,7 +71,7 @@
                                   v-for="(file, fileIndex) in child1Func(child.value)">
                           <!--                          单个文件时-->
                           <span v-if="child.value && child.value.length > 0 && child.value.length === 1">
-                          <a style="font-size: 16px;color: #409EFF;cursor: pointer"
+                          <a style="font-size: 16px;color: #409EFF;cursor: pointer;margin-left: -60px"
                              @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
                              :title="file.oldFileName">{{ file.oldFileName }}</a>
                           <i