From a83ccefe63d6b1a22183498ad03e5ea68743abcf Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Mon, 22 Jan 2024 13:57:57 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E9=80=80=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/purchasereceiptRecordDetail/index.ts | 12 ++ .../purchasereturnRequestMain/index.vue | 119 ++++++++++-------- .../purchasereturnRequestMain.data.ts | 67 ++++++++-- 3 files changed, 141 insertions(+), 57 deletions(-) diff --git a/src/api/wms/purchasereceiptRecordDetail/index.ts b/src/api/wms/purchasereceiptRecordDetail/index.ts index b326094dc..569de2b18 100644 --- a/src/api/wms/purchasereceiptRecordDetail/index.ts +++ b/src/api/wms/purchasereceiptRecordDetail/index.ts @@ -58,6 +58,18 @@ export const getPurchasereceiptRecordDetailPage = async (params) => { return await request.get({ url: `/wms/purchasereceipt-record-detail/page`, params }) } } + +// 查询采购收货记录子列表 +export const getPurchasereceiptRecordDetailPageBySupplierCode = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/purchasereceipt-record-detail/seniorBySupplierCode', data }) + } else { + return await request.get({ url: `/wms/purchasereceipt-record-detail/pageBySupplierCode`, params }) + } +} + // 查询采购收货记录子列表 export const getPurchasereceiptRecordDetailList = async (params) => { return await request.get({ url: `/wms/purchasereceipt-record-detail/list`, params }) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue index 8ce249001..543bc0adf 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue @@ -167,55 +167,62 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) => row['projectCode'] = val[0]['projectCode'] } else { const setV = {} - setV[formField] = val[0][searchField] - setV['purchaseReceiptRecordNumber'] = val[0]['number'] - setV['supplierCode'] = val[0]['supplierCode'] - setV['asnNumber'] = val[0]['asnNumber'] - setV['ppNumber'] = val[0]['ppNumber'] - - // 获取子表数据 getBomDisassemble - PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailList({ - masterId: val[0]['id'] - }) - .then((res) => { - if (res) tableData.value = res - tableData.value.forEach((item) => { - item.batch = item.toBatch - item.packingNumber = item.toPackingNumber - item.containerNumber = item.toContainerNumber - item.containerNumber = item.toContainerNumber - item.toLocationGroupCode = null - item.toWarehouseCode = null - item.toLocationTypes = null - item.toLocationCode = null - // item.fromLocationCode = item.fromLocationCode - // item.fromLocationGroupCode = item.fromLocationGroupCode - }) - isShowButton.value = false - PurchasereturnRequestMain.allSchemas.formSchema.forEach((item) => { - if (item.field == 'supplierCode') { - item.componentProps.disabled = true - } - }) - PurchasereturnRequestDetail.allSchemas.tableFormColumns.map((item) => { - item.tableForm.disabled = true - if (item.field == 'remark') { - item.tableForm.disabled = false - } - if (item.field == 'qty') { - item.tableForm.disabled = false - } - if (item.field == 'reason') { - item.tableForm.disabled = false - } - if (item.field == 'itemCode') { - item.tableForm.isInpuFocusShow = false - } - }) - }) - .catch((err) => { + if(formField == 'purchaseReceiptRecordNumber'){ + isShowButton.value = false + setV[formField] = val[0][searchField] + setV['purchaseReceiptRecordNumber'] = val[0]['number'] + setV['supplierCode'] = val[0]['supplierCode'] + setV['asnNumber'] = val[0]['asnNumber'] + setV['ppNumber'] = val[0]['ppNumber'] + + // 获取子表数据 getBomDisassemble + PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailList({ + masterId: val[0]['id'] + }).then((res) => { + if (res) tableData.value = res + tableData.value.forEach((item) => { + item.batch = item.toBatch + item.packingNumber = item.toPackingNumber + item.containerNumber = item.toContainerNumber + item.containerNumber = item.toContainerNumber + item.toLocationGroupCode = null + item.toWarehouseCode = null + item.toLocationTypes = null + item.toLocationCode = null + // item.fromLocationCode = item.fromLocationCode + // item.fromLocationGroupCode = item.fromLocationGroupCode + }) + + PurchasereturnRequestMain.allSchemas.formSchema.forEach((item) => { + if (item.field == 'supplierCode') { + item.componentProps.disabled = true + } + }) + PurchasereturnRequestDetail.allSchemas.tableFormColumns.map((item) => { + item.tableForm.disabled = true + if (item.field == 'remark') { + item.tableForm.disabled = false + } + if (item.field == 'qty') { + item.tableForm.disabled = false + } + if (item.field == 'reason') { + item.tableForm.disabled = false + } + if (item.field == 'itemCode') { + item.tableForm.isInpuFocusShow = false + } + }) + }).catch((err) => { console.log(err) }) + } + if(formField == 'supplierCode'){ + isShowButton.value = true + setV['supplierCode'] = val[0]['code'] + setV['purchaseReceiptRecordNumber'] = '' + tableData.value = [] + } formRef.setValues(setV) } }) @@ -513,6 +520,7 @@ const tableData = ref([]) // 添加明细 const handleAddTable = () => { tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys))) + let purchaseReceiptRecordNumber = formRef.value.formRef.formModel.purchaseReceiptRecordNumber PurchasereturnRequestDetail.allSchemas.tableFormColumns.map((item) => { item.tableForm.disabled = true if (item.field == 'remark') { @@ -524,8 +532,20 @@ const handleAddTable = () => { if (item.field == 'qty') { item.tableForm.disabled = false } - if (item.field == 'itemCode') { - item.tableForm.isInpuFocusShow = true + if(purchaseReceiptRecordNumber == ''){ + if (item.field == 'itemCode') { + item.tableForm.isInpuFocusShow = true + } + if(item.field == 'poLine'){ + item.tableForm.isInpuFocusShow = false + } + }else{ + if (item.field == 'itemCode') { + item.tableForm.isInpuFocusShow = false + } + if(item.field == 'poLine'){ + item.tableForm.isInpuFocusShow = true + } } }) } @@ -541,7 +561,6 @@ const handleDeleteTable = (item, index, formRef) => { }) nextTick(() => { const setV = {} - setV['purchaseReceiptRecordNumber'] = '' setV['supplierCode'] = '' formRef.setValues(setV) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts index e3e005a0c..20de11058 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts @@ -10,7 +10,8 @@ import { import * as BalanceApi from '@/api/wms/balance' import { Balance } from '@/views/wms/inventoryManage/balance/balance.data' import * as PurchasereceiptRecordDetailApi from '@/api/wms/purchasereceiptRecordDetail' - +import { Supplier } from "@/views/wms/basicDataManage/supplierManage/supplier/supplier.data"; +import * as SupplierApi from "@/api/wms/supplier"; // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值 @@ -99,7 +100,12 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive([ isSearch: true, form:{ componentProps:{ - disabled:false + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择供应商代码', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '供应商信息', // 查询弹窗标题 + searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类 + searchPage: SupplierApi.getSupplierPage // 查询弹窗所需分页方法 } } }, @@ -491,7 +497,22 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive width: 150 }, tableForm:{ - disabled:true + isInpuFocusShow: true, // 开启查询弹窗 + searchListPlaceholder: '请选择订单行', + searchField: 'poLine', + searchTitle: '采购收货记录信息', + searchAllSchemas: PurchasereceiptRecordDetail.allSchemas, + searchPage: PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPage, + searchCondition: [{ + key: 'number', + value: 'purchaseReceiptRecordNumber', + message: '请填写采购收货记录号！', + isMainValue: true + },{ + key: 'available', + value: 'TRUE', + isMainValue: false + }] }, form: { // labelMessage: '信息提示说明！！！', @@ -521,13 +542,45 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive sort: 'custom', table: { width: 150 - }, + }, tableForm:{ - disabled:true + // labelMessage: '信息提示说明！！！', + isInpuFocusShow: true, // 开启查询弹窗 + searchListPlaceholder: '请选择订单行', + searchField: 'poLine', + searchTitle: '采购收货记录信息', + searchAllSchemas: PurchasereceiptRecordDetail.allSchemas, + searchPage: PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPageBySupplierCode, + searchCondition: [{ + key: 'supplierCode', + value: 'supplierCode', + message: '请填写采购收货记录号！', + isMainValue: true + },{ + key: 'available', + value: 'TRUE', + isMainValue: false + }] }, form: { - componentProps:{ - disabled:true + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, + searchListPlaceholder: '请选择订单行', + searchField: 'poLine', + searchTitle: '采购收货记录信息', + searchAllSchemas: PurchasereceiptRecordDetail.allSchemas, + searchPage: PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPageBySupplierCode, + searchCondition: [{ + key: 'supplierCode', + value: 'supplierCode', + message: '请填写采购收货记录号！', + isMainValue: true + },{ + key: 'available', + value: 'TRUE', + isMainValue: false + }] } } }, From 7f0a3c853366d6bf13d4a737cb5807a3fdd1cdb6 Mon Sep 17 00:00:00 2001 From: chenfang Date: Mon, 22 Jan 2024 15:21:02 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=89=A9=E6=96=99?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerManage/customeritem/customeritem.data.ts | 8 +++++++- .../basicDataManage/customerManage/customeritem/index.vue | 4 ++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts b/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts index db261dc08..b3e7f1d7e 100644 --- a/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts +++ b/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts @@ -85,6 +85,11 @@ export const Customeritem = useCrudSchemas(reactive([ table: { width: 150 }, + form: { + componentProps:{ + disabled: true + } + } }, { label: '转换率', @@ -183,7 +188,8 @@ export const Customeritem = useCrudSchemas(reactive([ value: 'TRUE', componentProps: { inactiveValue: 'FALSE', - activeValue: 'TRUE' + activeValue: 'TRUE', + disabled: true } }, isSearch: true diff --git a/src/views/wms/basicDataManage/customerManage/customeritem/index.vue b/src/views/wms/basicDataManage/customerManage/customeritem/index.vue index bfbb6924a..4078b7a75 100644 --- a/src/views/wms/basicDataManage/customerManage/customeritem/index.vue +++ b/src/views/wms/basicDataManage/customerManage/customeritem/index.vue @@ -179,6 +179,10 @@ const formsSuccess = async (formType,data) => { const searchTableSuccess = (formField, searchField, val, formRef) => { nextTick(() => { const setV = {} + if(formField == 'itemCode'){ + console.log(val); + setV['cusotmerUom'] = val[0]['uom'] + } setV[formField] = val[0][searchField] formRef.setValues(setV) }) From e3340a898349496a53d30839d1ed15f2773ca61a Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Mon, 22 Jan 2024 15:25:09 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E9=80=80=E8=B4=A7=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereturnRequestMain/index.vue | 26 +++++++++++++++++++ .../purchasereturnRequestMain.data.ts | 23 +++------------- 2 files changed, 30 insertions(+), 19 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue index 95bec100b..1df1c96ae 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue @@ -77,6 +77,7 @@ :apiDelete="PurchasereturnRequestDetailApi.deletePurchasereturnRequestDetail" :Echo="Echo" @searchTableSuccessDetail="searchTableSuccessDetail" + :detailValidate="detailValidate" /> @@ -584,6 +585,18 @@ const submitForm = async (formType, data) => { } try { if (formType === 'create') { + let flag = false; + data.subList.forEach((item) => { + if(item.qty == 0){ + message.warning("数量不能为0") + flag = true; + return; + } + }) + if(flag){ + formRef.value.formLoading = false + return + } await PurchasereturnRequestMainApi.createPurchasereturnRequestMain(data) message.success(t('common.createSuccess')) } else { @@ -598,6 +611,19 @@ const submitForm = async (formType, data) => { } } +// 子表新增/编辑校验 +const detailValidate = (data) => { + let tag = false; + if(data.qty <= 0){ + message.warning('数量必须大于0') + tag = false; + return tag; + }else { + tag = true; + return tag; + } +} + /** 导入 */ const importFormRef = ref() const handleImport = () => { diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts index 20de11058..8aad77a84 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts @@ -508,10 +508,6 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive value: 'purchaseReceiptRecordNumber', message: '请填写采购收货记录号！', isMainValue: true - },{ - key: 'available', - value: 'TRUE', - isMainValue: false }] }, form: { @@ -528,10 +524,6 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive value: 'purchaseReceiptRecordNumber', message: '请填写采购收货记录号！', isMainValue: true - },{ - key: 'available', - value: 'TRUE', - isMainValue: false }] } }, @@ -556,10 +548,6 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive value: 'supplierCode', message: '请填写采购收货记录号！', isMainValue: true - },{ - key: 'available', - value: 'TRUE', - isMainValue: false }] }, form: { @@ -576,10 +564,6 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive value: 'supplierCode', message: '请填写采购收货记录号！', isMainValue: true - },{ - key: 'available', - value: 'TRUE', - isMainValue: false }] } } @@ -716,14 +700,15 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive }, form: { component: 'InputNumber', - componentProps:{ - disabled:true + componentProps: { + min: 0, + precision: 6 } }, tableForm:{ - disabled:true, type:'InputNumber', min:0, + precision: 6 } }, { From 889c488f0a430ab3b8134a6cca2ce196b912cb31 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Mon, 22 Jan 2024 16:15:19 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E9=80=80=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereturn/purchasereturnRequestMain/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue index 1df1c96ae..56c5b0fba 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue @@ -232,7 +232,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) => const searchTableSuccessDetail = (formField, searchField, val, formRef) => { nextTick(() => { const setV = {} - if(formField == 'poLine'){ + if(formField == 'poLine' || formField == 'itemCode'){ console.log(val) setV['poLine'] = val[0]['poLine'] setV['poNumber'] = val[0]['poNumber'] From 8205780f4dc271689d9493e9af533d9abea3a262 Mon Sep 17 00:00:00 2001 From: chenfang Date: Mon, 22 Jan 2024 17:18:52 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E5=8F=91=E8=B4=A7=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=97=B6=E9=99=90=E5=88=B6=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customeritem/customeritem.data.ts | 2 +- .../customerManage/customeritem/index.vue | 2 ++ .../deliver/deliverRequestMain/index.vue | 14 ++++++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts b/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts index b3e7f1d7e..21b99adbc 100644 --- a/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts +++ b/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts @@ -77,7 +77,7 @@ export const Customeritem = useCrudSchemas(reactive([ }, { label: '客户计量单位', - field: 'cusotmerUom', + field: 'customerUom', dictType: DICT_TYPE.UOM, dictClass: 'string', isTable: true, diff --git a/src/views/wms/basicDataManage/customerManage/customeritem/index.vue b/src/views/wms/basicDataManage/customerManage/customeritem/index.vue index 4078b7a75..33f74e9d4 100644 --- a/src/views/wms/basicDataManage/customerManage/customeritem/index.vue +++ b/src/views/wms/basicDataManage/customerManage/customeritem/index.vue @@ -139,6 +139,8 @@ const butttondata = [ const buttonTableClick = async (val, row) => { if (val == 'edit') { // 编辑 // const res = await CustomeritemApi.getItempackaging(row.id) + console.log(1111,row); + openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.id) diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue index 02ec2fd07..8d401726e 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue @@ -312,12 +312,26 @@ const openForm =async (type: string, row?: number) => { item.componentProps.isSearchList = false, item.componentProps.disabled = true } + if (item.field == 'customerCode') { + item.componentProps.isSearchList = false, + item.componentProps.disabled = true + } + if (item.field == 'customerDockCode') { + item.componentProps.isSearchList = false, + item.componentProps.disabled = true + } }) }else { DeliverRequestMain.allSchemas.formSchema.forEach((item) => { if (item.field == 'deliverPlanNumber') { item.componentProps.isSearchList = true } + if (item.field == 'customerCode') { + item.componentProps.isSearchList = true + } + if (item.field == 'customerDockCode') { + item.componentProps.isSearchList = true + } }) } tableData.value = [] // 重置明细数据 From e602b489575a24b4b22d2055ca56c9763e6dfbc1 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Tue, 23 Jan 2024 10:28:03 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=8F=AA=E5=81=9A=E7=A6=BB=E6=95=A3?= =?UTF-8?q?=E5=8D=95=E7=9A=84=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/purchaseDetail/index.ts | 5 ++++ .../purchasePlanMain/index.vue | 24 ++++++++++++------- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/src/api/wms/purchaseDetail/index.ts b/src/api/wms/purchaseDetail/index.ts index a9d7e622c..23e754226 100644 --- a/src/api/wms/purchaseDetail/index.ts +++ b/src/api/wms/purchaseDetail/index.ts @@ -43,6 +43,11 @@ export const getPurchaseDetailPage = async (params) => { } } +// 校验子表数据 +export const getPurchaseDetailPageCheckData = async (params) => { + return await request.get({ url: `/wms/purchase-detail/pageCheckData`, params }) +} + // 查询采购订单子列表 export const getPurchaseDetailPagePoNumber = async (params) => { if (params.isSearch) { diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue index af1229dee..4f8e575a9 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue @@ -388,14 +388,16 @@ const submitForm = async (formType, data) => { data.subList = [] for (let item of tableData.value) { - await PurchaseDetailApi.getPurchaseDetailPage({ + await PurchaseDetailApi.getPurchaseDetailPageCheckData({ number: item.poNumber, lineNumber: item.poLine, }).then(res => { console.log("【要货计划】-每条数据结果",item) - if (item.planQty > res.list[0].orderQty - res.list[0].plannedQty) { - message.error('要货计划数量不得大于订单数量-已计划数量') - return + if(res.list[0].type == 'DISCRETE'){//只有离散单需要这个校验 + if (item.planQty > res.list[0].orderQty - res.list[0].plannedQty) { + message.error('要货计划数量不得大于订单数量-已计划数量') + return + } } data.subList.push(item) // 拼接子表数据参数 }) @@ -422,14 +424,18 @@ // 子表新增/编辑校验 const detailValidate = async (data) => { let tag = false - await PurchaseDetailApi.getPurchaseDetailPage({ + await PurchaseDetailApi.getPurchaseDetailPageCheckData({ number: data.poNumber, lineNumber: data.poLine }).then(res => { - if (data.planQty > res.list[0].orderQty - res.list[0].plannedQty) { - message.error('要货计划数量不得大于订单数量-已计划数量') - tag = false - } else { + if(res.list[0].type == 'DISCRETE'){//只有离散单需要这个校验 + if (data.planQty > res.list[0].orderQty - res.list[0].plannedQty) { + message.error('要货计划数量不得大于订单数量-已计划数量') + tag = false + } else { + tag = true + } + }else{ tag = true } }).catch(err =>{ From e879df8d3b82b8d166af8904220d81201583c533 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Tue, 23 Jan 2024 16:13:47 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereturn/purchasereturnRequestMain/index.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue index 56c5b0fba..f0e6a6c53 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue @@ -405,7 +405,8 @@ const openForm = async (type: string, row?: number) => { if(type == 'create'){ PurchasereturnRequestMain.allSchemas.formSchema.forEach((item) => { if (item.field == 'supplierCode') { - item.componentProps.disabled = false + item.componentProps.disabled = true + item.componentProps.isSearchList = true } if(item.field == 'purchaseReceiptRecordNumber'){ item.componentProps.disabled = true @@ -416,7 +417,8 @@ const openForm = async (type: string, row?: number) => { if(type == 'update'){ PurchasereturnRequestMain.allSchemas.formSchema.forEach((item) => { if (item.field == 'supplierCode') { - item.componentProps.disabled = false + item.componentProps.disabled = true + item.componentProps.isSearchList = false } if(item.field == 'purchaseReceiptRecordNumber'){ item.componentProps.disabled = true From bb88c60b68e29f5af48b1826797b5d86651d4fcc Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Tue, 23 Jan 2024 16:51:05 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E7=82=B9=E7=BC=96=E8=BE=91=E6=8C=89?= =?UTF-8?q?=E9=92=AE=EF=BC=8C=E4=BE=9B=E5=BA=94=E5=95=86=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E6=8D=A2=E6=88=90=E5=85=B6=E4=BB=96=EF=BC=8C?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E8=83=BD=E6=88=90=E5=8A=9F=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliver/purchaseMain/index.vue | 48 +++++++++++++++---- 1 file changed, 40 insertions(+), 8 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue index a3b5e9984..221d8b2cb 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue @@ -26,17 +26,32 @@ - - @@ -208,7 +223,24 @@ /** 添加/修改操作 */ const formRef = ref() const openForm = async (type : string, row ?: number) => { + console.log("【purchaseMain】type类型:",type); tableData.value = [] // 重置明细数据 + if(type == 'create'){ + PurchaseMain.allSchemas.formSchema.forEach((item) => { + if (item.field == 'supplierCode') { + item.componentProps.isSearchList = true + item.componentProps.disabled = true + } + }) + } + if(type == 'update'){ + PurchaseMain.allSchemas.formSchema.forEach((item) => { + if (item.field == 'supplierCode') { + item.componentProps.isSearchList = false + item.componentProps.disabled = true + } + }) + } formRef.value.open(type, row) } From 7bb6247118695c5f4819d86a033e6c2874207cbb Mon Sep 17 00:00:00 2001 From: chenfang Date: Tue, 23 Jan 2024 16:55:12 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E5=8F=91=E8=B4=A7=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E6=9C=88=E5=8F=B0=E9=99=90=E5=88=B6=E5=8F=AA=E8=83=BD=E9=80=89?= =?UTF-8?q?=E5=8F=91=E8=B4=A7=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/customerdock/index.ts | 11 +++++++ .../deliverRequestMain.data.ts | 2 +- .../deliver/deliverRequestMain/index.vue | 26 +++++++++++++++ .../deliverPlanMain/deliverPlanMain.data.ts | 33 ++++++++++++------- .../deliverplan/deliverPlanMain/index.vue | 20 +++++++++++ 5 files changed, 80 insertions(+), 12 deletions(-) diff --git a/src/api/wms/customerdock/index.ts b/src/api/wms/customerdock/index.ts index 5a5d1dbc4..d93f98c85 100644 --- a/src/api/wms/customerdock/index.ts +++ b/src/api/wms/customerdock/index.ts @@ -62,3 +62,14 @@ export const exportCustomerdock = async (params) => { export const importTemplate = () => { return request.download({ url: '/wms/customerdock/get-import-template' }) } + +// 查询客户月台列表 +export const pageCustomerCodeToCustomerDock = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return request.post({ url: '/wms/customerdock/pageCustomerCodeToCustomerDockSenior', data }) + } else { + return await request.get({ url: `/wms/customerdock/pageCustomerCodeToCustomerDock`, params }) + } +} \ No newline at end of file diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts index 75ab5882c..73324cdb5 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts @@ -146,7 +146,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ searchField: 'code', // 查询弹窗赋值字段 searchTitle: '客户月台信息', // 查询弹窗标题 searchAllSchemas: Customerdock.allSchemas, // 查询弹窗所需类 - searchPage: CustomerdockApi.getCustomerdockPage, // 查询弹窗所需分页方法 + searchPage: CustomerdockApi.pageCustomerCodeToCustomerDock, // 查询弹窗所需分页方法 searchCondition: [{ key: 'available', value: 'TRUE', diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue index 8d401726e..22dffc30e 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue @@ -100,6 +100,7 @@ const { t } = useI18n() // 国际化 const route = useRoute() // 路由信息 const routeName = ref() routeName.value = route.name +const customerCode = ref() const tableColumns = ref(DeliverRequestMain.allSchemas.tableColumns) const isShowButton = ref(true) @@ -144,6 +145,31 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => item.tableForm.disabled = true } }) + // 修改 tableform 属性 + if(formField == 'customerCode'){ + console.log(1111,val); + customerCode.value = val[0]['code'] + console.log(11112,customerCode.value); + } + DeliverRequestMain.allSchemas.tableFormColumns.map(item => { + if(item.field == 'customerDockCode') { + item.tableForm.searchCondition = [ + { + key: 'customerCode', + value: customerCode.value , + isMainValue: true + }] + item.form.componentProps.searchCondition = [ + { + key: 'customerCode', + value: customerCode.value , + isMainValue: true + }]} + else { + delete item.tableForm.searchCondition + delete item.form.componentProps.searchCondition + } + }) }).catch(err => { console.log(err) message.error('错误') diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts index 6adcb194e..577da3ab7 100644 --- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts @@ -10,13 +10,6 @@ import { Customerdock } from '@/views/wms/basicDataManage/customerManage/custome import * as CustomerItemApi from '@/api/wms/customeritem' import { Customeritem } from '@/views/wms/basicDataManage/customerManage/customeritem/customeritem.data' -import * as SaleMainApi from '@/api/wms/saleMain' -import * as SaleDetailApi from '@/api/wms/saleDetail' -import { SaleDetail, SaleMain } from '../saleMain/saleMain.data' - -import * as ItembasicApi from '@/api/wms/itembasic' -import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data' - const { t } = useI18n() // 国际化 /** @@ -328,11 +321,11 @@ export const DeliverPlanDetail = useCrudSchemas(reactive([ }, tableForm:{ isInpuFocusShow: true, // 开启查询弹窗 - searchListPlaceholder: '请选择物料代码', + searchListPlaceholder: '请选择客户月台代码', searchField: 'code', - searchTitle: '物料基础信息', + searchTitle: '客户月台基础信息', searchAllSchemas: Customerdock.allSchemas, - searchPage: CustomerDockApi.getCustomerdockPage, + searchPage: CustomerDockApi.pageCustomerCodeToCustomerDock, searchCondition: [{ key: 'available', value: 'TRUE', @@ -343,7 +336,25 @@ export const DeliverPlanDetail = useCrudSchemas(reactive([ isMainValue: true }] }, - isForm: false, + form: { + componentProps: { + isSearchList: true, + searchListPlaceholder: '请选择客户月台代码', + searchField: 'code', + searchTitle: '客户月台基础信息', + searchAllSchemas: Customerdock.allSchemas, + searchPage: CustomerDockApi.pageCustomerCodeToCustomerDock, + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + },{ + key: 'customerCode', + value: 'customerCode', + isMainValue: true + }] + } + }, }, { label: '项目', diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue index 3bd12d4f6..7d2884a86 100644 --- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue @@ -91,6 +91,7 @@ const { t } = useI18n() // 国际化 const route = useRoute() // 路由信息 const routeName = ref() routeName.value = route.name +const customerCode = ref() const tableColumns = ref(DeliverPlanMain.allSchemas.tableColumns) // 字段设置 更新主列表字段 @@ -101,6 +102,25 @@ const updataTableColumns = (val) => { // 查询页面返回 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => { nextTick(() => { + // 修改 tableform 属性 + if(formField == 'customerCode'){ + customerCode.value = val[0]['code'] + } + DeliverPlanDetail.allSchemas.tableFormColumns.map(item => { + if(item.field == 'customerDockCode') { + item.tableForm.searchCondition = [ + { + key: 'customerCode', + value: customerCode.value , + isMainValue: false + }] + item.form.componentProps.searchCondition = [ + { + key: 'customerCode', + value: customerCode.value , + isMainValue: false + }]} + }) if (type == 'tableForm') { if(formField == 'itemCode') { row['uom'] = val[0]['customerUom'] From dba58c0de3a3f1c7496467910ecac1d5091db110 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Wed, 24 Jan 2024 09:38:04 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=98=AF=E6=97=A5=E7=A8=8B=E5=8D=95=20=E6=97=A0=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=95=B0=E9=87=8F=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliver/purchaseMain/index.vue | 34 ++++++++++++++++++- .../purchaseMain/purchaseMain.data.ts | 2 ++ 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue index 221d8b2cb..4dbdb7846 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue @@ -39,7 +39,8 @@ @handleAddTable="handleAddTable" @handleDeleteTable="handleDeleteTable" @searchTableSuccess="searchTableSuccess" - @submitForm="submitForm" /> + @submitForm="submitForm" + @onChange="onChangeQty" /> { + console.log("row",row.type); + if(row.type == 'DISCRETE'){ + PurchaseDetail.allSchemas.formSchema.map((item) => { + if (item.field == 'orderQty') { + item.componentProps.disabled = false + } + }) + }else{ + PurchaseDetail.allSchemas.formSchema.map((item) => { + if (item.field == 'orderQty') { + item.componentProps.disabled = true + } + }) + } detailRef.value.openDetail(row, titleName, titleValue,'orderPurchaseMain') } @@ -393,6 +408,23 @@ } getList() // 刷新当前列表 } + const onChangeQty = (field, cur) => { + if(field == 'type' && cur == 'DISCRETE'){ + PurchaseDetail.allSchemas.tableFormColumns.map((item) => { + if (item.field == 'orderQty') { + item.tableForm.disabled = false + } + }) + } + if(field == 'type' && cur == 'SCHEDULE'){ + PurchaseDetail.allSchemas.tableFormColumns.map((item) => { + if (item.field == 'orderQty') { + item.tableForm.disabled = true + } + }) + } + + } /** 初始化 **/ onMounted(async () => { diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts index 8114d84c9..3451a5e4e 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts @@ -459,11 +459,13 @@ export const PurchaseDetail = useCrudSchemas(reactive([ form: { component: 'InputNumber', componentProps: { + disabled:false, min: 1, precision: 6 } }, tableForm: { + disabled:false, type: 'InputNumber', min: 1, precision: 6