Merge remote-tracking branch 'origin/hella_online_20240803' into hella_online_20240803

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
 }

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) => {

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',  // 采购退货原因类型
 }

src/views/qms/inspectionRequest/index.vue

@@ -88,6 +88,17 @@
       @ListTableSubmit="ListTableSubmit"
     />
   </div>
+
+    <el-dialog
+    v-model="showQualityReport"
+    :title="t('质检明细')"
+    :append-to-body="false"
+    destroy-on-close
+    fullscreen
+  >
+    <iframe :height="reportHeight" width="100%" :src="qualityReport" frameborder="0"></iframe>
+  </el-dialog>
+
 </template>
 
 <script setup lang="ts">
@@ -105,6 +116,7 @@ import ListTable from '@/components/ListTable/src/ListTable.vue'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import { formatDate } from '@/utils/formatTime'
+import { getReportUrl } from '@/utils/systemParam'
 // import { InspectionJobPackage} from '../inspectionJob/inspectionJobMain.data'
 
 defineOptions({ name: 'inspectionMain' })
@@ -226,7 +238,8 @@ const butttondata = (row) => {
     defaultButtons.mainListEditBtn({
       hide: isShowMainButton(row, ['1']),
       hasPermi: 'qms:inspection-request-main:edit'
-    }) // 编辑
+    }),// 编辑
+    defaultButtons.mainListPlanCheckQualityReportBtn({}) // 查看质检报告
   ]
 }
 const listTableRef = ref()
@@ -263,6 +276,9 @@ const buttonTableClick = async (val, row) => {
       '包装信息',
       InspectionRequestPackage.allSchemas.tableColumns
     )
+  }else if (val == 'mainPlanCheckQualityReport') {
+    // 查看质检报告
+    checkQualityReport(row)
   } 
 }
 
@@ -350,6 +366,15 @@ const handleSubmit = async (id: number) => {
   }
 }
 
+// 查看质检报告
+const reportHeight = ref(window.innerHeight - 120)
+const showQualityReport = ref(false)
+const qualityReport = ref('')
+const checkQualityReport = async (row) => {
+  showQualityReport.value = true
+  qualityReport.value = getReportUrl() + '/purchasereceiptReport?asnNumber=' + row.asnNumber
+}
+
 /** 添加/修改操作 */
 const formRef = ref()
 const openForm = async (type: string, row?: number) => {

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

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

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

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

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

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

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

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

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

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 {

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 {

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

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

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

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

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

src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue

@@ -411,8 +411,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

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

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

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

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

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

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

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

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: '创建者',

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',

src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue

@@ -483,7 +483,8 @@ const handleHandle = async (id: number) => {
 
 /** 添加/修改操作 */
 const formRef = ref()
-const openForm = async (type: string, row?: number) => {
+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
@@ -491,6 +492,60 @@ const openForm = async (type: string, row?: number) => {
         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)
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts

@@ -992,7 +992,7 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
     label: '备注',
     field: 'remark',
     sort: 'custom',
-    sortTableDefault:1002,
+    sortTableDefault:1000,
     table: {
       width: 150
     },
@@ -1000,7 +1000,7 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
   {
     label: '创建时间',
     field: 'createTime',
-    sortTableDefault:1000,
+    sortTableDefault:1001,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -1018,6 +1018,7 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
         valueFormat: 'x',
       }
     },
+    hiddenInMain:false,
     isTableForm: false,
     isForm: false
   },
@@ -1025,10 +1026,11 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
     label: '创建者',
     field: 'creator',
     sort: 'custom',
-    sortTableDefault:1001,
+    sortTableDefault:1002,
     table: {
       width: 150
     },
+    hiddenInMain:false,
     isTableForm: false,
     isForm: false
   },

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

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

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`)
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
-  } catch {
   } finally {
     exportLoading.value = false
   }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue

@@ -554,8 +554,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

src/views/wms/productionManage/productredress/productredressJobMain/index.vue

@@ -195,8 +195,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await ProductredressJobMainApi.exportProductredressJobMain(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

src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts

@@ -383,7 +383,7 @@ export const ProductredressJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isTable:true,
+    isTable:false,
     isForm: false,
   },
   {
@@ -397,7 +397,7 @@ export const ProductredressJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    isTable:true,
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -668,16 +668,6 @@ export const ProductredressJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isTable:false,
     hiddenInMain:true,
   },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:true,
-    hiddenInMain:true,
-  },
   {
     label: '创建时间',
     field: 'createTime',
@@ -690,7 +680,7 @@ export const ProductredressJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 180
     },
     isTable:true,
-    hiddenInMain:true,
+    hiddenInMain:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -702,6 +692,16 @@ export const ProductredressJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isForm: false
   },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:true,
+    hiddenInMain:false,
+  },
   {
     label: '最后更新者',
     field: 'updater',

src/views/wms/productionManage/productredress/productredressRecordMain/index.vue

@@ -139,8 +139,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await ProductredressRecordMainApi.exportProductredressRecordMain(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

src/views/wms/productionManage/productredress/productredressRequestMain/index.vue

@@ -382,8 +382,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await ProductredressRequestMainApi.exportProductredressRequestMain(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

src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts

@@ -334,7 +334,7 @@ export const ProductredressRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'creator',
     sort: 'custom',
     isForm: false,
-    isTable: true,
+    isTable: false,
     table: {
       width: 150
     },
@@ -350,7 +350,7 @@ export const ProductredressRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    isTable: true,
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -700,18 +700,7 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
   //   isTable:false,
   //   hiddenInMain:true
   // },
-  {
+  
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false,
-    isTable:true,
-    hiddenInMain:true
-  },
   {
     label: '创建时间',
     field: 'createTime',
@@ -724,7 +713,7 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 180
     },
     isTable:true,
-    hiddenInMain:true,
+    hiddenInMain:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -737,6 +726,18 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     isTableForm: false,
     isForm: false
   },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    isTable:true,
+    hiddenInMain:false
+  },
   {
     label: '最后更新者',
     field: 'updater',

src/views/wms/productionManage/productrepair/productrepairRecordMain/index.vue

@@ -265,8 +265,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await ProductrepairRecordMainApi.exportProductrepairRecordMain(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

src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts

@@ -197,15 +197,6 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isTable: false
   },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: true
-  },
   {
     label: '创建时间',
     field: 'createTime',
@@ -236,6 +227,15 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: true
+  },
   {
     label: '最后更新时间',
     field: 'updateTime',

src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue

@@ -575,8 +575,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await ProductrepairRequestMainApi.exportProductrepairRequestMain(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

src/views/wms/productionManage/productscrap/productscrapJobMain/index.vue

@@ -223,8 +223,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await ProductscrapJobMainApi.exportProductscrapJobMain(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

src/views/wms/productionManage/productscrap/productscrapRecordMain/index.vue

@@ -266,8 +266,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await ProductscrapRecordMainApi.exportProductscrapRecordMain(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

src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue

@@ -728,8 +728,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await ProductscrapRequestMainApi.exportProductscrapRequestMain(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

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'
@@ -807,12 +810,14 @@ const onChangeForm = async (field, cur, formRef)=>{
     if(subList&&subList.length>0){
       tableData.value = subList.map(item=>({
         'batch':item['batch'],
-        'status':item['inventoryStatus'],
+        'inventoryStatus':item['inventoryStatus'],
         'inventoryBalance':item['qty'],
-        'qty':1,
+        'qty':0,
         'reason_type':'',
         'reason':''
       }))
+    }else{
+      tableData.value = []
     }
   }
 }
@@ -904,11 +909,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 +930,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

src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMainNew.data.ts

@@ -254,6 +254,7 @@ export const PurchasereturnRequestMainNew = useCrudSchemas(
       },
       form: {
         component: 'Select',
+        value:locationList[0]['value'],
         componentProps: {
           options: locationList
         }
@@ -546,7 +547,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,

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:{
+    // detail:{
-      span:2
+    //   span:2
-    }
+    // }
+  },
+  {
+    label: '工厂地点',
+    field: 'siteId',
+    sort: 'custom',
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
   },
   {
     label: '税额差异（税额-系统税额）',

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()

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:{
+    // detail:{
-      span:2
+    //   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) => {

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:{
+    // detail:{
-      span:2
+    //   span:2
-    }
+    // }
+  },
+  {
+    label: '工厂地点',
+    field: 'siteId',
+    sort: 'custom',
+    sortTableDefault: 6,
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
   },
   {
     label: '税额差异（税额-系统税额）',