From 8499983b6d08edd6c1e20455a478776c17f7b016 Mon Sep 17 00:00:00 2001
From: zyd <zhangyanduan@91isoft.com>
Date: Fri, 26 Aug 2022 13:31:44 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E4=B8=89=E4=B8=AA?=
 =?UTF-8?q?=E5=9F=BA=E7=A1=80=E5=BA=93=E4=B8=AD=E7=9A=84=E6=96=87=E6=9C=AC?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=88=97=E4=BD=8D=E7=BD=AE=EF=BC=8C=E4=BB=8E?=
 =?UTF-8?q?=E6=9C=80=E5=90=8E=E6=8C=AA=E5=88=B0=E7=AC=AC=E4=B8=89=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domesticStandardsAndRegulations/index.vue | 42 ++++++++---------
 .../components/EnterpriseStandardDatabase.vue | 37 +++++++--------
 .../foreignStandardsAndRegulations/index.vue  | 45 ++++++++++---------
 3 files changed, 64 insertions(+), 60 deletions(-)

diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 985cd7f18..48221be2e 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -247,6 +247,27 @@
                    class="table-jump">{{ scope.row.standName }}</a>
               </template>
             </el-table-column>
+            <el-table-column
+                    prop="textStatus"
+                    label="文本状态">
+              <!--              <template slot="header" slot-scope="scope">-->
+              <!--                <el-tooltip class="item" effect="dark" content="计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。" placement="bottom">-->
+              <!--                  <span>文本状态<i class="el-icon-warning-outline"></i></span>-->
+              <!--                </el-tooltip>-->
+              <!--              </template>-->
+              <template slot-scope="scope">
+                <span
+                        v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'"
+                        style="color: #F56C6C">{{
+                    textStatusMap[scope.row.textStatus]
+                  }}</span>
+                <span
+                        v-else-if="textStatusMap[scope.row.textStatus] === '参考' "
+                        style="color: #35720B">{{ textStatusMap[scope.row.textStatus] }}</span>
+                <span v-else>{{ textStatusMap[scope.row.textStatus] }}</span>
+              </template>
+            </el-table-column>
+
             <el-table-column
               prop="issueTime"
               sortable="custom"
@@ -321,26 +342,7 @@
                 <span v-else>{{ scope.row.dtbzh }}</span>
               </template>
             </el-table-column>
-            <el-table-column
-              prop="textStatus"
-              label="文本状态">
-              <!--              <template slot="header" slot-scope="scope">-->
-              <!--                <el-tooltip class="item" effect="dark" content="计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。" placement="bottom">-->
-              <!--                  <span>文本状态<i class="el-icon-warning-outline"></i></span>-->
-              <!--                </el-tooltip>-->
-              <!--              </template>-->
-              <template slot-scope="scope">
-                <span
-                  v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'"
-                  style="color: #F56C6C">{{
-                    textStatusMap[scope.row.textStatus]
-                  }}</span>
-                <span
-                  v-else-if="textStatusMap[scope.row.textStatus] === '参考' "
-                  style="color: #35720B">{{ textStatusMap[scope.row.textStatus] }}</span>
-                <span v-else>{{ textStatusMap[scope.row.textStatus] }}</span>
-              </template>
-            </el-table-column>
+
             <el-table-column fixed="right"
                              v-if="isPermission('cac1eb379eb8e3b987cbb2e4599adb50') >0"
                              label="收藏" align="center" width="50px"
diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index c58491dc1..f938f2acb 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -352,6 +352,25 @@
                 }}</a>
             </template>
           </el-table-column>
+          <el-table-column
+                  show-overflow-tooltip
+                  prop="standStatusShow"
+                  label="文本状态"
+                  width="110"
+          >
+
+            <template slot-scope="scope">
+                <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">
+                  {{ scope.row.standStatusShow }}
+                </span>
+              <span v-if="scope.row.standStatusShow === '参考'" style="color: #35720B">
+                  {{ scope.row.standStatusShow }}
+                </span>
+              <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">
+                  {{ scope.row.standStatusShow }}
+                </span>
+            </template>
+          </el-table-column>
           <el-table-column
             show-overflow-tooltip
             prop="dtqbbhbuss"
@@ -401,25 +420,7 @@
                 }}</span>
             </template>
           </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            prop="standStatusShow"
-            label="文本状态"
-            width="110"
-          >
 
-            <template slot-scope="scope">
-                <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">
-                  {{ scope.row.standStatusShow }}
-                </span>
-              <span v-if="scope.row.standStatusShow === '参考'" style="color: #35720B">
-                  {{ scope.row.standStatusShow }}
-                </span>
-              <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">
-                  {{ scope.row.standStatusShow }}
-                </span>
-            </template>
-          </el-table-column>
           <el-table-column
                   show-overflow-tooltip
                   prop="reviseStatus"
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index beb98580a..74572a5e1 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -265,6 +265,28 @@
                   }}</a>
               </template>
             </el-table-column>
+            <el-table-column
+                    prop="textStatus"
+                    width="110"
+                    label="文本状态">
+              <!--              <template slot="header" slot-scope="scope">-->
+              <!--                <el-tooltip class="item" effect="dark" content="计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。" placement="bottom">-->
+              <!--                  <span>文本状态 <i class="el-icon-warning-outline"></i></span>-->
+              <!--                </el-tooltip>-->
+              <!--              </template>-->
+              <template slot-scope="scope">
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                    textStatusMap[scope.row.textStatus]
+                  }}</span>
+                <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
+                    textStatusMap[scope.row.textStatus]
+                  }}</span>
+                <span v-else-if="textStatusMap[scope.row.textStatus] === '参考' " style="color: #35720B">{{
+                    textStatusMap[scope.row.textStatus]
+                  }}</span>
+                <span v-else style="color: #333333">{{ textStatusMap[scope.row.textStatus] }}</span>
+              </template>
+            </el-table-column>
             <el-table-column
               prop="issueTime"
               width="120"
@@ -342,28 +364,7 @@
                   }}</span>
               </template>
             </el-table-column>
-            <el-table-column
-              prop="textStatus"
-              width="110"
-              label="文本状态">
-              <!--              <template slot="header" slot-scope="scope">-->
-              <!--                <el-tooltip class="item" effect="dark" content="计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。" placement="bottom">-->
-              <!--                  <span>文本状态 <i class="el-icon-warning-outline"></i></span>-->
-              <!--                </el-tooltip>-->
-              <!--              </template>-->
-              <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
-                    textStatusMap[scope.row.textStatus]
-                  }}</span>
-                <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
-                    textStatusMap[scope.row.textStatus]
-                  }}</span>
-                <span v-else-if="textStatusMap[scope.row.textStatus] === '参考' " style="color: #35720B">{{
-                    textStatusMap[scope.row.textStatus]
-                  }}</span>
-                <span v-else style="color: #333333">{{ textStatusMap[scope.row.textStatus] }}</span>
-              </template>
-            </el-table-column>
+
             <el-table-column fixed="right" v-if="isPermission('f9745194958bc9ed3ee5127459795dbc')>0" label="收藏" align="center" width="50">
               <template slot-scope="scope">
 <!--                <div v-if="isPermission('f9745194958bc9ed3ee5127459795dbc,e8d690904ee1895dd0d17d9c794fbcd7,b299fa5edb3f3f35badb2adb6bda9f2e') == 1"-->