From b373bee56d421ebd65611f2ce32ba3323539f1e0 Mon Sep 17 00:00:00 2001 From: bjang03 Date: Wed, 29 May 2024 11:12:47 +0800 Subject: [PATCH 1/3] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D=201=E3=80=81.env?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=9B=9E=E9=80=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 3 --- 1 file changed, 3 deletions(-) diff --git a/.env b/.env index 4eb2fc114..74e66bb15 100644 --- a/.env +++ b/.env @@ -15,6 +15,3 @@ VITE_APP_CAPTCHA_ENABLE=true # 百度统计 VITE_APP_BAIDU_CODE = a1ff8825baa73c3a78eb96aa40325abc - -# 查看质检报告环境 -VITE_REPORT_URL = 'http://dev.ccwin-in.com:25400' From dd6bb143bb7c8bf33665aada65ac538e2e12c2ca Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Wed, 29 May 2024 11:17:35 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../unplannedreceipt/unplannedreceiptRequestMain/index.vue | 1 + .../unplannedreceiptRequestMain.data.ts | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) 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 Date: Wed, 29 May 2024 11:27:26 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E7=AD=96=E7=95=A5?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../strategy/upShelfStrategy/AddForm.vue | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) 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]