From ef582b1b5715da35e55bd3d7afe5f6abba856aa1 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Mon, 11 Apr 2022 10:38:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=99=9A=E6=8B=9F=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=E8=AF=A6=E6=83=85=E7=BB=86=E8=8A=82=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |   2 +
 jero-web/src/common/lang/zh-cn.js             |   3 +-
 jero-web/src/components/UpdateLog/index.vue   | 120 ++++++++++++++++++
 .../components/virtualListDetails.vue         |  78 ++++++++----
 .../views/documentTools/virtualList/index.vue |   4 +-
 5 files changed, 180 insertions(+), 27 deletions(-)
 create mode 100644 jero-web/src/components/UpdateLog/index.vue

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index faeba1e69..b0aabc359 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -639,4 +639,6 @@ module.exports = {
   onlyOnefileUploaded:'only one file can be uploaded',
   typeCannotUploaded:'this type of file cannot be uploaded',
   confirmWithdraw:'confirm Withdraw',
+  OperationDetails:'Operation details',
+  OperationTime:'Operation time',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index e825ebe70..b921cbce5 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -643,5 +643,6 @@ module.exports = {
   onlyOnefileUploaded:'只能上传一个文件',
   typeCannotUploaded:'不支持上传该类型的文件',
   confirmWithdraw:'确认撤回？',
-
+  OperationDetails:'操作详情',
+  OperationTime:'操作时间',
 }
\ No newline at end of file
diff --git a/jero-web/src/components/UpdateLog/index.vue b/jero-web/src/components/UpdateLog/index.vue
new file mode 100644
index 000000000..aa9143d42
--- /dev/null
+++ b/jero-web/src/components/UpdateLog/index.vue
@@ -0,0 +1,120 @@
+<template>
+  <a-modal
+    :title="$t('UpdateLog')"
+    :width="900"
+    :visible="visible"
+    :confirm-loading="confirmLoading"
+    :maskClosable="false"
+    @ok="handleOk"
+    @cancel="handleCancel"
+  >
+    <a-table
+      class="table"
+      :columns="columns"
+      :pagination="false"
+      :scroll="{y: 400}"
+      :data-source="dataSource"
+      :loading="loading"
+    >
+       <span slot="content" slot-scope="text,record">
+          <a-tooltip placement="topLeft">
+        <template slot="title">
+          <span v-html="text"></span>
+        </template>
+            <span v-html="text"></span>
+      </a-tooltip>
+       </span>
+    </a-table>
+    <div class="page" v-if="dataSource.length > 0">
+      <a-pagination
+        :show-total="total => $t('total')+`${total}`+$t('strip')"
+        show-quick-jumper
+        show-size-changer
+        :page-size.sync="pageSize "
+        :total="total"
+        @change="onChange"
+        @showSizeChange="SizeChange"
+      />
+    </div>
+  </a-modal>
+</template>
+
+<script>
+  import { getAction, postAction,  } from '@/api/manage'
+  export default {
+    name: 'index',
+    props:['url'],
+    data(){
+        return{
+          visible:false,
+          confirmLoading:false,
+          dataSource:[],
+          loading:false,
+          pageNo: 1,
+          pageSize: 10,
+          total: 0,
+          columns: [
+            {
+              title: this.$t('OperationDetails'),
+              dataIndex: 'content',
+              align: 'center',
+              ellipsis: true,
+              scopedSlots: { customRender: 'content' }
+            },
+            {
+              title: this.$t('OperationTime'),
+              dataIndex: 'createTime',
+              align: 'center',
+              ellipsis: true,
+              width: 180
+            },
+          ]
+        }
+    },
+    mounted() {
+    },
+    methods:{
+      getList(){
+        this.visible = true
+        this.pageNo = 1
+        this.bussLogList()
+      },
+      handleOk() {
+        this.visible = false
+      },
+      handleCancel() {
+        this.visible = false
+      },
+      onChange(page, pageSize) {
+        this.pageNo = page
+        this.bussLogList()
+      },
+      SizeChange(page, pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.bussLogList()
+      },
+      bussLogList(){
+        let query = {
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+          documentId: this.$route.query.id
+        }
+        this.loading = true
+        getAction(this.url.logList, query).then((res) => {
+          if (res.success) {
+            this.dataSource = res.result.records
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.loading = false
+          }
+        })
+      },
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
index 12c07b34c..7e95f3371 100644
--- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
+++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
@@ -10,7 +10,8 @@
         </span>
       </div>
       <div class="Virtual-detail-right">
-        <div @click="UpdateLog" class="operator-text-text" style="margin-right: 37px" :title="$t('UpdateLog')">
+        <div @click="UpdateLogClick" class="operator-text-text" style="margin-right: 37px;cursor: pointer"
+             :title="$t('UpdateLog')">
           <a-icon type="reload"/>
           {{$t('UpdateLog')}}
         </div>
@@ -25,13 +26,13 @@
                   {{$t('VirtualListName')}}
               </span>
               <span class="text-right" style="margin-right: 100px">
-                是的开了房间都是立刻就的路上看见圣诞快乐
+                {{$route.query.name}}
               </span>
               <span class="text-left" :title="$t('instructionForUse')">
                   {{$t('instructionForUse')}}
               </span>
               <span class="text-right">
-                 是的开了房间都是立刻就的路上看见圣诞快乐 上看到了附件三零客机上的翻开历史交锋是开了房间都是付款了第三方
+                 {{$route.query.useExplain}}
               </span>
             </div>
           </div>
@@ -44,22 +45,29 @@
             <a-row :gutter="24">
               <a-col :md="6" :sm="8">
                 <div class="box-title-text">
-                  <div class="title-text" :title="$t('VirtualListName')">
-                    <span>{{$t('VirtualListName')}}</span>
+                  <div class="title-text" :title="$t('standard')">
+                    <span>{{$t('standard')}}</span>
                   </div>
-                  <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('VirtualListName')"
-                           v-model="queryParam.db_field_name"></a-input>
+                  <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
+                           v-model="queryParam.standard"></a-input>
                 </div>
               </a-col>
               <a-col :md="6" :sm="8">
                 <div class="box-title-text">
-                  <div class="title-text" :title="$t('listStatus')">
-                    <span>{{$t('listStatus')}}</span>
+                  <div class="title-text" :title="$t('title')">
+                    <span>{{$t('title')}}</span>
                   </div>
-                  <j-dict-select-tag class="box-input" v-model="queryParam.db_field_name"
-                                     :placeholder="$t('PleaseSelect')+$t('listStatus')"
-                                     :type="'select'"
-                                     :triggerChange="false" :dictCode="''"/>
+                  <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
+                           v-model="queryParam.title"></a-input>
+                </div>
+              </a-col>
+              <a-col :md="6" :sm="8">
+                <div class="box-title-text">
+                  <div class="title-text" :title="$t('subtitle')">
+                    <span>{{$t('subtitle')}}</span>
+                  </div>
+                  <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('subtitle')"
+                           v-model="queryParam.subtitle"></a-input>
                 </div>
               </a-col>
               <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
@@ -71,10 +79,10 @@
             </a-row>
           </div>
           <div class="table-operator">
-            <div class="operator-text" v-has="'document:importZip'">
+            <div class="operator-text" v-has="'document:importZip'" v-if="isTrue">
               <ImportFile :url="url"/>
             </div>
-            <div @click="handleModule" class="operator-text">
+            <div @click="handleModule" class="operator-text" v-if="isTrue">
               <a-icon type="download"/>
               {{$t('templateDownload')}}
             </div>
@@ -82,19 +90,19 @@
               <a-icon type="export" :rotate="-90"/>
               {{$t('export')}}
             </div>
-            <div @click="copyClick" class="operator-text">
+            <div @click="copyClick" class="operator-text" v-if="isTrue">
               <a-icon type="copy"/>
               {{$t('copy')}}
             </div>
-            <div @click="batSettingClick" class="operator-text">
+            <div @click="batSettingClick" class="operator-text" v-if="isTrue">
               <a-icon type="setting"/>
               {{$t('batSetting')}}
             </div>
-            <div @click="handleAdd" class="operator-text">
+            <div @click="handleAdd" class="operator-text" v-if="isTrue">
               <a-icon type="plus"/>
               {{$t('add')}}
             </div>
-            <div @click="handleDel" class="operator-text">
+            <div @click="handleDel" class="operator-text" v-if="isTrue">
               <a-icon type="delete"/>
               {{$t('BatchDelete')}}
             </div>
@@ -121,6 +129,7 @@
     </div>
     <addModel ref="addModelRef"/>
     <editModel ref="editModelRef"/>
+    <UpdateLog ref="UpdateLogRef"/>
   </div>
 </template>
 
@@ -128,13 +137,15 @@
   import ImportFile from '@/components/ImportFile/index'
   import addModel from './addModel'
   import editModel from './editModel'
+  import UpdateLog from '@/components/UpdateLog/index'
 
   export default {
     name: 'virtualListDetails',
     components: {
       ImportFile,
       addModel,
-      editModel
+      editModel,
+      UpdateLog
     },
     data() {
       return {
@@ -143,7 +154,7 @@
         url: {},
         loading: false,
         dataSource: [],
-        columns: [
+        columnsAll: [
           {
             title: 'WVTA ID',
             align: 'center',
@@ -295,12 +306,31 @@
             scopedSlots: { customRender: 'operation' }
           }
         ],
-        selectedRowKeys: []
+        selectedRowKeys: [],
+        isTrue: false
+      }
+    },
+    mounted() {
+      this.title = this.$route.query.title
+      this.isTrue = this.$route.query.title == '虚拟清单详情' ? false : true
+    },
+    computed: {
+      columns() {
+        let columnResult = JSON.parse(JSON.stringify(this.columnsAll))
+        if (this.title === '虚拟清单详情') {
+          for (var i = 0; i < columnResult.length; i++) {
+            if (columnResult[i].title === this.$t('operation')) {
+              columnResult.splice(i, 1)
+              i--
+            }
+          }
+        }
+        return columnResult
       }
     },
     methods: {
-      UpdateLog() {
-
+      UpdateLogClick() {
+        this.$refs.UpdateLogRef.getList()
       },
       searchQuery() {
 
diff --git a/jero-web/src/views/documentTools/virtualList/index.vue b/jero-web/src/views/documentTools/virtualList/index.vue
index 6294354d4..30b051ed9 100644
--- a/jero-web/src/views/documentTools/virtualList/index.vue
+++ b/jero-web/src/views/documentTools/virtualList/index.vue
@@ -253,7 +253,7 @@
             name: item.name,
             useExplain: item.useExplain,
             id: item.id,
-            isTrue: false
+            title: '维护虚拟清单'
           }
         })
         window.open(newUrl.href, '_blank')
@@ -306,7 +306,7 @@
             name: item.name,
             useExplain: item.useExplain,
             id: item.id,
-            isTrue: true
+            title: '虚拟清单详情'
           }
         })
         window.open(newUrl.href, '_blank')