From 94bd6a8e11f030b3653905d2287f9a1b9af98aae Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Wed, 14 Aug 2024 17:07:06 +0800
Subject: [PATCH 1/5] =?UTF-8?q?scp=E5=AF=BC=E5=87=BA=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=90=8D=E5=AD=97=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basicDataManage/systemSetting/supplierUser/index.vue | 6 ++++--
 .../purchasereceipt/purchasereceiptJobMain/index.vue     | 3 ++-
 .../supplierdeliver/supplierdeliverRecordMain/index.vue  | 4 +++-
 .../supplierdeliver/supplierdeliverRequestMain/index.vue | 5 +++--
 src/views/wms/supplierManage/invoicingcalendar/index.vue | 6 ++++--
 .../supplierinvoice/supplierinvoiceRecordMain/index.vue  | 7 +++++--
 .../supplierinvoice/supplierinvoiceRequestMain/index.vue | 9 ++++++---
 .../supplierinvoiceRequestMainDifference/index.vue       | 9 ++++++---
 .../wms/supplierManage/supplierinvoiceInvoiced/index.vue | 6 ++++--
 9 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue b/src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue
index c8d92b883..7c720e543 100644
--- a/src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue
+++ b/src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue
@@ -74,6 +74,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
+import { formatDate } from '@/utils/formatTime'
 // 供应商用户关联管理
 defineOptions({ name: 'SupplierUser' })
 
@@ -220,8 +221,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await SupplierUserApi.exportSupplierUser(tableObject.params)
-    download.excel(data, '供应商用户关联信息.xls')
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -236,7 +238,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '供应商用户关联信息导入模版.xls'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
index 6cf95dc4e..74a76de16 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
@@ -363,8 +363,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await PurchasereceiptJobMainApi.exportPurchasereceiptJobMain(tableObject.params)
-    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
+     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue
index bb0d7b600..c856afd3d 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue
@@ -118,6 +118,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { getAccessToken } from '@/utils/auth'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
+import { formatDate } from '@/utils/formatTime'
 // 供应商发货记录主
 defineOptions({ name: 'SupplierdeliverRecordMain' })
 
@@ -279,8 +280,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await SupplierdeliverRecordMainApi.exportSupplierdeliverRecordMain(tableObject.params)
-    download.excel(data, `${t('ts.供应商发货记录主')}.xlsx`)
+     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 619b878e1..72c82bf0e 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -1029,10 +1029,11 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await SupplierdeliverRequestMainApi.exportSupplierdeliverRequestMain(
       tableObject.params
     )
-    download.excel(data, `${'ts.供应商发货申请主'}.xlsx`)
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -1225,7 +1226,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: `${t('ts.供应商发货申请主导入模版')}.xlsx`
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 
 // 导入成功之后
diff --git a/src/views/wms/supplierManage/invoicingcalendar/index.vue b/src/views/wms/supplierManage/invoicingcalendar/index.vue
index 3309c3eff..a5e636af5 100644
--- a/src/views/wms/supplierManage/invoicingcalendar/index.vue
+++ b/src/views/wms/supplierManage/invoicingcalendar/index.vue
@@ -65,6 +65,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
+import { formatDate } from '@/utils/formatTime'
 
 defineOptions({ name: 'Invoicingcalendar' })
 
@@ -211,8 +212,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await InvoicingcalendarApi.exportInvoicingcalendar(tableObject.params)
-    download.excel(data, '开票日历.xlsx')
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -227,7 +229,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '开票日历导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
index 5555740fe..0ee70f35b 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
@@ -152,6 +152,7 @@ import * as SupplierinvoiceRequestDetailApi from '@/api/wms/supplierinvoiceReque
 import * as PackageApi from "@/api/wms/package";
 import {getAccessToken} from "@/utils/auth";
 import {getJmreportBaseUrl} from "@/utils/systemParam";
+import { formatDate } from '@/utils/formatTime'
 
 // 供应商发票记录主
 defineOptions({ name: 'SupplierinvoiceRecordMain' })
@@ -307,8 +308,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await SupplierinvoiceRecordMainApi.exportSupplierinvoiceRecordMain({...tableObject.params,checkNums:rows})
-    download.excel(data, `${t('ts.供应商发票记录主')}.xlsx`)
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -344,8 +346,9 @@ const handleDetailExport = async (masterId) => {
     let params = {
       masterId: masterId
     }
+    const excelTitle = ref(route.meta.title)
     const data = await SupplierinvoiceRecordMainApi.exportSupplierinvoiceRecordDetail(params)
-    download.excel(data, `${t('ts.供应商发票记录明细')}.xlsx`)
+    download.excel(data, `【${excelTitle.value}明细】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoadingDetail.value = false
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index 82d712df7..40192c959 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -350,6 +350,7 @@ import { ElMessageBox } from 'element-plus'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
 import { accountantFormart } from '@/utils/formatter'
 
+import { formatDate } from '@/utils/formatTime'
 defineOptions({ name: 'SupplierinvoiceRequestMain' })
 
 const message = useMessage() // 消息弹窗
@@ -1179,8 +1180,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await SupplierinvoiceRequestMainApi.exportSupplierinvoiceRequestMain(paramsData)
-    download.excel(data, `${t('ts.供应商发票申请主')}.xlsx`)
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -1272,7 +1274,7 @@ const submitForm = async (formType, submitData) => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: `${t('ts.供应商发票申请主导入模板')}.xlsx`
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 
 // 导入成功之后
@@ -1327,8 +1329,9 @@ const handleDetailExport = async (masterId) => {
     let params = {
       masterId: masterId
     }
+    const excelTitle = ref(route.meta.title)
     const data = await SupplierinvoiceRequestMainApi.exportSupplierinvoiceRequestDetail(params)
-    download.excel(data, `${t('ts.供应商发票申请明细')}.xlsx`)
+    download.excel(data, `【${excelTitle.value}明细】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoadingDetail.value = false
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue
index 8930eab3f..815f5fb61 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue
@@ -151,6 +151,7 @@ import dayjs from 'dayjs'
   import { ElMessageBox } from 'element-plus'
   import { getJmreportBaseUrl } from '@/utils/systemParam'
   import { accountantFormart } from '@/utils/formatter'
+import { formatDate } from '@/utils/formatTime'
 
   defineOptions({ name: 'SupplierinvoiceRequestMain' })
 
@@ -329,8 +330,9 @@ const searchTableSuccessDetail = async (formField, searchField, val, formRef,sea
       await message.exportConfirm()
       // 发起导出
       exportLoading.value = true
+      const excelTitle = ref(route.meta.title)
       const data = await SupplierinvoiceRequestMainApi.exportSupplierinvoiceRequestMain(paramsData)
-      download.excel(data, `${t('ts.供应商发票申请主')}.xlsx`)
+      download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
     } catch {
     } finally {
       exportLoading.value = false
@@ -351,7 +353,7 @@ const searchTableSuccessDetail = async (formField, searchField, val, formRef,sea
   // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: `${t('ts.供应商发票申请主导入模板')}.xlsx`
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 
 
@@ -407,8 +409,9 @@ const importTemplateData = reactive({
       let params = {
         masterId: masterId
       }
+      const excelTitle = ref(route.meta.title)
       const data = await SupplierinvoiceRequestMainApi.exportSupplierinvoiceRequestDetail(params)
-      download.excel(data, `${t('ts.供应商发票申请明细')}.xlsx`)
+      download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
     } catch {
     } finally {
       exportLoadingDetail.value = false
diff --git a/src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue b/src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue
index 8eb82cd74..7d376edd1 100644
--- a/src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue
@@ -64,6 +64,7 @@ import * as SupplierinvoiceInvoicedApi from '@/api/wms/supplierinvoiceInvoiced'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
+import { formatDate } from '@/utils/formatTime'
 
 defineOptions({ name: 'SupplierinvoiceInvoiced' })
 
@@ -271,8 +272,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await SupplierinvoiceInvoicedApi.exportSupplierinvoiceInvoiced(tableObject.params)
-    download.excel(data, `${t('ts.待开票')}.xlsx`)
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -287,7 +289,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: `${t('ts.待开票导入模版')}.xlsx`
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {

From d46a1cc9bc8a3c5625ca7b39fa991b0a158a86a7 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Wed, 14 Aug 2024 19:22:47 +0800
Subject: [PATCH 2/5] =?UTF-8?q?qms=E9=80=89=E5=AE=9A=E7=BA=A7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E4=B9=8B=E5=89=8D=E5=8A=9F=E8=83=BD=E7=9A=84=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E6=96=87=E4=BB=B6=E5=90=8D=E5=AD=97=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qms/aql/index.vue             | 6 ++++--
 src/views/qms/counter/index.vue         | 6 ++++--
 src/views/qms/dynamicRule/index.vue     | 6 ++++--
 src/views/qms/sampleCode/index.vue      | 6 ++++--
 src/views/qms/samplingProcess/index.vue | 6 ++++--
 src/views/qms/samplingScheme/index.vue  | 6 ++++--
 src/views/qms/selectedSet/index.vue     | 6 ++++--
 7 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/src/views/qms/aql/index.vue b/src/views/qms/aql/index.vue
index 3dc399dba..e3ccacf2b 100644
--- a/src/views/qms/aql/index.vue
+++ b/src/views/qms/aql/index.vue
@@ -79,6 +79,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
+import { formatDate } from '@/utils/formatTime'
 
 defineOptions({ name: 'Aql' })
 
@@ -267,8 +268,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await AqlApi.exportAql(tableObject.params)
-    download.excel(data, 'aql.xlsx')
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -283,7 +285,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: 'aql导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/qms/counter/index.vue b/src/views/qms/counter/index.vue
index d57b19136..6a02cd889 100644
--- a/src/views/qms/counter/index.vue
+++ b/src/views/qms/counter/index.vue
@@ -72,6 +72,7 @@ import download from '@/utils/download'
 import { Counter, CounterRules } from './counter.data'
 import * as CounterApi from '@/api/qms/counter'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { formatDate } from '@/utils/formatTime'
 // import TableHead from '@/components/TableHead/src/TableHead.vue'
 // import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 // import Detail from '@/components/Detail/src/Detail.vue'
@@ -235,8 +236,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await CounterApi.exportCounter(tableObject.params)
-    download.excel(data, '物料检验计数器.xlsx')
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -251,7 +253,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '物料检验计数器导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/qms/dynamicRule/index.vue b/src/views/qms/dynamicRule/index.vue
index 72b59a060..9643b42a5 100644
--- a/src/views/qms/dynamicRule/index.vue
+++ b/src/views/qms/dynamicRule/index.vue
@@ -109,6 +109,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import UploadFile from '@/components/UploadFile/src/UploadFile.vue'
 import { checkPermi } from '@/utils/permission'
 import ImportForm from '../../../components/ImportForm/src/ImportForm.vue'
+import { formatDate } from '@/utils/formatTime'
 // import TableHead from '@/components/TableHead/src/TableHead.vue'
 // import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 // import Detail from '@/components/Detail/src/Detail.vue'
@@ -313,8 +314,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await DynamicRuleApi.exportDynamicRule(tableObject.params)
-    download.excel(data, '动态修改规则.xlsx')
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -329,7 +331,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '动态修改规则导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/qms/sampleCode/index.vue b/src/views/qms/sampleCode/index.vue
index 9288e264f..29e986fb4 100644
--- a/src/views/qms/sampleCode/index.vue
+++ b/src/views/qms/sampleCode/index.vue
@@ -79,6 +79,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
+import { formatDate } from '@/utils/formatTime'
 
 defineOptions({ name: 'SampleCode' })
 
@@ -279,8 +280,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await SampleCodeApi.exportSampleCode(tableObject.params)
-    download.excel(data, '样本字码.xlsx')
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -295,7 +297,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '样本字码导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/qms/samplingProcess/index.vue b/src/views/qms/samplingProcess/index.vue
index 1d5254334..f63c249cd 100644
--- a/src/views/qms/samplingProcess/index.vue
+++ b/src/views/qms/samplingProcess/index.vue
@@ -83,6 +83,7 @@ import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
 import { validatePercent, validateInteger, validateTwoNum } from '@/utils/validator'
+import { formatDate } from '@/utils/formatTime'
 
 defineOptions({ name: 'SamplingProcess' })
 
@@ -270,8 +271,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await SamplingProcessApi.exportSamplingProcess(tableObject.params)
-    download.excel(data, '采样过程.xlsx')
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -286,7 +288,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '采样过程导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/qms/samplingScheme/index.vue b/src/views/qms/samplingScheme/index.vue
index cddeb98d1..bc6adb003 100644
--- a/src/views/qms/samplingScheme/index.vue
+++ b/src/views/qms/samplingScheme/index.vue
@@ -78,6 +78,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
+import { formatDate } from '@/utils/formatTime'
 
 defineOptions({ name: 'SamplingScheme' })
 
@@ -268,8 +269,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await SamplingSchemeApi.exportSamplingScheme(tableObject.params)
-    download.excel(data, '采样方案.xlsx')
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -284,7 +286,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '采样方案导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {
diff --git a/src/views/qms/selectedSet/index.vue b/src/views/qms/selectedSet/index.vue
index 25f479d28..d4ca5e698 100644
--- a/src/views/qms/selectedSet/index.vue
+++ b/src/views/qms/selectedSet/index.vue
@@ -112,6 +112,7 @@ import component from 'virtual:svg-icons-register'
 import * as DictTypeApi from '@/api/system/dict/dict.type'
 import { checkPermi } from '@/utils/permission'
 import ImportForm from '../../../components/ImportForm/src/ImportForm.vue'
+import { formatDate } from '@/utils/formatTime'
 // import TableHead from '@/components/TableHead/src/TableHead.vue'
 // import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 // import Detail from '@/components/Detail/src/Detail.vue'
@@ -316,8 +317,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await SelectedSetApi.exportSelectedSet(tableObject.params)
-    download.excel(data, '选定集.xlsx')
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -332,7 +334,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '选定集导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {

From 16048f79a182eae720425365f64c60162fca0cc4 Mon Sep 17 00:00:00 2001
From: TengXF <302828528@qq.com>
Date: Wed, 14 Aug 2024 19:25:06 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=BF=85=E5=A1=AB?=
 =?UTF-8?q?=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../itemManage/packageunit/packageunit.data.ts              | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts b/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts
index 70d24363b..326abc320 100644
--- a/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts
@@ -672,6 +672,12 @@ export const PackageunitRules = reactive({
   reuse: [
     { required: true, message: '请选择是否重复使用', trigger: 'change' }
   ],
+  available: [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+  manageBalance: [
+    { required: true, message: '请选择是否管理包装库存', trigger: 'change' }
+  ],
   desc: [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' },
     { required: true, message: '请输入包装描述', trigger: 'change' }

From abd38f40e2c17f25ec0de880372528b9bba42aae Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Wed, 14 Aug 2024 19:33:30 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7(=E6=96=B0)--=E9=93=BA=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BasicForm/src/BasicForm.vue    |    3 +
 .../purchasereturnRequestMainNew/index.vue    | 1034 +++++++++++++++++
 .../purchasereturnRequestMain.data.ts         |  879 ++++++++++++++
 3 files changed, 1916 insertions(+)
 create mode 100644 src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
 create mode 100644 src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMain.data.ts

diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index a4a995345..bd0156d2e 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -22,6 +22,9 @@
         @onEnter="onEnter"
         @onFocus="onFocus"
       >
+        <template v-for="name in Object.keys($slots)" :key="name" #[name]>
+          <slot :name="name"></slot>
+        </template>
         <template #crontab="formSchema1" v-if="fromeWhere == 'countPlan'">
           <crontab
             v-model="formSchema1.crontab"
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
new file mode 100644
index 000000000..cb95b32a2
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
@@ -0,0 +1,1034 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search
+      :schema="[
+        ...PurchasereturnRequestMain.allSchemas.searchSchema,
+        ...PurchasereturnRequestDetail.allSchemas.searchSchema
+      ]"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="PurchasereturnRequestMain.allSchemas"
+    :detailAllSchemas="PurchasereturnRequestDetail.allSchemas"
+  />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      v-clientTable
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{ row }">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row, $index }">
+        <ButtonBase
+          :Butttondata="butttondata(row, $index)"
+          @button-base-click="buttonTableClick($event, row)"
+        />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="PurchasereturnRequestMainRules"
+    :formAllSchemas="PurchasereturnRequestMain.allSchemas"
+    :tableAllSchemas="PurchasereturnRequestDetail.allSchemas"
+    :tableFormRules="PurchasereturnRequestDetailRules"
+    :tableData="tableData"
+    :apiUpdate="PurchasereturnRequestMainApi.updatePurchasereturnRequestMain"
+    :apiCreate="PurchasereturnRequestMainApi.createPurchasereturnRequestMain"
+    :isBusiness="true"
+    :isShowButton="isShowButton"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    :isShowReduceButtonSelection="true"
+    @tableSelectionDelete="tableSelectionDelete"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+    @onEnter="onEnter"
+    @onChange="onChangeForm"
+  >
+  <template #hahaha>
+    <div>
+      <el-button style="margin-left:90px" type="primary">选择收货单明细</el-button>
+    </div>
+  </template>
+  <template #hehehe>
+    <div></div>
+  </template>
+  </BasicForm>
+  <!-- 添加明细：采购收货记录单号 -->
+  <SearchTable ref="searchTableRef" @searchTableSuccess="searchTableSuccess1" />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="PurchasereturnRequestMain.allSchemas"
+    :detailAllSchemas="PurchasereturnRequestDetail.allSchemas"
+    :detailAllSchemasRules="PurchasereturnRequestDetailRules"
+    :apiCreate="PurchasereturnRequestDetailApi.createPurchasereturnRequestDetail"
+    :apiUpdate="PurchasereturnRequestDetailApi.updatePurchasereturnRequestDetail"
+    :apiPage="PurchasereturnRequestDetailApi.getPurchasereturnRequestDetailPage"
+    :apiDelete="PurchasereturnRequestDetailApi.deletePurchasereturnRequestDetail"
+    :Echo="Echo"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+    @detailOpenForm="detailOpenForm"
+    :detailValidate="detailValidate"
+  />
+
+  <!-- 创建标签 -->
+  <BasicForm
+    ref="formLabelRef"
+    @success="getList"
+    :tableAllSchemas="PurchasereReturnRequestDetailLabel.allSchemas"
+    :tableFormRules="PurchasereturnRequestDetailRules"
+    :tableData="detatableData.tableList"
+    :isBusiness="true"
+    :isShowButton="false"
+    :isShowReduceButton="false"
+    @submitForm="submitFormLabel"
+    @searchTableSuccess="searchTableSuccessLabel"
+  />
+  <!-- 标签打印 -->
+  <SearchTable style="width: 905px" ref="showLabelRef" @searchTableSuccess="showLabelSuccess" />
+  <!-- 导入 -->
+  <ImportForm
+    ref="importFormRef"
+    url="/wms/purchasereturn-request-main/import"
+    :importTemplateData="importTemplateData"
+    @success="importSuccess"
+    :updateIsDisable="true"
+    :coverIsDisable="true"
+    :mode="2"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import {
+  PurchasereturnRequestMain,
+  PurchasereturnRequestMainRules,
+  PurchasereturnRequestDetail,
+  PurchasereturnRequestDetailRules,
+  PurchasereReturnRequestDetailLabel,
+  PurchasereceiptRecordMain1
+} from './purchasereturnRequestMain.data'
+import * as PurchasereturnRequestMainApi from '@/api/wms/purchasereturnRequestMain'
+import * as PurchasereturnRequestDetailApi from '@/api/wms/purchasereturnRequestDetail'
+import * as PurchasereceiptRecordDetailApi from '@/api/wms/purchasereceiptRecordDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { SupplierdeliverRequestPackage } from '../../supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data'
+import * as PackageApi from '@/api/wms/package'
+import { getAccessToken } from '@/utils/auth'
+import * as BalanceApi from '@/api/wms/balance'
+import { async } from '@antv/x6/lib/registry/marker/async'
+import { getJmreportBaseUrl } from '@/utils/systemParam'
+import { formatDate } from '@/utils/formatTime'
+// 采购退货申请
+defineOptions({ name: 'PurchasereturnRequestMainNew' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+const genLabelId = ref() //主表ID
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref([
+  ...PurchasereturnRequestMain.allSchemas.tableColumns,
+  ...PurchasereturnRequestDetail.allSchemas.tableMainColumns
+])
+
+const isShowButton = ref(true)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+const onChangeForm = (field, cur, formRef)=>{
+  console.log('onChangeForm',field, cur, formRef)
+  console.log('1111')
+  console.log(PurchasereturnRequestMain.allSchemas)
+  PurchasereturnRequestMain.allSchemas.formSchema.forEach(item=>{
+    if(item.field == field){
+      let setV = {}
+      setV['supplierName'] =  item.componentProps.options?.find(el=>el.id==cur)['nickname']
+      formRef.value.setValues(setV)
+    }
+  })
+
+}
+const onEnter = async (field, value) => {
+  console.log(field, value)
+  if ('supplierCode' == field) {
+    //供应商代码
+    formRef.value.opensearchTable(
+      'purchaseReceiptRecordNumber',
+      'number',
+      '采购收货记录',
+      PurchasereceiptRecordMain1.allSchemas,
+      PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPageReturn,
+      [
+        {
+          key: 'supplierCode',
+          value: 'supplierCode',
+          isMainValue: true
+        }
+      ]
+    )
+  } else if ('purchaseReceiptRecordNumber' == field) {
+    //采购收货记录
+  }
+}
+
+// 生成标签
+const isCreateLabel = ref(false)
+const formLabelRef = ref()
+const { tableObject: detatableData, tableMethods: detatableMethods } = useTable({
+  getListApi: PurchasereturnRequestDetailApi.getPurchasereturnRequestDetailPage
+})
+const { getList: getDetailList } = detatableMethods
+
+// 生成标签按钮操作
+const submitFormLabel = async (formType, submitData) => {
+  let data = { ...submitData }
+  if (data.masterId) {
+    data.id = data.masterId
+  }
+  try {
+    console.log('formType==', formType)
+    console.log('data==', data)
+    data.subList = detatableData.tableList
+    console.log('detatableData', detatableData)
+    await message.confirm(t('ts.是否为此数据生成标签？'))
+    await PurchasereturnRequestMainApi.genLabel(data) //genLabelId.value
+    isCreateLabel.value = true
+    message.success('创建标签成功')
+  } finally {
+    formLabelRef.value.formLoading = false
+    formLabelRef.value.dialogVisible = false
+  }
+}
+
+// 查询页面返回
+const searchTableSuccessLabel = (formField, searchField, val, formRef, type, row) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      row[formField] = val[0][searchField]
+      if (formField == 'packUnit' || formField == 'packQty') {
+        row['packUnit'] = val[0]['packUnit']
+        row['packQty'] = val[0]['packQty']
+      }
+    }
+  })
+}
+
+// 查询页面返回
+const searchTableSuccess = async (formField, searchField, val, formRef, type, row) => {
+  console.log('searchTableSuccess', formField, searchField, val, formRef, type, row)
+  console.log('searchTableSuccess123', val)
+  nextTick(async () => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+
+      if (formField == 'asnNumber') {
+        row[formField] = val[0][searchField]
+        //搜索记录单号--回显数据
+        row['purchaseReceiptRecordNumber'] = val[0]['number']
+        row['asnNumber'] = val[0]['asnNumber']
+        row['supplierCode'] = val[0]['supplierCode']
+        row['poNumber'] = val[0]['poNumber']
+        row['poLine'] = val[0]['poLine']
+        row['itemCode'] = val[0]['itemCode']
+        row['itemName'] = val[0]['itemName']
+        row['itemDesc1'] = val[0]['itemDesc1']
+        row['itemDesc2'] = val[0]['itemDesc2']
+        row['batch'] = val[0]['batch']
+        row['altBatch'] = val[0]['altBatch']
+        row['containerNumber'] = val[0]['containerNumber']
+        row['qty'] = val[0]['qty']
+        row['uom'] = val[0]['uom']
+        row['supplierQty'] = val[0]['supplierQty']
+        row['supplierUom'] = val[0]['supplierUom']
+        row['inventoryStatus'] = val[0]['inventoryStatus']
+        // row['fromLocationCode'] = val[0]['toLocationCode']
+        row['toLocationCode'] = val[0]['toLocationCode']
+        row['fromLocationGroupCode'] = val[0]['locationGroupCode']
+        row['toLocationGroupCode'] = null
+        row['toWarehouseCode'] = null
+        row['toAreaTypes'] = null
+        row['fromAreaCode'] = val[0]['areaCode']
+        row['toAreaCode'] = val[0]['toAreaCode']
+        row['fromQwnerCode'] = val[0]['fromQwnerCode']
+        row['toOwnerCode'] = val[0]['toOwnerCode']
+        row['arriveDate'] = val[0]['arriveDate']
+        row['produceDate'] = val[0]['produceDate']
+        row['expireDate'] = val[0]['expireDate']
+        row['convertRate'] = val[0]['convertRate']
+        row['visualInspectResult'] = val[0]['visualInspectResult']
+        row['visualInspectPhotos'] = val[0]['visualInspectPhotos']
+        row['failedReason'] = val[0]['failedReason']
+        row['singlePrice'] = val[0]['singlePrice']
+        row['amount'] = val[0]['amount']
+        row['projectCode'] = val[0]['projectCode']
+      } else if (formField == 'itemCode') {
+        row[formField] = val[0][searchField]
+        row['batch'] = val[0]['toBatch']
+        row['containerNumber'] = val[0]['toContainerNumber']
+        row['containerNumber'] = val[0]['containerNumber']
+        row['containerNumber'] = val[0]['containerNumber']
+        // row['fromLocationCode'] = val[0]['fromLocationCode']
+        row['toLocationCode'] = val[0]['toLocationCode']
+      } else if (formField == 'fromLocationCode') {
+        row[formField] = val[0][searchField]
+        //   let params = {
+        //   itemCode: row.itemCode,
+        //   batch: row.batch,
+        //   locationCode:val[0]['code']
+        // }
+        // let aa  = await  BalanceApi.getSumByConditions(params);
+        // console.log('23423423',aa);
+        // row['inventoryBalance'] = aa//库存余额
+      } else if (formField == 'packingNumber') {
+        // row[formField] = val[0][searchField]
+        val.forEach((item,index)=>{
+          if(index==0){
+            row[formField] = item[searchField]
+            row['inventoryBalance'] = item['qty'] //库存余额
+          }else{
+            let newRow =  {...row}
+            newRow[formField] = item[searchField]
+            row['inventoryBalance'] = item['qty'] //库存余额
+            tableData.value.push(newRow)
+          }
+        })
+        row['fromLocationCode'] = val[0]['locationCode']
+        row['batch'] = val[0]['batch']
+        // row['inventoryBalance'] = val[0]['qty'] //库存余额
+      }else{
+        row[formField] = val[0][searchField]
+      }
+    } else {
+      const setV = {}
+      if(formField=='itemCode'){
+        PurchasereturnRequestMain.allSchemas.formSchema.forEach(item=>{
+          if(item.field == 'supplierCode1'){
+            item.componentProps.options = [
+              {
+                id:'454556',
+                nickname:'哈哈哈哈'
+              }
+            ]
+            formRef.setValues(setV)
+          }
+        })
+      }
+      formRef.setValues(setV)
+    }
+  })
+}
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    if (formField == 'poLine' || formField == 'itemCode') {
+      console.log(val)
+      setV['poLine'] = val[0]['poLine']
+      setV['poNumber'] = val[0]['poNumber']
+      setV['itemCode'] = val[0]['itemCode']
+      setV['itemName'] = val[0]['itemName']
+      setV['itemDesc1'] = val[0]['itemDesc1']
+      setV['itemDesc2'] = val[0]['itemDesc2']
+      setV['batch'] = val[0]['toBatch']
+      setV['altBatch'] = val[0]['altBatch']
+      setV['containerNumber'] = val[0]['toContainerNumber']
+      setV['receiptQty'] = val[0]['qty']
+      setV['qty'] = val[0]['qty']
+      setV['uom'] = val[0]['uom']
+      setV['supplierQty'] = val[0]['supplierQty']
+      setV['supplierUom'] = val[0]['supplierUom']
+      setV['inventoryStatus'] = val[0]['inventoryStatus']
+      // setV['fromLocationCode'] = val[0]['toLocationCode']
+      // setV['toLocationCode'] = val[0]['toLocationCode']
+      setV['fromLocationGroupCode'] = val[0]['locationGroupCode']
+      setV['toLocationGroupCode'] = null
+      setV['toWarehouseCode'] = null
+      setV['toAreaTypes'] = null
+      setV['fromAreaCode'] = val[0]['areaCode']
+      setV['toAreaCode'] = val[0]['toAreaCode']
+      setV['fromQwnerCode'] = val[0]['fromQwnerCode']
+      setV['toOwnerCode'] = val[0]['toOwnerCode']
+      setV['arriveDate'] = val[0]['arriveDate']
+      setV['produceDate'] = val[0]['produceDate']
+      setV['expireDate'] = val[0]['expireDate']
+      setV['convertRate'] = val[0]['convertRate']
+      setV['visualInspectResult'] = val[0]['visualInspectResult']
+      setV['visualInspectPhotos'] = val[0]['visualInspectPhotos']
+      setV['failedReason'] = val[0]['failedReason']
+      setV['singlePrice'] = val[0]['singlePrice']
+      setV['amount'] = val[0]['amount']
+      setV['projectCode'] = val[0]['projectCode']
+      // setV['packingNumber'] = val[0]['packingNumber']
+      // setV['inventoryBalance'] = val[0]['qty']
+
+      if (formField == 'itemCode') {
+        setV['batch'] = val[0]['toBatch']
+        setV['containerNumber'] = val[0]['toContainerNumber']
+        setV['containerNumber'] = val[0]['containerNumber']
+        setV['containerNumber'] = val[0]['containerNumber']
+        // setV['fromLocationCode'] = val[0]['fromLocationCode']
+        // setV['toLocationCode'] = val[0]['toLocationCode']
+      }
+    } else if (formField == 'packingNumber'){
+      setV[formField] = val[0][searchField]
+      setV['inventoryBalance'] = val[0]['qty']
+      setV['batch'] = val[0]['batch']
+      setV['fromLocationCode'] = val[0]['locationCode']
+    }
+    else {
+      setV[formField] = val[0][searchField]
+    }
+    formRef.setValues(setV)
+  })
+}
+
+// 子表新增的时候选择表格之后需要会显得字段
+// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
+const Echo = []
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: PurchasereturnRequestDetailApi.getPurchasereturnRequestDetailPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  // defaultButtons.defaultAddBtn({hasPermi:'wms:purchasereturn-request-main:create'}), // 新增
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:purchasereturn-request-main:import'}), // 导入
+  // defaultButtons.defaultExportBtn({hasPermi:'wms:purchasereturn-request-main:export'}), // 导出
+  defaultButtons.defaultAddBtn(null), // 新增
+  defaultButtons.defaultImportBtn(null), // 导入
+  defaultButtons.defaultExportBtn(null), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null) // 设置
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') {
+    // 新增
+    openForm('create')
+  } else if (val == 'import') {
+    // 导入
+    handleImport()
+  } else if (val == 'export') {
+    // 导出
+    handleExport()
+  } else if (val == 'refresh') {
+    // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') {
+    // 筛选
+  } else {
+    // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row, val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row, $index) => {
+  const findIndex = row['masterId']
+    ? tableObject.tableList.findIndex((item) => item['masterId'] == row['masterId'])
+    : -1
+  if (findIndex > -1 && findIndex < $index) {
+    return []
+  }
+  return [
+    defaultButtons.mainListCloseBtn({
+      hide: isShowMainButton(row, ['1', '2', '3', '4', '6']),
+      hasPermi: 'wms:purchasereturn-request-main:close'
+    }), // 关闭
+    defaultButtons.mainListReAddBtn({
+      hide: isShowMainButton(row, ['5']),
+      hasPermi: 'wms:purchasereturn-request-main:reAdd'
+    }), //重新添加
+    defaultButtons.mainListSubmitBtn({
+      hide: isShowMainButton(row, ['1']),
+      hasPermi: 'wms:purchasereturn-request-main:submit'
+    }), // 提交审批
+    defaultButtons.mainListTurnDownBtn({
+      hide: isShowMainButton(row, ['2']),
+      hasPermi: 'wms:purchasereturn-request-main:refused'
+    }), // 驳回
+    defaultButtons.mainListApproveBtn({
+      hide: isShowMainButton(row, ['2']),
+      hasPermi: 'wms:purchasereturn-request-main:agree'
+    }), // 审批通过
+    defaultButtons.mainListHandleBtn({
+      hide: isShowMainButton(row, ['3']),
+      hasPermi: 'wms:purchasereturn-request-main:handle'
+    }), // 处理
+    defaultButtons.mainListEditBtn({
+      hide: isShowMainButton(row, ['1']),
+      hasPermi: 'wms:purchasereturn-request-main:update'
+    }) // 编辑
+    // {
+    //   label: '生成标签',
+    //   name: 'ssbq',
+    //   hide: isShowMainButton(row, ['3']),
+    //   type: 'primary',
+    //   icon: '',
+    //   color: '',
+    //   hasPermi: '',
+    //   link: true // 文本展现按钮
+    // },
+    // defaultButtons.mainListPointBtn({ hide: isShowMainButton(row, ['3','6']) }), // 标签打印
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainClose') {
+    // 关闭
+    handleClose(row.masterId)
+  } else if (val == 'mainReAdd') {
+    // 重新添加
+    handleReAdd(row.masterId)
+  } else if (val == 'mainSubmit') {
+    // 提交审批
+    handleSubmit(row.masterId)
+  } else if (val == 'mainTurnDown') {
+    // 驳回
+    handleRefused(row.masterId)
+  } else if (val == 'mainApprove') {
+    // 审批通过
+    handleAgree(row.masterId)
+  } else if (val == 'mainHandle') {
+    // 处理
+    handleHandle(row.masterId)
+  } else if (val == 'edit') {
+    // 编辑
+    openForm('update', row)
+  } else if (val == 'ssbq') {
+    // 生成标签
+    detatableData.params = {
+      masterId: row.masterId
+    }
+    genLabelId.value = row.masterId
+    await getDetailList()
+    formLabelRef.value.open('create', row, null, 'createLabel') //创建标签页面 createLabel 标题
+  } else if (val == 'point') {
+    // 标签打印
+    labelPrint(row)
+  }
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = async (type: string, row?: number) => {
+  originTableData.value = [] // 重置明细数据
+  tableData.value = [] // 重置明细数据
+  isShowButton.value = true
+  if (type == 'create') {
+    PurchasereturnRequestMain.allSchemas.formSchema.forEach((item) => {
+      // if (item.field == 'supplierCode') {
+      //   item.componentProps.disabled = true
+      //   item.componentProps.isSearchList = true
+      // }
+      if (item.field == 'asnNumber') {
+        item.componentProps.disabled = true
+        item.componentProps.isSearchList = true
+      }
+    })
+  }
+  if (type == 'update') {
+    PurchasereturnRequestMain.allSchemas.formSchema.forEach((item) => {
+      // if (item.field == 'supplierCode') {
+      //   item.componentProps.disabled = true
+      //   item.componentProps.isSearchList = false
+      // }
+      if (item.field == 'asnNumber') {
+        item.componentProps.disabled = true
+        item.componentProps.isSearchList = false
+      }
+    })
+  }
+  formRef.value.open(type, row)
+}
+
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const purchaseReceiptRecordNumberRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  purchaseReceiptRecordNumberRef.value = row.purchaseReceiptRecordNumber
+  const departmentCode = wsCache
+    .get(CACHE_KEY.DEPT)
+    .find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  PurchasereturnRequestDetail.allSchemas.tableColumns =
+    PurchasereturnRequestDetail.allSchemas.tableColumns.filter(
+      (item) => item.field != 'inventoryBalance'
+    )
+  detailRef.value.openDetail(row, titleName, titleValue, 'requestPurchasereturnMain')
+}
+
+/** 关闭按钮操作 */
+const handleClose = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmColse'))
+    tableObject.loading = true
+    await PurchasereturnRequestMainApi.closePurchasereturnRequestMain(id)
+    message.success(t('common.closeSuccess'))
+    buttonBaseClick('refresh',null)
+  } catch {
+  } finally {
+    tableObject.loading = false
+  }
+}
+
+/** 重新添加按钮操作 */
+const handleReAdd = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmReAdd'))
+    tableObject.loading = true
+    await PurchasereturnRequestMainApi.reAddPurchasereturnRequestMain(id)
+    message.success(t('common.reAddSuccess'))
+    buttonBaseClick('refresh',null)
+  } catch {
+  } finally {
+    tableObject.loading = false
+  }
+}
+
+/** 审批通过按钮操作 */
+const handleAgree = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmAgree'))
+    tableObject.loading = true
+    await PurchasereturnRequestMainApi.agreePurchasereturnRequestMain(id)
+    message.success(t('common.agreeSuccess'))
+    buttonBaseClick('refresh',null)
+  } catch {
+  } finally {
+    tableObject.loading = false
+  }
+}
+
+/** 审批驳回按钮操作 */
+const handleRefused = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmRefused'))
+    tableObject.loading = true
+    await PurchasereturnRequestMainApi.refusedPurchasereturnRequestMain(id)
+    message.success(t('common.refusedSuccess'))
+    buttonBaseClick('refresh',null)
+  } catch {
+  } finally {
+    tableObject.loading = false
+  }
+}
+
+/** 处理按钮操作 */
+const handleHandle = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmHandle'))
+    tableObject.loading = true
+    await PurchasereturnRequestMainApi.handlePurchasereturnRequestMain(id)
+    message.success(t('common.handleSuccess'))
+    buttonBaseClick('refresh',null)
+  } catch {
+  } finally {
+    tableObject.loading = false
+  }
+}
+
+/** 提交按钮操作 */
+const handleSubmit = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmSubmit'))
+    tableObject.loading = true
+    await PurchasereturnRequestMainApi.submitPurchasereturnRequestMain(id)
+    message.success(t('common.submitSuccess'))
+    buttonBaseClick('refresh',null)
+    tableObject.loading = false
+  } catch {
+  } finally {
+    tableObject.loading = false
+  }
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await PurchasereturnRequestMainApi.exportPurchasereturnRequestMain(
+      tableObject.params
+    )
+    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/**
+ * tableForm方法
+ */
+const tableFormKeys = {}
+PurchasereturnRequestDetail.allSchemas.tableFormColumns.forEach((item) => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+const originTableData = ref([])
+
+const searchTableRef = ref()
+// 添加明细
+const handleAddTable = () => {
+  const subTableDFata = originTableData.value.filter(
+    (item) => !tableData.value.find((item1) => item1.id == item.id)
+  )
+  if (subTableDFata.length == 0) {
+    message.warning('暂无可选择数据!')
+    return
+  }
+
+  const tableObject = {
+    // 当前页
+    currentPage: 1,
+    // 导出加载中
+    exportLoading: false,
+    // 加载中
+    loading: false,
+    // 页数
+    pageSize: subTableDFata.length,
+    params: null,
+    // 排序
+    sort: {
+      order: '', // 排序规则
+      prop: '' // 排序字段
+    },
+    // 总条数
+    total: subTableDFata.length,
+    // 表格数据
+    tableList: subTableDFata,
+    currentRow: null
+  }
+
+  const tableColumns = PurchasereturnRequestDetail.allSchemas.tableFormColumns
+  tableColumns.forEach((item) => {
+    item.width = item.table?.width || 150
+  })
+
+  searchTableRef.value.openData('采购收货记录单号', tableObject, { tableColumns }, true)
+  // searchTableRef.value.open(
+  //   ('供应商信息',
+  //   // _searchTableAllSchemas,
+  //   // _searchTablePage, // 接口
+  //   // formField,
+  //   // searchField,
+  //   true,//是否多选
+  //   // type,
+  //   // row,
+  //   _searchCondition
+  //   )
+  // )
+
+  // console.log(subTableDFata)
+  // const {tableObject, tableMethods } = useTable({
+  //   getListApi: getPage.value // 分页接口
+  // })
+  // searchTableRef.value.open(
+  //   ('供应商信息',
+  //   // _searchTableAllSchemas,
+  //   // _searchTablePage, // 接口
+  //   // formField,
+  //   // searchField,
+  //   true,//是否多选
+  //   // type,
+  //   // row,
+  //   _searchCondition
+  //   )
+  // )
+  // tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+  // let purchaseReceiptRecordNumber = formRef.value.formRef.formModel.purchaseReceiptRecordNumber
+  // PurchasereturnRequestDetail.allSchemas.tableFormColumns.map((item) => {
+  //   item.tableForm.disabled = true
+  //   if (item.field == 'remark') {
+  //     item.tableForm.disabled = false
+  //   }
+  //   if (item.field == 'reason') {
+  //     item.tableForm.disabled = false
+  //   }
+  //   if (item.field == 'qty') {
+  //     item.tableForm.disabled = false
+  //   }
+  //   if(purchaseReceiptRecordNumber == ''){
+  //     if (item.field == 'itemCode') {
+  //       item.tableForm.isInpuFocusShow = true
+  //     }
+  //     if(item.field == 'poLine'){
+  //       item.tableForm.isInpuFocusShow = false
+  //     }
+  //   }else{
+  //     if (item.field == 'itemCode') {
+  //       item.tableForm.isInpuFocusShow = false
+  //     }
+  //     if(item.field == 'poLine'){
+  //       item.tableForm.isInpuFocusShow = true
+  //     }
+  //   }
+  // })
+}
+const searchTableSuccess1 = (formField, searchField, val, formRef, type, row) => {
+  console.log(val)
+  tableData.value = [...tableData.value, ...val]
+}
+// 删除明细
+const handleDeleteTable = (item, index, formRef) => {
+  let itemIndex = tableData.value.indexOf(item)
+  if (itemIndex > -1) {
+    tableData.value.splice(itemIndex, 1)
+  }
+  if (tableData.value.length == 0) {
+    isShowButton.value = true
+    PurchasereturnRequestMain.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'supplierCode') {
+        item.componentProps.disabled = false
+      }
+    })
+  }
+}
+const tableSelectionDelete = (selection) => {
+  tableData.value = tableData.value.filter((item) => !selection.includes(item))
+  if (tableData.value.length == 0) {
+    isShowButton.value = true
+    PurchasereturnRequestMain.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'supplierCode') {
+        item.componentProps.disabled = false
+      }
+    })
+    nextTick(() => {
+      const setV = {}
+      setV['asnNumber'] = ''
+      setV['supplierCode'] = ''
+      formRef.setValues(setV)
+    })
+  }
+}
+
+// 主子数据 提交
+const submitForm = async (formType, submitData) => {
+  let data = { ...submitData }
+  if (data.masterId) {
+    data.id = data.masterId
+  }
+  console.log('submitForm', tableData.value)
+  // if(tableData.value.find(item=>Number(item.returnedQty)>Number(item.receiptQty))){
+  //   message.warning("退货数量不能大于收获数量")
+  //   return;
+  // }
+  if (tableData.value.find((item) => Number(item.qty) > Number(item.inventoryBalance))) {
+    message.warning('退货数量不能大于库存余额')
+    return
+  }
+  data.subList = tableData.value // 拼接子表数据参数
+  formRef.value.formLoading = true
+  try {
+    if (formType === 'create') {
+      let flag = false
+      data.subList.forEach((item) => {
+        if (item.qty == 0) {
+          message.warning('数量不能为0')
+          flag = true
+          return
+        }
+      })
+      if (flag) {
+        formRef.value.formLoading = false
+        return
+      }
+      data.returnSourceType='1'
+      await PurchasereturnRequestMainApi.createPurchasereturnRequestMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      data.returnSourceType='1'
+      await PurchasereturnRequestMainApi.updatePurchasereturnRequestMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    if (formType === 'create') {
+      getList()
+    }else{
+      buttonBaseClick('refresh',null)
+    }
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+// 子表新增/编辑校验
+const detailValidate = (data) => {
+  let tag = false
+  if (data.qty <= 0) {
+    message.warning('数量必须大于0')
+    tag = false
+    return tag
+  } else {
+    tag = true
+    return tag
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+const detailOpenForm = (type, row) => {
+  console.log('type', type)
+  console.log('row', row)
+  console.log('AAAAAA', purchaseReceiptRecordNumberRef.value)
+  PurchasereturnRequestDetail.allSchemas.tableFormColumns.map((item) => {
+    if (purchaseReceiptRecordNumberRef.value == '') {
+      if (item.field == 'itemCode') {
+        item.form.componentProps.disabled = true
+        item.form.componentProps.isSearchList = true
+      }
+      if (item.field == 'poLine') {
+        item.form.componentProps.disabled = true
+        item.form.componentProps.isSearchList = false
+      }
+    } else {
+      if (item.field == 'itemCode') {
+        item.form.componentProps.disabled = true
+        item.form.componentProps.isSearchList = false
+      }
+      if (item.field == 'poLine') {
+        item.form.componentProps.disabled = true
+        item.form.componentProps.isSearchList = true
+      }
+    }
+  })
+}
+
+const BASE_URL = getJmreportBaseUrl()
+const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+
+// 标签打印
+const showLabelRef = ref()
+const labelPrint = async (row) => {
+  tableObject.loading = true
+  const defaultParams = { moduleName: 'purchasereturn', recordNumber: row.number }
+  const { tableObject: tableObjectPrint, tableMethods } = useTable({
+    defaultParams,
+    getListApi: PackageApi.getLabelDetailPage // 分页接口
+  })
+
+  // 获得表格的各种操作
+  const { getList: getListPrint } = tableMethods
+  getListPrint()
+  tableObject.loading = false
+  const tableColumns = SupplierdeliverRequestPackage.allSchemas.tableFormColumns
+  tableColumns.forEach((item) => {
+    item.width = item.table?.width || 150
+  })
+  showLabelRef.value.openData('标签信息', tableObjectPrint, { tableColumns }, true)
+}
+
+// 批量打印---采购收货申请
+const showLabelSuccess = async (formField, searchField, val, formRef, type, row) => {
+  console.log('批量打印', val)
+
+  if (val.length == 0) {
+    message.warning('请先选择要打印的数据!')
+    return
+  }
+  await PackageApi.batchPrintingLable(val.map((item1) => item1.number).join(','))
+    .then((res) => {
+      console.log(res)
+      window.open(src.value + '&asn_number=' + res)
+    })
+    .catch((err) => {
+      console.log(err)
+      message.error('创建标签失败')
+    })
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await PurchasereturnRequestMainApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMain.data.ts
new file mode 100644
index 000000000..26d19b63d
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMain.data.ts
@@ -0,0 +1,879 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
+const { t } = useI18n() // 国际化
+import * as getRequestsettingApi from '@/api/wms/requestsetting/index'
+import {
+  PurchasereceiptRecordDetail,
+  PurchasereceiptRecordMain
+} from '../../purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data'
+import * as PurchasereceiptRecordDetailApi from '@/api/wms/purchasereceiptRecordDetail'
+import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
+import * as SupplierApi from '@/api/wms/supplier'
+import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
+import * as ItemPackageApi from '@/api/wms/itempackage/index'
+import * as LocationApi from '@/api/wms/location'
+import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
+import * as BalanceApi from '@/api/wms/balance'
+import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
+
+import * as InspectionQ2Api from '@/api/qms/inspectionQ2'
+import { Q2 } from '@/views/qms/inspectionQ2/inspectionQ2.data'
+
+import * as ItembasicApi from '@/api/wms/itembasic'
+import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize: 10,
+  pageNo: 1,
+  code: 'PurchaseReturnRequest'
+}
+const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+const requestsettingData = data?.list[0] || {}
+
+// 获取当前操作人的部门
+import { useUserStore } from '@/store/modules/user'
+import { TableColumn } from '@/types/table'
+const userStore = useUserStore()
+const userDept = userStore.userSelfInfo.dept
+// id 转str 否则form回显匹配不到
+userDept.id = userDept.id.toString()
+const userDeptArray: any = [userDept]
+
+// 采购收货记录展示列
+export const PurchasereceiptRecordMain1 = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '物料代码',
+      field: 'itemCode',
+      fixed: 'left',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isSearch: true
+    },
+    {
+      label: '采购收货记录单号',
+      field: 'number',
+      fixed: 'left',
+      sort: 'custom',
+      table: {
+        width: 200
+      },
+      isSearch: true
+    },
+    {
+      label: '发货单号',
+      field: 'asnNumber',
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      sortTableDefault: 2,
+      isSearch: true
+    },
+    
+    {
+      label: '采购订单号',
+      field: 'poNumber',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isSearch: true
+    },
+    {
+      label: '订单行',
+      field: 'poLine',
+      sort: 'custom',
+      table: {
+        width: 150
+      }
+    },
+
+    {
+      label: '物料名称',
+      field: 'itemName',
+      sort: 'custom',
+      table: {
+        width: 150
+      }
+    },
+    {
+      label: '批次', // 实际是子表的从批次，为了不影响页面，单独放上面
+      field: 'fromBatch',
+      sort: 'custom',
+      isForm: false,
+      isTableForm: false,
+      table: {
+        width: 150
+      }
+    },
+    {
+      label: '计量单位',
+      field: 'uom',
+      dictType: DICT_TYPE.UOM,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      }
+    },
+    // {
+    //   label: '包装规格',
+    //   field: 'packUnit',
+    //   dictClass: 'string',
+    //   isTable: true,
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    // },
+    // {
+    //   label: '从库位代码',
+    //   field: 'fromLocationCode',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //
+    // },
+    {
+      label: '到库位代码',
+      field: 'toLocationCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      }
+    }
+  ])
+)
+
+/**
+ * @returns {Array} 采购退货申请主表
+ */
+export const PurchasereturnRequestMain = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '物料代码',
+      field: 'itemCode',
+      sort: 'custom',
+      isSearch: true,
+      table:{
+        width: 150
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          enterSearch:true,
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+          searchField: 'code', // 查询弹窗赋值字段
+          searchTitle: '物料基础信息', // 查询弹窗标题
+          searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
+          searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
+          searchCondition: [{
+            key: 'available',
+            value: 'TRUE',
+            action: '==',
+            isSearch: true,
+            isMainValue: false
+          }],
+          verificationParams: [{
+            key: 'code',
+            action: '==',
+            value: '',
+            isMainValue: false,
+            isSearch: 'true',
+            isFormModel: true
+          }], // 失去焦点校验参数
+        }
+      }
+    },
+    {
+      label: '物料名称',
+      field: 'itemName',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      tableForm:{
+        disabled:true
+      },
+      form: {
+        componentProps:{
+          disabled:true
+        }
+      }
+    },
+    {
+      label: '供应商1',
+      field: 'supplierCode1',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Select',
+        componentProps: {
+          options: [{
+            id:123,
+            nickname:'供应商'
+          }],
+          optionsAlias: {
+            labelField: 'id',
+            valueField: 'id'
+          },
+          filterable: true,
+        }
+      }
+    },
+    {
+      label: '供应商名称',
+      field: 'supplierName',
+      sort: 'custom',
+      table: {
+        width: 180,
+      },
+      isForm: true,
+      form: {
+        componentProps:{
+          disabled:true
+        }
+      }
+    },
+    {
+      label: '',
+      field: 'hahaha',
+      table: {
+        width: 180
+      },
+      isTable:false,
+      isDetail:false,
+      form: {
+        componentProps: {
+          type: 'slot',
+        }
+      },
+    },
+    {
+      label: '',
+      field: 'hehehe',
+      table: {
+        width: 180
+      },
+      isTable:false,
+      isDetail:false,
+      form: {
+        componentProps: {
+          type: 'slot',
+        }
+      },
+    },
+    {
+      label: '采购订单号',
+      field: 'poNumber',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      tableForm:{
+        disabled:true
+      },
+      form: {
+        componentProps:{
+          disabled:true
+        }
+      }
+    },
+    {
+      label: '采购订单行',
+      field: 'poLine',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      tableForm:{
+        disabled:true
+      },
+      form: {
+        componentProps:{
+          disabled:true
+        }
+      }
+    },
+    {
+      label: '收货单号',
+      field: 'purchaseReceiptRecordNumber',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      tableForm:{
+        disabled:true
+      },
+      form: {
+        componentProps:{
+          disabled:true
+        }
+      }
+    },
+    {
+      label: '发货单号',
+      field: 'asnNumber1',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      tableForm:{
+        disabled:true
+      },
+      form: {
+        componentProps:{
+          disabled:true
+        }
+      }
+    },
+    {
+      label: '状态',
+      field: 'status',
+      dictType: DICT_TYPE.REQUEST_STATUS,
+      dictClass: 'string',
+      isSearch: true,
+      isTable: true,
+      isForm: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 1,
+      form: {
+        value: '1',
+        componentProps: {
+          disabled: true
+        }
+      }
+    },
+    {
+      label: '退货库位',
+      field: 'locationCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Select',
+        componentProps: {
+          options: [{
+            id:123,
+            nickname:'供应商'
+          }],
+          optionsAlias: {
+            labelField: 'id',
+            valueField: 'id'
+          },
+          filterable: true,
+        }
+      }
+    },
+    {
+      label: 'Q2通知单号',
+      field: 'q2Number',
+      sort: 'custom',
+      isSearch: false,
+      isDetail: true,
+      table: {
+        width: 150
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          enterSearch: true,
+          // multiple: true,
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择Q2通知单号', // 输入框占位文本
+          searchField: 'number', // 查询弹窗赋值字段
+          searchTitle: 'Q2通知单号', // 查询弹窗标题
+          searchAllSchemas: Q2.allSchemas, // 查询弹窗所需类
+          searchPage: InspectionQ2Api.getQ2Page, // 查询弹窗所需分页方法
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            },
+            {
+              key: 'status',
+              value: '0',
+              isMainValue: false
+            },
+            {
+              key: 'supplierCode',
+              value: 'supplierCode',
+              isMainValue: true
+            }
+          ],
+          verificationParams: [
+            {
+              key: 'number',
+              action: '==',
+              value: '',
+              isMainValue: false,
+              isSearch: true,
+              isFormModel: true
+            }
+          ] // 失去焦点校验参数
+        }
+      }
+    },
+    {
+      label: '操作',
+      field: 'action',
+      isDetail: false,
+      isForm: false,
+      table: {
+        width: 300,
+        fixed: 'right'
+      }
+    }
+  ])
+)
+
+//表单校验
+export const PurchasereturnRequestMainRules = reactive({
+  supplierCode: [
+    { required: true, message: '请输入供应商代码', trigger: 'blur' }
+  ],
+  dueTime: [
+    { required: true, message: '请选择截止时间', trigger: 'blur' }
+  ],
+  purchaseReceiptRecordNumber: [
+    { required: true, message: '请输入采购收货记录单号', trigger: 'blur' }
+  ],
+  carrierCode: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+  ],
+  vehiclePlateNumber: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  fromWarehouseCode: [
+    { required: true, message: '请输入从仓库代码', trigger: 'blur' }
+  ],
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  autoCommit: [
+    { required: true, message: '请选择是否自动提交', trigger: 'change' }
+  ],
+  autoAgree: [
+    { required: true, message: '请选择是否自动通过', trigger: 'change' }
+  ],
+  autoExecute: [
+    { required: true, message: '请选择是否自动执行', trigger: 'change' }
+  ],
+  directCreateRecord: [
+    { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 采购退货申请子表
+ */
+export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled:true
+    },
+    form: {
+      componentProps:{
+        disabled:true
+      }
+    }
+  },
+  {
+    label: '状态',
+    field: 'status',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled:true
+    },
+    form: {
+      componentProps:{
+        disabled:true
+      }
+    }
+  },
+  {
+    label: '隔离库存数量',
+    field: 'inventoryBalance',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled: true,
+        min: 0,
+        precision: 6
+      }
+    },
+    tableForm:{
+      hidden:false,//控制列是否展示
+      type:'InputNumber',
+      min:0,
+      precision: 6
+    },
+    hiddenInMain: true,
+    isTable: false,
+    isDetail: false,
+  },
+  {
+    label: '退货数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6,
+        disabled:false
+      }
+    },
+    isTable:false,
+    isTableForm:true,
+    tableForm:{
+      disabled:true,
+      type:'InputNumber',
+      min:0,
+      precision: 6
+    }
+  },
+  {
+    label: '退货原因',
+    field: 'status',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    // isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled:true,
+      type: 'Select',
+    },
+    form: {
+      componentProps:{
+        disabled:true
+      }
+    }
+  },
+  {
+    label: '退货原因描述',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '操作',
+    hiddenInMain:true,
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:false,
+  }
+]))
+
+//表单校验
+export const PurchasereturnRequestDetailRules = reactive({
+})
+
+export const PurchasereReturnRequestDetailLabel = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled:true
+    },
+    isTableForm: true,
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled:true
+    },
+    isTableForm: true,
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:false,
+    isTableForm: false,
+    isForm: false
+  },
+  // {
+  //   label: '器具号',
+  //   field: 'containerNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTableForm: false,
+  //   isForm: false
+  // },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled:true,
+        min: 1,
+        precision: 6
+      },
+    },
+    tableForm: {
+      disabled:true,
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    }
+  },
+  {
+    label: '从库位代码1',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        disabled:true,
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm:{
+      disabled:true,
+      type:'FormDate',
+      placeholder: '请选择生产日期',
+      valueFormat: 'x',
+    },
+  },
+
+  // {
+  //   label: '替代批次',
+  //   field: 'altBatch',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTableForm: false,
+  //   isForm: false
+  // },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    tableForm: {
+      type: 'Select'
+    }
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true,
+        isSearchList: true,
+        searchListPlaceholder: '请选择包装',
+        searchField: 'packQty',
+        searchTitle: '物品包装信息',
+        searchAllSchemas: Itempackaging.allSchemas,
+        searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
+        searchCondition: [
+          {
+            key: 'itemCode',
+            value: 'itemCode',
+            message: '请选择订单行',
+            isMainValue: true
+          },
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+
+        ]
+      }
+    },
+    tableForm: {
+      disabled: true,
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择包装',
+      searchField: 'packQty',
+      searchTitle: '物品包装信息',
+      searchAllSchemas: Itempackaging.allSchemas,
+      searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
+      searchCondition: [
+        {
+          key: 'itemCode',
+          value: 'itemCode',
+          message: '请选择订单行',
+          isMainValue: true
+        },
+        {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+    },
+    isTableForm: true,
+    isForm: true
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150,
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm:{
+      disabled:true
+    },
+    isTableForm: true,
+    isForm: true
+  },
+]))
+

From e0dee287f5e51a3a6901379d42646d92d588386a Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Wed, 14 Aug 2024 19:34:26 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=88=AA=E6=AD=A2?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=8C=89=E9=92=AE+=E4=B8=8B=E6=9E=B6?=
 =?UTF-8?q?=E7=AD=96=E7=95=A5=E4=B8=8B=E7=89=A9=E6=96=99=E5=88=86=E7=BB=84?=
 =?UTF-8?q?=E6=94=B9=E6=88=90=E4=B8=8B=E6=8B=89=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../strategy/downShelfStrategy/AddForm.vue    | 23 +++++++++++++++++--
 .../productionreturnRequestMain.data.ts       |  3 ++-
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
index 47ed9e9e9..ed8ffd727 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
@@ -157,13 +157,29 @@
                     :value="cur.value"
                   />
                 </el-select>
-                <el-input key="物料分组"
+                <el-select key="物料分组"
+                  v-model="item.Value"
+                  placeholder="请输入物料分组，多个物料分组以逗号分隔"
+                  style="flex: 1"
+                  clearable
+                  multiple
+                  collapse-tags
+                  v-if="item.ParamCode == 'ItemGroup'"
+                >
+                  <el-option
+                    v-for="cur in getStrDictOptions(DICT_TYPE.ITEM_GROUP)"
+                    :key="'物料分组Value'+cur.value"
+                    :label="cur.label"
+                    :value="cur.value"
+                  />
+                </el-select>
+                <!-- <el-input key="物料分组"
                   v-model="item.Value"
                   placeholder="请输入物料分组，多个物料分组以逗号分隔"
                   clearable
                   style="flex: 1"
                   v-else-if="item.ParamCode == 'ItemGroup'"
-                />
+                /> -->
                 <el-input key="项目"
                   v-model="item.Value"
                   placeholder="请输入项目，多个项目以逗号分隔"
@@ -1064,6 +1080,9 @@ defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 /** 提交表单 */
 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
 const submitForm = async () => {
+
+  console.log('规则条件',formData.value.condition)
+  
   // 校验表单
   if (!formRef) return
   const valid = await formRef.value.validate()
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
index 97ccff14f..b31c3985a 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
@@ -206,6 +206,7 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>
       width: 180
     },
     isTable: false,
+    isForm: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -431,7 +432,7 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>
       }
     },
     isForm: false,
-    isSearch: false,
+    isSearch: true,
     search: {
       component: 'DatePicker',
       componentProps: {