From ce612c0b3f932859680b6c974c191094f0493c30 Mon Sep 17 00:00:00 2001
From: ljlong_2630 <ljlong_2630@yeah.net>
Date: Fri, 16 Aug 2024 19:34:39 +0800
Subject: [PATCH 01/37] =?UTF-8?q?=E7=BC=BA=E9=99=B7=EF=BC=9AHL-5009?=
 =?UTF-8?q?=EF=BC=8C=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=98=BE=E7=A4=BA=E5=92=8C?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E9=83=BD=E5=BA=94=E8=AF=A5=E6=9C=89=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E4=BA=BA=E5=92=8C=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=EF=BC=8C=E8=A1=A5=E5=85=85=EF=BC=9A=E5=B7=B2=E6=94=B9=E5=88=B0?=
 =?UTF-8?q?=E5=88=B6=E5=93=81=E8=BF=94=E4=BF=AE-=E5=88=B6=E5=93=81?=
 =?UTF-8?q?=E8=BF=94=E4=BF=AE=E8=AE=B0=E5=BD=95=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productdismantleRequestMain.data.ts       |  8 +++--
 .../productredressJobMain.data.ts             | 26 ++++++++--------
 .../productredressRequestMain.data.ts         | 31 ++++++++++---------
 .../productrepairRecordMain.data.ts           | 18 +++++------
 4 files changed, 43 insertions(+), 40 deletions(-)

diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
index 19a0dd669..ba0d74fb2 100644
--- a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
+++ b/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
   },
diff --git a/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts b/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts
index 89d853a3d..35d0113d7 100644
--- a/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts
+++ b/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',
diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts b/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts
index 044ab68e6..a20b2301f 100644
--- a/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts
+++ b/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: {
@@ -688,18 +688,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',
@@ -712,7 +701,7 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 180
     },
     isTable:true,
-    hiddenInMain:true,
+    hiddenInMain:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -725,6 +714,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',
diff --git a/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts b/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts
index 18eaba2c4..7e3d1b89a 100644
--- a/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts
+++ b/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',

From a222f159b5e99113712d9053f9520f3d98f11459 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Fri, 16 Aug 2024 19:37:14 +0800
Subject: [PATCH 02/37] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productreceiptscrapRequestMain/index.vue                   | 3 ++-
 .../productredress/productredressJobMain/index.vue             | 3 ++-
 .../productredress/productredressRecordMain/index.vue          | 3 ++-
 .../productredress/productredressRequestMain/index.vue         | 3 ++-
 .../productrepair/productrepairRecordMain/index.vue            | 3 ++-
 .../productrepair/productrepairRequestMain/index.vue           | 3 ++-
 .../productscrap/productscrapJobMain/index.vue                 | 3 ++-
 .../productscrap/productscrapRecordMain/index.vue              | 3 ++-
 .../productscrap/productscrapRequestMain/index.vue             | 3 ++-
 9 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
index 5a386df07..4b9ad9fd4 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
+++ b/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
diff --git a/src/views/wms/productionManage/productredress/productredressJobMain/index.vue b/src/views/wms/productionManage/productredress/productredressJobMain/index.vue
index 80c0ff2ff..b11c354cf 100644
--- a/src/views/wms/productionManage/productredress/productredressJobMain/index.vue
+++ b/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
diff --git a/src/views/wms/productionManage/productredress/productredressRecordMain/index.vue b/src/views/wms/productionManage/productredress/productredressRecordMain/index.vue
index c4c8cc8e4..da2fc8db2 100644
--- a/src/views/wms/productionManage/productredress/productredressRecordMain/index.vue
+++ b/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
diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue b/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue
index 6f0ab4500..c73a1a9a4 100644
--- a/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue
+++ b/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
diff --git a/src/views/wms/productionManage/productrepair/productrepairRecordMain/index.vue b/src/views/wms/productionManage/productrepair/productrepairRecordMain/index.vue
index 848994c16..6ba640900 100644
--- a/src/views/wms/productionManage/productrepair/productrepairRecordMain/index.vue
+++ b/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
diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
index 542181a69..14037bb28 100644
--- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
+++ b/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
diff --git a/src/views/wms/productionManage/productscrap/productscrapJobMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapJobMain/index.vue
index ce2845cca..f6be26c1b 100644
--- a/src/views/wms/productionManage/productscrap/productscrapJobMain/index.vue
+++ b/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
diff --git a/src/views/wms/productionManage/productscrap/productscrapRecordMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRecordMain/index.vue
index 68546914a..4babb15c9 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRecordMain/index.vue
+++ b/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
diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
index 276ccdda9..3772e2435 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
+++ b/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

From bbe0011222a552beaee65af2f0ce1efd32a57e16 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 16 Aug 2024 19:58:02 +0800
Subject: [PATCH 03/37] =?UTF-8?q?=E6=96=B0=E7=89=88=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E9=80=80=E8=B4=A7=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereturn/purchasereturnRequestMainNew/index.vue     | 4 +++-
 .../purchasereturnRequestMainNew.data.ts                      | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
index 1805e5bf4..d065fb8d6 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
@@ -810,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':0,
         'reason_type':'',
         'reason':''
       }))
+    }else{
+      tableData.value = []
     }
   }
 }
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMainNew.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMainNew.data.ts
index f904e74ff..e1eb42507 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMainNew.data.ts
+++ b/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
         }

From 45b1bc1b5f8c9a5e9e115afd0a811b3e6467a8c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com>
Date: Fri, 16 Aug 2024 20:15:42 +0800
Subject: [PATCH 04/37] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A3=80=E9=AA=8C?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E7=9A=84=E8=B4=A8=E6=A3=80=E6=8A=A5=E5=91=8A?=
 =?UTF-8?q?=20HL-5363?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qms/inspectionRequest/index.vue | 29 +++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/views/qms/inspectionRequest/index.vue b/src/views/qms/inspectionRequest/index.vue
index a50c38cee..4e6ea8443 100644
--- a/src/views/qms/inspectionRequest/index.vue
+++ b/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,7 +276,10 @@ 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) => {

From 47b0363b4a13ba7bff929ae45e43e235cccb12bd Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Fri, 16 Aug 2024 20:27:45 +0800
Subject: [PATCH 05/37] =?UTF-8?q?WMS=20bug=EF=BC=9AHL-5158=EF=BC=9A?=
 =?UTF-8?q?=E9=9A=94=E7=A6=BB=E8=BD=AC=E5=90=88=E6=A0=BC,=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E9=9A=94=E7=A6=BB,=E5=BA=93=E5=AD=98=E7=A7=BB?=
 =?UTF-8?q?=E5=8A=A8=E7=9B=B8=E5=85=B3=E7=94=B3=E8=AF=B7,=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1,=E8=AE=B0=E5=BD=95=E5=85=A8=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E7=94=A8businessType=E6=9D=A5=E7=AD=9B=E9=80=89=E3=80=82?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2,=E9=AB=98=E7=BA=A7=E6=9F=A5=E8=AF=A2,?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inventorymoveJobMain/index.vue            |  62 ++++++-----
 .../inventorymoveRecordMain/index.vue         |  82 ++++++++------
 .../inventorymoveRequestMain/index.vue        | 102 +++++++++--------
 .../inventorymoveRequestMainMOVE/index.vue    | 104 ++++++++++--------
 .../inventorymoveRequestMainOKHOLD/index.vue  | 102 +++++++++--------
 5 files changed, 262 insertions(+), 190 deletions(-)

diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue
index 37b59e638..cd055e2fa 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue
@@ -142,67 +142,70 @@ const importFileName = ref()
  */
  if ( routeName.value == 'OktoholdJobMain') {
   tableObject.params = {
-    fromInventoryStatus: 'OK',
-    toInventoryStatus:'HOLD',
+    // fromInventoryStatus: 'OK',
+    // toInventoryStatus:'HOLD',
     businessType :'OkToHold'
   }
-  fromInventoryStatus.value = 'OK'
-  toInventoryStatus.value = "HOLD"
+  // fromInventoryStatus.value = 'OK'
+  // toInventoryStatus.value = "HOLD"
   businessType.value = 'OkToHold'
   importFileName.value = '合格转隔离任务'
 } else if ( routeName.value == 'NoktoholdJobMain') {
   tableObject.params = {
-    fromInventoryStatus: 'NOK',
-    toInventoryStatus:'HOLD',
+    // fromInventoryStatus: 'NOK',
+    // toInventoryStatus:'HOLD',
     businessType :'NokToHold'
   }
-  fromInventoryStatus.value = 'NOK'
-  toInventoryStatus.value = "HOLD"
+  // fromInventoryStatus.value = 'NOK'
+  // toInventoryStatus.value = "HOLD"
   businessType.value = 'NokToHold'
   importFileName.value = '不合格转隔离任务'
 } else if ( routeName.value == 'HoldtookJobMain') {
   tableObject.params = {
-    fromInventoryStatus: 'HOLD',
-    toInventoryStatus:'OK',
+    // fromInventoryStatus: 'HOLD',
+    // toInventoryStatus:'OK',
     businessType :'HoldToOk'
   }
-  fromInventoryStatus.value = 'HOLD'
-  toInventoryStatus.value = "OK"
+  // fromInventoryStatus.value = 'HOLD'
+  // toInventoryStatus.value = "OK"
   businessType.value = 'HoldToOk'
   importFileName.value = '隔离转合格任务'
 } else if ( routeName.value == 'HoldtoscrapJobMain') {
   tableObject.params = {
-    fromInventoryStatus: 'HOLD',
-    toInventoryStatus:'SCRAP',
+    // fromInventoryStatus: 'HOLD',
+    // toInventoryStatus:'SCRAP',
     businessType:'HoldToScrap'
   }
-  fromInventoryStatus.value = 'HOLD'
-  toInventoryStatus.value = "SCRAP"
+  // fromInventoryStatus.value = 'HOLD'
+  // toInventoryStatus.value = "SCRAP"
   businessType.value = 'HoldToScrap'
   importFileName.value = '隔离转报废任务'
 } else if ( routeName.value == 'OktoscrapJobMain') {
   tableObject.params = {
-    fromInventoryStatus: 'OK',
-    toInventoryStatus:'SCRAP',
+    // fromInventoryStatus: 'OK',
+    // toInventoryStatus:'SCRAP',
     businessType :'OkToScrap'
   }
-  fromInventoryStatus.value = 'OK'
-  toInventoryStatus.value = "SCRAP"
+  // fromInventoryStatus.value = 'OK'
+  // toInventoryStatus.value = "SCRAP"
   businessType.value = 'OkToScrap'
   importFileName.value = '合格转报废任务'
 } else if ( routeName.value == 'ScraptoholdJobMain') {
   tableObject.params = {
-    fromInventoryStatus: 'SCRAP',
-    toInventoryStatus:'HOLD',
+    // fromInventoryStatus: 'SCRAP',
+    // toInventoryStatus:'HOLD',
     businessType :'ScrapToHold'
   }
-  fromInventoryStatus.value = 'SCRAP'
-  toInventoryStatus.value = "HOLD"
+  // fromInventoryStatus.value = 'SCRAP'
+  // toInventoryStatus.value = "HOLD"
   businessType.value = 'ScrapToHold'
   importFileName.value = '报废转隔离任务'
 } else {
   console.log(146 , fromInventoryStatus.value)
-  fromInventoryStatus.value = null
+  tableObject.params = {
+     businessType :'Move'
+  }
+  // fromInventoryStatus.value = null
   businessType.value = 'Move'
   importFileName.value = '库存移动任务'
 }
@@ -332,6 +335,15 @@ const handleExport = async () => {
 
 // 筛选提交
 const searchFormClick = (searchData) => {
+  const cmd = {
+    'column':'businessType',
+    'action':'==',
+    'value':businessType.value
+  }
+  if (!Array.isArray(searchData.filters)) {
+    searchData.filters = [];
+  }
+  searchData.filters.push(cmd)
   tableObject.params = {
     isSearch: true,
     filters: searchData.filters
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue
index 265b41b9f..b8f62ebf4 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue
@@ -103,61 +103,68 @@ const { tableObject, tableMethods } = useTable({
  */
  if ( routeName.value == 'OktoholdRecordMain') {
   tableObject.params = {
-    fromInventoryStatus: 'OK',
-    toInventoryStatus: 'HOLD',
+    // fromInventoryStatus: 'OK',
+    // toInventoryStatus: 'HOLD',
     businessType:'OkToHold'
   }
-  fromInventoryStatus.value = 'OK'
-  toInventoryStatus.value = "HOLD"
-  importFileName.value = '合格转隔离记录'
-} else if ( routeName.value == 'NoktoholdRecordMain') {
+  // fromInventoryStatus.value = 'OK'
+  // toInventoryStatus.value = "HOLD"
+   businessType.value = 'OkToHold'
+   importFileName.value = '合格转隔离记录'
+ } else if ( routeName.value == 'NoktoholdRecordMain') {
   tableObject.params = {
-    fromInventoryStatus: 'NOK',
-    toInventoryStatus:'HOLD',
+    // fromInventoryStatus: 'NOK',
+    // toInventoryStatus:'HOLD',
     businessType:'NoktoHold'
   }
-  fromInventoryStatus.value = 'NOK'
-  toInventoryStatus.value = "HOLD"
-  importFileName.value = '不合格转隔离记录'
+  // fromInventoryStatus.value = 'NOK'
+  // toInventoryStatus.value = "HOLD"
+   businessType.value = 'NoktoHold'
+   importFileName.value = '不合格转隔离记录'
 }else if ( routeName.value == 'HoldtookRecordMain') {
   tableObject.params = {
-    fromInventoryStatus: 'HOLD',
-    toInventoryStatus:'OK',
+    // fromInventoryStatus: 'HOLD',
+    // toInventoryStatus:'OK',
     businessType:'HoldtoOk'
   }
-  fromInventoryStatus.value = 'HOLD'
-  toInventoryStatus.value = "OK"
-  importFileName.value = '隔离转合格记录'
+  // fromInventoryStatus.value = 'HOLD'
+  // toInventoryStatus.value = "OK"
+   businessType.value = 'HoldtoOk'
+   importFileName.value = '隔离转合格记录'
 } else if ( routeName.value == 'HoldtoscrapRecordMain') {
   tableObject.params = {
-    fromInventoryStatus: 'HOLD',
-    toInventoryStatus:'SCRAP',
+    // fromInventoryStatus: 'HOLD',
+    // toInventoryStatus:'SCRAP',
     businessType:'HoldtoScrap'
   }
-  fromInventoryStatus.value = 'HOLD'
-  toInventoryStatus.value = "SCRAP"
-  importFileName.value = '隔离转报废记录'
+  // fromInventoryStatus.value = 'HOLD'
+  // toInventoryStatus.value = "SCRAP"
+   businessType.value = 'HoldtoScrap'
+   importFileName.value = '隔离转报废记录'
 } else if ( routeName.value == 'OktoscrapRecordMain') {
   tableObject.params = {
-    fromInventoryStatus: 'OK',
-    toInventoryStatus:'SCRAP',
+    // fromInventoryStatus: 'OK',
+    // toInventoryStatus:'SCRAP',
     businessType:'OktoScrap'
   }
-  fromInventoryStatus.value = 'OK'
-  toInventoryStatus.value = "SCRAP"
-  importFileName.value = '合格转报废记录'
+  // fromInventoryStatus.value = 'OK'
+  // toInventoryStatus.value = "SCRAP"
+   businessType.value = 'OktoScrap'
+   importFileName.value = '合格转报废记录'
 } else if ( routeName.value == 'ScraptoholdRecordMain') {
   tableObject.params = {
-    fromInventoryStatus: 'SCRAP',
-    toInventoryStatus:'HOLD',
+    // fromInventoryStatus: 'SCRAP',
+    // toInventoryStatus:'HOLD',
     businessType:'ScraptoHold'
   }
-  fromInventoryStatus.value = 'SCRAP'
-  toInventoryStatus.value = "HOLD"
-  importFileName.value = '报废转隔离记录'
+  // fromInventoryStatus.value = 'SCRAP'
+  // toInventoryStatus.value = "HOLD"
+   businessType.value = 'ScraptoHold'
+   importFileName.value = '报废转隔离记录'
 } else {
-   console.log(146, fromInventoryStatus.value)
-   fromInventoryStatus.value = null
+   tableObject.params = {
+     businessType :'Move'
+   }
    businessType.value = 'Move'
    importFileName.value = '库存移动记录'
 
@@ -281,6 +288,15 @@ const importSuccess = () => {
 
 // 筛选提交
 const searchFormClick = (searchData) => {
+  const cmd = {
+    'column':'businessType',
+    'action':'==',
+    'value':businessType.value
+  }
+  if (!Array.isArray(searchData.filters)) {
+    searchData.filters = [];
+  }
+  searchData.filters.push(cmd)
   tableObject.params = {
     isSearch: true,
     filters: searchData.filters
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
index d51adbb4f..e238a8a53 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
@@ -115,73 +115,78 @@ const { tableObject, tableMethods } = useTable({
 /**
  * OktoholdRequestMain 合格转隔离
  */
- if ( routeName.value == 'OktoholdRequestMain') {
+if ( routeName.value == 'OktoholdRequestMain') {
   tableObject.params = {
-    toInventoryStatus:'HOLD'
+    // fromInventoryStatus: 'OK',
+    // toInventoryStatus:'HOLD',
+    businessType :'OkToHold'
   }
-  toInventoryStatus.value = "HOLD"
+  // fromInventoryStatus.value = 'OK'
+  // toInventoryStatus.value = "HOLD"
   businessType.value = 'OkToHold'
   importFileName.value = '物料转隔离申请'
 }
-// else if ( routeName.value == 'NoktoholdRequestMain') {
-//   tableObject.params = {
-//     fromInventoryStatus: 'NOK',
-//     toInventoryStatus:'HOLD'
-//   }
-//   fromInventoryStatus.value = 'NOK'
-//   toInventoryStatus.value = "HOLD"
-//   businessType.value = 'NokToHold'
-//   importFileName.value = '不合格转隔离申请'
-// }
- else if ( routeName.value == 'HoldtookRequestMain') {
+else if ( routeName.value == 'NoktoholdRequestMain') {
   tableObject.params = {
-    fromInventoryStatus: 'HOLD',
-    toInventoryStatus:'OK'
+    // fromInventoryStatus: 'NOK',
+    // toInventoryStatus:'HOLD',
+    businessType :'NokToHold'
   }
-  fromInventoryStatus.value = 'HOLD'
-  toInventoryStatus.value = "OK"
+  // fromInventoryStatus.value = 'NOK'
+  // toInventoryStatus.value = "HOLD"
+  businessType.value = 'NokToHold'
+  importFileName.value = '不合格转隔离申请'
+}
+else if ( routeName.value == 'HoldtookRequestMain') {
+  tableObject.params = {
+    // fromInventoryStatus: 'HOLD',
+    // toInventoryStatus:'OK',
+    businessType :'HoldToOk'
+  }
+  // fromInventoryStatus.value = 'HOLD'
+  // toInventoryStatus.value = "OK"
   businessType.value = 'HoldToOk'
   importFileName.value = '隔离转合格申请'
 } else if ( routeName.value == 'HoldtoscrapRequestMain') {
   tableObject.params = {
-    fromInventoryStatus: 'HOLD',
-    toInventoryStatus:'SCRAP'
+    // fromInventoryStatus: 'HOLD',
+    // toInventoryStatus:'SCRAP',
+    businessType:'HoldToScrap'
   }
-  fromInventoryStatus.value = 'HOLD'
-  toInventoryStatus.value = "SCRAP"
+  // fromInventoryStatus.value = 'HOLD'
+  // toInventoryStatus.value = "SCRAP"
   businessType.value = 'HoldToScrap'
   importFileName.value = '隔离转报废申请'
 } else if ( routeName.value == 'OktoscrapRequestMain') {
   tableObject.params = {
-    fromInventoryStatus: 'OK',
-    toInventoryStatus:'SCRAP'
+    // fromInventoryStatus: 'OK',
+    // toInventoryStatus:'SCRAP',
+    businessType :'OkToScrap'
   }
-  fromInventoryStatus.value = 'OK'
-  toInventoryStatus.value = "SCRAP"
+  // fromInventoryStatus.value = 'OK'
+  // toInventoryStatus.value = "SCRAP"
   businessType.value = 'OkToScrap'
   importFileName.value = '合格转报废申请'
-} 
-// else if ( routeName.value == 'ScraptoholdRequestMain') {
-//   tableObject.params = {
-//     fromInventoryStatus: 'SCRAP',
-//     toInventoryStatus:'HOLD'
-//   }
-//   fromInventoryStatus.value = 'SCRAP'
-//   toInventoryStatus.value = "HOLD"
-//   businessType.value = 'ScrapToHold'
-//   importFileName.value = '报废转隔离申请'
-// } 
-else if( routeName.value == 'InventorymoveRequestMain'){
-  fromInventoryStatus.value = null
-  businessType.value = 'Move'
-  importFileName.value = '库存移动申请'
-}else {
+}
+else if ( routeName.value == 'ScraptoholdRequestMain') {
   tableObject.params = {
-    fromInventoryStatus: 'OK',
-    toInventoryStatus:'SCRAP'
+    // fromInventoryStatus: 'SCRAP',
+    // toInventoryStatus:'HOLD',
+    businessType :'ScrapToHold'
   }
+  // fromInventoryStatus.value = 'SCRAP'
+  // toInventoryStatus.value = "HOLD"
+  businessType.value = 'ScrapToHold'
+  importFileName.value = '报废转隔离申请'
+} else {
+  tableObject.params = {
+    businessType :'Move'
+  }
+  businessType.value = 'Move'
+  importFileName.value = '库存移动申请'
 }
 console.log(99 ,  businessType.value)
+
 InventorymoveRequestMain.allSchemas.tableFormColumns.map(item =>{
   if(item.field == 'fromWarehouseCode') {
     if (fromInventoryStatus.value) {
@@ -789,6 +794,15 @@ const importSuccess = () => {
 
 // 筛选提交
 const searchFormClick = (searchData) => {
+  const cmd = {
+    'column':'businessType',
+    'action':'==',
+    'value':businessType.value
+  }
+  if (!Array.isArray(searchData.filters)) {
+    searchData.filters = [];
+  }
+  searchData.filters.push(cmd)
   tableObject.params = {
     isSearch: true,
     filters: searchData.filters
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue
index d58c2c9f7..8def5a68b 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue
@@ -116,73 +116,80 @@ const { tableObject, tableMethods } = useTable({
 /**
  * OktoholdRequestMain 合格转隔离
  */
- if ( routeName.value == 'OktoholdRequestMain') {
+if ( routeName.value == 'OktoholdRequestMain') {
   tableObject.params = {
-    toInventoryStatus:'HOLD'
+    // fromInventoryStatus: 'OK',
+    // toInventoryStatus:'HOLD',
+    businessType :'OkToHold'
   }
-  toInventoryStatus.value = "HOLD"
+  // fromInventoryStatus.value = 'OK'
+  // toInventoryStatus.value = "HOLD"
   businessType.value = 'OkToHold'
   importFileName.value = '物料转隔离申请'
 }
-// else if ( routeName.value == 'NoktoholdRequestMain') {
-//   tableObject.params = {
-//     fromInventoryStatus: 'NOK',
-//     toInventoryStatus:'HOLD'
-//   }
-//   fromInventoryStatus.value = 'NOK'
-//   toInventoryStatus.value = "HOLD"
-//   businessType.value = 'NokToHold'
-//   importFileName.value = '不合格转隔离申请'
-// }
- else if ( routeName.value == 'HoldtookRequestMain') {
+else if ( routeName.value == 'NoktoholdRequestMain') {
   tableObject.params = {
-    fromInventoryStatus: 'HOLD',
-    toInventoryStatus:'OK'
+    // fromInventoryStatus: 'NOK',
+    // toInventoryStatus:'HOLD',
+    businessType :'NokToHold'
   }
-  fromInventoryStatus.value = 'HOLD'
-  toInventoryStatus.value = "OK"
+  // fromInventoryStatus.value = 'NOK'
+  // toInventoryStatus.value = "HOLD"
+  businessType.value = 'NokToHold'
+  importFileName.value = '不合格转隔离申请'
+}
+else if ( routeName.value == 'HoldtookRequestMain') {
+  tableObject.params = {
+    // fromInventoryStatus: 'HOLD',
+    // toInventoryStatus:'OK',
+    businessType :'HoldToOk'
+  }
+  // fromInventoryStatus.value = 'HOLD'
+  // toInventoryStatus.value = "OK"
   businessType.value = 'HoldToOk'
   importFileName.value = '隔离转合格申请'
 } else if ( routeName.value == 'HoldtoscrapRequestMain') {
   tableObject.params = {
-    fromInventoryStatus: 'HOLD',
-    toInventoryStatus:'SCRAP'
+    // fromInventoryStatus: 'HOLD',
+    // toInventoryStatus:'SCRAP',
+    businessType:'HoldToScrap'
   }
-  fromInventoryStatus.value = 'HOLD'
-  toInventoryStatus.value = "SCRAP"
+  // fromInventoryStatus.value = 'HOLD'
+  // toInventoryStatus.value = "SCRAP"
   businessType.value = 'HoldToScrap'
   importFileName.value = '隔离转报废申请'
 } else if ( routeName.value == 'OktoscrapRequestMain') {
   tableObject.params = {
-    fromInventoryStatus: 'OK',
-    toInventoryStatus:'SCRAP'
+    // fromInventoryStatus: 'OK',
+    // toInventoryStatus:'SCRAP',
+    businessType :'OkToScrap'
   }
-  fromInventoryStatus.value = 'OK'
-  toInventoryStatus.value = "SCRAP"
+  // fromInventoryStatus.value = 'OK'
+  // toInventoryStatus.value = "SCRAP"
   businessType.value = 'OkToScrap'
   importFileName.value = '合格转报废申请'
-} 
-// else if ( routeName.value == 'ScraptoholdRequestMain') {
-//   tableObject.params = {
-//     fromInventoryStatus: 'SCRAP',
-//     toInventoryStatus:'HOLD'
-//   }
-//   fromInventoryStatus.value = 'SCRAP'
-//   toInventoryStatus.value = "HOLD"
-//   businessType.value = 'ScrapToHold'
-//   importFileName.value = '报废转隔离申请'
-// } 
-else if( routeName.value == 'InventorymoveRequestMain'){
-  fromInventoryStatus.value = null
-  businessType.value = 'Move'
-  importFileName.value = '库存移动申请'
-}else {
+}
+else if ( routeName.value == 'ScraptoholdRequestMain') {
+  tableObject.params = {
+    // fromInventoryStatus: 'SCRAP',
+    // toInventoryStatus:'HOLD',
+    businessType :'ScrapToHold'
+  }
+  // fromInventoryStatus.value = 'SCRAP'
+  // toInventoryStatus.value = "HOLD"
+  businessType.value = 'ScrapToHold'
+  importFileName.value = '报废转隔离申请'
+} else {
   tableObject.params = {
-    fromInventoryStatus: 'OK',
-    toInventoryStatus:'SCRAP'
+    businessType :'Move'
   }
+  businessType.value = 'Move'
+  importFileName.value = '库存移动申请'
 }
 console.log(99 ,  businessType.value)
+
+
+
 InventorymoveRequestMain.allSchemas.tableFormColumns.map(item =>{
   if(item.field == 'fromWarehouseCode') {
     if (fromInventoryStatus.value) {
@@ -803,6 +810,15 @@ const importSuccess = () => {
 
 // 筛选提交
 const searchFormClick = (searchData) => {
+  const cmd = {
+    'column':'businessType',
+    'action':'==',
+    'value':businessType.value
+  }
+  if (!Array.isArray(searchData.filters)) {
+    searchData.filters = [];
+  }
+  searchData.filters.push(cmd)
   tableObject.params = {
     isSearch: true,
     filters: searchData.filters
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue
index d58c2c9f7..f3cd23330 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue
@@ -116,73 +116,78 @@ const { tableObject, tableMethods } = useTable({
 /**
  * OktoholdRequestMain 合格转隔离
  */
- if ( routeName.value == 'OktoholdRequestMain') {
+if ( routeName.value == 'OktoholdRequestMain') {
   tableObject.params = {
-    toInventoryStatus:'HOLD'
+    // fromInventoryStatus: 'OK',
+    // toInventoryStatus:'HOLD',
+    businessType :'OkToHold'
   }
-  toInventoryStatus.value = "HOLD"
+  // fromInventoryStatus.value = 'OK'
+  // toInventoryStatus.value = "HOLD"
   businessType.value = 'OkToHold'
   importFileName.value = '物料转隔离申请'
 }
-// else if ( routeName.value == 'NoktoholdRequestMain') {
-//   tableObject.params = {
-//     fromInventoryStatus: 'NOK',
-//     toInventoryStatus:'HOLD'
-//   }
-//   fromInventoryStatus.value = 'NOK'
-//   toInventoryStatus.value = "HOLD"
-//   businessType.value = 'NokToHold'
-//   importFileName.value = '不合格转隔离申请'
-// }
- else if ( routeName.value == 'HoldtookRequestMain') {
+else if ( routeName.value == 'NoktoholdRequestMain') {
   tableObject.params = {
-    fromInventoryStatus: 'HOLD',
-    toInventoryStatus:'OK'
+    // fromInventoryStatus: 'NOK',
+    // toInventoryStatus:'HOLD',
+    businessType :'NokToHold'
   }
-  fromInventoryStatus.value = 'HOLD'
-  toInventoryStatus.value = "OK"
+  // fromInventoryStatus.value = 'NOK'
+  // toInventoryStatus.value = "HOLD"
+  businessType.value = 'NokToHold'
+  importFileName.value = '不合格转隔离申请'
+}
+else if ( routeName.value == 'HoldtookRequestMain') {
+  tableObject.params = {
+    // fromInventoryStatus: 'HOLD',
+    // toInventoryStatus:'OK',
+    businessType :'HoldToOk'
+  }
+  // fromInventoryStatus.value = 'HOLD'
+  // toInventoryStatus.value = "OK"
   businessType.value = 'HoldToOk'
   importFileName.value = '隔离转合格申请'
 } else if ( routeName.value == 'HoldtoscrapRequestMain') {
   tableObject.params = {
-    fromInventoryStatus: 'HOLD',
-    toInventoryStatus:'SCRAP'
+    // fromInventoryStatus: 'HOLD',
+    // toInventoryStatus:'SCRAP',
+    businessType:'HoldToScrap'
   }
-  fromInventoryStatus.value = 'HOLD'
-  toInventoryStatus.value = "SCRAP"
+  // fromInventoryStatus.value = 'HOLD'
+  // toInventoryStatus.value = "SCRAP"
   businessType.value = 'HoldToScrap'
   importFileName.value = '隔离转报废申请'
 } else if ( routeName.value == 'OktoscrapRequestMain') {
   tableObject.params = {
-    fromInventoryStatus: 'OK',
-    toInventoryStatus:'SCRAP'
+    // fromInventoryStatus: 'OK',
+    // toInventoryStatus:'SCRAP',
+    businessType :'OkToScrap'
   }
-  fromInventoryStatus.value = 'OK'
-  toInventoryStatus.value = "SCRAP"
+  // fromInventoryStatus.value = 'OK'
+  // toInventoryStatus.value = "SCRAP"
   businessType.value = 'OkToScrap'
   importFileName.value = '合格转报废申请'
-} 
-// else if ( routeName.value == 'ScraptoholdRequestMain') {
-//   tableObject.params = {
-//     fromInventoryStatus: 'SCRAP',
-//     toInventoryStatus:'HOLD'
-//   }
-//   fromInventoryStatus.value = 'SCRAP'
-//   toInventoryStatus.value = "HOLD"
-//   businessType.value = 'ScrapToHold'
-//   importFileName.value = '报废转隔离申请'
-// } 
-else if( routeName.value == 'InventorymoveRequestMain'){
-  fromInventoryStatus.value = null
-  businessType.value = 'Move'
-  importFileName.value = '库存移动申请'
-}else {
+}
+else if ( routeName.value == 'ScraptoholdRequestMain') {
   tableObject.params = {
-    fromInventoryStatus: 'OK',
-    toInventoryStatus:'SCRAP'
+    // fromInventoryStatus: 'SCRAP',
+    // toInventoryStatus:'HOLD',
+    businessType :'ScrapToHold'
   }
+  // fromInventoryStatus.value = 'SCRAP'
+  // toInventoryStatus.value = "HOLD"
+  businessType.value = 'ScrapToHold'
+  importFileName.value = '报废转隔离申请'
+} else {
+  tableObject.params = {
+    businessType :'Move'
+  }
+  businessType.value = 'Move'
+  importFileName.value = '库存移动申请'
 }
 console.log(99 ,  businessType.value)
+
 InventorymoveRequestMain.allSchemas.tableFormColumns.map(item =>{
   if(item.field == 'fromWarehouseCode') {
     if (fromInventoryStatus.value) {
@@ -803,6 +808,15 @@ const importSuccess = () => {
 
 // 筛选提交
 const searchFormClick = (searchData) => {
+  const cmd = {
+    'column':'businessType',
+    'action':'==',
+    'value':businessType.value
+  }
+  if (!Array.isArray(searchData.filters)) {
+    searchData.filters = [];
+  }
+  searchData.filters.push(cmd)
   tableObject.params = {
     isSearch: true,
     filters: searchData.filters

From 991415df5e5380c11d0d3132e66739c1f4457ad5 Mon Sep 17 00:00:00 2001
From: songguoqiang <765017469@qq.com>
Date: Sat, 17 Aug 2024 08:35:13 +0800
Subject: [PATCH 06/37] =?UTF-8?q?=E7=BC=BA=E9=99=B7HL-5403:=E5=BE=85?=
 =?UTF-8?q?=E5=BC=80=E7=A5=A8=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E5=8F=91=E7=A5=A8=E7=94=B3=E8=AF=B7=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/dict.ts                             |  1 +
 .../supplierinvoiceInvoiced.data.ts           | 20 +++++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index b72379329..11aca3804 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -346,6 +346,7 @@ export enum DICT_TYPE {
 
   SUPPLIERINVOICE_REQUEST_STATUS = 'supplierinvoice_request_status', //发票申请状态
   SUPPLIERINVOICE_STATUS = 'supplierinvoice_status', //待开票审核状态
+  INVOICE_REQUEST_STATUS = 'invoice_request_status', //待开票申请状态
 
   // ========== system - 消息通知优化 - ==========
   MESSAGE_NOTICE_TABLE = 'message_notice_table', //消息通知表
diff --git a/src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts b/src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts
index a99de5e62..dca912aad 100644
--- a/src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts
@@ -143,6 +143,26 @@ export const SupplierinvoiceInvoiced = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
 
+  {
+    label: '发票申请状态',
+    field: 'requestStatus',
+    dictType: DICT_TYPE.INVOICE_REQUEST_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    isForm:false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+
 
   {
     label: '订单行',

From ebe0a7162fa887bfede7cacb794d9415551100f1 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Sat, 17 Aug 2024 10:11:07 +0800
Subject: [PATCH 07/37] =?UTF-8?q?=E7=BC=BA=E9=99=B7:HL-5190=E9=80=80?=
 =?UTF-8?q?=E8=B4=A7=E5=8E=9F=E5=9B=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereturnJobMain.data.ts             | 28 ++++++++++++
 .../purchasereturnRecordMain.data.ts          | 45 ++++++++++++-------
 .../purchasereturnRequestMain.data.ts         | 28 ++++++++++++
 3 files changed, 86 insertions(+), 15 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts
index e401c8840..6eafe4f71 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts
@@ -935,6 +935,34 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
       disabled:false
     }
   },
+  {
+    label: '退货原因',
+    field: 'reasonType',
+    dictType: DICT_TYPE.RETURN_REASON_TYPE,
+    dictClass: 'string',
+    // isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      type: 'Select',
+    },
+    form: {
+      componentProps:{
+        disabled:true
+      }
+    }
+  },
+  {
+    label: '退货原因描述',
+    field: 'reason',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '计量单位',
     field: 'uom',
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts
index 4934ee993..cc3db763a 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts
@@ -744,20 +744,7 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     hiddenInMain: true,
     isSearch: false
   },
-  {
-    label: '原因',
-    field: 'reason',
-    dictType: DICT_TYPE.PURCHASE_RETURN_REASON,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault: 1013,
-    hiddenInMain: true
-  },
-
+  
   {
     label: '物料代码',
     field: 'itemCode',
@@ -887,7 +874,35 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
   //   },
   // },
   {
-    label: '原因',
+    label: '退货原因',
+    field: 'reasonType',
+    dictType: DICT_TYPE.RETURN_REASON_TYPE,
+    dictClass: 'string',
+    // isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      type: 'Select',
+    },
+    form: {
+      componentProps:{
+        disabled:true
+      }
+    }
+  },
+  {
+    label: '退货原因描述',
+    field: 'reason',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
     field: 'remark',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMain.data.ts
index ba8735894..3f63b07f0 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMain.data.ts
@@ -1236,6 +1236,34 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       precision: 6
     }
   },
+  {
+    label: '退货原因',
+    field: 'reasonType',
+    dictType: DICT_TYPE.RETURN_REASON_TYPE,
+    dictClass: 'string',
+    // isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      type: 'Select',
+    },
+    form: {
+      componentProps:{
+        disabled:true
+      }
+    }
+  },
+  {
+    label: '退货原因描述',
+    field: 'reason',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '库存状态',
     field: 'inventoryStatus',

From 965b13eb612a4a311b6108d4914f4a3e10f683a5 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Sat, 17 Aug 2024 10:20:24 +0800
Subject: [PATCH 08/37] =?UTF-8?q?=E6=98=AF=E5=90=A6=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/components/LoginForm.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/login/components/LoginForm.vue b/src/views/login/components/LoginForm.vue
index 7751297e1..084b29a4e 100644
--- a/src/views/login/components/LoginForm.vue
+++ b/src/views/login/components/LoginForm.vue
@@ -33,7 +33,7 @@
             :prefix-icon="iconLock" show-password type="password" @keyup.enter="getCode()" style="height: 42px;" />
         </el-form-item>
       </el-col>
-      <el-col :span="24" style="padding-right: 10px; padding-left: 10px" v-if="needCode!='false'">
+      <el-col :span="24" style="padding-right: 10px; padding-left: 10px" v-if="needCode">
         <el-form-item prop="code">
           <div class="flex w-[100%]">
             <el-input v-model="loginData.loginForm.code" :placeholder="t('login.codePlaceholder')"
@@ -97,7 +97,7 @@
   import * as DeptApi from '@/api/system/dept'
   import { getTenant } from '@/utils/systemParam'
   import { getSystermUpdateAlert,getSystermUpdateUrl,getNeedCode } from '@/utils/systemParam'
-  const needCode = ref(getNeedCode())
+  const needCode = ref(getNeedCode()==true||getNeedCode()=='true')
 
   defineOptions({ name: 'LoginForm' })
 
@@ -174,7 +174,7 @@
   //   }
   // }
   function getCode() {
-    if(needCode.value=='false'){
+    if(!needCode){
       return
     }
     getCodeImg().then(res => {
@@ -234,7 +234,7 @@
         return
       }
       let res = null
-      if(needCode.value=='false'){
+      if(!needCode){
         res = await LoginApi.loginNoCode(loginData.loginForm)
       }else{
         res = await LoginApi.login(loginData.loginForm)

From 0c8be0a04bd8bc19959b7646c14ad6b652b4d4bc Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Sat, 17 Aug 2024 10:31:53 +0800
Subject: [PATCH 09/37] =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81=20=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E7=99=BB=E5=BD=95+=E6=9D=A8=E7=8E=89=E7=A6=8F?=
 =?UTF-8?q?=EF=BC=9A=E5=8E=BB=E6=8E=89=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?=
 =?UTF-8?q?=E7=A5=A8=E7=94=B3=E8=AF=B7=E9=87=87=E8=B4=AD=E4=BB=B7=E6=A0=BC?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9=E4=BA=BA=E9=BB=98=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/components/LoginForm.vue      |  4 +-
 .../supplierinvoiceRequestMain/index.vue      | 40 +++++++++----------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/views/login/components/LoginForm.vue b/src/views/login/components/LoginForm.vue
index 084b29a4e..661c0c0eb 100644
--- a/src/views/login/components/LoginForm.vue
+++ b/src/views/login/components/LoginForm.vue
@@ -174,7 +174,7 @@
   //   }
   // }
   function getCode() {
-    if(!needCode){
+    if(!needCode.value){
       return
     }
     getCodeImg().then(res => {
@@ -234,7 +234,7 @@
         return
       }
       let res = null
-      if(!needCode){
+      if(!needCode.value){
         res = await LoginApi.loginNoCode(loginData.loginForm)
       }else{
         res = await LoginApi.login(loginData.loginForm)
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index bca5b0524..8c363166d 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -702,16 +702,16 @@ const buttonTableClick = async (val, row) => {
     handleRepeal(row.id)
   }
 }
-const procurementCreators = ref([])
-SupplierinvoiceRequestMainApi.queryUserInfoByRoleCode({
-  roleCode: 'purchase',
-  pageSize: 1000,
-  pageNo: 1,
-  sort: '',
-  by: 'ASC'
-}).then((res) => {
-procurementCreators.value = res.list
-})
+// const procurementCreators = ref([])
+// SupplierinvoiceRequestMainApi.queryUserInfoByRoleCode({
+//   roleCode: 'purchase',
+//   pageSize: 1000,
+//   pageNo: 1,
+//   sort: '',
+//   by: 'ASC'
+// }).then((res) => {
+// procurementCreators.value = res.list
+// })
 /** 添加/修改操作 */
 const formRef = ref()
 const openForm = async (type: string, row?: any) => {
@@ -787,10 +787,10 @@ const openForm = async (type: string, row?: any) => {
         item.componentProps.disabled = false
       }
 
-      if (item.field == 'procurementCreator') {
-        item.componentProps.options = procurementCreators.value
+      // if (item.field == 'procurementCreator') {
+      //   item.componentProps.options = procurementCreators.value
         
-      }
+      // }
     })
   }
   if (row && (row.status == '3' || row.status == '7')) {
@@ -813,13 +813,13 @@ const openForm = async (type: string, row?: any) => {
     }
     tableData.value = [] // 重置明细数据
     formRef.value.open(type, row)
-    if(type=='create'){
-      nextTick(() => {
-      formRef.value.formRef.setValues({
-          procurementCreator:procurementCreators.value[0].id
-          })
-      })
-    }
+    // if(type=='create'){
+    //   nextTick(() => {
+    //   formRef.value.formRef.setValues({
+    //       procurementCreator:procurementCreators.value[0].id
+    //       })
+    //   })
+    // }
   })
 }
 const defaultSupplierCode = ref('')

From 7ed7a0901a84da1bfcac0f214cadd382df4111ac Mon Sep 17 00:00:00 2001
From: songguoqiang <765017469@qq.com>
Date: Sat, 17 Aug 2024 10:45:10 +0800
Subject: [PATCH 10/37] =?UTF-8?q?=E7=BC=BA=E9=99=B7=EF=BC=9AHL-5405=20?=
 =?UTF-8?q?=E5=BA=94=E5=95=86=E7=89=A9=E6=96=99=E5=85=B3=E7=B3=BB=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E4=BF=AE=E6=94=B9=E5=85=A5=E5=8F=A3=EF=BC=8C=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E6=97=A0=E6=B3=95=E6=8E=A7=E5=88=B6=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E5=85=81=E8=AE=B8=E8=B6=85=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierManage/supplieritem/index.vue            | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue b/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue
index 1184dbc18..486c73b79 100644
--- a/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue
+++ b/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue
@@ -77,14 +77,14 @@ const route = useRoute() //路由信息
 const routeName = ref()
 routeName.value = route.name
 const tableColumns = ref(Supplieritem.allSchemas.tableColumns)
-if(routeName.value.includes('SCP')){
-  tableColumns.value = tableColumns.value.filter(item=>item.field!='action')
-}
+// if(routeName.value.includes('SCP')){
+//   tableColumns.value = tableColumns.value.filter(item=>item.field!='action')
+// }
 //字段设置 更新主列表字段
 const updataTableColumns = (val) => {
-  if(routeName.value.includes('SCP')){
-    val = val.filter(item=>item.field!='action')
-  }
+  // if(routeName.value.includes('SCP')){
+  //   val = val.filter(item=>item.field!='action')
+  // }
   tableColumns.value = val
 }
 const { tableObject, tableMethods } = useTable({

From c5298daa3b5cb80427e1c79929824cc3010f6788 Mon Sep 17 00:00:00 2001
From: TengXF <302828528@qq.com>
Date: Sat, 17 Aug 2024 10:47:12 +0800
Subject: [PATCH 11/37] =?UTF-8?q?HL-5354=20=E8=A3=85=E9=85=8D=E5=88=B6?=
 =?UTF-8?q?=E5=93=81=E4=B8=8A=E6=9E=B6=E8=AE=B0=E5=BD=95=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E4=B8=8D=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/productputawayRecordDetail/index.ts           | 2 +-
 src/api/wms/productputawayRecordMain/index.ts             | 8 +++++++-
 .../stockup/stockupMainJob/index.vue                      | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/api/wms/productputawayRecordDetail/index.ts b/src/api/wms/productputawayRecordDetail/index.ts
index 4464c5c7e..5b46db206 100644
--- a/src/api/wms/productputawayRecordDetail/index.ts
+++ b/src/api/wms/productputawayRecordDetail/index.ts
@@ -54,7 +54,7 @@ export const getProductputawayRecordDetailPage = async (params) => {
 
 // 查询制品上架记录子列表
 export const getProductputawayRecordDetailPageAssemble = async (params) => {
-    params.type = 'assemble'
+  params.type = 'assemble'
   if (params.isSearch) {
     const cmd = {
       'column':'type',
diff --git a/src/api/wms/productputawayRecordMain/index.ts b/src/api/wms/productputawayRecordMain/index.ts
index 897de3153..f411cfb30 100644
--- a/src/api/wms/productputawayRecordMain/index.ts
+++ b/src/api/wms/productputawayRecordMain/index.ts
@@ -74,8 +74,14 @@ export const deleteProductputawayRecordMain = async (id: number) => {
 
 // 导出制品上架记录主 Excel
 export const exportProductputawayRecordMain = async (params) => {
-  params.type = 'predict'
+  params.type = 'assemble'
   if (params.isSearch) {
+    const cmd = {
+      'column':'type',
+      'action':'==',
+      'value':'assemble'
+    }
+    params.filters.push(cmd)
     delete params.isSearch
     const data = {...params}
     return await request.downloadPost({ url: '/wms/productputaway-record-main/export-excel-senior', data })
diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue
index 92a3e9db4..1551887fb 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue
@@ -142,7 +142,7 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultExportBtn({hasPermi:'wms:stockup-job-main:export'}), // 导出
+  defaultButtons.defaultExportBtn({hasPermi:'wms:stockup-main-job:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置

From bb01965e61ae11d48efa97843d371726c08b9621 Mon Sep 17 00:00:00 2001
From: TengXF <302828528@qq.com>
Date: Sat, 17 Aug 2024 11:00:37 +0800
Subject: [PATCH 12/37] =?UTF-8?q?HL-5400=20=E9=A2=84=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E8=AE=B0=E5=BD=95=E5=AF=BC=E5=87=BA=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E4=B8=8D=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productreceipt/productreceiptRecordMain/index.vue    | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue
index c68de58d5..542698de4 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue
@@ -305,6 +305,15 @@ const handleExport = async () => {
 
 // 筛选提交
 const searchFormClick = (searchData) => {
+  const cmd = {
+    'column':'type',
+    'action':'==',
+    'value':'predict'
+  }
+  if (!Array.isArray(searchData.filters)) {
+    searchData.filters = [];
+  }
+  searchData.filters.push(cmd)
   tableObject.params = {
     isSearch: true,
     filters: searchData.filters

From ebc5855f54b78b3341256b83c3f3b800aafc2ea9 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Sat, 17 Aug 2024 11:05:00 +0800
Subject: [PATCH 13/37] =?UTF-8?q?=E6=96=B0=E7=89=88-=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E9=80=80=E8=B4=A7=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereturnRequestMainNew/index.vue    | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
index d065fb8d6..81a5268d7 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
@@ -83,7 +83,7 @@
   </template>
   </BasicForm>
   <!-- 添加明细：采购收货记录单号 -->
-  <SearchTable ref="searchTableRef" @searchTableSuccess="searchTableSuccess1" >
+  <SearchTable ref="searchTableRef" :hiddenFilterBtn="true" @searchTableSuccess="searchTableSuccess1" >
     <template #searchQueryhahaha>
       <el-form :inline="true">
         <el-form-item label="供应商">
@@ -278,10 +278,13 @@ const searchTableSuccess = async (formField, searchField, val, formRef, type, ro
         setV['asnNumber'] = ''
         tableData.value = []
         getSupplierOptions(val[0][searchField])
-        
       }
       
       formRef.setValues(setV)
+      if(formField=='itemCode'){
+        onChangeForm('itemCode',null,formRef)
+      }
+
     }
   })
 }
@@ -788,7 +791,6 @@ const handleAddTable = () => {
   // })
 }
 const onChangeForm = async (field, cur, formRef)=>{
-  console.log('onChangeForm',field, cur, formRef)
   if(field=='supplierCode'){
     //供应商
     PurchasereturnRequestMainNew.allSchemas.formSchema.forEach(item=>{
@@ -799,11 +801,16 @@ const onChangeForm = async (field, cur, formRef)=>{
         formRef.value.setValues(setV)
       }
     })
-  }else if(field == 'locationCode'){
+  }else if(field == 'locationCode' || field == 'itemCode'){
     // 退货库位 获取明细列表
+    let itemCode = field == 'locationCode'?formRef.value.formModel.itemCode:formRef.formModel.itemCode
+    let fromLocationCode = field == 'locationCode'?formRef.value.formModel.locationCode:formRef.formModel.locationCode
+    if(!itemCode||!fromLocationCode){
+      return
+    }
     let subList = await PurchasereturnRequestDetailApi.getBalancePurchaseReceiptReturn({
-      itemCode:formRef.value.formModel.itemCode,
-      fromLocationCode:formRef.value.formModel.locationCode
+      itemCode,
+      fromLocationCode
     })
 
     console.log('subList',subList)

From 2513e63cd31b9ab3184dd652d40a2156b097a4f4 Mon Sep 17 00:00:00 2001
From: songguoqiang <765017469@qq.com>
Date: Sat, 17 Aug 2024 11:23:11 +0800
Subject: [PATCH 14/37] =?UTF-8?q?=E7=BC=BA=E9=99=B7=EF=BC=9AHL-5403=20?=
 =?UTF-8?q?=E5=8F=91=E7=A5=A8=E7=94=B3=E8=AF=B7=E4=BD=9C=E5=BA=9F=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E5=BE=85=E5=BC=80=E7=A5=A8=E5=88=97=E8=A1=A8=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E6=98=8E=E7=BB=86=E7=8A=B6=E6=80=81=E5=BA=94=E5=8F=98?=
 =?UTF-8?q?=E4=B8=BA=E2=80=9C=E9=80=9A=E8=BF=87=E2=80=9D=E3=80=82=E7=8E=B0?=
 =?UTF-8?q?=E5=9C=A8=E7=B3=BB=E7=BB=9F=E6=98=BE=E7=A4=BA=E7=9A=84=E4=BD=9C?=
 =?UTF-8?q?=E5=BA=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts b/src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts
index dca912aad..df6ed9b46 100644
--- a/src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts
@@ -154,7 +154,7 @@ export const SupplierinvoiceInvoiced = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isSearch: true,
+    isSearch: false,
     form: {
       value: '1',
       componentProps: {

From 1e2b08435d4ef6e44201d0d92a4484241ddc6c8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com>
Date: Sat, 17 Aug 2024 13:22:27 +0800
Subject: [PATCH 15/37] =?UTF-8?q?=E4=BF=AE=E6=94=B9Q2=20Q3=E6=94=BE?=
 =?UTF-8?q?=E5=A4=A7=E9=95=9C=E5=B1=95=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=20HL-5368?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qms/inspectionQ2/inspectionQ2.data.ts     | 94 ++++++++++---------
 .../qms/inspectionQ3/inspectionQ3.data.ts     | 89 +++++++++---------
 2 files changed, 93 insertions(+), 90 deletions(-)

diff --git a/src/views/qms/inspectionQ2/inspectionQ2.data.ts b/src/views/qms/inspectionQ2/inspectionQ2.data.ts
index f62948b2a..2e2f6a883 100644
--- a/src/views/qms/inspectionQ2/inspectionQ2.data.ts
+++ b/src/views/qms/inspectionQ2/inspectionQ2.data.ts
@@ -49,50 +49,7 @@ export const Q2 = useCrudSchemas(
         fixed: 'left'
       }
     },
-    {
-      label: 'Q1通知单号',
-      field: 'q1Number',
-      sort: 'custom',
-      table: {
-        width: 150
-      },
-      form: {
-        // labelMessage: '信息提示说明！！！',
-        componentProps: {
-          enterSearch: true,
-          multiple: true,
-          isSearchList: true, // 开启查询弹窗
-          searchListPlaceholder: '请选择Q1通知单', // 输入框占位文本
-          searchField: 'number', // 查询弹窗赋值字段
-          searchTitle: 'Q1通知单', // 查询弹窗标题
-          searchAllSchemas: Q1.allSchemas, // 查询弹窗所需类
-          searchPage: InspectionQ1Api.getQ1Page, // 查询弹窗所需分页方法
-          searchCondition: [
-            {
-              key: 'available',
-              value: 'TRUE',
-              isMainValue: false
-            },
-            {
-              key: 'status',
-              value: '0',
-              isMainValue: false
-            }
-          ],
-          verificationParams: [
-            {
-              key: 'number',
-              action: '==',
-              value: '',
-              isMainValue: false,
-              isSearch: true,
-              isFormModel: true
-            }
-          ] // 失去焦点校验参数
-        }
-      },
-      isSearch: true
-    },
+
     {
       label: '状态',
       field: 'status',
@@ -380,6 +337,7 @@ export const Q2 = useCrudSchemas(
         }
       }
     },
+
     {
       label: '索赔日期',
       field: 'claimTime',
@@ -422,6 +380,50 @@ export const Q2 = useCrudSchemas(
         }
       }
     },
+    {
+      label: 'Q1通知单号',
+      field: 'q1Number',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          enterSearch: true,
+          multiple: true,
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择Q1通知单', // 输入框占位文本
+          searchField: 'number', // 查询弹窗赋值字段
+          searchTitle: 'Q1通知单', // 查询弹窗标题
+          searchAllSchemas: Q1.allSchemas, // 查询弹窗所需类
+          searchPage: InspectionQ1Api.getQ1Page, // 查询弹窗所需分页方法
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            },
+            {
+              key: 'status',
+              value: '0',
+              isMainValue: false
+            }
+          ],
+          verificationParams: [
+            {
+              key: 'number',
+              action: '==',
+              value: '',
+              isMainValue: false,
+              isSearch: true,
+              isFormModel: true
+            }
+          ] // 失去焦点校验参数
+        }
+      },
+      isSearch: true
+    },
     {
       label: '描述',
       field: 'desc',
@@ -473,8 +475,8 @@ export const Q2 = useCrudSchemas(
           valueFormat: 'YYYY-MM-DD HH:mm:ss',
           type: 'daterange',
           defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-        },
-      },
+        }
+      }
     },
     {
       label: '操作',
diff --git a/src/views/qms/inspectionQ3/inspectionQ3.data.ts b/src/views/qms/inspectionQ3/inspectionQ3.data.ts
index 7a466a93c..3a3bea419 100644
--- a/src/views/qms/inspectionQ3/inspectionQ3.data.ts
+++ b/src/views/qms/inspectionQ3/inspectionQ3.data.ts
@@ -48,50 +48,7 @@ export const InspectionQ3Main = useCrudSchemas(
         fixed: 'left'
       }
     },
-    {
-      label: 'Q1通知单号',
-      field: 'q1Number',
-      sort: 'custom',
-      isSearch: true,
-      table: {
-        width: 150
-      },
-      form: {
-        // labelMessage: '信息提示说明！！！',
-        componentProps: {
-          enterSearch: true,
-          multiple: true,
-          isSearchList: true, // 开启查询弹窗
-          searchListPlaceholder: '请选择Q1通知单', // 输入框占位文本
-          searchField: 'number', // 查询弹窗赋值字段
-          searchTitle: 'Q1通知单', // 查询弹窗标题
-          searchAllSchemas: Q1.allSchemas, // 查询弹窗所需类
-          searchPage: InspectionQ1Api.getQ1Page, // 查询弹窗所需分页方法
-          searchCondition: [
-            {
-              key: 'available',
-              value: 'TRUE',
-              isMainValue: false
-            },
-            {
-              key: 'status',
-              value: '0',
-              isMainValue: false
-            }
-          ],
-          verificationParams: [
-            {
-              key: 'number',
-              action: '==',
-              value: '',
-              isMainValue: false,
-              isSearch: true,
-              isFormModel: true
-            }
-          ] // 失去焦点校验参数
-        }
-      }
-    },
+
     {
       label: '负责用户',
       field: 'responUser',
@@ -157,6 +114,50 @@ export const InspectionQ3Main = useCrudSchemas(
         }
       }
     },
+    {
+      label: 'Q1通知单号',
+      field: 'q1Number',
+      sort: 'custom',
+      isSearch: true,
+      table: {
+        width: 150
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          enterSearch: true,
+          multiple: true,
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择Q1通知单', // 输入框占位文本
+          searchField: 'number', // 查询弹窗赋值字段
+          searchTitle: 'Q1通知单', // 查询弹窗标题
+          searchAllSchemas: Q1.allSchemas, // 查询弹窗所需类
+          searchPage: InspectionQ1Api.getQ1Page, // 查询弹窗所需分页方法
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            },
+            {
+              key: 'status',
+              value: '0',
+              isMainValue: false
+            }
+          ],
+          verificationParams: [
+            {
+              key: 'number',
+              action: '==',
+              value: '',
+              isMainValue: false,
+              isSearch: true,
+              isFormModel: true
+            }
+          ] // 失去焦点校验参数
+        }
+      }
+    },
     {
       label: '描述',
       field: 'desc',

From dd397d848115304311e2be8cdf1d645e4252eebf Mon Sep 17 00:00:00 2001
From: TengXF <302828528@qq.com>
Date: Sat, 17 Aug 2024 13:31:42 +0800
Subject: [PATCH 16/37] =?UTF-8?q?HL-5267=20=E7=89=A9=E6=96=99=E5=BA=93?=
 =?UTF-8?q?=E5=8C=BA=E9=85=8D=E7=BD=AE=E7=AE=A1=E7=90=86bug=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basicDataManage/itemManage/itemarea/itemarea.data.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts b/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
index df0380761..98b205c6f 100644
--- a/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
@@ -446,8 +446,14 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
     label: '超过高储是否允许叫料',
     field: 'allowIssueRequest',
     sort: 'custom',
+    isSearch: false,
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
+    // colorType: 'danger',
+    isTable: true,
+    table: {
+      width: 150
+    },
     form: {
       component: 'Switch',
       value: 'TRUE',
@@ -456,7 +462,6 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
         activeValue: 'TRUE'
       }
     },
-    isTable: false
   },
   // {
   //   label: '优先空库位',
@@ -771,7 +776,7 @@ export const ItemareaDetail = useCrudSchemas(reactive<CrudSchema[]>([
         isFormModel: true,
       }],
       verificationPage: LocationApi.getLocationByCodes, // 校验数去焦点输入是否正确的方法
-      isShowTableFormSearch: true, // 
+      isShowTableFormSearch: true, //
     },
     form: {
       // labelMessage: '信息提示说明！！！',

From 5402d458754a91c0006dbff315399289f88ba2ec Mon Sep 17 00:00:00 2001
From: zhaoyiran <zhaoyrd@yonyou.com>
Date: Sat, 17 Aug 2024 13:51:04 +0800
Subject: [PATCH 17/37] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereceiptRecordMain.data.ts                  | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
index 89fd1cf7c..d9341133d 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
@@ -48,6 +48,16 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: false,
     sortTableDefault:3
   },
+  {
+    label: '明细备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: false,
+    sortTableDefault:3
+  },
   {
     label: '发货单号',
     field: 'asnNumber',

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

---
 .../purchasereturnRecordSpareMain/index.vue                  | 5 +++--
 .../purchasereturnRequestSpareMain/index.vue                 | 3 ++-
 .../purchasereceiptManage/putaway/putawayJobMain/index.vue   | 3 ++-
 .../putaway/putawayRecordMain/index.vue                      | 3 ++-
 .../putaway/putawayRequestMain/index.vue                     | 3 ++-
 .../sparereceipt/sparereceiptJobMain/index.vue               | 3 ++-
 .../sparereceipt/sparereceiptRecordMain/index.vue            | 3 ++-
 .../sparereceipt/sparereceiptRequestMain/index.vue           | 3 ++-
 .../purchaseclaim/purchaseclaimRecordMain/index.vue          | 3 ++-
 .../purchaseclaim/purchaseclaimRequestMain/index.vue         | 3 ++-
 10 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/index.vue
index a2ec773c7..f3f07b615 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/index.vue
@@ -169,12 +169,13 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     if(routeName.value.includes('SCP')){
       const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMainSCP(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 PurchasereturnRecordMainApi.exportPurchasereturnRecordMainSpare(tableObject.params)
-      download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
+      download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
     }
     
   } catch {
diff --git a/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/index.vue
index a5de550cc..8469b9ea0 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/index.vue
@@ -706,10 +706,11 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await PurchasereturnRequestMainApi.exportPurchasereturnRequestMainSpare(
       tableObject.params
     )
-    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
index 7dee1ed75..9990aa9ee 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
@@ -348,8 +348,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await PutawayJobMainApi.exportPutawayJobMain(tableObject.params)
-    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue
index 9aa5e6792..c8257f4de 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue
@@ -211,8 +211,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await PutawayRecordMainApi.exportPutawayRecordMain(tableObject.params)
-    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue
index ad499e129..504cdafcf 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue
@@ -406,8 +406,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await PutawayRequestMainApi.exportPutawayRequestMain(tableObject.params)
-    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue
index b32591516..86414352e 100644
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue
@@ -259,8 +259,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await PurchasereceiptJobMainApi.exportSparereceiptJobMain(tableObject.params)
-    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue
index 0682aad0b..072018567 100644
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue
@@ -160,8 +160,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await PurchasereceiptRecordMainApi.exportSparereceiptRecordMain(tableObject.params)
-    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue
index 8020ef79d..d738b2fc8 100644
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue
@@ -560,8 +560,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await PurchasereceiptRequestMainApi.exportSparereceiptRequestMain(tableObject.params)
-    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/index.vue b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/index.vue
index 6784b9653..07ce15882 100644
--- a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/index.vue
+++ b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/index.vue
@@ -156,8 +156,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await PurchaseclaimRecordMainApi.exportPurchaseclaimRecordMain(tableObject.params)
-    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue
index 3b4377640..9456dc032 100644
--- a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue
+++ b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue
@@ -414,8 +414,9 @@ import { getJmreportBaseUrl } from '@/utils/systemParam'
       await message.exportConfirm()
       // 发起导出
       exportLoading.value = true
+      const excelTitle = ref(route.meta.title)
       const data = await PurchaseclaimRequestMainApi.exportPurchaseclaimRequestMain(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

From 125e02fbb3eaf41834c0f67fa9f5f0ab56cfed9e Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Sat, 17 Aug 2024 14:28:27 +0800
Subject: [PATCH 19/37] =?UTF-8?q?=E7=BC=BA=E9=99=B7:HL-5075=E9=80=80?=
 =?UTF-8?q?=E8=B4=A7=E5=AF=BC=E5=85=A5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/purchasereturnRequestMain/index.ts               | 5 +++++
 .../purchasereturn/purchasereturnRequestMainNew/index.vue    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/api/wms/purchasereturnRequestMain/index.ts b/src/api/wms/purchasereturnRequestMain/index.ts
index 6ec472016..880ce56a3 100644
--- a/src/api/wms/purchasereturnRequestMain/index.ts
+++ b/src/api/wms/purchasereturnRequestMain/index.ts
@@ -101,6 +101,11 @@ export const importTemplateSpare = () => {
   return request.download({ url: '/wms/purchasereturn-request-main/get-import-template-spare' })
 }
 
+// 下载用户导入模板(新)
+export const importTemplateNew = () => {
+  return request.download({ url: '/wms/purchasereturn-request-main/get-import-template-new' })
+}
+
 // 关闭采购退货申请主 Excel
 export const closePurchasereturnRequestMain = async (id) => {
   return await request.put({ url: `/wms/purchasereturn-request-main/close?id=` + id })
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
index d065fb8d6..749c144f9 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
@@ -1057,6 +1057,6 @@ const showLabelSuccess = async (formField, searchField, val, formRef, type, row)
 /** 初始化 **/
 onMounted(async () => {
   getList()
-  importTemplateData.templateUrl = await PurchasereturnRequestMainApi.importTemplate()
+  importTemplateData.templateUrl = await PurchasereturnRequestMainApi.importTemplateNew()
 })
 </script>

From 24116266bfa0544b8db1066c80671a6450fd0d97 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Sat, 17 Aug 2024 14:29:48 +0800
Subject: [PATCH 20/37] =?UTF-8?q?=E7=BC=BA=E9=99=B7:HL-5075=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereturn/purchasereturnRequestMainNew/index.vue       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
index 749c144f9..dd8f6193d 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
@@ -133,7 +133,7 @@
   <!-- 导入 -->
   <ImportForm
     ref="importFormRef"
-    url="/wms/purchasereturn-request-main/import"
+    url="/wms/purchasereturn-request-main/importNew"
     :importTemplateData="importTemplateData"
     @success="importSuccess"
     :updateIsDisable="true"

From 6a1f9fd9e94d2e3baeaffd98d95a23f8738bf4a9 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Sat, 17 Aug 2024 14:43:19 +0800
Subject: [PATCH 21/37] =?UTF-8?q?=E6=96=B0=E7=89=88=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E9=80=80=E8=B4=A7-=E8=AF=AD=E6=B3=95=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereturn/purchasereturnRequestMainNew/index.vue     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
index b89d456ce..d2261df0b 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
@@ -803,8 +803,8 @@ const onChangeForm = async (field, cur, formRef)=>{
     })
   }else if(field == 'locationCode' || field == 'itemCode'){
     // 退货库位 获取明细列表
-    let itemCode = field == 'locationCode'?formRef.value.formModel.itemCode:formRef.formModel.itemCode
-    let fromLocationCode = field == 'locationCode'?formRef.value.formModel.locationCode:formRef.formModel.locationCode
+    let itemCode = formRef.formModel?formRef.formModel.itemCode:formRef.value.formModel.itemCode
+    let fromLocationCode = formRef.formModel?formRef.formModel.locationCode:formRef.value.formModel.locationCode
     if(!itemCode||!fromLocationCode){
       return
     }

From 98dd6b322e70c1f89127d388fe2a86e5ff8875f1 Mon Sep 17 00:00:00 2001
From: songguoqiang <765017469@qq.com>
Date: Sat, 17 Aug 2024 14:59:57 +0800
Subject: [PATCH 22/37] =?UTF-8?q?=E7=BC=BA=E9=99=B7HL-4830:=E4=BE=9B?=
 =?UTF-8?q?=E5=BA=94=E5=95=86=E7=94=A8=E6=88=B7=E5=85=B3=E8=81=94=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=AF=BC=E5=87=BA=E6=B7=BB=E5=8A=A0loding?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/basicDataManage/systemSetting/supplierUser/index.vue    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue b/src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue
index 7c720e543..c54af273d 100644
--- a/src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue
+++ b/src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue
@@ -221,12 +221,14 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    tableObject.loading = true
     const excelTitle = ref(route.meta.title)
     const data = await SupplierUserApi.exportSupplierUser(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
+    tableObject.loading = false
   }
 }
 

From c38c229c685ca470c975082d5b85c86cd0d19831 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Sat, 17 Aug 2024 15:27:27 +0800
Subject: [PATCH 23/37] =?UTF-8?q?=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereturn/purchasereturnRequestMainNew/index.vue       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
index d2261df0b..c79f3e737 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
@@ -129,7 +129,7 @@
     @searchTableSuccess="searchTableSuccessLabel"
   />
   <!-- 标签打印 -->
-  <SearchTable style="width: 905px" ref="showLabelRef" @searchTableSuccess="showLabelSuccess" />
+  <SearchTable style="width: 905px" :hiddenFilterBtn="true" ref="showLabelRef" @searchTableSuccess="showLabelSuccess" />
   <!-- 导入 -->
   <ImportForm
     ref="importFormRef"

From ee64e7ea68cf80279937ce38eefddb5c5da7a57e Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Sat, 17 Aug 2024 17:21:59 +0800
Subject: [PATCH 24/37] =?UTF-8?q?=E9=9A=90=E8=97=8F=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereturn/purchasereturnRequestMainNew/index.vue       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
index c79f3e737..6c7ad4a30 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
@@ -83,7 +83,7 @@
   </template>
   </BasicForm>
   <!-- 添加明细：采购收货记录单号 -->
-  <SearchTable ref="searchTableRef" :hiddenFilterBtn="true" @searchTableSuccess="searchTableSuccess1" >
+  <SearchTable ref="searchTableRef" :hiddenFilterBtnFields="['hahaha']" @searchTableSuccess="searchTableSuccess1" >
     <template #searchQueryhahaha>
       <el-form :inline="true">
         <el-form-item label="供应商">

From 0d66d6d89c111bafd625ac9a71ebfa4609d1e05e Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Sun, 18 Aug 2024 10:02:59 +0800
Subject: [PATCH 25/37] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=90=8D=E5=AD=97=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereceiptManage/inspect/inspectJobMain/index.vue   | 3 ++-
 .../inspect/inspectRecordMain/index.vue                      | 3 ++-
 .../inspect/inspectRequestMain/index.vue                     | 3 ++-
 .../purchasereceipt/purchasereceiptRecordMain/index.vue      | 5 +++--
 .../purchasereceiptRecordRefuseMain/index.vue                | 5 +++--
 .../purchasereceipt/purchasereceiptRequestMain/index.vue     | 3 ++-
 .../purchasereturn/purchasereturnJobMain/index.vue           | 3 ++-
 .../purchasereturn/purchasereturnRecordMain/index.vue        | 5 +++--
 .../purchasereturn/purchasereturnRequestMain/index.vue       | 3 ++-
 .../purchasereturn/purchasereturnRequestMainNew/index.vue    | 3 ++-
 10 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/index.vue b/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/index.vue
index 73a95c56b..651ccf6bc 100644
--- a/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/index.vue
@@ -233,8 +233,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await InspectJobMainApi.exportInspectJobMain(tableObject.params)
-    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue b/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue
index a987cad02..30d9c98c6 100644
--- a/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue
@@ -179,8 +179,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await InspectRecordMainApi.exportInspectRecordMain(tableObject.params)
-    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue
index 4cbc8f5df..d634e8b7e 100644
--- a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue
@@ -322,8 +322,9 @@
       await message.exportConfirm()
       // 发起导出
       exportLoading.value = true
+      const excelTitle = ref(route.meta.title)
       const data = await InspectRequestMainApi.exportInspectRequestMain(tableObject.params)
-    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
+      download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
     } catch {
     } finally {
       exportLoading.value = false
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
index 8eb9603f4..d2431c211 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
@@ -303,12 +303,13 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     if(routeName.value.includes('SCP')){
       const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordMainSCP(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 PurchasereceiptRecordMainApi.exportPurchasereceiptRecordMain(tableObject.params)
-      download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
+      download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
     }
   } catch {
   } finally {
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/index.vue
index 2dcb35833..f4d5f3823 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/index.vue
@@ -291,12 +291,13 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+      const excelTitle = ref(route.meta.title)
     if(routeName.value.includes('SCP')){
       const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordMainSCP(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 PurchasereceiptRecordMainApi.exportPurchasereceiptRecordRefuseMain(tableObject.params)
-      download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
+      download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
     }
   } catch {
   } finally {
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
index d1544d64c..dc4670e67 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
@@ -762,8 +762,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await PurchasereceiptRequestMainApi.exportPurchasereceiptRequestMain(tableObject.params)
-    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue
index e5365a2ca..740fa9daa 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue
@@ -238,8 +238,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await PurchasereturnJobMainApi.exportPurchasereturnJobMain(tableObject.params)
-    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue
index 7e218fafa..c43899e89 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue
@@ -169,12 +169,13 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     if(routeName.value.includes('SCP')){
       const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMainSCP(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 PurchasereturnRecordMainApi.exportPurchasereturnRecordMain(tableObject.params)
-      download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
+      download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
     }
   } catch {
   } finally {
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
index 700d90eda..8512c8b4c 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
@@ -756,10 +756,11 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await PurchasereturnRequestMainApi.exportPurchasereturnRequestMain(
       tableObject.params
     )
-    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
index 6c7ad4a30..a5eaed857 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
@@ -672,10 +672,11 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await PurchasereturnRequestMainApi.exportPurchasereturnRequestMain(
       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

From 7f54266cf9b7eb31b9225b58d1eaf1a4c3b02e50 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Sun, 18 Aug 2024 10:05:57 +0800
Subject: [PATCH 26/37] =?UTF-8?q?=E7=BC=BA=E9=99=B7:HL-5433=E9=87=87?=
 =?UTF-8?q?=E8=B4=AD=E9=80=80=E8=B4=A7=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/purchasereturnRequestMain/index.ts               | 5 +++++
 .../purchasereturn/purchasereturnRequestMainNew/index.vue    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/api/wms/purchasereturnRequestMain/index.ts b/src/api/wms/purchasereturnRequestMain/index.ts
index 880ce56a3..68cc0f4bd 100644
--- a/src/api/wms/purchasereturnRequestMain/index.ts
+++ b/src/api/wms/purchasereturnRequestMain/index.ts
@@ -136,6 +136,11 @@ export const handlePurchasereturnRequestMain = async (id) => {
   return await request.put({ url: `/wms/purchasereturn-request-main/handle?id=` + id })
 }
 
+// 处理采购退货申请主(新)
+export const handlePurchasereturnRequestMainNew = async (id) => {
+  return await request.put({ url: `/wms/purchasereturn-request-main/handleNew?id=` + id })
+}
+
 // 生成标签
 export const genLabel = async (data) => {
   return await request.post({ url: `/wms/purchasereturn-request-main/genLabel`, data })
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
index 6c7ad4a30..fb9de2408 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
@@ -640,7 +640,7 @@ const handleHandle = async (id: number) => {
   try {
     await message.confirm(t('common.confirmHandle'))
     tableObject.loading = true
-    await PurchasereturnRequestMainApi.handlePurchasereturnRequestMain(id)
+    await PurchasereturnRequestMainApi.handlePurchasereturnRequestMainNew(id)
     message.success(t('common.handleSuccess'))
     buttonBaseClick('refresh',null)
   } catch {

From 6cc6f7239cc0023628387c32b124de6587b8a0c8 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Sun, 18 Aug 2024 10:12:32 +0800
Subject: [PATCH 27/37] =?UTF-8?q?HL-5438=E7=89=A9=E6=96=99=E5=8C=85?=
 =?UTF-8?q?=E8=A3=85=E4=BF=A1=E6=81=AF-=E8=BF=99=E4=B8=AA=E6=94=B9?=
 =?UTF-8?q?=E6=88=900.954=EF=BC=8C=E8=87=AA=E5=8A=A8=E5=8F=98=E6=88=901?=
 =?UTF-8?q?=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../itemManage/itempackage/itempackage.data.ts   | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts b/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts
index d023d27c8..bd8739244 100644
--- a/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts
@@ -133,7 +133,7 @@ export const Itempackaging = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'InputNumber',
       componentProps: {
-        min: 1,
+        min: 0,
         precision: 6
       }
     }
@@ -295,12 +295,22 @@ export const Itempackaging = useCrudSchemas(reactive<CrudSchema[]>([
     }
   }
 ]))
-
+const validateQty = (rule: any, value: any, callback: any,a,b) => {
+  console.log('validateQty',rule, value,a,b)
+  if (!value) {
+      callback(new Error('包装数量必须大于0'));
+  } else {
+      callback();
+  }
+}  
 // 表单校验
 export const ItempackagingRules = reactive({
   itemCode: [{ required: true, message: '物料代码不能为空', trigger: 'change' }],
   uom: [{ required: true, message: '计量单位不能为空', trigger: 'change' }],
   packUnit: [{ required: true, message: '包装单位不能为空', trigger: 'change' }],
-  packQty: [{ required: true, message: '包装数量不能为空', trigger: 'change' }],
+  packQty: [
+    { required: true, message: '包装数量不能为空', trigger: 'change' },
+    { validator: validateQty, trigger: 'change' }
+  ],
   available: [{ required: true, message: '是否可用不能为空', trigger: 'change' }]
 })

From 07b435bf9c46880c198f629ec7bb75a88f26ebbc Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Sun, 18 Aug 2024 10:22:03 +0800
Subject: [PATCH 28/37] =?UTF-8?q?HL-5332=20SCP=E8=A6=81=E8=B4=A7=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E5=A4=B4=E9=83=A8=E7=AD=9B=E9=80=89=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=95=B0=E6=8D=AE=E6=98=BE=E7=A4=BA=E4=B8=8D?=
 =?UTF-8?q?=E5=85=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Search/src/Search.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/Search/src/Search.vue b/src/components/Search/src/Search.vue
index a95460d5f..c233dd92c 100644
--- a/src/components/Search/src/Search.vue
+++ b/src/components/Search/src/Search.vue
@@ -342,12 +342,12 @@ defineExpose({setFormValues,search}) // 提供 open 方法，用于打开弹窗
 <style lang="scss" scoped>
 .search ::v-deep(.el-form-item) {
   margin-right: 1%;
-  width: 20%;
+  width: 24%;
 }
 .dateSearch ::v-deep(.el-form-item) {
   margin-right: 1%;
-  min-width: 20%;
-  width: auto;
+  min-width: 320px;
+  width:30%;
 }
 .search ::v-deep(.el-form-item:nth-last-child(1)) {
   margin-right: 0px;

From 7f14d49bc977331d16f25497755ecf7bab84ac02 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Sun, 18 Aug 2024 11:17:41 +0800
Subject: [PATCH 29/37] =?UTF-8?q?HL-5341SCP=E6=AD=A3=E5=BC=8F=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=EF=BC=8C=E5=9C=A8=E7=94=B3=E8=AF=B7=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E4=B8=AD=E9=BB=98=E8=AE=A4=E4=B8=8D=E6=98=BE=E7=A4=BA=E4=BD=9C?=
 =?UTF-8?q?=E5=BA=9F=E7=9A=84=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoice/supplierinvoiceRecordMain/index.vue   | 7 ++++++-
 .../supplierinvoiceRecordMain.data.ts                     | 7 +++++++
 .../supplierinvoice/supplierinvoiceRequestMain/index.vue  | 8 +++++++-
 .../supplierinvoiceRequestMain.data.ts                    | 7 +++++++
 .../supplierinvoiceRequestMainDifference/index.vue        | 7 ++++++-
 .../supplierinvoiceRequestMainDifference.data.ts          | 7 +++++++
 6 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
index 0ee70f35b..c794151db 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
@@ -280,7 +280,12 @@ const searchList = (model)=>{
     model.postingDate[1] = model.postingDate[1].replace('00:00:00','23:59:59')
   }
   selectionRows.value = []
-  setSearchParams(model)
+  let model1 = {
+    ...model,
+    statuss: model.status.join(',')?model.status.join(','):''
+  }
+  delete model1.status
+  setSearchParams(model1)
 }
 const selectionRows = ref<any>([])
 const tableRef = ref()
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
index e14b82825..615b53c71 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
@@ -73,6 +73,13 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    search: {
+      componentProps: {
+        multiple: true,
+        collapseTags: true,
+        collapseTagsTooltip: true,
+      }
+    },
     isSearch: true,
     form: {
       value: '1',
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index 8c363166d..06298c5ca 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -378,7 +378,12 @@ const searchTableParams = ref([
 const formPurchasePassRef = ref()
 const searchList = (model) => {
   selectionRows.value = []
-  setSearchParams(model)
+  let model1 = {
+    ...model,
+    statuss: model.status.join(',')?model.status.join(','):''
+  }
+  delete model1.status
+  setSearchParams(model1)
 }
 const selectionRows = ref<any>([])
 const tableRef = ref()
@@ -1175,6 +1180,7 @@ const handleExport = async () => {
     paramsData = { ...paramsData, checkNums: rows }
   }
   console.log('批量导出', paramsData)
+  return
   try {
     // 导出的二次确认
     await message.exportConfirm()
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index 07379eceb..2ccc023cc 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -220,6 +220,13 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     },
     sortTableDefault:9,
     isSearch: true,
+    search: {
+      componentProps: {
+        multiple: true,
+        collapseTags: true,
+        collapseTagsTooltip: true,
+      }
+    },
     form: {
       value: '1',
       componentProps: {
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue
index 815f5fb61..a3358fa02 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue
@@ -185,7 +185,12 @@ const searchList = (model)=>{
   model.endDifferencePrice = endDifferencePrice.value
   console.log('searchList',model)
   selectionRows.value = []
-  setSearchParams(model)
+  let model1 = {
+    ...model,
+    statuss: model.status.join(',')?model.status.join(','):''
+  }
+  delete model1.status
+  setSearchParams(model1)
 }
 const resetList = (model)=>{
   staDifferencePrice.value = null
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts
index 44b57812b..eb3e00cfb 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts
@@ -212,6 +212,13 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     },
     sortTableDefault:9,
     isSearch: true,
+    search: {
+      componentProps: {
+        multiple: true,
+        collapseTags: true,
+        collapseTagsTooltip: true,
+      }
+    },
     form: {
       value: '1',
       componentProps: {

From b2a1c6aca9e48197bb72366ab3bc51dbfc30f96e Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Sun, 18 Aug 2024 11:52:27 +0800
Subject: [PATCH 30/37] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?=
 =?UTF-8?q?=E7=A5=A8=E7=94=B3=E8=AF=B7=E5=8E=BB=E6=8E=89return?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoice/supplierinvoiceRequestMain/index.vue         | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index 06298c5ca..7e8f49b28 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -1180,7 +1180,6 @@ const handleExport = async () => {
     paramsData = { ...paramsData, checkNums: rows }
   }
   console.log('批量导出', paramsData)
-  return
   try {
     // 导出的二次确认
     await message.exportConfirm()

From ff35d8c1491eace56006d17b337581a1b9552f22 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Sun, 18 Aug 2024 13:16:34 +0800
Subject: [PATCH 31/37] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?=
 =?UTF-8?q?=E8=B4=A7=E7=94=B3=E8=AF=B7=E5=AF=BC=E5=87=BA=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E7=9A=84=E6=97=B6=E5=80=99?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoice/supplierinvoiceRequestMain/index.vue    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index 7e8f49b28..632e0b1c7 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -1164,6 +1164,7 @@ const genRecords = async (id: number) => {
 /** 导出按钮操作 */
 const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
+ console.log(111)
   let rows: any = []
   selectionRows.value.forEach((item) => {
     rows = [...rows, ...item.selectionRows.map((item1) => item1.number)]
@@ -1179,7 +1180,12 @@ const handleExport = async () => {
   } else {
     paramsData = { ...paramsData, checkNums: rows }
   }
+  console.log(tableObject.params)
+  console.log(paramsData)
   console.log('批量导出', paramsData)
+  if (!paramsData.createTime || paramsData.createTime && paramsData.createTime.length == 0) {
+  delete paramsData.createTime
+  }
   try {
     // 导出的二次确认
     await message.exportConfirm()

From 581aff7fa5795de7d75cd3b2f845f109d6d49538 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Sun, 18 Aug 2024 13:16:55 +0800
Subject: [PATCH 32/37] =?UTF-8?q?=E5=8E=BB=E6=8E=89console?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoice/supplierinvoiceRequestMain/index.vue       | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index 632e0b1c7..4e1f90a26 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -1180,9 +1180,6 @@ const handleExport = async () => {
   } else {
     paramsData = { ...paramsData, checkNums: rows }
   }
-  console.log(tableObject.params)
-  console.log(paramsData)
-  console.log('批量导出', paramsData)
   if (!paramsData.createTime || paramsData.createTime && paramsData.createTime.length == 0) {
   delete paramsData.createTime
   }

From 5de9ca9a55ab2bbfdf31ebdb22e58e37051fa31c Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Sun, 18 Aug 2024 13:21:22 +0800
Subject: [PATCH 33/37] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?=
 =?UTF-8?q?=E8=B4=A7=E8=AE=B0=E5=BD=95=E4=BB=B7=E5=B7=AE=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=AF=BC=E5=87=BA=E6=B2=A1=E6=9C=89=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E6=97=B6=E9=97=B4=E5=8E=BB=E6=8E=89=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoice/supplierinvoiceRecordMain/index.vue        | 3 +++
 .../supplierinvoiceRequestMainDifference/index.vue             | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
index c794151db..e3b10dcb3 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
@@ -308,6 +308,9 @@ const handleExport = async () => {
   selectionRows.value.forEach(item=>{
     rows = [...rows,...item.selectionRows.map(item1=>item1.number)]
   })
+  if (!tableObject.params.createTime || tableObject.params.createTime && tableObject.params.  createTime.length == 0) {
+      delete tableObject.params.createTime
+  }
   try {
     // 导出的二次确认
     await message.exportConfirm()
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue
index a3358fa02..9dec5c5cd 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue
@@ -329,6 +329,9 @@ const searchTableSuccessDetail = async (formField, searchField, val, formRef,sea
     }else{
       paramsData = {...paramsData,checkNums:rows}
     }
+    if (!paramsData.createTime || paramsData.createTime && paramsData.createTime.length == 0) {
+      delete paramsData.createTime
+    }
     console.log('批量导出',paramsData)
     try {
       // 导出的二次确认

From 7610d56a9bde6418dd27c605bd14dd30bff3063d Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Sun, 18 Aug 2024 14:05:54 +0800
Subject: [PATCH 34/37] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?=
 =?UTF-8?q?=E7=A5=A8=E8=AE=B0=E5=BD=95=E7=AD=9B=E9=80=89=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/supplierinvoiceRecordMain/index.ts | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/api/wms/supplierinvoiceRecordMain/index.ts b/src/api/wms/supplierinvoiceRecordMain/index.ts
index dfdb880ec..207089eb7 100644
--- a/src/api/wms/supplierinvoiceRecordMain/index.ts
+++ b/src/api/wms/supplierinvoiceRecordMain/index.ts
@@ -53,8 +53,14 @@ export const deleteSupplierinvoiceRecordMain = async (id: number) => {
 }
 
 // 导出供应商发票记录主 Excel
-export const exportSupplierinvoiceRecordMain = async (data) => {
-  return await request.downloadPost({ url: `/wms/supplierinvoice-record-main/export-excel`, data })
+export const exportSupplierinvoiceRecordMain = async (params) => {
+  console.log(params)
+  if (params.isSearch) {
+    const data = { ...params }
+    return await request.downloadPost({ url: `/wms/supplierinvoice-record-main/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/supplierinvoice-record-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板

From ef5c80a0c09802082b5dc23ba81b5a455bee405a Mon Sep 17 00:00:00 2001
From: ljlong_2630 <ljlong_2630@yeah.net>
Date: Sun, 18 Aug 2024 14:55:28 +0800
Subject: [PATCH 35/37] =?UTF-8?q?=E7=BC=BA=E9=99=B7=EF=BC=9AHL-5048?=
 =?UTF-8?q?=EF=BC=8CHL-5049.=E8=A1=A5=E5=85=85=E4=BF=AE=E5=A4=8D=EF=BC=9A?=
 =?UTF-8?q?=E8=A3=85=E9=85=8D=E5=AE=8C=E5=B7=A5=E6=94=B6=E8=B4=A7=E7=9A=84?=
 =?UTF-8?q?=E5=8E=9F=E6=96=99=E4=BF=A1=E6=81=AF=E6=9F=A5=E8=AF=A2=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E5=8A=9F=E8=83=BD=E6=B7=BB=E5=8A=A0=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mesRawMaterialConsumptionInfo/index.ts    | 15 +++++++++++
 .../wms/rawMaterialConsumptionInfo/index.ts   | 11 ++++++++
 .../mesRawMaterialConsumptionInfo/index.vue   | 20 ++++++++++++--
 .../rawMaterialConsumptionInfo/index.vue      | 26 +++++++++++++++----
 4 files changed, 65 insertions(+), 7 deletions(-)

diff --git a/src/api/wms/mesRawMaterialConsumptionInfo/index.ts b/src/api/wms/mesRawMaterialConsumptionInfo/index.ts
index fbfaf7290..dac92362b 100644
--- a/src/api/wms/mesRawMaterialConsumptionInfo/index.ts
+++ b/src/api/wms/mesRawMaterialConsumptionInfo/index.ts
@@ -44,3 +44,18 @@ export const getMesRawMaterialConsumptionInfoPage = async (params) => {
 }
 
 
+
+export const exportAssemblyMaterialUsageMes = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/productreceipt-detailb/getAssemblyMaterialUsageMesSeniorExport`, data })
+  }else{
+    return await request.download({ url: `/wms/productreceipt-detailb/assemblyMaterialUsageMesExport`, params })
+  }
+}
+
+
+
+
+
+
diff --git a/src/api/wms/rawMaterialConsumptionInfo/index.ts b/src/api/wms/rawMaterialConsumptionInfo/index.ts
index 38b62d2a9..477158e1f 100644
--- a/src/api/wms/rawMaterialConsumptionInfo/index.ts
+++ b/src/api/wms/rawMaterialConsumptionInfo/index.ts
@@ -44,3 +44,14 @@ export const getRawMaterialConsumptionInfoPage = async (params) => {
 }
 
 
+export const exportAssemblyMaterialUsage = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/backflush-record-detailb/getAssemblyMaterialUsageSeniorExport`, data })
+  }else{
+    return await request.download({ url: `/wms/backflush-record-detailb/assemblyMaterialUsageExport`, params })
+  }
+}
+
+
+
diff --git a/src/views/wms/productionManage/productreceiptAssemble/mesRawMaterialConsumptionInfo/index.vue b/src/views/wms/productionManage/productreceiptAssemble/mesRawMaterialConsumptionInfo/index.vue
index c0f82ff6a..d3116835b 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/mesRawMaterialConsumptionInfo/index.vue
+++ b/src/views/wms/productionManage/productreceiptAssemble/mesRawMaterialConsumptionInfo/index.vue
@@ -56,6 +56,8 @@ const routeName = ref()
 routeName.value = route.name
 const tableColumns = ref([...MesRawMaterialConsumptionInfo.allSchemas.tableColumns])
 
+/** 列表导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
 const mesModelVisible = ref(false)
 const { tableObject: tableObject, tableMethods: tableMethods } =useTable({
   getListApi: MesRawMaterialConsumptionInfoApi.getMesRawMaterialConsumptionInfoPage
@@ -70,7 +72,7 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  // defaultButtons.defaultExportBtn({hasPermi:'wms:productreceipt-record-main:export'}), // 导出
+  defaultButtons.defaultExportBtn(null), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -79,7 +81,7 @@ const HeadButttondata = [
 // 头部按钮事件
 const buttonBaseClick = (val, item) => {
   if (val == 'export') { // 导出
-    // handleExport()
+    handleExport()
   } else if (val == 'refresh') { // 刷新
     if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
       searchFormClick({
@@ -95,6 +97,20 @@ const buttonBaseClick = (val, item) => {
 }
 
 
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await MesRawMaterialConsumptionInfoApi.exportAssemblyMaterialUsageMes(tableObject.params)
+    download.excel(data, '装配完工原料信息.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
 // 筛选提交
 const searchFormClick = (searchData) => {
   tableObject.params = {
diff --git a/src/views/wms/productionManage/productreceiptAssemble/rawMaterialConsumptionInfo/index.vue b/src/views/wms/productionManage/productreceiptAssemble/rawMaterialConsumptionInfo/index.vue
index ede928449..c938e8da9 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/rawMaterialConsumptionInfo/index.vue
+++ b/src/views/wms/productionManage/productreceiptAssemble/rawMaterialConsumptionInfo/index.vue
@@ -50,12 +50,14 @@ defineOptions({ name: 'RawMaterialConsumptionInfo' })
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
-
+  
+  
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
 const tableColumns = ref([...RawMaterialConsumptionInfo.allSchemas.tableColumns])
-
+/** 列表导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
 const mesModelVisible = ref(false)
 const { tableObject: tableObject, tableMethods: tableMethods } =useTable({
   getListApi: RawMaterialConsumptionInfoApi.getRawMaterialConsumptionInfoPage
@@ -70,7 +72,7 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  // defaultButtons.defaultExportBtn({hasPermi:'wms:productreceipt-record-main:export'}), // 导出
+  defaultButtons.defaultExportBtn(null), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -80,7 +82,7 @@ const HeadButttondata = [
 // 头部按钮事件
 const buttonBaseClick = (val, item) => {
   if (val == 'export') { // 导出
-    // handleExport()
+    handleExport()
   } else if (val == 'refresh') { // 刷新
     if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
       searchFormClick({
@@ -89,7 +91,7 @@ const buttonBaseClick = (val, item) => {
     } else {
       getList()
     }
-  } else if (val == 'filtrate') { // 筛选
+  }else if (val == 'filtrate') { // 筛选
   } else { // 其他按钮
     console.log('其他按钮', item)
   }
@@ -104,6 +106,20 @@ const searchFormClick = (searchData) => {
   getList() // 刷新当前列表
 }
 
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await RawMaterialConsumptionInfoApi.exportAssemblyMaterialUsage(tableObject.params)
+    download.excel(data, '装配完工原料信息.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
 /** 初始化 **/
 onMounted(async () => {
   getList()

From 299598fef6f8a0264604a42d692a09541405d79c Mon Sep 17 00:00:00 2001
From: ljlong_2630 <ljlong_2630@yeah.net>
Date: Sun, 18 Aug 2024 15:14:23 +0800
Subject: [PATCH 36/37] =?UTF-8?q?=E7=BC=BA=E9=99=B7=EF=BC=9AHL-5048?=
 =?UTF-8?q?=EF=BC=8CHL-5049.=E8=A1=A5=E5=85=85=E4=BF=AE=E5=A4=8D=EF=BC=9A?=
 =?UTF-8?q?=E8=A3=85=E9=85=8D=E5=AE=8C=E5=B7=A5=E6=94=B6=E8=B4=A7=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E7=9A=84=E6=88=90=E5=93=81=E5=88=9B=E5=BB=BA=E4=BA=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mesRawMaterialConsumptionInfo.data.ts                       | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/views/wms/productionManage/productreceiptAssemble/mesRawMaterialConsumptionInfo/mesRawMaterialConsumptionInfo.data.ts b/src/views/wms/productionManage/productreceiptAssemble/mesRawMaterialConsumptionInfo/mesRawMaterialConsumptionInfo.data.ts
index 527092ab8..3623500ae 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/mesRawMaterialConsumptionInfo/mesRawMaterialConsumptionInfo.data.ts
+++ b/src/views/wms/productionManage/productreceiptAssemble/mesRawMaterialConsumptionInfo/mesRawMaterialConsumptionInfo.data.ts
@@ -91,7 +91,6 @@ export const MesRawMaterialConsumptionInfo = useCrudSchemas(reactive<CrudSchema[
     label: '原料包装号',
     field: 'packingNumber',
     sort: 'custom',
-    isSearch: true,
     table: {
       width: 150
     },
@@ -103,7 +102,6 @@ export const MesRawMaterialConsumptionInfo = useCrudSchemas(reactive<CrudSchema[
     table: {
       width: 150
     },
-    isSearch: true,
   },
   {
     label: '原料批次',

From 12a38b82e1511dfce48a2e249be64857eee8e850 Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Sun, 18 Aug 2024 16:34:11 +0800
Subject: [PATCH 37/37] =?UTF-8?q?WMS=20=E9=9C=80=E6=B1=82=EF=BC=9AHL-5264?=
 =?UTF-8?q?=EF=BC=9A=E4=BB=BF=E7=85=A7=E5=A4=87=E4=BB=B6=E9=A2=86=E7=94=A8?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=86=8D=E5=81=9A=E4=B8=80=E4=B8=AA=E5=A4=87?=
 =?UTF-8?q?=E4=BB=B6=E9=80=80=E5=BA=93=E5=8A=9F=E8=83=BD=EF=BC=8C=E5=A4=87?=
 =?UTF-8?q?=E4=BB=B6=E5=BA=93=E5=AD=98=E5=87=AD=E7=A9=BA=E8=BF=9B=E5=85=A5?=
 =?UTF-8?q?=E5=A4=87=E4=BB=B6=E5=BA=93=EF=BC=8C=E7=BB=99QAD=E4=BC=A0?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=A4=96=E5=85=A5=E5=BA=93=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/unplannedissueRecordDetail/index.ts   |   23 +-
 src/api/wms/unplannedissueRecordMain/index.ts |   38 +-
 .../wms/unplannedissueRequestDetail/index.ts  |   25 +-
 .../wms/unplannedissueRequestMain/index.ts    |   26 +-
 .../wms/unplannedreceiptRecordDetail/index.ts |   44 +-
 .../unplannedreceiptRequestDetail/index.ts    |   41 +
 .../wms/unplannedreceiptRequestMain/index.ts  |    4 +
 .../sparepartReturnRecordMain/index.vue       |  182 ++
 .../sparepartReturnRecordMain.data.ts         |  879 +++++++++
 .../sparepartReturnRequestMain/index.vue      |  696 +++++++
 .../sparepartReturnRequestMain.data.ts        | 1677 +++++++++++++++++
 .../index.vue                                 |    2 +-
 .../unplannedissueRecordMain/index.vue        |    1 +
 .../unplannedissueRequestMain/index.vue       |    1 +
 .../unplannedreceiptRecordMain/index.vue      |    1 +
 .../unplannedreceiptRequestMain/index.vue     |    1 +
 16 files changed, 3586 insertions(+), 55 deletions(-)
 create mode 100644 src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRecordMain/index.vue
 create mode 100644 src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRecordMain/sparepartReturnRecordMain.data.ts
 create mode 100644 src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/index.vue
 create mode 100644 src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/sparepartReturnRequestMain.data.ts

diff --git a/src/api/wms/unplannedissueRecordDetail/index.ts b/src/api/wms/unplannedissueRecordDetail/index.ts
index 9e508c4ae..839ff3bd9 100644
--- a/src/api/wms/unplannedissueRecordDetail/index.ts
+++ b/src/api/wms/unplannedissueRecordDetail/index.ts
@@ -38,10 +38,15 @@ export const getUnplannedissueRecordDetailPage = async (params) => {
       'action':'==',
       'value':'1'
     }
-    if(!data.filters){
-      data.filters = []
+    const cmdExists = data.filters.some(filter =>
+      filter.column === dataTypeCondition.column &&
+      filter.action === dataTypeCondition.action &&
+      filter.value === dataTypeCondition.value
+    );
+
+    if (!cmdExists) {
+      data.filters.push(dataTypeCondition)
     }
-    data.filters.push(dataTypeCondition)
     return await request.post({ url: '/wms/unplannedissue-record-detail/senior', data })
   } else {
     params.detailDataType='1'
@@ -59,7 +64,15 @@ export const getUnplannedissueRecordDetailPageSpare = async (params) => {
       'action':'==',
       'value':'2'
     }
-    data.filters.push(dataTypeCondition)
+    const cmdExists = data.filters.some(filter =>
+      filter.column === dataTypeCondition.column &&
+      filter.action === dataTypeCondition.action &&
+      filter.value === dataTypeCondition.value
+    );
+
+    if (!cmdExists) {
+      data.filters.push(dataTypeCondition)
+    }
     return await request.post({ url: '/wms/unplannedissue-record-detail/senior', data })
   } else {
     params.detailDataType='2'
@@ -95,4 +108,4 @@ export const exportUnplannedissueRecordDetail = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/unplannedissue-record-detail/get-import-template' })
-}
\ No newline at end of file
+}
diff --git a/src/api/wms/unplannedissueRecordMain/index.ts b/src/api/wms/unplannedissueRecordMain/index.ts
index 772b38813..18feaf0ab 100644
--- a/src/api/wms/unplannedissueRecordMain/index.ts
+++ b/src/api/wms/unplannedissueRecordMain/index.ts
@@ -24,42 +24,6 @@ export interface UnplannedissueRecordMainVO {
   available: string
 }
 
-// 查询计划外出库记录主列表
-export const getUnplannedissueRecordMainPage = async (params) => {
-  if (params.isSearch) {
-    delete params.isSearch
-    const data = {...params}
-    const dataTypeCondition = {
-      'column':'dataType',
-      'action':'==',
-      'value':'1'
-    }
-    data.filters.push(dataTypeCondition)
-    return await request.post({ url: '/wms/unplannedissue-record-main/senior', data })
-  } else {
-    params.dataType='1'
-    return await request.get({ url: `/wms/unplannedissue-record-main/page`, params })
-  }
-}
-
-// 查询计划外出库记录主列表
-export const getUnplannedissueRecordMainPageSpare = async (params) => {
-  if (params.isSearch) {
-    delete params.isSearch
-    const data = {...params}
-    const dataTypeCondition = {
-      'column':'dataType',
-      'action':'==',
-      'value':'2'
-    }
-    data.filters.push(dataTypeCondition)
-    return await request.post({ url: '/wms/unplannedissue-record-main/senior', data })
-  } else {
-    params.dataType='2'
-    return await request.get({ url: `/wms/unplannedissue-record-main/page`, params })
-  }
-}
-
 // 查询计划外出库记录主详情
 export const getUnplannedissueRecordMain = async (id: number) => {
   return await request.get({ url: `/wms/unplannedissue-record-main/get?id=` + id })
@@ -94,4 +58,4 @@ export const exportUnplannedissueRecordMain = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/unplannedissue-record-main/get-import-template' })
-}
\ No newline at end of file
+}
diff --git a/src/api/wms/unplannedissueRequestDetail/index.ts b/src/api/wms/unplannedissueRequestDetail/index.ts
index 99adb86f7..b8a444f31 100644
--- a/src/api/wms/unplannedissueRequestDetail/index.ts
+++ b/src/api/wms/unplannedissueRequestDetail/index.ts
@@ -33,10 +33,15 @@ export const getUnplannedissueRequestDetailPage = async (params) => {
       'action':'==',
       'value':'1'
     }
-    if(!data.filters){
-      data.filters = [];
+    const cmdExists = data.filters.some(filter =>
+      filter.column === dataTypeCondition.column &&
+      filter.action === dataTypeCondition.action &&
+      filter.value === dataTypeCondition.value
+    );
+
+    if (!cmdExists) {
+      data.filters.push(dataTypeCondition)
     }
-    data.filters.push(dataTypeCondition)
     return await request.post({ url: '/wms/unplannedissue-request-detail/senior', data })
   } else {
     params.detailDataType='1'
@@ -44,7 +49,7 @@ export const getUnplannedissueRequestDetailPage = async (params) => {
   }
 }
 
-// 查询计划外出库申请子列表
+// 查询备件领用列表
 export const getUnplannedissueRequestDetailPageSpare = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
@@ -54,7 +59,15 @@ export const getUnplannedissueRequestDetailPageSpare = async (params) => {
       'action':'==',
       'value':'2'
     }
-    data.filters.push(dataTypeCondition)
+    const cmdExists = data.filters.some(filter =>
+      filter.column === dataTypeCondition.column &&
+      filter.action === dataTypeCondition.action &&
+      filter.value === dataTypeCondition.value
+    );
+
+    if (!cmdExists) {
+      data.filters.push(dataTypeCondition)
+    }
     return await request.post({ url: '/wms/unplannedissue-request-detail/senior', data })
   } else {
     params.detailDataType='2'
@@ -90,4 +103,4 @@ export const exportUnplannedissueRequestDetail = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/unplannedissue-request-detail/get-import-template' })
-}
\ No newline at end of file
+}
diff --git a/src/api/wms/unplannedissueRequestMain/index.ts b/src/api/wms/unplannedissueRequestMain/index.ts
index 4796b2cb7..2137666eb 100644
--- a/src/api/wms/unplannedissueRequestMain/index.ts
+++ b/src/api/wms/unplannedissueRequestMain/index.ts
@@ -32,7 +32,15 @@ export const getUnplannedissueRequestMainPage = async (params) => {
       'action':'==',
       'value':'1'
     }
-    data.filters.push(dataTypeCondition)
+    const cmdExists = data.filters.some(filter =>
+      filter.column === dataTypeCondition.column &&
+      filter.action === dataTypeCondition.action &&
+      filter.value === dataTypeCondition.value
+    );
+
+    if (!cmdExists) {
+      data.filters.push(dataTypeCondition)
+    }
     return await request.post({ url: '/wms/unplannedissue-request-main/senior', data })
   } else {
     params.dataType='1'
@@ -70,13 +78,13 @@ export const exportUnplannedissueRequestMain = async (params) => {
   }
 }
 
+
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/unplannedissue-request-main/get-import-template' })
 }
 
 
-
 // 关闭-计划外出库申请
 export const closeUnplannedissueRequestMain = async (id) => {
   return await request.put({ url: `/wms/unplannedissue-request-main/close?id=` + id })
@@ -114,14 +122,22 @@ export const getUnplannedissueRequestMainPageSpare = async (params) => {
     delete params.isSearch
     const data = {...params}
     const dataTypeCondition = {
-      'column':'dataType',
+      'column':'detailDataType',
       'action':'==',
       'value':'2'
     }
-    data.filters.push(dataTypeCondition)
+    const cmdExists = data.filters.some(filter =>
+      filter.column === dataTypeCondition.column &&
+      filter.action === dataTypeCondition.action &&
+      filter.value === dataTypeCondition.value
+    );
+
+    if (!cmdExists) {
+      data.filters.push(dataTypeCondition)
+    }
     return await request.post({ url: '/wms/unplannedissue-request-main/senior', data })
   } else {
-    params.dataType='2'
+    params.detailDataType='2'
     return await request.get({ url: `/wms/unplannedissue-request-main/page`, params })
   }
 }
diff --git a/src/api/wms/unplannedreceiptRecordDetail/index.ts b/src/api/wms/unplannedreceiptRecordDetail/index.ts
index 458ebabed..28905fbf0 100644
--- a/src/api/wms/unplannedreceiptRecordDetail/index.ts
+++ b/src/api/wms/unplannedreceiptRecordDetail/index.ts
@@ -37,8 +37,50 @@ export const getUnplannedreceiptRecordDetailPage = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
+    const dataTypeCondition = {
+      'column':'detailDataType',
+      'action':'==',
+      'value':'1'
+    }
+    const cmdExists = data.filters.some(filter =>
+      filter.column === dataTypeCondition.column &&
+      filter.action === dataTypeCondition.action &&
+      filter.value === dataTypeCondition.value
+    );
+
+    if (!cmdExists) {
+      data.filters.push(dataTypeCondition)
+    }
     return await request.post({ url: '/wms/unplannedreceipt-record-detail/senior', data })
   } else {
+    params.detailDataType='1'
+    return await request.get({ url: `/wms/unplannedreceipt-record-detail/page`, params })
+  }
+}
+
+
+// 查询备件退库记录子列表
+export const getUnplannedreceiptRecordDetailPageSpare = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    const dataTypeCondition = {
+      'column':'detailDataType',
+      'action':'==',
+      'value':'2'
+    }
+    const cmdExists = data.filters.some(filter =>
+      filter.column === dataTypeCondition.column &&
+      filter.action === dataTypeCondition.action &&
+      filter.value === dataTypeCondition.value
+    );
+
+    if (!cmdExists) {
+      data.filters.push(dataTypeCondition)
+    }
+    return await request.post({ url: '/wms/unplannedreceipt-record-detail/senior', data })
+  } else {
+    params.detailDataType='2'
     return await request.get({ url: `/wms/unplannedreceipt-record-detail/page`, params })
   }
 }
@@ -71,4 +113,4 @@ export const exportUnplannedreceiptRecordDetail = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/unplannedreceipt-record-detail/get-import-template' })
-}
\ No newline at end of file
+}
diff --git a/src/api/wms/unplannedreceiptRequestDetail/index.ts b/src/api/wms/unplannedreceiptRequestDetail/index.ts
index 3b63ee625..f9268afab 100644
--- a/src/api/wms/unplannedreceiptRequestDetail/index.ts
+++ b/src/api/wms/unplannedreceiptRequestDetail/index.ts
@@ -32,8 +32,49 @@ export const getUnplannedreceiptRequestDetailPage = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
+    const dataTypeCondition = {
+      'column':'detailDataType',
+      'action':'==',
+      'value':'1'
+    }
+    const cmdExists = data.filters.some(filter =>
+      filter.column === dataTypeCondition.column &&
+      filter.action === dataTypeCondition.action &&
+      filter.value === dataTypeCondition.value
+    );
+
+    if (!cmdExists) {
+      data.filters.push(dataTypeCondition)
+    }
+    return await request.post({ url: '/wms/unplannedreceipt-request-detail/senior', data })
+  } else {
+    params.detailDataType='1'
+    return await request.get({ url: `/wms/unplannedreceipt-request-detail/page`, params })
+  }
+}
+
+// 查询维修备件退库列表
+export const getUnplannedreceiptRequestDetailPageSpare = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    const dataTypeCondition = {
+      'column':'detailDataType',
+      'action':'==',
+      'value':'2'
+    }
+    const cmdExists = data.filters.some(filter =>
+      filter.column === dataTypeCondition.column &&
+      filter.action === dataTypeCondition.action &&
+      filter.value === dataTypeCondition.value
+    );
+
+    if (!cmdExists) {
+      data.filters.push(dataTypeCondition)
+    }
     return await request.post({ url: '/wms/unplannedreceipt-request-detail/senior', data })
   } else {
+    params.detailDataType='2'
     return await request.get({ url: `/wms/unplannedreceipt-request-detail/page`, params })
   }
 }
diff --git a/src/api/wms/unplannedreceiptRequestMain/index.ts b/src/api/wms/unplannedreceiptRequestMain/index.ts
index 67966664e..23f034ae1 100644
--- a/src/api/wms/unplannedreceiptRequestMain/index.ts
+++ b/src/api/wms/unplannedreceiptRequestMain/index.ts
@@ -96,3 +96,7 @@ export const agreeUnplannedreceiptRequestMain = async (id) => {
 export const handleUnplannedreceiptRequestMain = async (id) => {
   return await request.put({ url: `/wms/unplannedreceipt-request-main/handle?id=` + id })
 }
+
+export const handleSparepartReturnRequestMain = async (id) => {
+  return await request.put({ url: `/wms/unplannedreceipt-request-main/handleBack?id=` + id })
+}
diff --git a/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRecordMain/index.vue b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRecordMain/index.vue
new file mode 100644
index 000000000..a818b90dd
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRecordMain/index.vue
@@ -0,0 +1,182 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="[...UnplannedreceiptRecordMain.allSchemas.searchSchema,...UnplannedreceiptRecordDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="UnplannedreceiptRecordMain.allSchemas"
+      :detailAllSchemas="UnplannedreceiptRecordDetail.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table v-clientTable
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row,$index }">
+        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="UnplannedreceiptRecordMainRules"
+    :formAllSchemas="UnplannedreceiptRecordMain.allSchemas"
+    :tableAllSchemas="UnplannedreceiptRecordDetail.allSchemas"
+    :tableFormRules="UnplannedreceiptRecordDetailRules"
+    :isBusiness="true"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="UnplannedreceiptRecordMain.allSchemas"
+    :detailAllSchemas="UnplannedreceiptRecordDetail.allSchemas"
+    :detailAllSchemasRules="UnplannedreceiptRecordDetailRules"
+    :apiPage="UnplannedreceiptRecordDetailApi.getUnplannedreceiptRecordDetailPageSpare"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { UnplannedreceiptRecordMain,UnplannedreceiptRecordMainRules,UnplannedreceiptRecordDetail,UnplannedreceiptRecordDetailRules } from './sparepartReturnRecordMain.data'
+import * as UnplannedreceiptRecordMainApi from '@/api/wms/unplannedreceiptRecordMain'
+import * as UnplannedreceiptRecordDetailApi from '@/api/wms/unplannedreceiptRecordDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { formatDate } from '@/utils/formatTime'
+// 调拨入库记录主
+defineOptions({ name: 'UnplannedreceiptRecordMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref([...UnplannedreceiptRecordMain.allSchemas.tableColumns,...UnplannedreceiptRecordDetail.allSchemas.tableMainColumns])
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: UnplannedreceiptRecordDetailApi.getUnplannedreceiptRecordDetailPageSpare // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:unplannedreceipt-record-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row,$index) => {
+  const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
+  if(findIndex>-1&&findIndex<$index){
+    return []
+  }
+  return []
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+}
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'recordUnplannedreceiptMain')
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
+    tableObject.params.detailDataType = 2
+    const data = await UnplannedreceiptRecordMainApi.exportUnplannedreceiptRecordMain(tableObject.params)
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRecordMain/sparepartReturnRecordMain.data.ts b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRecordMain/sparepartReturnRecordMain.data.ts
new file mode 100644
index 000000000..32c7b00bf
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRecordMain/sparepartReturnRecordMain.data.ts
@@ -0,0 +1,879 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import { TableColumn } from '@/types/table'
+
+
+import { QadCostcentre } from '@/views/wms/basicDataManage/subject/qadCostcentre/qadCostcentre.data'
+import * as QadCostcentreApi from '@/api/wms/qadCostcentre/index'
+
+import { QadProject } from '@/views/wms/basicDataManage/subject/qadProject/qadProject.data'
+import * as QadProjectApi from '@/api/wms/qadProject'
+
+import * as SubjectAccountApi  from '@/api/wms/subjectAccount'
+import { SubjectAccount } from '@/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data'
+
+/**
+ * @returns {Array} 计划外入库记录主表
+ */
+export const UnplannedreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true
+  },
+  {
+    label: '任务单号',
+    field: 'jobNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '执行时间',
+    field: 'executeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '生效日期',
+    field: 'activeDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '成本中心代码',
+    field: 'costCenterCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择成本中心代码',
+      searchField: 'costcentreCode',
+      searchTitle: '成本中心代码',
+      searchAllSchemas: QadCostcentre.allSchemas,
+      searchPage: QadCostcentreApi.getQadCostcentrePage
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择成本中心代码', // 输入框占位文本
+        searchField: 'costcentreCode', // 查询弹窗赋值字段
+        searchTitle: '成本中心代码', // 查询弹窗标题
+        searchAllSchemas: QadCostcentre.allSchemas, // 查询弹窗所需类
+        searchPage: QadCostcentreApi.getQadCostcentrePage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '成本中心类型',
+    field: 'costCenterType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+  },
+  {
+    label: '领用原因代码',
+    field: 'reasonCodeRequisition',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择成领用原因代码',
+      searchField: 'code',
+      searchTitle: '领用原因代码',
+      searchAllSchemas: SubjectAccount.allSchemas,
+      searchPage: SubjectAccountApi.getSubjectAccountPage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key: 'costcentreType',
+        value: 'costCenterType',
+        message: '成本中心类型不能为空!',
+        isMainValue: true
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择成本中心代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '领用原因代码', // 查询弹窗标题
+        searchAllSchemas: SubjectAccount.allSchemas, // 查询弹窗所需类
+        searchPage: SubjectAccountApi.getSubjectAccountPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'costcentreType',
+          value: 'costCenterType',
+          message: '成本中心类型不能为空!',
+          isMainValue: true
+        }]
+      }
+    }
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择QAD项目信息',
+      searchField: 'projectCode',
+      searchTitle: '领用原因代码',
+      searchAllSchemas: QadProject.allSchemas,
+      searchPage: QadProjectApi.getQadProjectPage
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择QAD项目信息', // 输入框占位文本
+        searchField: 'projectCode', // 查询弹窗赋值字段
+        searchTitle: '领用原因代码', // 查询弹窗标题
+        searchAllSchemas: QadProject.allSchemas, // 查询弹窗所需类
+        searchPage: QadProjectApi.getQadProjectPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '工作中心',
+    field: 'workCenter',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '到库区代码范围',
+  //   field: 'toAreaCodes',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '领用代码',
+    field: 'usageCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTable:false,
+  },
+  {
+    label: '领用描述',
+    field: 'usageDescription',
+    sort: 'custom',
+    isTable:false,
+    isForm:false,
+    isTableForm:false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '出库事务类型',
+    field: 'outTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '入库事务类型',
+    field: 'inTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remarkMain',
+    isTable:false,
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    isTable:false,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    isTable:false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    sort: 'custom',
+    isDetail: true,
+    isForm: false,
+    isTable: false,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    isDetail: true,
+    isForm: false,
+    isTable: false,
+    table: {
+      width: 150
+    }
+  },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: false,
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+]))
+
+//表单校验
+export const UnplannedreceiptRecordMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  toWarehouseCode: [
+    { required: true, message: '请选择到仓库代码', trigger: 'change' }
+  ],
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
+  ],
+  toAreaCodes: [
+    { required: true, message: '请选择到库区代码范围', trigger: 'change' }
+  ],
+  outTransaction: [
+    { required: true, message: '请输入出库事务类型', trigger: 'blur' }
+  ],
+  inTransaction: [
+    { required: true, message: '请输入入库事务类型', trigger: 'blur' }
+  ],
+  executeTime: [
+    { required: true, message: '请输入执行时间', trigger: 'change' }
+  ],
+  activeDate: [
+    { required: true, message: '请输入生效日期', trigger: 'change' }
+  ],
+  available: [
+    { required: true, message: '请输入是否可用', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  interfaceType: [
+    { required: true, message: '请选择接口类型', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 计划外入库记录子表
+ */
+export const UnplannedreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    hiddenInMain:true,
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '器具号',
+  //   field: 'containerNumber',
+  //   isTable:false,
+  //   isForm:false,
+  //   isTableForm:false,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单价',
+    field: 'singlePrice',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '金额',
+    field: 'amount',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货日期',
+    field: 'arriveDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '过期日期',
+    field: 'expireDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '到库位组代码',
+    field: 'toLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码',
+    field: 'toAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '成本中心代码',
+    field: 'costcentreCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:false,
+  },
+  {
+    label: '科目代码',
+    field: 'qadProjectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:false,
+  },
+  {
+    label: '原因',
+    field: 'reason',
+    dictType: DICT_TYPE.UNPLANNED_RECEIPT_REASON,
+    dictClass: 'string',
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return cellValue
+    },
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        filterable: true
+      }
+    },
+    tableForm: {
+      type: 'Select',
+      filterable: true
+    }
+  },
+  {
+    label: '货主代码',
+    field: 'ownerCode',
+    sort: 'custom',
+    isTable:false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    isTable:false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: false,
+    isForm:false,
+    isTableForm:false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '任务明细ID',
+  //   field: 'jobDetailId',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+]))
+
+//表单校验
+export const UnplannedreceiptRecordDetailRules = reactive({
+  packingNumber: [
+    { required: true, message: '请选择包装号', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
+  toLocationGroupCode: [
+    { required: true, message: '请选择到库位组代码', trigger: 'change' }
+  ],
+  toAreaCode: [
+    { required: true, message: '请选择到库区代码', trigger: 'change' }
+  ],
+  arriveDate: [
+    { required: true, message: '请输入到货日期', trigger: 'change' }
+  ],
+  produceDate: [
+    { required: true, message: '请选择生产日期', trigger: 'change' }
+  ],
+  expireDate: [
+    { required: true, message: '请选择过期日期', trigger: 'change' }
+  ]
+})
diff --git a/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/index.vue b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/index.vue
new file mode 100644
index 000000000..8611480fe
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/index.vue
@@ -0,0 +1,696 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="[...UnplannedreceiptRequestMain.allSchemas.searchSchema,...UnplannedreceiptRequestDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="UnplannedreceiptRequestMain.allSchemas"
+      :detailAllSchemas="UnplannedreceiptRequestDetail.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table v-clientTable
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row,$index }">
+        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    :isOpenSearchTable="true"
+    fieldTableColumn="itemCode"
+    @success="getList"
+    :rules="UnplannedreceiptRequestMainRules"
+    :formAllSchemas="UnplannedreceiptRequestMain.allSchemas"
+    :tableAllSchemas="UnplannedreceiptRequestDetail.allSchemas"
+    :tableFormRules="UnplannedreceiptRequestDetailRules"
+    :tableData="tableData"
+    :apiUpdate="UnplannedreceiptRequestMainApi.updateUnplannedreceiptRequestMain"
+    :apiCreate="UnplannedreceiptRequestMainApi.createUnplannedreceiptRequestMain"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    :isShowReduceButtonSelection="true"
+    @tableSelectionDelete="tableSelectionDelete"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+    @inputNumberChange="inputNumberChange"
+    @tableFormSelectOnBlur="tableFormSelectOnBlur">
+    <template  v-slot="{row}">
+    <el-date-picker v-bind:modelValue="row['validityDays']?addDay(row['produceDate'],row['validityDays']):''" format="YYYY-MM-DD"
+    :clearable="true"
+    style="width: 100%"
+    :disabled="true" 
+    :placeholder="t('ts.选择日期')"/>
+    </template>
+  </BasicForm>
+
+  <!-- 详情 -->
+  <!-- :apiCreate="UnplannedreceiptRequestDetailApi.createUnplannedreceiptRequestDetail" -->
+  <!-- :apiUpdate="UnplannedreceiptRequestDetailApi.updateUnplannedreceiptRequestDetail" -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="UnplannedreceiptRequestMain.allSchemas"
+    :detailAllSchemas="UnplannedreceiptRequestDetail.allSchemas"
+    :detailAllSchemasRules="UnplannedreceiptRequestDetailRules"
+    :apiCreate="UnplannedreceiptRequestDetailApi.createUnplannedreceiptRequestDetail"
+    :apiUpdate="UnplannedreceiptRequestDetailApi.updateUnplannedreceiptRequestDetail"
+    :apiPage="UnplannedreceiptRequestDetailApi.getUnplannedreceiptRequestDetailPageSpare"
+    :apiDelete="UnplannedreceiptRequestDetailApi.deleteUnplannedreceiptRequestDetail"
+    :Echo="Echo"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+    :detailValidate="detailValidate"
+    @onBlur="onBlur"
+  />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/unplannedreceipt-request-main/import" :importTemplateData="importTemplateData" 
+  @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
+</template>
+
+<script setup lang="ts">
+import dayjs from 'dayjs'
+import { addDay } from '@/utils/formatTime'
+import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import {
+  UnplannedreceiptRequestMain,
+  UnplannedreceiptRequestMainRules,
+  UnplannedreceiptRequestDetail,
+  UnplannedreceiptRequestDetailRules, UnplannedreceiptRequestDetailLabel
+} from './sparepartReturnRequestMain.data'
+import * as UnplannedreceiptRequestMainApi from '@/api/wms/unplannedreceiptRequestMain'
+import * as UnplannedreceiptRequestDetailApi from '@/api/wms/unplannedreceiptRequestDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as ItembasicApi from "@/api/wms/itembasic";
+import { formatTime } from '@/utils/index'
+import { formatDate } from '@/utils/formatTime'
+import {handleSparepartReturnRequestMain} from "@/api/wms/unplannedreceiptRequestMain";
+
+// 计划外入库申请
+defineOptions({ name: 'UnplannedreceiptRequestMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref([...UnplannedreceiptRequestMain.allSchemas.tableColumns,...UnplannedreceiptRequestDetail.allSchemas.tableMainColumns])
+
+const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({
+  getListApi: UnplannedreceiptRequestDetailApi.getUnplannedreceiptRequestDetailPageCreateLabel
+})
+const { getList:getDetailList } = detatableMethods
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(async () => {
+    console.log('searchTableSuccess',formField, searchField, val, formRef, type, row )
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      if(formField == 'toLocationCode'){
+        row['toLocationCode'] = val[0]['code']
+      } else if(formField == 'itemCode'){
+        let itemCodes = val.filter(item=>tableData.value.find(item1=>item1['itemCode']==item['code']))
+        if(itemCodes.length>0){
+          itemCodes = itemCodes.map(item=>(item['code']))
+          message.warning(`物料${itemCodes.join(',')}已经存在`)
+        }
+        val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['itemCode']))
+        if(val.length==0){
+          return
+        }
+        const enableBuy = val[0]['enableBuy']
+        let newVal = val.filter(item=>item.enableBuy==enableBuy)
+        if(newVal.length<val.length){
+          message.warning('不能同时选择可制造和可采购的物料')
+        }
+        newVal = newVal.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['code']))
+        newVal.forEach(item=>{
+          let tfk = JSON.parse(JSON.stringify(tableFormKeys))
+          tfk.batch = formatTime(new Date(), 'yyyyMMdd')
+          //生产日期 到货日期 默认当天
+          tfk['produceDate'] = dayjs().valueOf()
+          tfk['arriveDate'] = dayjs().valueOf()
+          tfk['itemCode'] = item['code']
+          tfk['uom'] = item['uom']
+          tfk['validityDays'] = item['validityDays']
+          tableData.value.push(tfk)
+        })
+      } else if(formField === 'costcentreCode'){
+        row['costcentreCode'] = val[0]['costcentreCode']
+      } else if(formField === 'qadProjectCode'){
+        row['qadProjectCode'] = val[0]['projectCode']
+      }else {
+        row[formField] = val[0][searchField]
+      }
+    } else {
+      const setV = {}
+      if(formField === 'usageDescription'){
+        setV['usageDescription'] = val[0]['usageDescription']
+        setV['usageCode'] = val[0]['code']
+      }
+      if(formField === 'costCenterCode'){
+        setV['costcentreCode'] = val[0]['costcentreCode']
+        setV['costCenterType'] = val[0]['costcentreType']
+      }
+      if(formField === 'reasonCodeRequisition'){
+        setV['reasonCodeRequisition'] = val[0]['code']
+      }
+      if(formField === 'projectCode'){
+        setV['projectCode'] = val[0]['projectCode']
+      }
+      setV[formField] = val[0][searchField]
+      formRef.setValues(setV)
+    }
+  })
+}
+const handleDetailSubmitForm = async (formType, data) => {
+  let mydata = {...data}
+  mydata['expireDate'] = data['expireDate'].valueOf()
+  if (formType === 'create') {
+    await UnplannedreceiptRequestDetailApi.createUnplannedreceiptRequestDetail(data)
+    message.success(t('common.createSuccess'))
+      
+  } else {
+    await UnplannedreceiptRequestDetailApi.updateUnplannedreceiptRequestDetail(data)
+    message.success(t('common.updateSuccess'))
+  }
+  detailRef.value.submitUpdateList()
+
+}
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    if(formField == 'toLocationCode'){
+      setV['toLocationCode'] = val[0]['code']
+    }
+    if(formField == 'itemCode'){
+      setV['itemCode'] = val[0]['code']
+      setV['uom'] = val[0]['uom']
+      setV['validityDays'] = val[0]['validityDays']
+      setV['expireDate'] =  val[0]['validityDays']?addDay(val[0]['produceDate'],val[0]['validityDays']).valueOf():''
+      setV['batch'] = formatTime(new Date(), 'yyyyMMdd')      //生产日期 到货日期 默认当天
+      setV['produceDate'] = dayjs().valueOf()
+      setV['arriveDate'] = dayjs().valueOf()
+      
+    }
+    if(formField === 'costcentreCode'){
+      setV['costcentreCode'] = val[0]['costcentreCode']
+    }
+    if(formField === 'qadProjectCode'){
+      setV['qadProjectCode'] = val[0]['projectCode']
+    }
+    formRef.setValues(setV)
+  })
+}
+
+const Echo =  []
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: UnplannedreceiptRequestDetailApi.getUnplannedreceiptRequestDetailPageSpare // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:unplannedreceipt-request-main:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:unplannedreceipt-request-main:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:unplannedreceipt-request-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row,$index) => {
+  const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
+  if(findIndex>-1&&findIndex<$index){
+    return []
+  }
+    return [
+        defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:unplannedreceipt-request-main:close'}), // 关闭
+        defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:unplannedreceipt-request-main:reAdd'}), // 重新添加
+        defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:unplannedreceipt-request-main:submit'}), // 提交审批
+        defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:unplannedreceipt-request-main:refused'}), // 驳回
+        defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:unplannedreceipt-request-main:agree'}), // 审批通过
+        defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:unplannedreceipt-request-main:handle'}), // 处理
+        defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:unplannedreceipt-request-main:update'}), // 编辑
+        // defaultButtons.mainListDeleteBtn({hasPermi:'wms:unplannedreceipt-request-main:delete'}), // 删除
+    ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  console.log("val",val)
+  if (val == 'mainClose') { // 关闭
+    console.log('列表-操作按钮事件-关闭')
+    handleClose(row.masterId)
+  } else if (val == 'mainReAdd') { // 重新添加
+    console.log('列表-操作按钮事件-重新添加')
+    handleReAdd(row.masterId)
+  } else if (val == 'mainSubmit') { // 提交审批
+    console.log('列表-操作按钮事件-提交审批')
+    handleSubmit(row.masterId)
+  } else if (val == 'mainTurnDown') { // 驳回
+    console.log('列表-操作按钮事件-驳回')
+    handleRefused(row.masterId)
+  } else if (val == 'mainApprove') { // 审批通过
+    console.log('列表-操作按钮事件-审批通过')
+    handleAgree(row.masterId)
+  } else if (val == 'mainHandle') { // 处理
+    console.log('列表-操作按钮事件-处理')
+    handleHandle(row.masterId)
+  } else if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.masterId)
+  }
+}
+
+/** 关闭按钮操作 */
+const handleClose = async (id: number) => {
+  await message.confirm(t('common.confirmColse'))
+  tableObject.loading = true
+  try{
+    await UnplannedreceiptRequestMainApi.closeUnplannedreceiptRequestMain(id)
+    message.success(t('common.closeSuccess'))
+    tableObject.loading = false
+    buttonBaseClick('refresh',null)
+  }catch{
+    tableObject.loading = false
+  }
+}
+
+/** 重新添加按钮操作 */
+const handleReAdd = async (id: number) => {
+  await message.confirm(t('common.confirmReAdd'))
+  tableObject.loading = true
+  try{
+    await UnplannedreceiptRequestMainApi.reAddUnplannedreceiptRequestMain(id)
+    message.success(t('common.reAddSuccess'))
+    tableObject.loading = false
+    buttonBaseClick('refresh',null)
+  }catch{
+    tableObject.loading = false
+  }
+}
+
+/** 提交按钮操作 */
+const handleSubmit = async (id: number) => {
+  await message.confirm(t('common.confirmSubmit'))
+  tableObject.loading = true
+  try{
+    await UnplannedreceiptRequestMainApi.submitUnplannedreceiptRequestMain(id)
+    message.success(t('common.submitSuccess'))
+    tableObject.loading = false
+    buttonBaseClick('refresh',null)
+  }catch{
+    tableObject.loading = false
+  }
+}
+
+/** 审批驳回按钮操作 */
+const handleRefused = async (id: number) => {
+  await message.confirm(t('common.confirmRefused'))
+  tableObject.loading = true
+  try{
+    await UnplannedreceiptRequestMainApi.refusedUnplannedreceiptRequestMain(id)
+    message.success(t('common.refusedSuccess'))
+    tableObject.loading = false
+    buttonBaseClick('refresh',null)
+  }catch{
+    tableObject.loading = false
+  }
+}
+
+/** 审批通过按钮操作 */
+const handleAgree = async (id: number) => {
+  await message.confirm(t('common.confirmAgree'))
+  tableObject.loading = true
+  try{
+    await UnplannedreceiptRequestMainApi.agreeUnplannedreceiptRequestMain(id)
+    message.success(t('common.agreeSuccess'))
+    tableObject.loading = false
+    buttonBaseClick('refresh',null)
+  }catch{
+    tableObject.loading = false
+  }
+}
+
+/** 处理按钮操作 */
+const handleHandle = async (id: number) => {
+  await message.confirm(t('common.confirmHandle'))
+  tableObject.loading = true
+  try {
+    await UnplannedreceiptRequestMainApi.handleSparepartReturnRequestMain(id)
+    message.success(t('common.handleSuccess'))
+    buttonBaseClick('refresh',null)
+  } finally {
+    tableObject.loading = false
+  }
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm =async (type: string, row?: number) => {
+    UnplannedreceiptRequestMain.allSchemas.formSchema.forEach((item) => {
+      if(type == "update"){
+        if (item.field == 'costCenterCode') {
+          //成本中心代码
+          item.componentProps.isSearchList = false
+          item.componentProps.disabled = true
+        }
+        if (item.field == 'reasonCodeRequisition') {
+          //领用原因代码
+          item.componentProps.isSearchList = false
+          item.componentProps.disabled = true
+        }
+        if (item.field == 'toWarehouseCode') {
+          //到仓库代码
+          item.componentProps.isSearchList = false
+          item.componentProps.disabled = true
+        }
+        
+        
+      }else{
+        if (item.field == 'costCenterCode') {
+          //成本中心代码
+          item.componentProps.isSearchList = true
+          item.componentProps.disabled = false
+        }
+        if (item.field == 'reasonCodeRequisition') {
+          //领用原因代码
+          item.componentProps.isSearchList = true
+          item.componentProps.disabled = false
+        }
+        if (item.field == 'toWarehouseCode') {
+          //到仓库代码
+          item.componentProps.isSearchList = true
+          item.componentProps.disabled = false
+        }
+      }
+    })
+  
+  tableData.value = [] // 重置明细数据
+  formRef.value.open(type, row)
+}
+
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'requestUnplannedreceiptMain')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await UnplannedreceiptRequestMainApi.deleteUnplannedreceiptRequestMain(id)
+    message.success(t('common.delSuccess'))
+    tableObject.loading = false
+    // 刷新列表
+    buttonBaseClick('refresh',null)
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
+    tableObject.params.detailDataType = 2
+    const data = await UnplannedreceiptRequestMainApi.exportUnplannedreceiptRequestMain(tableObject.params)
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+UnplannedreceiptRequestDetail.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  let tfk = JSON.parse(JSON.stringify(tableFormKeys))
+  tfk.batch = formatTime(new Date(), 'yyyyMMdd')
+  //生产日期 到货日期 默认当天
+  tfk['produceDate'] = dayjs().valueOf()
+  tfk['arriveDate'] = dayjs().valueOf()
+  tableData.value.push(tfk)
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  let itemIndex = tableData.value.indexOf(item)
+  if(itemIndex>-1){
+    tableData.value.splice(itemIndex, 1)
+  }
+}
+const tableSelectionDelete = (selection) => {
+  tableData.value = tableData.value.filter(item => !selection.includes(item))
+}
+// 主子数据 提交
+const submitForm = async (formType, submitData) => {
+  
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }  
+  data.subList = tableData.value // 拼接子表数据参数
+  data.subList.forEach(row=>{
+    row['expireDate'] = row['validityDays']?addDay(row['produceDate'],row['validityDays']).valueOf():''
+  })
+  try {
+    if (formType === 'create') {
+      console.log("【计划外入库子列表】",data.subList)
+      if(data.subList.length == 0){
+        message.warning("请添加子列表数据")
+        return;
+      }
+      let flag = false;
+      data.subList.forEach((item) => {
+          if(item.qty == 0){
+            message.warning("数量不能为0")
+            flag = true;
+            return;
+          }
+      })
+      if(flag){
+        return
+      }
+      data.dataType='2'
+      formRef.value.formLoading = true
+      await UnplannedreceiptRequestMainApi.createUnplannedreceiptRequestMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      data.dataType='2'
+      formRef.value.formLoading = true
+      await UnplannedreceiptRequestMainApi.updateUnplannedreceiptRequestMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    if (formType === 'create') {
+      getList()
+    }else{
+      buttonBaseClick('refresh',null)
+    }
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+// 子表新增/编辑校验
+const detailValidate = (data) => {
+  let tag = false;
+  if(data.qty <= 0){
+    message.warning('数量必须大于0')
+    tag = false;
+    return tag;
+  }else {
+    tag = true;
+    return tag;
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+const inputNumberChange = (field, index, row, val) => {
+  if(field == 'qty' || field == 'singlePrice'){
+    row.amount = row.qty * row.singlePrice
+  }
+}
+
+
+let validityDays = 0
+const detailOpenForm = (type, row)=>{
+  console.log('detailOpenForm',row)
+  if(type=='update'){
+    //有效期
+    ItembasicApi.getItembasicPage({
+      code:row.itemCode
+    }).then((res)=>{
+      res.list.forEach((item,index)=>{
+        const findItem = tableData.value.find(item1=>item1['itemCode']==row['code'])
+        if(findItem){
+          validityDays = findItem['expireTime']
+        }
+      })
+      detailRef.value.formRef.formRef.formModel.expireDate = addDay(detailRef.value.formRef.formRef.formModel.produceDate,validityDays).valueOf()
+    })
+  }else{
+    validityDays = 0
+  }
+  
+}
+const qtyOnChange = (field,val) =>{
+  console.log('qtyOnChange',field,val)
+  console.log(detailRef.value.formRef.formRef.formModel)
+  if(field=='produceDate'){
+    if(detailRef.value.formRef.formRef.formModel.validityDays){
+      detailRef.value.formRef.formRef.formModel.expireDate = addDay(detailRef.value.formRef.formRef.formModel.produceDate,detailRef.value.formRef.formRef.formModel.validityDays).valueOf()
+    }else{
+      detailRef.value.formRef.formRef.formModel.expireDate = addDay(detailRef.value.formRef.formRef.formModel.produceDate,validityDays).valueOf()
+    }
+  }
+  if(field == 'qty' || field == 'singlePrice'){
+    detailRef.value.formRef.formRef.formModel.amount = detailRef.value.formRef.formRef.formModel.qty * detailRef.value.formRef.formRef.formModel.singlePrice
+  }
+}
+
+const onBlur = (field, e) => {
+  if (field == 'reason') {
+    detailRef.value.formRef.formRef.formModel[field] = e.target.value
+  }
+}
+
+const tableFormSelectOnBlur = (field, val, row, index) => {
+  if (field == 'reason') {
+    tableData.value[index][field] = val.target.value
+  }
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await UnplannedreceiptRequestMainApi.importTemplate()
+})
+</script>
diff --git a/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/sparepartReturnRequestMain.data.ts b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/sparepartReturnRequestMain.data.ts
new file mode 100644
index 000000000..00bfdf790
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/sparepartReturnRequestMain.data.ts
@@ -0,0 +1,1677 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
+
+import * as SubjectAccountApi  from '@/api/wms/subjectAccount'
+import { SubjectAccount } from '@/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data'
+
+import * as ItembasicApi from '@/api/wms/itembasic'
+import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
+
+import {Warehouse} from "@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data";
+import * as WarehouseApi from "@/api/wms/warehouse";
+
+import {Location} from "@/views/wms/basicDataManage/factoryModeling/location/location.data";
+import * as LocationApi from "@/api/wms/location";
+
+import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
+import * as ItemPackageApi from '@/api/wms/itempackage/index'
+
+import { QadCostcentre } from '@/views/wms/basicDataManage/subject/qadCostcentre/qadCostcentre.data'
+import * as QadCostcentreApi from '@/api/wms/qadCostcentre/index'
+
+import { QadProject } from '@/views/wms/basicDataManage/subject/qadProject/qadProject.data'
+import * as QadProjectApi from '@/api/wms/qadProject'
+import * as BusinesstypeApi from '@/api/wms/businesstype'
+
+const businessType = 'UnplannedReceipt'
+const { t } = useI18n() // 国际化
+
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'UnplannedReceiptRequest'
+}
+ const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+ const requestsettingData =data?.list[0]||{}
+
+ // 获取当前操作人的部门
+ import { useUserStore } from '@/store/modules/user'
+ import { TableColumn } from '@/types/table'
+ const userStore = useUserStore()
+ const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
+ const userDeptArray:any = [userDept]
+ const UnplannedReceipt = await BusinesstypeApi.getBusinesstypeCode("UnplannedReceipt")
+/**
+ * @returns {Array} 计划外入库申请主表
+ */
+export const UnplannedreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isForm: false,
+    isSearch: true,
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isForm: false,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    isForm:false,
+    isTable:false,
+    isTableForm:false,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '成本中心代码',
+    field: 'costCenterCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      enterSearch: true,
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择成本中心代码',
+      searchField: 'costcentreCode',
+      searchTitle: '成本中心代码',
+      searchAllSchemas: QadCostcentre.allSchemas,
+      searchPage: QadCostcentreApi.getQadCostcentrePage,
+      verificationParams: [{
+        key: 'costcentreCode',
+        action: '==',
+        value: '',
+        isMainValue: false,
+        isSearch: true,
+        isFormModel: true,
+      }], // 失去焦点校验参数
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        enterSearch: true,
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择成本中心代码', // 输入框占位文本
+        searchField: 'costcentreCode', // 查询弹窗赋值字段
+        searchTitle: '成本中心代码', // 查询弹窗标题
+        searchAllSchemas: QadCostcentre.allSchemas, // 查询弹窗所需类
+        searchPage: QadCostcentreApi.getQadCostcentrePage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }],
+        verificationParams: [{
+          key: 'costcentreCode',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
+      }
+    }
+  },
+  {
+    label: '成本中心类型',
+    field: 'costCenterType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+  },
+  {
+    label: '领用原因代码',
+    field: 'reasonCodeRequisition',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      enterSearch: true,
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择成领用原因代码',
+      searchField: 'code',
+      searchTitle: '领用原因代码',
+      searchAllSchemas: SubjectAccount.allSchemas,
+      searchPage: SubjectAccountApi.getSubjectAccountPage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key: 'costcentreType',
+        value: 'costCenterType',
+        message: '成本中心类型不能为空!',
+        isMainValue: true
+        }],
+      verificationParams: [{
+        key: 'code',
+        action: '==',
+        value: '',
+        isMainValue: false,
+        isSearch: true,
+        isFormModel: true,
+      }], // 失去焦点校验参数
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        enterSearch: true,
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择成本中心代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '领用原因代码', // 查询弹窗标题
+        searchAllSchemas: SubjectAccount.allSchemas, // 查询弹窗所需类
+        searchPage: SubjectAccountApi.getSubjectAccountPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'costcentreType',
+          value: 'costCenterType',
+          message: '成本中心类型不能为空!',
+          isMainValue: true
+          }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
+      }
+    }
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      enterSearch: true,
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择QAD项目信息',
+      searchField: ' ',
+      searchTitle: '领用原因代码',
+      searchAllSchemas: QadProject.allSchemas,
+      searchPage: QadProjectApi.getQadProjectPage,
+      verificationParams: [{
+        key: 'projectCode',
+        action: '==',
+        value: '',
+        isMainValue: false,
+        isSearch: true,
+        isFormModel: true,
+      }], // 失去焦点校验参数
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        enterSearch: true,
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择QAD项目信息', // 输入框占位文本
+        searchField: 'projectCode', // 查询弹窗赋值字段
+        searchTitle: '领用原因代码', // 查询弹窗标题
+        searchAllSchemas: QadProject.allSchemas, // 查询弹窗所需类
+        searchPage: QadProjectApi.getQadProjectPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }],
+        verificationParams: [{
+          key: 'projectCode',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
+      }
+    }
+  },
+  {
+    label: '工作中心',
+    field: 'workCenter',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      enterSearch: true,
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择仓库代码',
+      searchField: 'code',
+      searchTitle: '仓库信息',
+      searchAllSchemas: Warehouse.allSchemas,
+      searchPage: WarehouseApi.getWarehousePage,
+      verificationParams: [{
+        key: 'code',
+        action: '==',
+        value: '',
+        isMainValue: false,
+        isSearch: true,
+        isFormModel: true,
+      }], // 失去焦点校验参数
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        enterSearch:true,
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '仓库信息', // 查询弹窗标题
+        searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
+        searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
+      }
+    }
+  },
+  {
+    label: '领用代码',
+    field: 'usageCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTable:false,
+  },
+  {
+    label: '领用描述',
+    field: 'usageDescription',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm:false,
+    isTable:false,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请领用描述信息',
+        searchField: 'usageDescription',
+        searchTitle: '领用描述信息',
+        searchAllSchemas: SubjectAccount.allSchemas,
+        searchPage: SubjectAccountApi.getSubjectAccountPage
+      }
+    }
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    isForm: false,
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: 'UnplannedReceipt',
+      componentProps: {
+        disabled: true
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    isForm: false,
+    table: {
+      width: 150
+    },
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return userDeptArray.find((account) => account.id == cellValue)?.name
+    },
+    form: {
+      value: userDept.id,
+      component: 'Select',
+      api: () => userDeptArray,
+      componentProps: {
+        disabled: true,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        }
+      }
+    }
+  },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    isForm: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    isForm: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoAgree,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    isForm: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.autoExecute,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  // {
+  //   label: '是否直接生成记录',
+  //   field: 'directCreateRecord',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   isForm: true,
+  //   isTable: false,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'Switch',
+  //     value: requestsettingData.directCreateRecord,
+  //     componentProps: {
+  //       inactiveValue: 'FALSE',
+  //       activeValue: 'TRUE'
+  //     }
+  //   }
+  // },
+  {
+    label: '备注',
+    field: 'remarkMain',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:false,
+    sortTableDefault: 1000,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    isTable:false,
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    isTable:false,
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    isTable:false,
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    isTable:false,
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 350,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const UnplannedreceiptRequestMainRules = reactive({
+  toWarehouseCode: [
+    { required: true, message: '请输入到库位代码', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  dueTime: [
+    { required: true, message: '请输入截止时间', trigger: 'blur' }
+  ],
+  costCenterCode: [
+    { required: true, message: '请输入成本中心代码', trigger: 'blur' }
+  ],
+  costCenterType: [
+    { required: true, message: '请输入成本中心类型', trigger: 'blur' }
+  ],
+  reasonCodeRequisition: [
+    { required: true, message: '请输入领用原因代码', trigger: 'blur' }
+  ],
+  autoCommit: [
+    { required: true, message: '请选择是否自动提交', trigger: 'change' }
+  ],
+  autoAgree: [
+    { required: true, message: '请选择是否自动通过', trigger: 'change' }
+  ],
+  autoExecute: [
+    { required: true, message: '请选择是否自动执行', trigger: 'change' }
+  ],
+  directCreateRecord: [
+    { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  usageDescription:[
+    { required: true, message: '请选择领用描述', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 计划外入库申请子表
+ */
+export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    hiddenInMain:true,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      multiple:true,//多选
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择物料代码',// 输入框占位文本
+      searchField: 'code',// 查询弹窗赋值字段
+      searchTitle: '物料基础信息',
+      searchAllSchemas: Itembasic.allSchemas,
+      searchPage: ItembasicApi.getItembasicPage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        action: '==',
+        isSearch: true,
+        isMainValue: false
+      },{
+        key: 'businessTypeCode',
+        value: 'UnplannedReceipt',
+        action: '==',
+        isSearch: true,
+        isMainValue: false
+        }],
+      verificationPage: ItembasicApi.getItemListByCodes, // tableForm下方输入框校验失去焦点之后是否正确的方法
+      isShowTableFormSearch: true, //tableForm下方是否出现输入框
+      verificationParams: [{
+        key: 'code',
+        action: '==',
+        value: '',
+        isMainValue: false,
+        isSearch: true,
+        isFormModel: true,
+      }], // 失去焦点校验参数
+    },
+    form: {
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '物料基础信息', // 查询弹窗标题
+        searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
+        searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          action: '==',
+          isSearch: true,
+          isMainValue: false
+        },{
+          key: 'businessTypeCode',
+          value: 'UnplannedReceipt',
+          action: '==',
+          isSearch: true,
+          isMainValue: false
+          }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
+      }
+    }
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  // {
+  //   label: '包装号',
+  //   field: 'packingNumber',
+  //   sort: 'custom',
+  //   isTableForm:false,
+  //   isForm:false,
+  //   table: {
+  //     width: 150
+  //   },
+  //   tableForm:{
+  //     disabled: true
+  //   }
+  // },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    isTableForm:false,
+    isForm:false,
+    isTable:false,
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6,
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 6,
+    },
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    },
+    form:{
+      componentProps:{
+        disabled:true
+      }
+    }
+  },
+  {
+    label: '单价',
+    field: 'singlePrice',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:false,
+    isTableForm:false,
+    isDetail:false,
+    isForm:false,
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6,
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 6,
+      disabled: true
+    },
+  },
+  {
+    label: '金额',
+    field: 'amount',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:false,
+    isTableForm:false,
+    isDetail:false,
+    isForm:false,
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled:true,
+        min: 0,
+        precision: 6,
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      disabled:true,
+      min: 0,
+      precision: 6,
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      enterSearch: true,
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择库位代码',
+      searchField: 'code',
+      searchTitle: '库位信息',
+      searchAllSchemas: Location.allSchemas,
+      searchPage: LocationApi.getLocationListByAreaAndBusinesstype,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key: 'warehouseCode',
+        value: 'toWarehouseCode',
+        message: '请填写到仓库代码！',
+        isMainValue: true,
+      },
+      {
+        key: 'businessType',
+        value: businessType ,
+        isMainValue: false
+      },{
+        key: 'isIn',
+        value: 'in',
+        isMainValue: false
+        }],
+      verificationParams: [{
+        key: 'code',
+        action: '==',
+        value: '',
+        isMainValue: false,
+        isSearch: true,
+        isFormModel: true,
+      }], // 失去焦点校验参数
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！！',
+      componentProps: {
+        enterSearch:true,
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库位信息', // 查询弹窗标题
+        searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+        searchPage: LocationApi.getLocationListByAreaAndBusinesstype, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'warehouseCode',
+          value: 'toWarehouseCode',
+          message: '请填写到仓库代码！',
+          isMainValue: true,
+        },
+        {
+          key: 'businessType',
+          value: businessType ,
+          isMainValue: false
+        },{
+          key: 'isIn',
+          value: 'in',
+          isMainValue: false
+          }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
+      }
+    }
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    sort: 'custom',
+    // dictType: DICT_TYPE.INVENTORY_STATUS,
+    // dictClass: 'string',
+    isTable: true,
+    table: {
+      width: 150
+    },
+    form:{
+      component: 'Select',
+      componentProps:{
+        options: UnplannedReceipt.inInventoryStatusList
+      }
+    },
+    tableForm: {
+      show:true,
+      type: 'Select',
+      initOptions:UnplannedReceipt.inInventoryStatusList
+    },
+  },
+  {
+    label: '到货日期',
+    field: 'arriveDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm: {
+      type: 'FormDate',
+      dateFormat: 'YYYY-MM-DD',
+      valueFormat: 'x',
+    }
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm: {
+      type: 'FormDate',
+      dateFormat: 'YYYY-MM-DD',
+      valueFormat: 'x',
+    }
+  },
+  {
+    label: '过期日期',
+    field: 'expireDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+        disabled:true
+      }
+    },
+    // tableForm: {
+    //   type: 'FormDate',
+    //   dateFormat: 'YYYY-MM-DD',
+    //   valueFormat: 'x',
+    // }
+    tableForm: {
+      type: 'slot',
+      disabled:true
+    }
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    isTable:false,
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '成本中心代码',
+    field: 'costcentreCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:false,
+    isTableForm:false,
+    isDetail:false,
+    isForm:false,
+    tableForm:{
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '选择成本中心',
+      searchField: 'costcentreCode',
+      searchTitle: '成本中心信息',
+      searchAllSchemas: SubjectAccount.allSchemas,
+      searchPage: SubjectAccountApi.getSubjectAccountPage,
+      searchCondition: [{
+        key: 'code', // 查询列表中字段
+        value: 'usageCode', // 指查询具体值
+        message: '请选择成本中心信息！', // 当前置条件为空时 弹出信息提示
+        isMainValue: true // 表示查询条件不是主表的字段的值
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '选择成本中心',
+        searchField: 'costcentreCode',
+        searchTitle: '成本中心信息',
+        searchAllSchemas: SubjectAccount.allSchemas,
+        searchPage: SubjectAccountApi.getSubjectAccountPage,
+        searchCondition: [{
+          key: 'code', // 查询列表中字段
+          value: 'usageCode', // 指查询具体值
+          message: '请选择成本中心信息!', // 当前置条件为空时 弹出信息提示
+          isMainValue: true // 表示查询条件不是主表的字段的值
+        }]
+      }
+    }
+  },
+  {
+    label: '科目代码',
+    field: 'qadProjectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:false,
+    isTableForm:false,
+    isDetail:false,
+    isForm:false,
+    tableForm:{
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '选择科目代码',
+      searchField: 'projectCode',
+      searchTitle: '科目代码信息',
+      searchAllSchemas: SubjectAccount.allSchemas,
+      searchPage: SubjectAccountApi.getSubjectAccountPage,
+      searchCondition: [{
+        key: 'code', // 查询列表中字段
+        value: 'usageCode', // 指查询具体值
+        message: '请选择科目代码信息!', // 当前置条件为空时 弹出信息提示
+        isMainValue: true // 表示查询条件不是主表的字段的值
+      },{
+        key: 'costcentreCode', // 查询列表中字段
+        value: 'costcentreCode', // 指查询具体值
+        message: '请选择科目代码信息!', // 当前置条件为空时 弹出信息提示
+        isMainValue: true // 表示查询条件不是主表的字段的值
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '选择科目代码',
+        searchField: 'projectCode',
+        searchTitle: '科目代码信息',
+        searchAllSchemas: SubjectAccount.allSchemas,
+        searchPage: SubjectAccountApi.getSubjectAccountPage,
+        searchCondition: [{
+          key: 'code', // 查询列表中字段
+          value: 'usageCode', // 指查询具体值
+          message: '请选择科目代码信息!', // 当前置条件为空时 弹出信息提示
+          isMainValue: true // 表示查询条件不是主表的字段的值
+        },{
+          key: 'costcentreCode', // 查询列表中字段
+          value: 'costecentreCode', // 指查询具体值
+          message: '请选择科目代码信息!', // 当前置条件为空时 弹出信息提示
+          isMainValue: false // 表示查询条件不是主表的字段的值
+        }]
+      }
+    }
+  },
+  {
+    label: '原因',
+    field: 'reason',
+    dictType: DICT_TYPE.UNPLANNED_RECEIPT_REASON,
+    dictClass: 'string',
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return cellValue
+    },
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        filterable: true
+      }
+    },
+    tableForm: {
+      type: 'Select',
+      filterable: true
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: true,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    sortTableDefault: 1001,
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault: 1002,
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    isTable:false,
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    isTable:false,
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    hiddenInMain:true,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:false,
+  }
+]))
+function validateQty(rule, value, callback) {
+  if (value>0) {
+    callback()
+  }else{
+    callback(new Error('数量必须大于0'))
+  }
+}
+//表单校验
+export const UnplannedreceiptRequestDetailRules = reactive({
+  arriveDate: [
+    { required: true, message: '请选择到货日期', trigger: 'change' }
+  ],
+  produceDate: [
+    { required: true, message: '请选择生产日期', trigger: 'change' }
+  ],
+  expireDate: [
+    { required: true, message: '请选择过期日期', trigger: 'change' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  qty:[
+    { validator:validateQty, message: '数量必须大于0', trigger: 'change'}
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  costcentreCode:[
+    { required: true, message: '请选择成本中心代码', trigger: 'change' }
+  ],
+  qadProjectCode:[
+    { required: true, message: '请选择科目代码', trigger: 'change' }
+  ],
+  singlePrice:[
+    { required: true, message: '请维护标准成本价格', trigger: 'blur' }
+  ],
+})
+
+
+/**
+ * @returns {Array} 生产退料申请子表创建标签
+ */
+export const UnplannedreceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '到货日期',
+    field: 'arriveDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+        disabled:true
+      }
+    },
+    tableForm: {
+      type: 'FormDate',
+      dateFormat: 'YYYY-MM-DD',
+      valueFormat: 'x',
+      disabled:true
+    }
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+        disabled:true
+      }
+    },
+    tableForm: {
+      type: 'FormDate',
+      dateFormat: 'YYYY-MM-DD',
+      valueFormat: 'x',
+      disabled:true
+    }
+  },
+  {
+    label: '过期日期',
+    field: 'expireDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+        disabled:true
+      }
+    },
+    tableForm: {
+      type: 'FormDate',
+      dateFormat: 'YYYY-MM-DD',
+      valueFormat: 'x',
+      disabled:true
+    }
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150,
+      componentProps: {
+        disabled: true,
+        isSearchList: true,
+        searchListPlaceholder: '请选择包装',
+        searchField: 'packUnit',
+        searchTitle: '物品包装信息',
+        searchAllSchemas: Itempackaging.allSchemas,
+        searchPage: ItemPackageApi.getItempackagingPage,
+        searchCondition: [
+          {
+            key: 'itemCode',
+            value: 'itemCode',
+            message: '请选择物料代码',
+            isMainValue: true
+          },
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+        ]
+
+      }
+    },
+    tableForm: {
+      enterSearch:true,
+      disabled: true,
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择包装',
+      searchField: 'packUnit',
+      searchTitle: '物品包装信息',
+      searchAllSchemas: Itempackaging.allSchemas,
+      searchPage: ItemPackageApi.getItempackagingPage,
+      searchCondition: [
+        {
+          key: 'itemCode',
+          value: 'itemCode',
+          message: '请选择物料代码',
+          isTableRowValue: true, 
+          isMainValue:false
+        },
+        {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+    }
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true,
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+]))
+
+//表单校验
+export const UnplannedreceiptRequestDetailLabelRules = reactive({
+  packUnit: [
+    { required: true, message: '请选择包装规格', trigger: 'change' }
+  ],
+})
diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue
index bba9b77d4..3676c92d0 100644
--- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue
@@ -401,8 +401,8 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    tableObject.params.detailDataType = 2
     const excelTitle = ref(route.meta.title)
+    tableObject.params.detailDataType = 2
     const data = await UnplannedissueRequestMainApi.exportUnplannedissueRequestMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/index.vue b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/index.vue
index 08ffbf748..5576ccab7 100644
--- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/index.vue
@@ -157,6 +157,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const excelTitle = ref(route.meta.title)
+    tableObject.params.detailDataType = 1
     const data = await UnplannedissueRecordMainApi.exportUnplannedissueRecordMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue
index 56bf85919..5f140eb93 100644
--- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue
@@ -439,6 +439,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const excelTitle = ref(route.meta.title)
+    tableObject.params.detailDataType = 1
     const data = await UnplannedissueRequestMainApi.exportUnplannedissueRequestMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/index.vue
index 0c89f0917..7972ac52c 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/index.vue
@@ -157,6 +157,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const excelTitle = ref(route.meta.title)
+    tableObject.params.detailDataType = 1
     const data = await UnplannedreceiptRecordMainApi.exportUnplannedreceiptRecordMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
index 407c8487c..9cb708a64 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
@@ -668,6 +668,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const excelTitle = ref(route.meta.title)
+    tableObject.params.detailDataType = 1
     const data = await UnplannedreceiptRequestMainApi.exportUnplannedreceiptRequestMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {