Merge branch 'fix_foton_20240619' into 'master'

fix: 首页企标动态添加代替标准号和实施时间，国标库和企标库添加被代替标准号

See merge request laws-foton-slrs/foton-laws-system-front!206

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>

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"

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="发布日期"