From a1ffe86826f12fd710872cef5bf975be519144df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Mon, 30 Oct 2023 15:38:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B8=82=E5=9C=BA=E6=B3=95?=
 =?UTF-8?q?=E8=A7=84=E6=B8=85=E5=8D=95=E8=AF=A6=E6=83=85=E7=9A=84=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E8=AE=B0=E5=BD=95=E7=9A=84=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../UpdateLog/versionUpdatedRecordList.vue    | 24 ++++++---
 .../components/virtualListDetails.vue         | 50 +++++++++++--------
 2 files changed, 47 insertions(+), 27 deletions(-)

diff --git a/jero-web/src/components/UpdateLog/versionUpdatedRecordList.vue b/jero-web/src/components/UpdateLog/versionUpdatedRecordList.vue
index 1642c6f6c..bdba6d23b 100644
--- a/jero-web/src/components/UpdateLog/versionUpdatedRecordList.vue
+++ b/jero-web/src/components/UpdateLog/versionUpdatedRecordList.vue
@@ -10,12 +10,7 @@
       :loading="loading"
     >
        <span slot="content" slot-scope="text,record">
-          <a-tooltip placement="topLeft" overlayClassName="tooltipColor">
-        <template slot="title">
-          <span v-html="text"></span>
-        </template>
-            <span v-html="text"></span>
-      </a-tooltip>
+              <a @click="versionNumClick(record)">{{record.versionNum}}</a>
        </span>
     </a-table>
     <div class="page" v-if="dataSource.length > 0">
@@ -36,6 +31,7 @@
 <script>
   import { getAction, postAction } from '@/api/manage'
   import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+
   export default {
     name: 'versionUpdatedRecordList',
     mixins: [ResizeHeader, ResizeColumnProvide],
@@ -57,7 +53,8 @@
             dataIndex: 'versionNum',
             align: 'left',
             ellipsis: true,
-            width: 100
+            width: 100,
+            scopedSlots: { customRender: 'content' }
           },
           {
             title: this.$t('upgradeInstructions'),
@@ -116,6 +113,19 @@
             this.loading = false
           }
         })
+      },
+      versionNumClick(row) {
+        let newUrl = this.$router.resolve({
+          path: '/virtualListDetails',
+          query: {
+            name: row.name,
+            useExplain: row.upgradeExplanation,
+            id: row.listId,
+            title: '市场清单详情',
+            isColophon: 'yes'
+          }
+        })
+        window.open(newUrl.href, '_blank')
       }
     }
   }
diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
index 3b3f53188..8f022266b 100644
--- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
+++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
@@ -68,8 +68,8 @@
                     <div class="title-text" :title="$t('areaOfResponsibility')">
                       <span>{{$t('areaOfResponsibility')}}</span>
                     </div>
-<!--                    <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('subtitle')"-->
-<!--                             v-model="queryParam.dutyTerritory"></j-input>-->
+                    <!--                    <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('subtitle')"-->
+                    <!--                             v-model="queryParam.dutyTerritory"></j-input>-->
                     <j-multi-select-tag class="box-input-search" v-model="queryParam.dutyTerritory"
                                         :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
                                         :type="'select'"
@@ -137,8 +137,8 @@
                   <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
                   <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
                   <globalAdvancedQuery ref="globalAdvancedQueryRef"
-                                      @handleSuperQuery="handleSuperQuery"
-                                      :fieldList="fieldList"/>
+                                       @handleSuperQuery="handleSuperQuery"
+                                       :fieldList="fieldList"/>
                </a-col>
             </span>
               </a-row>
@@ -350,9 +350,9 @@
                 @showSizeChange="SizeChange"
               />
             </div>
-<!--            <div class="buttom-box" v-if="dataSource && dataSource.length > 0">-->
-<!--              {{$t('total')+' '+this.dataSource.length+' '+ $t('strip')}}-->
-<!--            </div>-->
+            <!--            <div class="buttom-box" v-if="dataSource && dataSource.length > 0">-->
+            <!--              {{$t('total')+' '+this.dataSource.length+' '+ $t('strip')}}-->
+            <!--            </div>-->
           </div>
         </a-card>
       </div>
@@ -474,7 +474,7 @@
           exportTemplate: '/dummy/dummyInventoryInfoEO/exportTemplate',
           getSysCategoryTree: '/sys/category/getSysCategoryTree',
           logList: '/dummy/dummyLogEO/page',
-          versionList:'/log/marketListVersionUpdateLogEO/page',
+          versionList: '/log/marketListVersionUpdateLogEO/page'
         },
         loading: false,
         dataSource: [],
@@ -722,7 +722,7 @@
                 ellipsis: true
               }
             ]
-          },
+          }
           // {
           //   title: this.$t('operation'),
           //   align: 'left',
@@ -1067,7 +1067,7 @@
             dictCode: 'duty_territory'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
           }
         ],
-        firstLevelDutyTerritoryList:[],
+        firstLevelDutyTerritoryList: []
       }
     },
     created() {
@@ -1130,8 +1130,8 @@
         this.getList()
       },
       UpdateLogClick() {
-        this.$refs.UpdateLogRef.getList({ dummyInventoryBaseId: this.$route.query.id, },
-          {listId:this.$route.query.id,listType:'Market Regulation List'})
+        this.$refs.UpdateLogRef.getList({ dummyInventoryBaseId: this.$route.query.id },
+          { listId: this.$route.query.id, listType: 'Market Regulation List' })
       },
       searchQuery() {
         this.getList()
@@ -1235,9 +1235,9 @@
           moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单'
         }).then((res) => {
           if (res.success) {
-            if(res.result && res.result.length > 0){
+            if (res.result && res.result.length > 0) {
               this.columnsAll = res.result
-            }else{
+            } else {
               this.columnsAll = this.column
             }
             for (let j = 0; j < this.columnsAll.length; j++) {
@@ -1324,7 +1324,13 @@
           pageSize: this.pageSize
         }
         this.loading = true
-        getAction(this.url.list, query).then((res) => {
+        let url = ''
+        if (this.$route.query.isColophon && this.$route.query.isColophon == 'yes') {
+          url = '/dummy/dummyInventoryInfoHistoryEO/page'
+        } else {
+          url = this.url.list
+        }
+        getAction(url, query).then((res) => {
           if (res.success) {
             if (res.result.current > 1 && res.result.records.length == 0) {
               this.pageNo = 1
@@ -1469,7 +1475,7 @@
       edit(item) {
         this.$refs.editModelRef.editModel(JSON.parse(JSON.stringify(item)))
       },
-      viewClick(item){
+      viewClick(item) {
         this.$refs.editModelRef.viewModel(JSON.parse(JSON.stringify(item)))
       },
       deleteLib(val) {
@@ -1567,13 +1573,13 @@
       },
       viewFileClick(item) {
         this.$refs.viewFileModelRef.clickButtonToUpload(item)
-      },
+      }
     }
   }
 </script>
 
 <style lang="less" scoped>
-  @import'~@assets/less/common.less';
+  @import '~@assets/less/common.less';
 
   .doc-detail {
     background: #fff;
@@ -1800,18 +1806,22 @@
   /deep/ .ant-table-column-title {
     font-weight: bold !important;
   }
+
   ::v-deep .ant-table-thead > tr > th .ant-table-header-column {
     max-width: none !important;
   }
+
   .viewFile {
     color: #00B3BE;
     cursor: pointer;
   }
-  ::v-deep .ant-table-thead > tr > th[colspan]:not([colspan='1']){
+
+  ::v-deep .ant-table-thead > tr > th[colspan]:not([colspan='1']) {
     text-align: left;
-    padding-left: 16px!important;
+    padding-left: 16px !important;
     border-right: 1px solid #e8e8e8;
   }
+
   .page {
     text-align: right;
     margin-top: 20px;