From bc46d0a37a9bf3fa6d00571086a0222ac20ba95e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Mon, 24 Apr 2023 15:02:34 +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=E3=80=81=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95=E7=9A=84?=
 =?UTF-8?q?=E5=8F=91=E5=B8=83?=
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             |   2 +
 jero-web/src/components/UpdateLog/index.vue   | 148 +++++++++++-------
 .../UpdateLog/versionUpdatedRecordList.vue    | 138 ++++++++++++++++
 .../components/virtualListDetails.vue         |   8 +-
 .../components/releaseForm.vue                |   2 +-
 .../certificationListMaintenance.vue          |   8 +-
 7 files changed, 243 insertions(+), 65 deletions(-)
 create mode 100644 jero-web/src/components/UpdateLog/versionUpdatedRecordList.vue

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index a2d24c0b9..ca68b2ff2 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1807,4 +1807,6 @@ module.exports = {
   andTheOperatorCurrentData:' And the operator is the responsible person for the current data',
   upgradeInstructions:'Upgrade Instructions',
   upgradeOrNot:'Upgrade or not',
+  operationRecords:'Operation Records',
+  versionUpdatedRecord:'Version Updated Record',
 }
\ 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 7376d26c3..f7a7221b3 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1909,4 +1909,6 @@ module.exports = {
   andTheOperatorCurrentData:',并且登录人为当前数据的责任人',
   upgradeInstructions:'升版说明',
   upgradeOrNot:'是否升版',
+  operationRecords:'操作记录',
+  versionUpdatedRecord:'版本更新记录',
 }
\ No newline at end of file
diff --git a/jero-web/src/components/UpdateLog/index.vue b/jero-web/src/components/UpdateLog/index.vue
index f29fb58b8..6388938fb 100644
--- a/jero-web/src/components/UpdateLog/index.vue
+++ b/jero-web/src/components/UpdateLog/index.vue
@@ -12,15 +12,21 @@
         {{$t('cancel')}}
       </a-button>
     </template>
-    <a-table
-      class="table"
-      :components="drag(columns,'columns')"
-      :columns="columns"
-      :pagination="false"
-      :scroll="{x:'100%',y: 420}"
-      :data-source="dataSource"
-      :loading="loading"
-    >
+    <a-tabs v-model="active" @change="activeChange" v-if="isVersion">
+      <a-tab-pane :key="$t('operationRecords')" :tab="$t('operationRecords')">
+      </a-tab-pane>
+      <a-tab-pane :key="$t('versionUpdatedRecord')" :tab="$t('versionUpdatedRecord')"></a-tab-pane>
+    </a-tabs>
+    <div v-if="active == this.$t('operationRecords')">
+      <a-table
+        class="table"
+        :components="drag(columns,'columns')"
+        :columns="columns"
+        :pagination="false"
+        :scroll="{x:'100%',y: 420}"
+        :data-source="dataSource"
+        :loading="loading"
+      >
        <span slot="content" slot-scope="text,record">
           <a-tooltip placement="topLeft" overlayClassName="tooltipColor">
         <template slot="title">
@@ -29,64 +35,88 @@
             <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"
-        :current="pageNo"
-        @change="onChange"
-        @showSizeChange="SizeChange"
-      />
+      </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"
+          :current="pageNo"
+          @change="onChange"
+          @showSizeChange="SizeChange"
+        />
+      </div>
     </div>
+    <versionUpdatedRecordList :url="url"
+                              ref="versionUpdatedRecordRef"
+                              v-else-if="active == this.$t('versionUpdatedRecord')"/>
   </a-modal>
 </template>
 
 <script>
-  import { getAction, postAction,  } from '@/api/manage'
+  import { getAction, postAction } from '@/api/manage'
+  import versionUpdatedRecordList from './versionUpdatedRecordList'
   import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
 
   export default {
     name: 'index',
-    props:['url'],
-    mixins:[ResizeHeader, ResizeColumnProvide],
-    data(){
-        return{
-          visible:false,
-          confirmLoading:false,
-          dataSource:[],
-          loading:false,
-          pageNo: 1,
-          pageSize: 10,
-          queryId:{},
-          total: 0,
-          columns: [
-            {
-              title: this.$t('OperationDetails'),
-              dataIndex: 'logContent',
-              align: 'left',
-              ellipsis: true,
-              scopedSlots: { customRender: 'content' },
-              width: 664
-            },
-            {
-              title: this.$t('OperationTime'),
-              dataIndex: 'createTime',
-              align: 'left',
-              ellipsis: true,
-              width: 180
-            },
-          ]
-        }
+    props: ['url','isVersion'],
+    mixins: [ResizeHeader, ResizeColumnProvide],
+    components: {
+      versionUpdatedRecordList
+    },
+    data() {
+      return {
+        visible: false,
+        confirmLoading: false,
+        dataSource: [],
+        loading: false,
+        pageNo: 1,
+        pageSize: 10,
+        queryId: {},
+        total: 0,
+        versionData:{},
+        active: this.$t('operationRecords'),
+        columns: [
+          {
+            title: this.$t('OperationDetails'),
+            dataIndex: 'logContent',
+            align: 'left',
+            ellipsis: true,
+            scopedSlots: { customRender: 'content' },
+            width: 664
+          },
+          {
+            title: this.$t('OperationTime'),
+            dataIndex: 'createTime',
+            align: 'left',
+            ellipsis: true,
+            width: 180
+          }
+        ]
+      }
     },
     mounted() {
     },
-    methods:{
-      getList(data){
+    methods: {
+      activeChange(value) {
+        if (value == this.$t('operationRecords')) {
+          this.pageNo = 1
+          this.bussLogList()
+        } else if (value == this.$t('versionUpdatedRecord')) {
+          this.$nextTick(()=>{
+            this.$refs.versionUpdatedRecordRef.getList(this.versionData)
+          })
+        }
+      },
+      getList(data,versionData) {
         this.visible = true
+        if (versionData){
+           this.versionData = versionData
+        }
+        this.active = this.$t('operationRecords')
         this.pageNo = 1
         this.queryId = data
         this.bussLogList()
@@ -100,7 +130,7 @@
         this.pageSize = pageSize
         this.bussLogList()
       },
-      bussLogList(){
+      bussLogList() {
         let query = {
           pageNo: this.pageNo,
           pageSize: this.pageSize,
@@ -116,7 +146,7 @@
             this.loading = false
           }
         })
-      },
+      }
     }
   }
 </script>
@@ -126,11 +156,13 @@
     text-align: right;
     margin-top: 20px;
   }
-  /deep/.tooltipColor .ant-tooltip-inner {
+
+  /deep/ .tooltipColor .ant-tooltip-inner {
     color: #333;
     background-color: #fff !important;
   }
-  /deep/.tooltipColor .ant-tooltip-arrow::before {
+
+  /deep/ .tooltipColor .ant-tooltip-arrow::before {
     background-color: #fff;
   }
 </style>
\ No newline at end of file
diff --git a/jero-web/src/components/UpdateLog/versionUpdatedRecordList.vue b/jero-web/src/components/UpdateLog/versionUpdatedRecordList.vue
new file mode 100644
index 000000000..1642c6f6c
--- /dev/null
+++ b/jero-web/src/components/UpdateLog/versionUpdatedRecordList.vue
@@ -0,0 +1,138 @@
+<template>
+  <div>
+    <a-table
+      class="table"
+      :columns="columns"
+      :components="drag(columns,'columns')"
+      :pagination="false"
+      :scroll="{x:'100%',y: 420}"
+      :data-source="dataSource"
+      :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>
+       </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"
+        :current="pageNo"
+        @change="onChange"
+        @showSizeChange="SizeChange"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+  import { getAction, postAction } from '@/api/manage'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+  export default {
+    name: 'versionUpdatedRecordList',
+    mixins: [ResizeHeader, ResizeColumnProvide],
+    props: ['url'],
+    data() {
+      return {
+        visible: false,
+        confirmLoading: false,
+        dataSource: [],
+        loading: false,
+        pageNo: 1,
+        pageSize: 10,
+        versionData: {},
+        total: 0,
+        active: this.$t('operationRecords'),
+        columns: [
+          {
+            title: this.$t('VersionNumber'),
+            dataIndex: 'versionNum',
+            align: 'left',
+            ellipsis: true,
+            width: 100
+          },
+          {
+            title: this.$t('upgradeInstructions'),
+            dataIndex: 'upgradeExplanation',
+            align: 'left',
+            ellipsis: true,
+            width: 360
+          },
+          {
+            title: this.$t('Operator'),
+            dataIndex: 'createBy',
+            align: 'left',
+            ellipsis: true,
+            width: 100
+          },
+          {
+            title: this.$t('OperationTime'),
+            dataIndex: 'createTime',
+            align: 'left',
+            ellipsis: true,
+            width: 150
+          }
+        ]
+      }
+    },
+    mounted() {
+    },
+    methods: {
+      getList(data) {
+        this.pageNo = 1
+        this.versionData = data
+        this.bussLogList()
+      },
+      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,
+          ...this.versionData
+        }
+        this.loading = true
+        getAction(this.url.versionList, 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>
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+
+  /deep/ .tooltipColor .ant-tooltip-inner {
+    color: #333;
+    background-color: #fff !important;
+  }
+
+  /deep/ .tooltipColor .ant-tooltip-arrow::before {
+    background-color: #fff;
+  }
+</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 3965a9050..1b8c32b24 100644
--- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
+++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
@@ -323,7 +323,7 @@
     </div>
     <addModel :url="url" ref="addModelRef" @addModelList="addModelList" @visible='sVisible'/>
     <editModel :url="url" ref="editModelRef" @editModelList="editModelList" @visible='sVisible'/>
-    <UpdateLog :url="url" ref="UpdateLogRef" @visible='sVisible'/>
+    <UpdateLog :url="url" :isVersion="true" ref="UpdateLogRef" @visible='sVisible'/>
     <transferList :url="url" @transferListForm="transferListForm" ref="transferListRef" @visible='sVisible'/>
     <transferListvirtal :url="url" @transferListFormHomo="transferListFormHomo" ref="transferListvirtalRef"/>
     <batSetting :url="url" ref="batSettingRef" @batSettingList="batSettingList"/>
@@ -434,7 +434,8 @@
           exportData: '/dummy/dummyInventoryInfoEO/exportData',
           exportTemplate: '/dummy/dummyInventoryInfoEO/exportTemplate',
           getSysCategoryTree: '/sys/category/getSysCategoryTree',
-          logList: '/dummy/dummyLogEO/page'
+          logList: '/dummy/dummyLogEO/page',
+          versionList:'/log/marketListVersionUpdateLogEO/page',
         },
         loading: false,
         dataSource: [],
@@ -1062,7 +1063,8 @@
         this.getList()
       },
       UpdateLogClick() {
-        this.$refs.UpdateLogRef.getList({ dummyInventoryBaseId: this.$route.query.id })
+        this.$refs.UpdateLogRef.getList({ dummyInventoryBaseId: this.$route.query.id, },
+          {listId:this.$route.query.id,listType:'Market Regulation List'})
       },
       searchQuery() {
         this.getList()
diff --git a/jero-web/src/views/virtualAuthenticationList/components/releaseForm.vue b/jero-web/src/views/virtualAuthenticationList/components/releaseForm.vue
index 724b58b64..c2685d197 100644
--- a/jero-web/src/views/virtualAuthenticationList/components/releaseForm.vue
+++ b/jero-web/src/views/virtualAuthenticationList/components/releaseForm.vue
@@ -22,7 +22,7 @@
                 <a-radio :value="1">
                   是
                 </a-radio>
-                <a-radio :value="2">
+                <a-radio :value="0">
                   否
                 </a-radio>
               </a-radio-group>
diff --git a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue
index 5a6f8b47f..3d54dc18e 100644
--- a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue
+++ b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue
@@ -244,7 +244,7 @@
         </a-card>
       </div>
     </div>
-    <UpdateLog :url="url" ref="UpdateLogRef"/>
+    <UpdateLog :url="url" :isVersion="true" ref="UpdateLogRef"/>
     <transferList :url="url" @transferListForm="transferListForm" ref="transferListRef"/>
     <addModel :url="url" ref="addModelRef" @addModelList="addModelList"/>
     <edit-model :url="url" ref="editModelRef" @editModelList="editModelList"></edit-model>
@@ -299,7 +299,8 @@
           editModel: '/authDummy/authDummyInventoryInfoEO/edit',//编辑
           setBatch: '/authDummy/authDummyInventoryInfoEO/setBatch',//批量设置
           importZipUrl: '/authDummy/authDummyInventoryInfoEO/importData',//导入
-          number: '/project/projectLawsInventoryEO/list'
+          number: '/project/projectLawsInventoryEO/list',
+          versionList:'/log/marketListVersionUpdateLogEO/page',
         },
         queryParam: {},
         orderByField: '',
@@ -416,7 +417,8 @@
         this.toggleSearchStatus = !this.toggleSearchStatus
       },
       UpdateLogClick() {
-        this.$refs.UpdateLogRef.getList({ authDummyInventoryBaseId: this.$route.query.id })
+        this.$refs.UpdateLogRef.getList({ authDummyInventoryBaseId: this.$route.query.id },
+          {listId:this.$route.query.id,listType:'Market Certification List'})
       },
       //搜索
       searchQuery() {