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 01/32] =?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 02/32] =?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 03/32] =?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 04/32] =?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 05/32] =?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 06/32] =?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 07/32] =?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 08/32] =?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 09/32] =?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 10/32] =?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 11/32] =?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 12/32] =?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 13/32] =?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 14/32] =?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 15/32] =?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 16/32] =?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 17/32] =?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 18/32] =?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 19/32] =?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 20/32] =?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 21/32] =?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 22/32] =?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 23/32] =?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 24/32] =?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 25/32] =?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 26/32] =?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 27/32] =?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 28/32] =?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 29/32] =?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 30/32] =?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 31/32] =?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 32/32] =?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 })
+  }
 }
 
 // 下载用户导入模板