From caf1e876bd0487d76dff041ecbe200becb5762c7 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Fri, 31 May 2024 19:24:35 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereturnRequestMain.data.ts | 105 +++++++++++------- 1 file changed, 62 insertions(+), 43 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts index 2b302bfad..c2c4592a0 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts @@ -743,7 +743,9 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive sort: 'custom', table: { width: 150 - }, + }, + isTableForm:false, + isTable:false, hiddenInMain: true, tableForm:{ disabled:true @@ -760,7 +762,9 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive sort: 'custom', table: { width: 150 - }, + }, + isTableForm:false, + isTable:false, hiddenInMain: true, tableForm:{ disabled:true @@ -771,7 +775,22 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive } } }, - + { + label: '批次', + field: 'batch', + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + disabled:true + }, + form: { + componentProps:{ + disabled:true + } + } + }, { label: '替代批次', field: 'altBatch', @@ -880,6 +899,46 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive // disabled:false // } // }, + { + label: '从库位代码', + field: 'fromLocationCode', + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + // labelMessage: '信息提示说明！！！', + isInpuFocusShow: true, // 开启查询弹窗 + searchListPlaceholder: '请选择从库位代码', + searchField: 'code', + searchTitle: '库位代码信息', + searchAllSchemas: Location.allSchemas, + searchPage: LocationApi.getLocationListByAreaAndBusinesstype, + searchCondition: [{ + key: 'businessType', + value: 'PurchaseReturn', + message: '请填写业务类型', + isMainValue: false + }] + }, + hiddenInMain: true, + isTable: false, + }, + { + label: '包装号', + field: 'packingNumber', + sort: 'custom', + table: { + width: 150 + }, + hiddenInMain: true, + isTable: false, + form: { + componentProps:{ + disabled:true + } + } + }, { label: '库存余额', field: 'inventoryBalance', @@ -922,21 +981,6 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive precision: 6 } }, - { - label: '包装号', - field: 'packingNumber', - sort: 'custom', - table: { - width: 150 - }, - hiddenInMain: true, - isTable: false, - form: { - componentProps:{ - disabled:true - } - } - }, { label: '库存状态', field: 'inventoryStatus', @@ -960,31 +1004,6 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive } } }, - { - label: '从库位代码', - field: 'fromLocationCode', - sort: 'custom', - table: { - width: 150 - }, - tableForm:{ - // labelMessage: '信息提示说明！！！', - isInpuFocusShow: true, // 开启查询弹窗 - searchListPlaceholder: '请选择从库位代码', - searchField: 'code', - searchTitle: '库位代码信息', - searchAllSchemas: Location.allSchemas, - searchPage: LocationApi.getLocationListByAreaAndBusinesstype, - searchCondition: [{ - key: 'businessType', - value: 'PurchaseReturn', - message: '请填写业务类型', - isMainValue: false - }] - }, - hiddenInMain: true, - isTable: false, - }, { label: '到库位代码', field: 'toLocationCode', From 9e3a35f01422bdee1c1060e554d0719dcfe5cdae Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Fri, 31 May 2024 19:41:21 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7?= =?UTF-8?q?=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereturnRequestMain/index.vue | 40 ++++++++++--------- .../purchasereturnRequestMain.data.ts | 35 +++++++++++++++- 2 files changed, 55 insertions(+), 20 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue index e0f65f42e..27581ecc1 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue @@ -260,14 +260,16 @@ const searchTableSuccess = async(formField, searchField, val, formRef, type, row // row['fromLocationCode'] = val[0]['fromLocationCode'] row['toLocationCode'] = val[0]['toLocationCode'] }else if(formField=='fromLocationCode'){ - let params = { - itemCode: row.itemCode, - batch: row.batch, - locationCode:val[0]['code'] - } - let aa = await BalanceApi.getSumByConditions(params); - console.log('23423423',aa); - row['inventoryBalance'] = aa//库存余额 + // let params = { + // itemCode: row.itemCode, + // batch: row.batch, + // locationCode:val[0]['code'] + // } + // let aa = await BalanceApi.getSumByConditions(params); + // console.log('23423423',aa); + // row['inventoryBalance'] = aa//库存余额 + }else if(formField=='packingNumber'){ + row['inventoryBalance'] = val[0]['qty']//库存余额 } } else { const setV = {} @@ -491,17 +493,17 @@ const butttondata = (row,$index) => { hide: isShowMainButton(row, ['1']), hasPermi: 'wms:purchasereceipt-request-main:update' }), // 编辑 - { - label: '生成标签', - name: 'ssbq', - hide: isShowMainButton(row, ['3']), - type: 'primary', - icon: '', - color: '', - hasPermi: '', - link: true // 文本展现按钮 - }, - defaultButtons.mainListPointBtn({ hide: isShowMainButton(row, ['3','6']) }), // 标签打印 + // { + // label: '生成标签', + // name: 'ssbq', + // hide: isShowMainButton(row, ['3']), + // type: 'primary', + // icon: '', + // color: '', + // hasPermi: '', + // link: true // 文本展现按钮 + // }, + // defaultButtons.mainListPointBtn({ hide: isShowMainButton(row, ['3','6']) }), // 标签打印 ] } diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts index c2c4592a0..e26d13203 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts @@ -10,6 +10,8 @@ import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackag import * as ItemPackageApi from '@/api/wms/itempackage/index' import * as LocationApi from "@/api/wms/location"; import {Location} from "@/views/wms/basicDataManage/factoryModeling/location/location.data"; +import * as BalanceApi from '@/api/wms/balance' +import { Balance } from '@/views/wms/inventoryManage/balance/balance.data' @@ -937,7 +939,38 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive componentProps:{ disabled:true } - } + }, + tableForm:{ + // labelMessage: '信息提示说明！！！', + isInpuFocusShow: true, // 开启查询弹窗 + searchListPlaceholder: '请选择物料代码、批次、从库位代码', + searchField: 'packingNumber', + searchTitle: '库存余额信息', // 查询弹窗标题 + searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类 + searchPage: BalanceApi.getBalancePage, + searchCondition: [{ + key: 'itemCode', + value: 'itemCode', + message: '请填写物料代码', + isTableRowValue: true, //查询当前searchTable表中行数据的值 + required:true, + isMainValue:false + },{ + key: 'batch', + value: 'batch', + message: '请填写批次', + isTableRowValue: true, //查询当前searchTable表中行数据的值 + required:true, + isMainValue:false + },{ + key: 'fromLocationCode', + value: 'fromLocationCode', + message: '请选择从库位代码', + isTableRowValue: true, //查询当前searchTable表中行数据的值 + required:true, + isMainValue:false + }] + }, }, { label: '库存余额', From 8bf7721322648ccfb08f15f0ddb954c34dbaa5f6 Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Fri, 31 May 2024 19:43:43 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=89=8D=E7=BD=AE=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/BasicForm/src/BasicForm.vue | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index 2dfe94013..716e2006a 100644 --- a/src/components/BasicForm/src/BasicForm.vue +++ b/src/components/BasicForm/src/BasicForm.vue @@ -390,6 +390,13 @@ const opensearchTable = ( return } }else if(searchCondition[i].isTableRowValue){ + if(searchCondition[i].required){ + if (row[searchCondition[i].value] == '' ||row[searchCondition[i].value] == undefined) { + message.warning(searchCondition[i].message?searchCondition[i].message:'前置条件未选择！') + return + } + } + row[searchCondition[i].value] //查询当前table表数据的值 _searchCondition[searchCondition[i].key] = row[searchCondition[i].value] } else { From 45817ec58d91ef224db1189ccbb476d15cd48d4d Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Fri, 31 May 2024 19:59:13 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereturnRequestMain/purchasereturnRequestMain.data.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts index e26d13203..26962e000 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts @@ -963,7 +963,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive required:true, isMainValue:false },{ - key: 'fromLocationCode', + key: 'locationCode', value: 'fromLocationCode', message: '请选择从库位代码', isTableRowValue: true, //查询当前searchTable表中行数据的值