From 92b6591c7fc8d37f45b8544f6b7e455ce807f9cd Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Thu, 30 May 2024 14:02:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/inventorymoveRecordMain/index.ts  |  7 +++-
 .../wms/inventoryManage/balance/index.vue     | 22 ++++++-------
 .../inventorymoveRecordMain/index.vue         | 27 +++++++++++++++
 .../inventorymoveRequestMain/index.vue        | 33 +++----------------
 .../demandforecastingMain.data.ts             |  4 +--
 5 files changed, 51 insertions(+), 42 deletions(-)

diff --git a/src/api/wms/inventorymoveRecordMain/index.ts b/src/api/wms/inventorymoveRecordMain/index.ts
index 2f351b719..18bb292e3 100644
--- a/src/api/wms/inventorymoveRecordMain/index.ts
+++ b/src/api/wms/inventorymoveRecordMain/index.ts
@@ -125,4 +125,9 @@ export const exportScrapToHoldRecordMain = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/inventorymove-record-main/get-import-template' })
-}
\ No newline at end of file
+}
+
+// 下载用户导入模板（除库存移动外）
+export const importTemplateExceptMove = () => {
+  return request.download({ url: '/wms/inventorymove-record-main/get-import-template-exceptMove' })
+}
diff --git a/src/views/wms/inventoryManage/balance/index.vue b/src/views/wms/inventoryManage/balance/index.vue
index bc9a950bc..d7fd2b8da 100644
--- a/src/views/wms/inventoryManage/balance/index.vue
+++ b/src/views/wms/inventoryManage/balance/index.vue
@@ -193,17 +193,17 @@ const handleSelectionPoint = async ()=>{
 }
 // 列表-操作按钮
 const butttondata = [
-  // {
-  //   label: '标签信息',
-  //   name: 'bqxx',
-  //   hide: false,
-  //   type: 'primary',
-  //   icon: '',
-  //   color: '',
-  //   link: true,
-  //   float:'right',
-  //   hasPermi: ''
-  // },
+  {
+    label: '标签信息',
+    name: 'bqxx',
+    hide: false,
+    type: 'primary',
+    icon: '',
+    color: '',
+    link: true,
+    float:'right',
+    hasPermi: ''
+  },
   defaultButtons.mainListPointBtn(null), // 标签打印
   // defaultButtons.mainListEditBtn({hasPermi:'wms:balance:update'}), // 编辑
   // defaultButtons.mainListDeleteBtn({hasPermi:'wms:balance:delete'}), // 删除
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue
index 1cb0ba47e..abd19c83a 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue
@@ -59,6 +59,9 @@
     :detailAllSchemasRules="InventorymoveRecordDetailRules"
     :apiPage="InventorymoveRecordDetailApi.getInventorymoveRecordDetailPage"
   />
+<!-- 导入 -->
+<ImportForm ref="importFormRef" url="/wms/inventorymove-record-main/import" :importTemplateData="importTemplateData" 
+  @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" :fromInventoryStatus= "fromInventoryStatus" :toInventoryStatus="toInventoryStatus" />
 </template>
 
 <script setup lang="ts">
@@ -174,6 +177,8 @@ const buttonBaseClick = (val, item) => {
     } else {
       getList()
     }
+  } else if (val == 'import') { // 导入
+    handleImport()
   } else if (val == 'filtrate') { // 筛选
   } else { // 其他按钮
     console.log('其他按钮', item)
@@ -235,6 +240,23 @@ const handleExport = async () => {
   }
 }
 
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: importFileName.value + '.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
 // 筛选提交
 const searchFormClick = (searchData) => {
   tableObject.params = {
@@ -247,5 +269,10 @@ const searchFormClick = (searchData) => {
 /** 初始化 **/
 onMounted(async () => {
   getList()
+  if(routeName.value == "InventorymoveRecordMain"){
+    importTemplateData.templateUrl = await InventorymoveRecordMainApi.importTemplate()
+  }else {
+    importTemplateData.templateUrl = await InventorymoveRecordMainApi.importTemplateExceptMove()
+  }
 })
 </script>
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
index 5a343df14..a69cb90f4 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
@@ -177,50 +177,27 @@ InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => {
         key: 'businessType',
         value: businessType.value ,
         isMainValue: false
-      },
-      {
-          key: 'fromWarehouseCode',
-          value: 'fromWarehouseCode',
-          message: '请选择从仓库代码！',
-          isMainValue: true
-        }]
+      }]
       item.form.componentProps.searchCondition = [
       {
         key: 'businessType',
         value: businessType.value,
         isMainValue: false
-      },
-      {
-          key: 'fromWarehouseCode',
-          value: 'fromWarehouseCode',
-          message: '请选择从仓库代码！',
-          isMainValue: true
-        }]
+      }
+     ]
     } else if (fromInventoryStatus.value == null) {
       item.tableForm.searchCondition = [
       {
         key: 'businessType',
         value: businessType.value ,
         isMainValue: false
-      },
-      {
-          key: 'fromWarehouseCode',
-          value: 'fromWarehouseCode',
-          message: '请选择从仓库代码！',
-          isMainValue: true
-        }]
+      }]
       item.form.componentProps.searchCondition = [
       {
         key: 'businessType',
         value: businessType.value,
         isMainValue: false
-      },
-      {
-          key: 'fromWarehouseCode',
-          value: 'fromWarehouseCode',
-          message: '请选择从仓库代码！',
-          isMainValue: true
-        }]
+      }]
     } else {
       delete item.tableForm.searchCondition
     }
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
index 2b473703b..801001d62 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
@@ -236,8 +236,8 @@ export const DemandforecastingMainRules = reactive({
   available: [
     { required: true, message: '请选择是否可用', trigger: 'change' }
   ],
-  status: [
-    { required: true, message: '请选择状态', trigger: 'change' }
+  supplierCode: [
+    { required: true, message: '请选择供应商代码', trigger: 'change' }
   ],
   version:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }