From 82e1f1c29efd3b68550c7c25d0a30e9abe124147 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Tue, 18 Jul 2023 16:51:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=98=8E=E7=BB=86=E7=9A=84?=
 =?UTF-8?q?=E6=8A=BD=E5=B1=89bug=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PC/InterFace.Dash/src/mixins/TableMixins.js   |  2 ++
 .../basicConfig/ExportCustomUserSetting.vue   | 30 +++++++++++++++++--
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/PC/InterFace.Dash/src/mixins/TableMixins.js b/PC/InterFace.Dash/src/mixins/TableMixins.js
index b183970..0404865 100644
--- a/PC/InterFace.Dash/src/mixins/TableMixins.js
+++ b/PC/InterFace.Dash/src/mixins/TableMixins.js
@@ -126,6 +126,8 @@ export const tableMixins = {
           }
           // 前端分页处理
           // this.propsData = this.detailListPageFromFE(res)
+        }else{
+          this.Loading.DrawerLoading = false
         }
       }).catch(err => {
         this.Loading.DrawerLoading = false
diff --git a/PC/InterFace.Dash/src/views/basicConfig/ExportCustomUserSetting.vue b/PC/InterFace.Dash/src/views/basicConfig/ExportCustomUserSetting.vue
index a85e09c..ff31f28 100644
--- a/PC/InterFace.Dash/src/views/basicConfig/ExportCustomUserSetting.vue
+++ b/PC/InterFace.Dash/src/views/basicConfig/ExportCustomUserSetting.vue
@@ -82,6 +82,28 @@
       ></importFile>
       <!--抽屉-->
       <curren-Drawer
+        ref="currenDrawer_Ref"
+        :title="apiColumns_DesTions"
+        @rowDrop="rowDrop"
+        :tableColumns="apiColumns_DetailsTable"
+        :tabsDesTions="apiColumns_DesTions"
+        :DrawerLoading="Loading.DrawerLoading"
+        :drawer="displayDialog.detailsDialog"
+        :propsData="propsData"
+        :dropdownData="dropdownData"
+        @drawerShut="(val) => (displayDialog.detailsDialog = val)"
+        @drawerbutton="drawerbutton"
+        @handleCommand="drawerHandle"
+        @close-value="closeValue"
+        :firstTabs="firstTabs"
+        :totalCount="totalCountDetails"
+        :currentPage="oldSkipCountDetails"
+        :MaxResultCount="MaxResultCountDetails"
+        @alterResultCountDetails="alterResultCountDetails"
+        @alertoldSkipCountDetails="alertoldSkipCountDetails"
+        :buttonOperationList="operationButtonsDetail"
+    ></curren-Drawer>
+      <!-- <curren-Drawer
         :title="apiColumns_DesTions"
         :tableColumns="apiColumns_DetailsTable"
         :tabsDesTions="apiColumns_DesTions"
@@ -95,7 +117,7 @@
         @handleCommand="drawerHandle"
         @close-value="closeValue"
         :firstTabs="firstTabs"
-      ></curren-Drawer>
+      ></curren-Drawer> -->
     </div>
   </template>
   <script>
@@ -110,6 +132,8 @@
   import  * as tabsDesTions_api from "@/utils/tabsDesTions_api/index" //全局从接口缓存的详情
   import  * as detailsTableColumns_api from "@/utils/detailsTableColumns_api/index" //全局从接口缓存的详情
   import { initFromApiColumnsLable } from '@/utils/index'
+  import  * as detailsPageColumns_api from "@/utils/detailsPageColumns_api/index" //全局从接口缓存的明细列表
+
   // import { getExportConfigList } from '@/api/wms-interface'
   
   export default {
@@ -170,10 +194,12 @@
         ],
         editRules: {
           cerateRule: {
+            customUserSetting: [{ required: true, trigger: "blur", message: "不可为空" }],
             exportColumnName: [{ required: true, trigger: "blur", message: "不可为空" }],
             exportTableName: [{ required: true, trigger: "blur", message: "不可为空" }],
           },
           editRule: {
+            customUserSetting: [{ required: true, trigger: "blur", message: "不可为空" }],
             exportColumnName: [{ required: true, trigger: "blur", message: "不可为空" }],
             exportTableName: [{ required: true, trigger: "blur", message: "不可为空" }],
           }
@@ -181,7 +207,7 @@
       };
     },
     mounted () {
-      this.initApiColumns(tableColumns_api,tabsDesTions_api,detailsTableColumns_api)
+      this.initApiColumns(tableColumns_api,tabsDesTions_api,detailsTableColumns_api,detailsPageColumns_api)
       this.paging();
     },
   };