From 9dd8d6e5c65be3971a8602fce785063daa0aa4d8 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, 25 Jul 2023 16:59:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E9=A1=B5=E9=9D=A2=E7=89=B9?=
 =?UTF-8?q?=E6=AE=8A=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   |   1 -
 .../menuList/ExportCustomUserSetting.vue      | 128 +++++++++++-------
 2 files changed, 81 insertions(+), 48 deletions(-)

diff --git a/PC/InterFace.Dash/src/mixins/TableMixins.js b/PC/InterFace.Dash/src/mixins/TableMixins.js
index 9357fcf..92d1ef1 100644
--- a/PC/InterFace.Dash/src/mixins/TableMixins.js
+++ b/PC/InterFace.Dash/src/mixins/TableMixins.js
@@ -162,7 +162,6 @@ export const tableMixins = {
         this.pagingCallback(callback)
       }).catch((err)=>{
         this.Loading.tableLoading = false
-        if(error_callback)error_callback()
       })
     },
     //接受排序信息并改变视图
diff --git a/PC/InterFace.Dash/src/views/menuList/ExportCustomUserSetting.vue b/PC/InterFace.Dash/src/views/menuList/ExportCustomUserSetting.vue
index cbf4123..d10560b 100644
--- a/PC/InterFace.Dash/src/views/menuList/ExportCustomUserSetting.vue
+++ b/PC/InterFace.Dash/src/views/menuList/ExportCustomUserSetting.vue
@@ -106,21 +106,6 @@
       @alertoldSkipCountDetails="alertoldSkipCountDetails"
       :buttonOperationList_left="operationButtonsDetail"
   ></curren-Drawer>
-    <!-- <curren-Drawer
-      :title="apiColumns_DesTions"
-      :tableColumns="apiColumns_DetailsTable"
-      :tabsDesTions="apiColumns_DesTions"
-      :DrawerLoading="Loading.DrawerLoading"
-      :drawer="displayDialog.detailsDialog"
-      :dropdownData="dropdownData"
-      :propsData="propsData"
-      :tableLoading="tableLoading"
-      @drawerShut="(val) => (displayDialog.detailsDialog = val)"
-      @drawerbutton="drawerbutton"
-      @handleCommand="drawerHandle"
-      @close-value="closeValue"
-      :firstTabs="firstTabs"
-    ></curren-Drawer> -->
   </div>
 </template>
 <script>
@@ -133,7 +118,10 @@ import { mixins } from "@/mixins/mixins"
 import { filterSelectMixins } from '@/mixins/filter-Select'
 import { initFromApiColumnsLable,firstWordSizeChange } from '@/utils/index'
 import { getPageList } from '@/api/wms-api'
-
+import {
+  postCreate,
+  postUpdate,
+} from "@/api/wms-api"
 // import { getExportConfigList } from '@/api/wms-interface'
 
 export default {
@@ -149,20 +137,21 @@ export default {
   ],
   computed: {
     editDialog: {
-      get: function () {
-        // 转义导出列
-        if(this.formReveal){
-          if(this.CreateFormData.exportColumnName)this.CreateFormData.exportColumnNameArr = this.CreateFormData.exportColumnName.split(" ")
-        }else{
-          if(this.editFormData.exportColumnName)this.editFormData.exportColumnNameArr = this.editFormData.exportColumnName.split(" ")
-          if(this.editFormData.exportTableName){this.getColumList()}
-        }
+      get: function (val) {
         return this.displayDialog.newDialog || this.displayDialog.editDialog;
       },
     },
   },
+  watch:{
+    'displayDialog.editDialog'(n){
+      if(n){
+        this.editFormData.exportColumnNameArr = this.editFormData.exportColumnName_old.split(" ")
+        this.getColumList()
+      }
+    }
+  },
   data () {
-      const userInfo=this.$store.getters.currentUserInfo
+    const userInfo=this.$store.getters.currentUserInfo
     return {
       tableLoading:false,
       //常用按钮数据
@@ -177,9 +166,10 @@ export default {
         customUserSetting: null,
         exportUserName: userInfo.name,
         exportUserId: userInfo.id,
-        exportColumnNameArr:null,
         exportColumnName: null,
         exportTableName: null,
+        exportColumnNameArr:null,
+        exportTableName_old:null,
       },
       //编辑
       editFormData: {
@@ -187,9 +177,11 @@ export default {
         customUserSetting: null,
         exportUserName: userInfo.name,
         exportUserId: userInfo.id,
-        exportColumnNameArr:null,
         exportColumnName: null,
         exportTableName: null,
+        exportColumnNameArr:null,
+        exportTableName_old:null,
+        exportColumnName_old:null
       },
       editOptions: {},
       CreateForm: [
@@ -197,24 +189,24 @@ export default {
         // { type: "input", label: initFromApiColumnsLable('ExportCustomUserSettingExportColumnName'), prop: "exportColumnName", colSpan: 12 },
         // { type: "input", label: initFromApiColumnsLable('ExportCustomUserSettingExportTableName'), prop: "exportTableName", colSpan: 12 },
         { type: "select", label: initFromApiColumnsLable('ExportCustomUserSettingCustomUserSetting'), prop: "customUserSetting", options: "whetherOrNotForNum", colSpan: 12 },
-        { type: "select", label: initFromApiColumnsLable('ExportCustomUserSettingExportTableName'), prop: "exportTableName", userOptions: this.initTablesName(), colSpan: 12 },
+        { type: "select", label: initFromApiColumnsLable('ExportCustomUserSettingExportTableName'), prop: "exportTableName_old", userOptions: this.initTablesName(), colSpan: 12 },
         { type: "select", disabled:true, multiple:true, label: initFromApiColumnsLable('ExportCustomUserSettingExportColumnName'), prop: "exportColumnNameArr", userOptions:null, colSpan: 12 },
       ],
       editForm: [
         { type: "select", label: initFromApiColumnsLable('ExportCustomUserSettingCustomUserSetting'), prop: "customUserSetting", options: "whetherOrNotForNum", colSpan: 12 },
-        { type: "select", label: initFromApiColumnsLable('ExportCustomUserSettingExportTableName'), prop: "exportTableName", userOptions: this.initTablesName(), colSpan: 12 },
+        { type: "select", label: initFromApiColumnsLable('ExportCustomUserSettingExportTableName'), prop: "exportTableName_old", userOptions: this.initTablesName(), colSpan: 12 },
         { type: "select", multiple:true, label: initFromApiColumnsLable('ExportCustomUserSettingExportColumnName'), prop: "exportColumnNameArr", userOptions:null, colSpan: 12 },
       ],
       editRules: {
         cerateRule: {
           customUserSetting: [{ required: true, trigger: "blur", message: "不可为空" }],
           exportColumnNameArr: [{ required: true, trigger: "blur", message: "不可为空" }],
-          exportTableName: [{ required: true, trigger: "blur", message: "不可为空" }],
+          exportTableName_old: [{ required: true, trigger: "blur", message: "不可为空" }],
         },
         editRule: {
           customUserSetting: [{ required: true, trigger: "blur", message: "不可为空" }],
           exportColumnNameArr: [{ required: true, trigger: "blur", message: "不可为空" }],
-          exportTableName: [{ required: true, trigger: "blur", message: "不可为空" }],
+          exportTableName_old: [{ required: true, trigger: "blur", message: "不可为空" }],
         }
       },
       columsList:[],
@@ -224,14 +216,28 @@ export default {
     this.paging();
   },
   methods:{
+    pagingCallback(){
+      this.Loading.tableLoading = false
+      this.tableData.forEach(item=>{
+        item.exportTableName_old = item.exportTableName
+        item.exportColumnName_old = item.exportColumnName
+        item.exportTableName = initFromApiColumnsLable(item.exportTableName)
+        let _arr = item.exportColumnName.split(" ")
+        let _zhArr = []
+        _arr.forEach(item2=>{
+          let _item2 = initFromApiColumnsLable(item.exportTableName_old+firstWordSizeChange(item2,'Upper')) || item2
+          _zhArr.push(_item2)
+        })
+        item.exportColumnName = _zhArr.join(',')
+      })
+    },
     // 新增/编辑的导出表下拉
     initTablesName(){
       let _names = this.$store.getters.tablesName
       let tablesList = []
       _names.forEach(item=>{
         let _item = {
-          // label:initFromApiColumnsLable(item),
-          label:item,
+          label:initFromApiColumnsLable(item),
           value:item
         }
         tablesList.push(_item)
@@ -240,36 +246,28 @@ export default {
     },
     changeSelect(prop,val){
       // 获取对应表的表头
-      if(prop=='exportTableName'){
+      if(prop=='exportTableName_old'){
         if(this.formReveal){
           this.CreateForm[2].disabled = false
+          // this.CreateFormData.exportTableName = this.CreateFormData.exportTableName_old
           this.CreateFormData.exportColumnNameArr = []
         }else{
           this.editForm[2].disabled = false
+          // this.editFormData.exportTableName = this.editFormData.exportTableName_old
           this.editFormData.exportColumnNameArr = []
         }
         this.getColumList()
       }
-      // 转义导出列值
-      if(prop == 'exportColumnNameArr'){
-        let _val = val.join(' ')
-        if(this.formReveal){
-          this.CreateFormData.exportColumnName = _val
-        }else{
-          this.editFormData.exportColumnName = _val
-        }
-      }
     },
     getColumList(){
-      let val = this.formReveal ? this.CreateFormData.exportTableName : this.editFormData.exportTableName
+      let val = this.formReveal ? this.CreateFormData.exportTableName_old : this.editFormData.exportTableName_old
       getPageList(this.PageListParams, val+'/base').then(res=>{
         let _column = res.items[0]
         this.columsList = []
         for(let item in _column){
           if(item != 'detail' || item != 'details'){
             let _item = {
-              // label:initFromApiColumnsLable(val+firstWordSizeChange(item,'Upper')),
-              label:item,
+              label:initFromApiColumnsLable(val+firstWordSizeChange(item,'Upper')),
               value:item
             }
             this.columsList.push(_item)
@@ -281,7 +279,43 @@ export default {
           this.editForm[2].userOptions = this.columsList
         }
       })
-    }
+    },
+    //提交表单
+    FormSubmit(val) {
+      this.ref = val
+      this.Loading.newAndEdiLoading = true
+      let _updata = this.formReveal ? this.URLOption_add : this.URLOption_edit
+      let _url = this.URLOption_updata ? this.URLOption_updata : (_updata ? _updata : this.URLOption_base)
+      switch (this.formReveal) {
+        case true:
+          this.CreateFormData.exportColumnName = this.CreateFormData.exportColumnNameArr.join(" ")
+          this.CreateFormData.exportTableName = this.CreateFormData.exportTableName_old
+          if(!_updata && !this.URLOption_updata){_url = _url + '/create'}
+          postCreate(this.CreateFormData, _url).then(res => {
+            this.oldSkipCount = 1;
+            this.Loading.newAndEdiLoading = false
+            this.paging()
+            this.FormResult("success")
+          }).catch(err => {
+            this.Loading.newAndEdiLoading = false
+            this.FormResult("error")
+          })
+          break;
+        case false:
+          if(!_updata && !this.URLOption_updata){_url = _url + '/update-by-id'}
+          this.editFormData.exportColumnName = this.editFormData.exportColumnNameArr.join(" ")
+          this.editFormData.exportTableName = this.editFormData.exportTableName_old
+          postUpdate(this.editFormData, this.editFormData.id, _url).then(res => {
+            this.propsData = res
+            this.Loading.newAndEdiLoading = false
+            this.paging()
+            this.FormResult("success")
+          }).catch(err => {
+            this.Loading.newAndEdiLoading = false
+            this.FormResult("error")
+          })
+      }
+    },
   }
 };
 </script>