diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue index c1c28fdab..48fa418c5 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue @@ -674,19 +674,23 @@ const buttonBaseClick = (val, item) => { // 获取供应商列表 const getFormSupplierList = async () => { - options.originSupplierList = await getSupplierList() + options.originSupplierList = await getSupplierList(null) options.supplierList = [...options.originSupplierList] } // 获取客户列表 const getFormCustomerList = async () => { - options.originSupplierList = await getCustomerList() + options.originSupplierList = await getCustomerList(null) options.supplierList = [...options.originSupplierList] } const filterMethod = (query: string) => { if (query) { options.supplierList = options.originSupplierList.filter((item) => { - return item.name.includes(query) + if(item.name==''){ + return item.code.includes(query) + }else{ + return item.name.includes(query) + } }) } else { options.supplierList = [...options.originSupplierList] diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue index 167761dc5..25d4b91b0 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue @@ -190,6 +190,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => } else { row['itemCode'] = val[0]['code'] row['uom'] = val[0]['uom'] + row['singlePrice'] = val[0]['price'] } } else if(formField === 'costcentreCode'){ row['costcentreCode'] = val[0]['costcentreCode'] diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts index 0df221d91..502d4cfe0 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts @@ -532,6 +532,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive