From 33032d320cb75854def7391026b0401f1bfb8360 Mon Sep 17 00:00:00 2001
From: 黎星凯 <13949086503@163.com>
Date: 星期六, 11 五月 2024 17:26:02 +0800
Subject: [PATCH] 20240511修改: 分发单优化, 分类,物品,分发单明细,采购单明细数据导入

---
 admin-web/src/views/stock/ledger/inventoryAlert/index.vue |   36 ++++++++++++++++++------------------
 1 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/admin-web/src/views/stock/ledger/inventoryAlert/index.vue b/admin-web/src/views/stock/ledger/inventoryAlert/index.vue
index 034560a..4a975fc 100644
--- a/admin-web/src/views/stock/ledger/inventoryAlert/index.vue
+++ b/admin-web/src/views/stock/ledger/inventoryAlert/index.vue
@@ -52,7 +52,7 @@
           options: [],
           cascader: [
             {key: 'warehouseId', queryKey: 'agencyId'},
-            {key: 'goodsTemplateId', queryKey: 'agencyId'},
+            {key: 'baseGoodsTemplateId', queryKey: 'agencyId'},
           ],
           optionsConfig: {url: '/pc/fin/sys/tenant/select/tree_fin_tenant', props: null},
         },
@@ -70,20 +70,6 @@
           },
         },
         {
-          type: 'select',
-          dataIndex: 'baseGoodsTemplateId',
-          label: '鐗╁搧鍚嶇О',
-          placeholder: '璇疯緭鍏�',
-          defaultValue: '',
-          options: [],
-          cascader: [{key: 'categoryId', queryKey: 'goodsTemplatesId'}],
-          optionsConfig: {
-            label: 'goodsName',
-            value: 'id',
-            url: SettingIplatform.apiBaseURL + '/pc/base/goods/template/query/goodsTemplate',
-          },
-        },
-        {
           type: 'cascader',
           dataIndex: 'categoryId',
           label: '鍒嗙被',
@@ -95,6 +81,20 @@
             value: 'id',
             url: SettingIplatform.apiBaseURL + '/pc/base/category/select/tree',
             props: {checkStrictly: false, emitPath: false, value: 'id'}
+          },
+          cascader: [{key:'baseGoodsTemplateId',queryKey: 'categoryId'}],
+        },
+        {
+          type: 'select',
+          dataIndex: 'baseGoodsTemplateId',
+          label: '鐗╁搧鍚嶇О',
+          placeholder: '璇疯緭鍏�',
+          defaultValue: '',
+          options: [],
+          optionsConfig: {
+            label: 'goodsName',
+            value: 'id',
+            url: SettingIplatform.apiBaseURL + '/pc/base/goods/template/query/goodsTemplate',
           },
         },
         {
@@ -121,7 +121,7 @@
         dialogShow: false,
         fileSettings: {
           data: {},
-          uploadUrl: getBaseUrl() + "/pc/fin/sys/tenant/import", // 涓婁紶鍦板潃
+          uploadUrl: getBaseUrl() + "/pc/warehouse/warningConfig/import", // 涓婁紶鍦板潃
           accept: '.xls', // 鏍煎紡
           type: 'text', // 鍥炴樉褰㈠紡
           loading: false // 瀵煎叆鏁堟灉
@@ -129,7 +129,7 @@
         /* 妯℃澘涓嬭浇 */
         templateSettings: {
           templateName: '瀵煎叆妯℃澘.xls', // 鍚嶇О
-          templateUrl: SettingIplatform.apiBaseURL + '/pc/fin/sys/tenant/getImportTemplate' // 涓嬭浇鍦板潃
+          templateUrl: SettingIplatform.apiBaseURL + '/pc/warehouse/warningConfig/getWarnConfImportTemplate' // 涓嬭浇鍦板潃
         },
         onSuccess: null
       },
@@ -259,7 +259,7 @@
     // 鏌ヨtable鍒楄〃
     search(pageNum) {
       if (pageNum != undefined) {
-        this.$refs.myTable.search(pageNum);
+        this.$refs.myTable.search({pageNum});
       } else {
         this.$refs.myTable.search();
       }

--
Gitblit v1.9.1