From db5b4ef5a8cd7bc6aba602e077db163c97f3dcf3 Mon Sep 17 00:00:00 2001
From: wxyclub <tjzdwxy@163.com>
Date: Thu, 4 Jul 2024 10:00:48 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=A6=96=E9=A1=B5=E4=BC=81=E6=A0=87?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81=E6=B7=BB=E5=8A=A0=E4=BB=A3=E6=9B=BF=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=E5=8F=B7=E5=92=8C=E5=AE=9E=E6=96=BD=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=EF=BC=8C=E5=9B=BD=E6=A0=87=E5=BA=93=E5=92=8C=E4=BC=81=E6=A0=87?=
 =?UTF-8?q?=E5=BA=93=E6=B7=BB=E5=8A=A0=E8=A2=AB=E4=BB=A3=E6=9B=BF=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../home2/components/releaseBuss/index.vue     | 16 ++++++++++++++++
 .../domesticStandardsAndRegulations/index.vue  | 18 +++++++++++++++++-
 .../components/EnterpriseStandardDatabase.vue  | 16 +++++++++++++++-
 3 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/src/pages/home2/components/releaseBuss/index.vue b/src/pages/home2/components/releaseBuss/index.vue
index 7a5c82dca..f8303a9ad 100644
--- a/src/pages/home2/components/releaseBuss/index.vue
+++ b/src/pages/home2/components/releaseBuss/index.vue
@@ -38,6 +38,14 @@
           </span>
         </template>
       </el-table-column>
+      <el-table-column
+          width="150"
+          label="代替标准号"
+      >
+        <template slot-scope="scope">
+          <span>{{ scope.row.dtbzh }}</span>
+        </template>
+      </el-table-column>
       <el-table-column
         width="120"
         label="发布时间"
@@ -46,6 +54,14 @@
           <span>{{ scope.row.releaseDate ? $moment(scope.row.releaseDate).format('YYYY-MM-DD') : '' }}</span>
         </template>
       </el-table-column>
+      <el-table-column
+          width="120"
+          label="实施时间"
+      >
+        <template slot-scope="scope">
+          <span>{{ scope.row.putTime ? $moment(scope.row.putTime).format('YYYY-MM-DD') : '' }}</span>
+        </template>
+      </el-table-column>
     </el-table>
     <div v-if="!pageVerify" class="more" @click="togo">更多 ⋙</div>
     <loading :loading="loading">加载中...</loading>
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 8e4e82244..f3f8b0501 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -461,7 +461,23 @@
                 <span v-else>{{ scope.row.dtbzh }}</span>
               </template>
             </el-table-column>
-
+            <el-table-column
+                prop="bdtbzh"
+                width="200"
+                label="被代替标准号"
+            >
+              <template slot-scope="scope">
+                <span
+                    v-if="textStatusMap[scope.row.textStatus] === '废止' "
+                    style="color: #F56C6C"
+                >{{ scope.row.bdtbzh }}</span>
+                <span
+                    v-else-if="textStatusMap[scope.row.textStatus] === '参考' || textStatusMap[scope.row.textStatus] === '被代替'"
+                    style="color: #35720B"
+                >{{ scope.row.bdtbzh }}</span>
+                <span v-else>{{ scope.row.bdtbzh }}</span>
+              </template>
+            </el-table-column>
             <el-table-column
               v-if="isPermission('cac1eb379eb8e3b987cbb2e4599adb50') >0"
               fixed="right"
diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index b30887217..b6c598ce0 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -447,7 +447,7 @@
             show-overflow-tooltip
             prop="dtqbbhbuss"
             label="代替企标编号"
-            min-width="300"
+            min-width="200"
           >
             <template slot-scope="scope">
               <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">{{ scope.row.dtqbbhbuss }}</span>
@@ -457,6 +457,20 @@
               }}</span>
             </template>
           </el-table-column>
+          <el-table-column
+              show-overflow-tooltip
+              prop="bdtqbbhbuss"
+              label="被代替企标编号"
+              min-width="200"
+          >
+            <template slot-scope="scope">
+              <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">{{ scope.row.bdtqbbhbuss }}</span>
+              <span v-if="scope.row.standStatusShow === '参考' " style="color: #35720B" class="table-jump">{{ scope.row.bdtqbbhbuss }}</span>
+              <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" class="table-jump">{{
+                  scope.row.bdtqbbhbuss
+                }}</span>
+            </template>
+          </el-table-column>
           <el-table-column
             prop="issueTime"
             label="发布日期"