Merge remote-tracking branch 'origin/develop' into develop

src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue

@@ -298,7 +298,6 @@
             show-overflow-tooltip
             prop="standName"
             label="中文名称"
-            width="180px"
           >
             <template slot-scope="scope">
               <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
@@ -308,7 +307,6 @@
             show-overflow-tooltip
             prop="standEnName"
             label="英文名称"
-            width="180px"
           >
             <template slot-scope="scope">
               <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
@@ -353,10 +351,8 @@
                   {{scope.row.standStatusShow}}
                 </span>
               </template>
-
-
           </el-table-column>
-          <el-table-column label="操作" align="center" width="50" fixed="right">
+          <el-table-column label="操作" align="center" width="80">
             <template slot-scope="scope">
               <div @click.stop style="display: inline-block">
                 <el-dropdown trigger="click" @command="handleCommand">

src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue

@@ -1377,10 +1377,12 @@ export default {
       }, {
         _this: this, loading: "loading"
       }, res => {
+        this.detailedListVersion = res.data[0].detailedListVersion
         if (res.data) {
           this.$router.push({
             name: "LocalProductDetail",
             query: {
+              detailedListVersion: this.detailedListVersion,
               tabName: this.ifMaintaince
             }
           });

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue

@@ -47,7 +47,7 @@
       <div class="action-bar">
         <el-row>
           <el-col :span="12">
-            <span style="font-size: 16px;font-weight: bold">清单版本: {{  }}</span>
+            <span style="font-size: 16px;font-weight: bold">清单版本: {{ detailedListVersion ? $moment(detailedListVersion).format('YYYY-MM-DD HH:mm:ss') : '-' }}</span>
           </el-col>
           <el-col :span="12" style="text-align: end">
             <el-button
@@ -473,6 +473,7 @@ export default {
   },
   data() {
     return {
+      detailedListVersion: '',
       standSortOptions: [],
       standCommonlySearch: {
         standSort: '',
@@ -959,6 +960,7 @@ export default {
     ...mapGetters(['getLocalPro'])
   },
   mounted() {
+    this.detailedListVersion = this.$route.query.detailedListVersion
     this.$nextTick(() => {
       this.Height = $('.contaiiner').height() - $('.contaiinerCard').height() - 190
       window.onresize = () => {