From ca84ac3e84340da7ff9b69cfe12b9291dc488ae4 Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Tue, 20 Aug 2024 14:16:05 +0800
Subject: [PATCH] =?UTF-8?q?WMS=20=E9=9C=80=E6=B1=82=EF=BC=9AHL-5264=20=20?=
 =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E5=A4=87=E4=BB=B6=E9=80=80=E5=BA=93=20?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ImportForm/src/ImportForm.vue                | 6 +++++-
 .../sparepartReturn/sparepartReturnRequestMain/index.vue    | 4 +++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/components/ImportForm/src/ImportForm.vue b/src/components/ImportForm/src/ImportForm.vue
index c69a2b4cd..7276097b4 100644
--- a/src/components/ImportForm/src/ImportForm.vue
+++ b/src/components/ImportForm/src/ImportForm.vue
@@ -16,7 +16,8 @@
         outFile + 
         '&extend=' + extend +
         '&fromInventoryStatus=' + fromInventoryStatus +
-        '&toInventoryStatus=' + toInventoryStatus 
+        '&toInventoryStatus=' + toInventoryStatus  +
+        dataType
       "
       :auto-upload="false"
       :disabled="formLoading"
@@ -229,6 +230,9 @@ const props = defineProps({
   }
 })
 const importTemplateData = ref(props.importTemplateData)
+console.log(333,props.importTemplateData.dataType)
+const dataType = ref('')
+dataType.value = props.importTemplateData.dataType ?'&dataType=' + props.importTemplateData.dataType :''
 const accept = ref(props.accept)
 const mode = ref(props.mode) //是否更新已经存在的用户数据.默认值是1
 const updateIsDisable = ref(props.updateIsDisable) //更新是否禁用,默认值不禁用
diff --git a/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/index.vue b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/index.vue
index 8611480fe..e91ab26aa 100644
--- a/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/index.vue
@@ -90,7 +90,7 @@
   />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/wms/unplannedreceipt-request-main/import" :importTemplateData="importTemplateData" 
+  <ImportForm ref="importFormRef" url="/wms/unplannedreceipt-request-main/import" :importTemplateData="importTemplateData"
   @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
 </template>
 
@@ -615,6 +615,7 @@ const handleImport = () => {
 
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
+  dataType:'2',
   templateUrl: '',
   templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
@@ -692,5 +693,6 @@ const tableFormSelectOnBlur = (field, val, row, index) => {
 onMounted(async () => {
   getList()
   importTemplateData.templateUrl = await UnplannedreceiptRequestMainApi.importTemplate()
+  console.log(344,importTemplateData)
 })
 </script>