From 0696d8d133a06348bd7be04cd09ae6d0ce0cec0a Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 19 十二月 2023 09:18:48 +0800
Subject: [PATCH] 1.递交

---
 src/views/basicSettings/warehouseList.vue |   58 +++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 47 insertions(+), 11 deletions(-)

diff --git a/src/views/basicSettings/warehouseList.vue b/src/views/basicSettings/warehouseList.vue
index ad715b1..6ef0916 100644
--- a/src/views/basicSettings/warehouseList.vue
+++ b/src/views/basicSettings/warehouseList.vue
@@ -3,6 +3,17 @@
     <div class="body" :style="{height:mainHeight+'px'}">
       <div class="bodyTopButtonGroup" style="justify-content: space-between">
         <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
+
+        <div style="display:flex">
+          <!--          <el-button-->
+          <!--            v-waves-->
+          <!--            type="success"-->
+          <!--            icon="el-icon-download"-->
+          <!--            @click="$router.push('./../systemSetting/dataImport?fileCode=6')"-->
+          <!--          >瀵煎叆-->
+          <!--          </el-button>-->
+          <el-button v-waves icon="el-icon-refresh-right" @click="syncERP">鍚屾浠撳簱</el-button>
+        </div>
       </div>
 
       <div class="bodyTopFormGroup">
@@ -141,11 +152,11 @@
               {{ row.description ? row.description : '/' }}
             </template>
           </el-table-column>
-          <el-table-column
-            prop="data_sources"
-            label="鏁版嵁鏉ユ簮"
-            sortable="custom"
-          />
+          <!--          <el-table-column-->
+          <!--            prop="data_sources"-->
+          <!--            label="鏁版嵁鏉ユ簮"-->
+          <!--            sortable="custom"-->
+          <!--          />-->
           <el-table-column
             prop="username"
             label="鍒涘缓浜哄憳"
@@ -248,14 +259,11 @@
 
 <script>
 import Pagination from '@/components/Pagination'
-import {
-  AddUpdateGroup,
-  DeleteGroup,
-  GroupData, TSecStckAddUpdate, TSecStckData, TSecStckDelete
-} from '@/api/basicSettings'
+import { TSecStckAddUpdate, TSecStckData, TSecStckDelete } from '@/api/basicSettings'
 import { validateCode } from '@/utils/global'
 import elDragDialog from '@/directive/el-drag-dialog'
 import waves from '@/directive/waves'
+import { SaveSearchWareHouse } from '@/api/ErpSyncMes'
 
 export default {
   name: 'Zzjg',
@@ -272,7 +280,7 @@
         name: '',
         status: '',
         ishasPosition: '',
-        prop: 'ishasPosition', // 鎺掑簭瀛楁
+        prop: 'lm_date', // 鎺掑簭瀛楁
         order: 'desc', // 鎺掑簭瀛楁
         page: 1, // 绗嚑椤�
         rows: 20 // 姣忛〉澶氬皯鏉�
@@ -424,6 +432,34 @@
         this.tableHeight = this.mainHeight - 200
         this.$refs.tableDataRef.doLayout()
       })
+    },
+    // 鍚屾ERP
+    syncERP() {
+      const loading = this.$loading({
+        lock: true,
+        text: '姝e湪鍚屾ERP锛岃绋嶇瓑...',
+        spinner: 'el-icon-loading',
+        customClass: 'osloading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+
+      SaveSearchWareHouse().then(res => {
+        if (res.code === '200') {
+          setTimeout(() => {
+            this.getTSecStckData()
+            loading.close()
+            this.$notify.success('鍚屾鎴愬姛锛�')
+          }, 2000)
+        }
+        // else if (res.code === '300') {
+        //   setTimeout(() => {
+        //     loading.close()
+        //     this.$message.error('鍚屾澶辫触锛�')
+        //   }, 10000)
+        // }
+      }).catch(e => {
+        loading.close()
+      })
     }
   }
 }

--
Gitblit v1.9.3