Merge branch 'hella_online_20240803' into master_hella

3 months ago · d7f33b4358
78 changed files with 2182 additions and 95 deletions
--- a/public/systemConfig.js
+++ b/public/systemConfig.js
@ -12,5 +12,6 @@ let systemConfig = {
  // 租户配置
  tenant: '["成都"]',
  systermUpdateAlert: true,
-  systermUpdateUrl: 'https://scptest.faway-hella.com/'
+  systermUpdateUrl: 'https://scptest.faway-hella.com/',
+  needCode:false
 }
--- a/src/api/wms/purchasereturnRequestMain/index.ts
+++ b/src/api/wms/purchasereturnRequestMain/index.ts
@ -61,6 +61,10 @@ export const createPurchasereturnRequestMainNew = async (data: PurchasereturnReq
 export const updatePurchasereturnRequestMain = async (data: PurchasereturnRequestMainVO) => {
  return await request.put({ url: `/wms/purchasereturn-request-main/update`, data })
 }
+// 修改采购退货申请主 --新版
+export const updatePurchasereturnRequestMainNew = async (data: PurchasereturnRequestMainVO) => {
+  return await request.post({ url: `/wms/purchasereturn-request-main/updateReturnNew`, data })
+}

 // 删除采购退货申请主
 export const deletePurchasereturnRequestMain = async (id: number) => {
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@ -399,4 +399,5 @@ export enum DICT_TYPE {
  PURCHASE_JOB_STATUS = 'purchase_job_status', // 采购收货任务状态
 PUBLISHE_STATUS = 'publishe_status', // 采购收货任务状态
  PUBLISHE_STATUS_FIRST_INSPECTION = 'publishe_status_first_inspection', // 首件检验记录发布状态
+  RETURN_REASON_TYPE = 'return_reason_type',  // 采购退货原因类型
 }
--- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/index.vue
+++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/index.vue
@ -156,8 +156,9 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    const data = await CustomerreceiptRecordMainApi.exportCustomerreceiptRecordMain(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
--- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue
@ -326,8 +326,9 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    const data = await CustomerreceiptRequestMainApi.exportCustomerreceiptRequestMain(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
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue
@ -365,8 +365,9 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    const data = await CustomerreturnJobMainApi.exportCustomerreturnJobMain(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
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/index.vue
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/index.vue
@ -162,8 +162,9 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    const data = await CustomerreturnRecordMainApi.exportCustomerreturnRecordMain(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
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
@ -653,8 +653,9 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    const data = await CustomerreturnRequestMainApi.exportCustomerreturnRequestMain(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
--- a/src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/index.vue
+++ b/src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/index.vue
@ -156,8 +156,9 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    const data = await CustomersettleRecordMainApi.exportCustomersettleRecordMain(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
--- a/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue
@ -337,8 +337,9 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    const data = await CustomersettleRequestMainApi.exportCustomersettleRequestMain(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
--- a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue
+++ b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue
@ -350,8 +350,9 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    const data = await DeliverJobMainApi.exportDeliverJobMain(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
--- a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue
@ -184,8 +184,9 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    const data = await DeliverRecordMainApi.exportDeliverRecordMain(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
--- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
@ -474,12 +474,13 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    if(routeName.value == 'DeliverRequestMain'){
      const data = await DeliverRequestMainApi.exportDeliverRequestMain(tableObject.params)
-      download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
    }else{
      const data = await DeliverRequestMainApi.exportZZBJDeliverRequestMain(tableObject.params)
-      download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
    }
  } catch {
  } finally {
--- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue
+++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue
@ -433,12 +433,13 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    if(routeName.value == 'DeliverRequestMain'){
      const data = await DeliverPlanMainApi.exportDeliverPlanMain(tableObject.params)
-      download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
+      download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
    }else{
      const data = await DeliverPlanMainApi.exportZZBJDeliverPlanMain(tableObject.params)
-      download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
+      download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
    }
  } catch {
  } finally {
--- a/src/views/wms/deliversettlementManage/deliverplan/saleMain/index.vue
+++ b/src/views/wms/deliversettlementManage/deliverplan/saleMain/index.vue
@ -253,8 +253,9 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    const data = await SaleMainApi.exportSaleMain(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
--- a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue
+++ b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue
@ -206,8 +206,9 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    const data = await SaleShipmentMainRecordApi.exportSaleShipmentMainRecord(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
--- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue
+++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue
@ -447,8 +447,9 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    const data = await SaleShipmentMainApi.exportSaleShipmentMain(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
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue
@ -239,8 +239,9 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    const data = await StockupJobMainApi.exportStockupMainJob(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
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/index.vue
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/index.vue
@ -157,8 +157,9 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    const data = await StockupMainRecordApi.exportStockupMainRecord(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
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue
@ -414,8 +414,9 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    const data = await StockupMainRequestApi.exportStockupMainRequest(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
--- a/src/views/wms/inventoryManage/balance/index.vue
+++ b/src/views/wms/inventoryManage/balance/index.vue
@ -298,8 +298,9 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    const data = await BalanceApi.exportBalance(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
--- a/src/views/wms/inventoryManage/expectin/index.vue
+++ b/src/views/wms/inventoryManage/expectin/index.vue
@ -226,8 +226,9 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    const data = await ExpectinApi.exportExpectin(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
--- a/src/views/wms/inventoryManage/expectout/index.vue
+++ b/src/views/wms/inventoryManage/expectout/index.vue
@ -225,8 +225,9 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    const data = await ExpectoutApi.exportExpectout(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
--- a/src/views/wms/inventoryManage/locationcapacity/index.vue
+++ b/src/views/wms/inventoryManage/locationcapacity/index.vue
@ -180,8 +180,9 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    const data = await LocationcapacityApi.exportLocationcapacity(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
--- a/src/views/wms/inventoryManage/package/index.vue
+++ b/src/views/wms/inventoryManage/package/index.vue
@ -250,8 +250,9 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    const data = await PackageApi.exportPackage(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
--- a/src/views/wms/inventoryManage/transaction/index.vue
+++ b/src/views/wms/inventoryManage/transaction/index.vue
@ -181,8 +181,9 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    const data = await TransactionApi.exportTransaction(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
--- a/src/views/wms/inventoryManage/transferlog/index.vue
+++ b/src/views/wms/inventoryManage/transferlog/index.vue
@ -180,8 +180,9 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    const data = await ExpectinApi.exportTransferlog(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
--- a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
@ -26,6 +26,33 @@ export const ScrapJobMain = useCrudSchemas(
      },
      isSearch: true
    },
+    {
+      label: 'Q1通知单号',
+      field: 'q1Number',
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isSearch: false
+    },
+    {
+      label: 'Q2通知单号',
+      field: 'q2Number',
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isSearch: false
+    },
+    {
+      label: 'Q3通知单号',
+      field: 'q3Number',
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isSearch: false
+    },
    {
      label: '状态',
      field: 'status',
@ -465,7 +492,7 @@ export const ScrapJobMain = useCrudSchemas(
          type: 'daterange',
          defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
        }
-      },
+      }
    },
    {
      label: '创建者',
--- a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
@ -35,6 +35,33 @@ export const ScrapRecordMain = useCrudSchemas(
      },
      isSearch: true
    },
+    {
+      label: 'Q1通知单号',
+      field: 'q1Number',
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isSearch: false
+    },
+    {
+      label: 'Q2通知单号',
+      field: 'q2Number',
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isSearch: false
+    },
+    {
+      label: 'Q3通知单号',
+      field: 'q3Number',
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isSearch: false
+    },
    {
      label: '申请时间',
      field: 'requestTime',
--- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
@ -483,14 +483,69 @@ const handleHandle = async (id: number) => {

 /** 添加/修改操作 */
 const formRef = ref()
-const openForm = async (type: string, row?: number) => {
-  ScrapRequestMain.allSchemas.formSchema.forEach((item) => {
-    if (item.field == 'q1Number' || item.field == 'q2Number' || item.field == 'q3Number') {
-      item.componentProps.enterSearch = true
-      item.componentProps.isSearchList = true
-      item.componentProps.disabled = false
+const openForm = async (type: string, row?: any) => {
+  if (type == 'create') {
+    ScrapRequestMain.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'q1Number' || item.field == 'q2Number' || item.field == 'q3Number') {
+        item.componentProps.enterSearch = true
+        item.componentProps.isSearchList = true
+        item.componentProps.disabled = false
+      }
+    })
+  } else {
+    if (row.q1Number) {
+      ScrapRequestMain.allSchemas.formSchema.forEach((item) => {
+        if (item.field == 'q1Number') {
+          item.componentProps.enterSearch = true
+          item.componentProps.isSearchList = true
+          item.componentProps.disabled = false
+        }
+        if (item.field == 'q2Number' || item.field == 'q3Number') {
+          item.componentProps.enterSearch = false
+          item.componentProps.isSearchList = false
+          item.componentProps.disabled = true
+        }
+      })
    }
-  })
+    if (row.q2Number) {
+      ScrapRequestMain.allSchemas.formSchema.forEach((item) => {
+        if (item.field == 'q2Number') {
+          item.componentProps.enterSearch = true
+          item.componentProps.isSearchList = true
+          item.componentProps.disabled = false
+        }
+        if (item.field == 'q1Number' || item.field == 'q3Number') {
+          item.componentProps.enterSearch = false
+          item.componentProps.isSearchList = false
+          item.componentProps.disabled = true
+        }
+      })
+    }
+    if (row.q3Number) {
+      ScrapRequestMain.allSchemas.formSchema.forEach((item) => {
+        if (item.field == 'q3Number') {
+          item.componentProps.enterSearch = true
+          item.componentProps.isSearchList = true
+          item.componentProps.disabled = false
+        }
+        if (item.field == 'q1Number' || item.field == 'q2Number') {
+          item.componentProps.enterSearch = false
+          item.componentProps.isSearchList = false
+          item.componentProps.disabled = true
+        }
+      })
+    }
+    if (!row.q3Number && !row.q2Number && !row.q1Number) {
+       ScrapRequestMain.allSchemas.formSchema.forEach((item) => {
+        if (item.field == 'q1Number' || item.field == 'q2Number' || item.field == 'q3Number') {
+          item.componentProps.enterSearch = true
+          item.componentProps.isSearchList = true
+          item.componentProps.disabled = false
+        }
+      })
+    }
+  }
+
  tableData.value = [] // 重置明细数据
  formRef.value.open(type, row)
 }
--- a/src/views/wms/issueManage/issue/issueJobMain/index.vue
+++ b/src/views/wms/issueManage/issue/issueJobMain/index.vue
@ -300,8 +300,9 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    const data = await IssueJobMainApi.exportIssueJobMain(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
--- a/src/views/wms/issueManage/issue/issueRecordMain/index.vue
+++ b/src/views/wms/issueManage/issue/issueRecordMain/index.vue
@ -156,8 +156,9 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    const data = await IssueRecordMainApi.exportIssueRecordMain(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
--- a/src/views/wms/issueManage/issue/issueRequestMain/index.vue
+++ b/src/views/wms/issueManage/issue/issueRequestMain/index.vue
@ -443,8 +443,9 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    const data = await IssueRequestMainApi.exportIssueRequestMain(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
--- a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/index.vue
+++ b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/index.vue
@ -151,8 +151,9 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    const data = await OnlinesettlementRecordMainApi.exportOnlinesettlementRecordMain(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
--- a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/index.vue
+++ b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/index.vue
@ -267,8 +267,9 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    const data = await OnlinesettlementRequestMainApi.exportOnlinesettlementRequestMain(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
--- a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue
+++ b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue
@ -458,8 +458,9 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    const data = await PreparetoissueMainApi.exportPreparetoissueMain(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
--- a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue
+++ b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue
@ -300,8 +300,9 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    const data = await ProductionreceiptJobMainApi.exportProductionreceiptJobMain(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
--- a/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/index.vue
+++ b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/index.vue
@ -156,8 +156,9 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    const data = await ProductionreceiptRecordMainApi.exportProductionreceiptRecordMain(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
--- a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue
@ -272,8 +272,9 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    const data = await ProductionreturnJobMainApi.exportProductionreturnJobMain(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
--- a/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue
@ -157,8 +157,9 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    const data = await ProductionreturnRecordMainApi.exportProductionreturnRecordMain(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
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
@ -607,8 +607,9 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    const data = await ProductionreturnRequestMainApi.exportProductionreturnRequestMain(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
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
@ -551,8 +551,9 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    const data = await ProductionreturnRequestMainNoApi.exportProductionreturnRequestMain(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
--- a/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/index.vue
+++ b/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/index.vue
@ -156,8 +156,9 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    const data = await ProductionscrapRecordMainApi.exportProductionscrapRecordMain(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
--- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue
+++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue
@ -607,8 +607,9 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    const data = await ProductionscrapRequestMainApi.exportProductionscrapRequestMain(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
--- a/src/views/wms/issueManage/repleinsh/repleinshJobMain/index.vue
+++ b/src/views/wms/issueManage/repleinsh/repleinshJobMain/index.vue
@ -328,8 +328,9 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    const data = await RepleinshJobMainApi.exportRepleinshJobMain(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
--- a/src/views/wms/issueManage/repleinsh/repleinshRecordMain/index.vue
+++ b/src/views/wms/issueManage/repleinsh/repleinshRecordMain/index.vue
@ -153,8 +153,9 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    const data = await RepleinshRecordMainApi.exportRepleinshRecordMain(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
--- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue
+++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue
@ -344,8 +344,9 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    const data = await RepleinshRequestMainApi.exportRepleinshRequestMain(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
--- a/src/views/wms/productionManage/offlinesettlement/offlinesettlementRecordMain/index.vue
+++ b/src/views/wms/productionManage/offlinesettlement/offlinesettlementRecordMain/index.vue
@ -156,8 +156,9 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    const data = await OfflinesettlementRecordMainApi.exportOfflinesettlementRecordMain(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
--- a/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue
+++ b/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue
@ -408,8 +408,9 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    const data = await ProcessproductionRequestMainApi.exportProcessproductionRequestMain(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
--- a/src/views/wms/productionManage/productdismantle/productdismantleJobMain/index.vue
+++ b/src/views/wms/productionManage/productdismantle/productdismantleJobMain/index.vue
@ -223,8 +223,9 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    const data = await ProductdismantleJobMainApi.exportProductdismantleJobMain(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
--- a/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/index.vue
+++ b/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/index.vue
@ -226,8 +226,9 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    const data = await ProductdismantleRecordMainApi.exportProductdismantleRecordMain(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
--- a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue
+++ b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue
@ -541,8 +541,9 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    const data = await ProductdismantleRequestMainApi.exportProductdismantleRequestMain(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
--- a/src/views/wms/productionManage/productionplan/productionMain/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMain/index.vue
@ -549,8 +549,9 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    const data = await ProductionMainApi.exportProductionMain(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
--- a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
@ -512,8 +512,9 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    const data = await ProductionMainApi.exportProductionMainAssemble(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
--- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
@ -500,9 +500,9 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    const data = await ProductionMainApi.exportProductionMainAssembleSparePart(tableObject.params)
-    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
-  } catch {
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
  } finally {
    exportLoading.value = false
  }
--- a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue
@ -502,8 +502,9 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    const data = await ProductionMainApi.exportProductionMainPredictSparePart(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
--- a/src/views/wms/productionManage/productionplan/qadproductionplan/index.vue
+++ b/src/views/wms/productionManage/productionplan/qadproductionplan/index.vue
@ -214,8 +214,9 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    const data = await QadProductionPlanMainApi.exportQadProductionPlanMain(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
--- a/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
+++ b/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
@ -246,8 +246,9 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    const data = await ProductputawayJobMainApi.exportProductputawayJobMain(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
--- a/src/views/wms/productionManage/productputaway/productputawayRecordMain/index.vue
+++ b/src/views/wms/productionManage/productputaway/productputawayRecordMain/index.vue
@ -156,8 +156,9 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    const data = await ProductputawayRecordMainApi.exportProductputawayRecordMain(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
--- a/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue
+++ b/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue
@ -342,8 +342,9 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    const data = await ProductputawayRequestMainApi.exportProductputawayRequestMain(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
--- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/index.vue
+++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/index.vue
@ -249,8 +249,9 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    const data = await ProductputawayJobMainApi.exportProductputawayJobMain(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
--- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/index.vue
+++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/index.vue
@ -156,8 +156,9 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    const data = await ProductputawayRecordMainApi.exportProductputawayRecordMain(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
--- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue
+++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue
@ -344,8 +344,9 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    const data = await ProductputawayRequestMainApi.exportProductputawayRequestMainAssemble(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
--- a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue
+++ b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue
@ -350,8 +350,9 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    const data = await ProductreceiptJobMainApi.exportProductreceiptJobMain(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
--- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue
@ -294,8 +294,9 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    const data = await ProductreceiptRecordMainApi.exportProductreceiptRecordMain(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
--- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
@ -577,8 +577,9 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    const data = await ProductreceiptRequestMainApi.exportProductreceiptRequestMain(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
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue
@ -290,8 +290,9 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    const data = await ProductreceiptJobMainApi.exportProductreceiptJobMainAssemble(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
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue
@ -358,8 +358,9 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    const data = await ProductreceiptRecordMainApi.exportProductreceiptRecordAssembleMain(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
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
@ -576,8 +576,9 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    const data = await ProductreceiptRequestMainApi.exportProductreceiptRequestMainAssemble(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
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue
@ -287,8 +287,9 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    const data = await ProductreceiptJobMainApi.exportProductreceiptJobMain(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
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue
@ -199,8 +199,9 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
    const data = await ProductreceiptRecordMainApi.exportProductreceiptRecordMain(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
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
@ -99,6 +99,9 @@
  <Detail
    ref="detailRef"
    :isBasic="false"
+    :detailButtonIsShowAdd="false"
+    :detailButtonIsShowEdit="false"
+    :detailButtonIsShowDelete="false"
    :allSchemas="PurchasereturnRequestMain.allSchemas"
    :detailAllSchemas="PurchasereturnRequestDetail.allSchemas"
    :detailAllSchemasRules="PurchasereturnRequestDetailRules"
@ -154,7 +157,7 @@ import {
  PurchasereturnRequestDetail,
  PurchasereturnRequestDetailRules,
  PurchasereReturnRequestDetailLabel
-} from '../purchasereturnRequestMain/purchasereturnRequestMain.data'
+} from './purchasereturnRequestMain.data'
 import * as PurchasereturnRequestMainApi from '@/api/wms/purchasereturnRequestMain'
 import * as PurchasereturnRequestDetailApi from '@/api/wms/purchasereturnRequestDetail'
 import * as PurchasereceiptRecordDetailApi from '@/api/wms/purchasereceiptRecordDetail'
@ -809,7 +812,7 @@ const onChangeForm = async (field, cur, formRef)=>{
        'batch':item['batch'],
        'status':item['inventoryStatus'],
        'inventoryBalance':item['qty'],
-        'qty':1,
+        'qty':0,
        'reason_type':'',
        'reason':''
      }))
@ -904,11 +907,19 @@ const submitForm = async (formType, submitData) => {
  //   message.warning("退货数量不能大于收获数量")
  //   return;
  // }
-  if (tableData.value.find((item) => item['qty']> item['inventoryBalance'])) {
+  if (tableData.value.find((item) => Number(item['qty'])> Number(item['inventoryBalance']))) {
    message.warning('退货数量不能大于库存余额')
    return
  }
-  data.subList = tableData.value.filter(item=>item['qty']>0) // 拼接子表数据参数
+  console.log(tableData.value)
+  data.subList = tableData.value.filter(item=>Number(item['qty'])>0) // 拼接子表数据参数
+  console.log('data.subList')
+  console.log(data.subList)
+
+  if(data.subList.length<1){
+    message.warning('至少有一条数据')
+    return
+  }
  formRef.value.formLoading = true
  try {
    if (formType === 'create') {
@ -917,7 +928,7 @@ const submitForm = async (formType, submitData) => {
      message.success(t('common.createSuccess'))
    } else {
      data.returnSourceType='1'
-      await PurchasereturnRequestMainApi.updatePurchasereturnRequestMain(data)
+      await PurchasereturnRequestMainApi.updatePurchasereturnRequestMainNew(data)
      message.success(t('common.updateSuccess'))
    }
    formRef.value.dialogVisible = false
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMain.data.ts
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMainNew.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMainNew.data.ts
@ -546,7 +546,7 @@ export const PurchasereturnRequestDetailNew = useCrudSchemas(reactive<CrudSchema
  {
    label: '退货原因',
    field: 'reasonType',
-    dictType: DICT_TYPE.UOM,
+    dictType: DICT_TYPE.RETURN_REASON_TYPE,
    dictClass: 'string',
    // isSearch: true,
    isTable: true,
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
@ -1175,9 +1175,19 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
    isTable: false,
    isSearch: false,
    isDetail: true,
-    detail:{
-      span:2
-    }
+    // detail:{
+    //   span:2
+    // }
+  },
+  {
+    label: '工厂地点',
+    field: 'siteId',
+    sort: 'custom',
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
  },
  {
    label: '税额差异（税额-系统税额）',
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@ -1401,6 +1401,14 @@ const getLoginUserRoleList = async () => {

 /** 初始化 **/
 onMounted(async () => {
+  
+  SupplierinvoiceRequestMain.allSchemas.formSchema.forEach(async item=>{
+    if(item.field == 'procurementCreator'){
+      //采购审批人
+      const procurementCreators = await SupplierinvoiceRequestMainApi.queryUserInfoByRoleCode({ roleCode: 'purchase',pageSize: 1000,pageNo: 1,sort: '',by: 'ASC' })
+      item.componentProps.options = procurementCreators.list
+    }
+  })
  getList()
  getDefaultSupplier()
  getLoginUserRoleList()
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@ -29,7 +29,7 @@ const requestsettingData = data?.list[0] || {}
 userDept.id = userDept.id.toString()
 const userDeptArray:any = [userDept]

-const procurementCreators = await SupplierinvoiceRequestMainApi.queryUserInfoByRoleCode({ roleCode: 'purchase',pageSize: 1000,pageNo: 1,sort: '',by: 'ASC' })
+// const procurementCreators = await SupplierinvoiceRequestMainApi.queryUserInfoByRoleCode({ roleCode: 'purchase',pageSize: 1000,pageNo: 1,sort: '',by: 'ASC' })
 /**
 * @returns {Array} 采购员列表
 */
@ -809,8 +809,9 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
    isDetail:false,
    form: {
      component: 'Select',
-      api: () => procurementCreators.list,
+      // api: () => procurementCreators.list,
      componentProps: {
+        options:[],
        optionsAlias: {
          labelField: 'nickname',
          valueField: 'id'
@ -1474,15 +1475,24 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
    label: '备注',
    field: 'remark',
    sort: 'custom',
-   
    sortTableDefault: 6,
    isForm: false,
    isTable: false,
    isSearch: false,
    isDetail: true,
-    detail:{
-      span:2
-    }
+    // detail:{
+    //   span:2
+    // }
+  },
+  {
+    label: '工厂地点',
+    field: 'siteId',
+    sort: 'custom',
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
  },
  {
    label: '税额差异（税额-系统税额）',
@ -1496,6 +1506,7 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
    isDetail: true,
  },
  
+
 ]))

 const singlePriceFormart = (row, column, cellValue) => {
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts
@ -1496,9 +1496,19 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
    isTable: false,
    isSearch: false,
    isDetail: true,
-    detail:{
-      span:2
-    }
+    // detail:{
+    //   span:2
+    // }
+  },
+  {
+    label: '工厂地点',
+    field: 'siteId',
+    sort: 'custom',
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
  },
  {
    label: '税额差异（税额-系统税额）',