From 2bb358ba9c50d1885fac3d65af6de3e65a7cc799 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Wed, 11 Sep 2024 11:46:13 +0800
Subject: [PATCH] =?UTF-8?q?HL-5906=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7?=
=?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=8F=AF=E4=BB=A5=E4=B8=8D=E9=80=89=E6=8B=A9?=
=?UTF-8?q?=E6=94=B6=E8=B4=A7=E5=8D=95=E6=98=8E=E7=BB=86=EF=BC=8C=E7=9B=B4?=
=?UTF-8?q?=E6=8E=A5=E9=80=89=E6=8B=A9=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95?=
=?UTF-8?q?=E5=8F=B7=E5=92=8C=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=E8=A1=8C?=
=?UTF-8?q?=EF=BC=8C=E8=AF=A6=E8=A7=81=E5=8E=9F=E5=9E=8B=E6=96=B9=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../purchasereturnRequestMainNew/index.vue | 83 ++++++++++++++++++-
.../purchasereturnRequestMainNew.data.ts | 9 +-
2 files changed, 86 insertions(+), 6 deletions(-)
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
index cde0b5255..cf3a42bfa 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
@@ -76,13 +76,13 @@
>
选择收货单明细
-
-
+ 直接选择采购订单
+
@@ -94,6 +94,16 @@
+
+
+
+
+
+
+
+
+
+
{
// })
}
const onChangeForm = async (field, cur, formRef)=>{
+ console.log('onChangeForm',field, cur, formRef)
if(field=='supplierCode'){
//供应商
PurchasereturnRequestMainNew.allSchemas.formSchema.forEach(item=>{
@@ -815,6 +829,7 @@ const onChangeForm = async (field, cur, formRef)=>{
formRef.value.setValues(setV)
}
})
+ getPurchanseList()
}else if(field == 'locationCode' || field == 'itemCode'){
// 退货库位 获取明细列表
let itemCode = formRef.formModel?formRef.formModel.itemCode:formRef.value.formModel.itemCode
@@ -842,6 +857,57 @@ const onChangeForm = async (field, cur, formRef)=>{
}
}
}
+
+const getPurchanseList = async ()=>{
+ let res = await PurchaseDetailApi.getPurchaseDetailPageWMS({
+ supplierCode: formRef.value.formRef.formModel.supplierCode,
+ itemCode: formRef.value.formRef.formModel.itemCode,
+ pageSize: 20,
+ pageNo: 1,
+ sort: '',
+ by: 'ASC'
+ })
+ if(res&&res.list&&res.list.length==1){
+ const setV = {}
+ setV['hahaha'] = ''
+ setV['hehehe'] = res.list[0]['number']
+ setV['poNumber'] = res.list[0]['number']
+ setV['poLine'] = res.list[0]['lineNumber']
+ setV['receiptNumber'] = ''
+ setV['asnNumber'] = ''
+ formRef.value.formRef.setValues(setV)
+ }
+ console.log('采购订单',res)
+}
+// 直接选择采购订单
+const choosePurchanseList = ()=>{
+
+ if(!formRef.value.formRef.formModel.itemCode){
+ message.error('请选择物料代码')
+ return
+ }
+ if(!formRef.value.formRef.formModel.supplierCode){
+ message.error('请选择供应商')
+ return
+ }
+ searchTableRef.value.open(
+ "直接选择采购订单",
+ PurchaseMain.allSchemas,
+ PurchaseDetailApi.getPurchaseDetailPageWMS,
+ "hehehe",
+ "hehehe",
+ false,
+ 'tableForm',
+ null,
+ {
+ supplierCode:formRef.value.formRef.formModel.supplierCode,
+ itemCode:formRef.value.formRef.formModel.itemCode
+ },
+ undefined,
+ true,
+ PurchaseDetail.allSchemas
+ )
+}
// 选择收货单明细
const chooseReceiptList = ()=>{
if(!formRef.value.formRef.formModel.itemCode){
@@ -871,19 +937,30 @@ const chooseReceiptList = ()=>{
)
}
-// 选择收货单明细
+// 选择收货单明细、直接选择采购订单
const searchTableSuccess1 = (formField, searchField, val, type, row) => {
console.log('searchTableSuccess1',formField, searchField, val, type, row)
if(formField=='hahaha'){
// 选择收货单明细
const setV = {}
+ setV['hehehe'] = ''
setV['hahaha'] = val[0]['receiptNumber']
setV['poNumber'] = val[0]['poNumber']
setV['poLine'] = val[0]['poLine']
setV['receiptNumber'] = val[0]['receiptNumber']
setV['asnNumber'] = val[0]['asnNumber']
formRef.value.formRef.setValues(setV)
+ }else if(formField=='hehehe'){
+ // 直接选择采购订单
+ const setV = {}
+ setV['hahaha'] = ''
+ setV['hehehe'] = val[0]['number']
+ setV['poNumber'] = val[0]['number']
+ setV['poLine'] = val[0]['lineNumber']
+ setV['receiptNumber'] = ''
+ setV['asnNumber'] = ''
+ formRef.value.formRef.setValues(setV)
}
}
// 删除明细
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMainNew.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMainNew.data.ts
index 9b2400efc..13c162522 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMainNew.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMainNew.data.ts
@@ -148,7 +148,7 @@ export const PurchasereturnRequestMainNew = useCrudSchemas(
},
},
{
- label: '',
+ label: ' ',
field: 'hehehe',
table: {
width: 180
@@ -330,8 +330,11 @@ export const PurchasereturnRequestMainRulesNew = reactive({
supplierCode: [
{ required: true, message: '请输入供应商代码', trigger: 'blur' }
],
- hahaha: [
- required
+ poNumber: [
+ { required: true, message: '请选择采购订单号', trigger: 'blur' }
+ ],
+ poLine: [
+ { required: true, message: '请选择订单行', trigger: 'blur' }
],
locationCode: [
{ required: true, message: '请选择收货单明细', trigger: 'blur' }