From b2f9f287babfa1383c9739795ab14e3b0d64083c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= <liuyanze@syxysoft.com>
Date: Mon, 6 Feb 2023 10:20:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=B7=A5=E5=85=B7-=E8=99=9A?=
 =?UTF-8?q?=E6=8B=9F=E6=B8=85=E5=8D=95-=E8=99=9A=E6=8B=9F=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=E8=AF=A6=E6=83=85-=E5=88=97=E5=AE=BD=E5=8F=AF?=
 =?UTF-8?q?=E6=8B=96=E6=8B=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/components/UpdateLog/index.vue   |  4 +-
 .../virtualList/components/addModel.vue       | 19 +++++++---
 .../virtualList/components/editModel.vue      |  1 +
 .../components/virtualListDetails.vue         | 37 ++++++++++++++-----
 4 files changed, 44 insertions(+), 17 deletions(-)

diff --git a/jero-web/src/components/UpdateLog/index.vue b/jero-web/src/components/UpdateLog/index.vue
index 254502f4b..f29fb58b8 100644
--- a/jero-web/src/components/UpdateLog/index.vue
+++ b/jero-web/src/components/UpdateLog/index.vue
@@ -5,10 +5,10 @@
     :visible="visible"
     :confirm-loading="confirmLoading"
     :maskClosable="false"
-    @cancel="visible = false"
+    @cancel="visible = false;$emit('visible')"
   >
     <template slot="footer">
-      <a-button key="back" @click="visible = false">
+      <a-button key="back" @click="visible = false;$emit('visible')">
         {{$t('cancel')}}
       </a-button>
     </template>
diff --git a/jero-web/src/views/documentTools/virtualList/components/addModel.vue b/jero-web/src/views/documentTools/virtualList/components/addModel.vue
index c946cdf25..95e9b29d8 100644
--- a/jero-web/src/views/documentTools/virtualList/components/addModel.vue
+++ b/jero-web/src/views/documentTools/virtualList/components/addModel.vue
@@ -62,6 +62,7 @@
       <div style="width: 100%">
         <a-table
           :columns="columns"
+          :components="drag(columns,'columns')"
           rowKey="id"
           :scroll="{x: 1200}"
           :data-source="dataList"
@@ -96,6 +97,7 @@
 <script>
   import { getAction, postAction } from '@/api/manage'
   import globalAdvancedQuery from '@/components/globalAdvancedQuery/index'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
 
   export default {
     name: 'addModel',
@@ -108,6 +110,7 @@
         default: {}
       }
     },
+    mixins:[ResizeHeader, ResizeColumnProvide],
     data() {
       return {
         toggleSearchStatus: false,
@@ -120,19 +123,22 @@
             title: this.$t('standard'),
             dataIndex: 'serial_number',
             align: 'left',
-            ellipsis: true
+            ellipsis: true,
+            width: 228
           },
           {
             title: this.$t('title'),
             dataIndex: 'title',
             align: 'left',
-            ellipsis: true
+            ellipsis: true,
+            width: 228
           },
           {
             title: this.$t('zoneOfApplication'),
             dataIndex: 'region',
             align: 'left',
-            ellipsis: true
+            ellipsis: true,
+            width: 228
           },
           // {
           //   title: this.$t('status'),
@@ -150,13 +156,15 @@
             title: this.$t('ImplementationDate'),
             dataIndex: 'xin1_che1_xing2_shi2_shi1_ri4_qi1',
             align: 'left',
-            ellipsis: true
+            ellipsis: true,
+            width: 228
           },
           {
             title: this.$t('vehicleInProductionDate'),
             dataIndex: 'implement_time',
             align: 'left',
-            ellipsis: true
+            ellipsis: true,
+            width: 228
           }
           // {
           //   title: this.$t('correspondingStandard'),
@@ -250,6 +258,7 @@
       },
       handleCancel() {
         this.visible = false
+        this.$emit('visible')
       },
       handleSubmit() {
         if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
diff --git a/jero-web/src/views/documentTools/virtualList/components/editModel.vue b/jero-web/src/views/documentTools/virtualList/components/editModel.vue
index fa979df36..0fea84383 100644
--- a/jero-web/src/views/documentTools/virtualList/components/editModel.vue
+++ b/jero-web/src/views/documentTools/virtualList/components/editModel.vue
@@ -737,6 +737,7 @@
       },
       handleCancel() {
         this.visible = false
+        this.$emit('visible')
       },
       handleSubmit() {
         this.$refs.ruleForm.validate(valid => {
diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
index 63f07166b..27d9396cc 100644
--- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
+++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
@@ -151,7 +151,7 @@
               {{$t('BatchDelete')}}
             </div>
           </div>
-          <div style="width: 100%">
+          <div style="width: 100%" v-if="istable">
             <a-table
               ref="table"
               class="ant-table tableList"
@@ -159,6 +159,7 @@
               :pagination="false"
               :scroll="{x: '100%',y:'calc(100vh - 356px)'}"
               rowKey="id"
+              :components="drag(columns,'columnsAll')"
               :data-source="dataSource"
               @change="tableOnChange"
               :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
@@ -227,10 +228,10 @@
         </a-card>
       </div>
     </div>
-    <addModel :url="url" ref="addModelRef" @addModelList="addModelList"/>
-    <editModel :url="url" ref="editModelRef" @editModelList="editModelList"/>
-    <UpdateLog :url="url" ref="UpdateLogRef"/>
-    <transferList :url="url" @transferListForm="transferListForm" ref="transferListRef"/>
+    <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'/>
+    <transferList :url="url" @transferListForm="transferListForm" ref="transferListRef" @visible='sVisible'/>
     <transferListvirtal :url="url" @transferListFormHomo="transferListFormHomo" ref="transferListvirtalRef"/>
     <batSetting :url="url" ref="batSettingRef" @batSettingList="batSettingList"/>
     <a-modal
@@ -280,6 +281,7 @@
   import { getAction, postAction, downloadFile } from '@/api/manage'
   import { Base64 } from 'js-base64'
   import { mapGetters } from 'vuex'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
 
   export default {
     name: 'virtualListDetails',
@@ -293,6 +295,7 @@
       batSetting,
       globalAdvancedQuery
     },
+    mixins:[ResizeHeader, ResizeColumnProvide],
     data() {
       return {
         title: '维护虚拟清单',
@@ -301,6 +304,7 @@
         visibleFile: false,
         transferList: false,
         orderBy: '1',
+        istable: true,
         orderByField: '',
         downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
         downLoadImgUrl: window._CONFIG['domianWebImgURL'] + '/sys/common/download',
@@ -672,11 +676,18 @@
             }
           }
         }
+        this.isTruee = false
+        this.$nextTick(()=>{
+          this.isTruee = true
+        })
         return columnResult
       }
     },
     methods: {
       ...mapGetters(['userInfo']),
+      sVisible(){
+        this.getDataAdmin()
+      },
       handleSuperQuery(params, matchType) {
         let sqp = {}
         if (!params || (params && params.length == 0)) {
@@ -710,6 +721,12 @@
       transferClick() {
           this.$refs.transferListRef.transferModel()
       },
+      getDataAdmin(){
+        this.isTrue = false
+        setTimeout(()=>{
+          this.isTrue = true
+        },100)
+      },
       //导出
       handleExport() {
         let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
@@ -962,7 +979,7 @@
 </script>
 
 <style lang="less" scoped>
-  @import '~@assets/less/common.less';
+  @import'~@assets/less/common.less';
 
   .doc-detail {
     background: #fff;
@@ -1130,12 +1147,12 @@
     overflow: visible;
   }
 
-  ::v-deep .ant-table-body {
-    padding-bottom: 7px;
-  }
+  //::v-deep .ant-table-body {
+  //  padding-bottom: 7px;
+  //}
 
   ::v-deep .ant-table-body-inner {
-    padding-bottom: 16px;
+    padding-bottom: 9px;
   }
 
   ::v-deep .ant-table-scroll .ant-table-header::-webkit-scrollbar {