From 613d4febfe68fd56cf6930f87ea08da33b0af9ac Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Tue, 30 Apr 2024 10:36:39 +0800 Subject: [PATCH 01/13] =?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.data.ts | 4 +++- 1 file changed, 3 insertions(+), 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 2f3ff2b4d..45d569204 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts @@ -96,6 +96,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明！！！', componentProps: { + disabled:true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择采购收货记录单号', // 输入框占位文本 searchField: 'number', // 查询弹窗赋值字段 @@ -782,6 +783,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive disabled:false } }, + isTable: false, isForm:false, tableForm:{ type:'InputNumber', @@ -791,7 +793,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive } }, { - label: '数量', + label: '退货数量', field: 'qty', sort: 'custom', table: { From 440452fe88946eec321998cf319ed291dc75b790 Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Tue, 30 Apr 2024 10:37:54 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E5=8F=91=E8=B4=A7=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deliverPlanMain/deliverPlanMain.data.ts | 264 +++++++++++++----- 1 file changed, 195 insertions(+), 69 deletions(-) diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts index bca93fa19..150705354 100644 --- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts @@ -52,6 +52,18 @@ export const DeliverPlanMain = useCrudSchemas(reactive([ isForm: false, isSearch: true }, + { + label: '状态', + field: 'status', + sort: 'custom', + table: { + width: 150 + }, + dictType: DICT_TYPE.PLAN_STATUS, + dictClass: 'string', + isSearch: true, + isForm:false, + }, { label: '客户代码', field: 'customerCode', @@ -63,6 +75,7 @@ export const DeliverPlanMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch: true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择客户代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 @@ -77,6 +90,51 @@ export const DeliverPlanMain = useCrudSchemas(reactive([ } } }, + { + label: '客户月台', + field: 'customerDockCode', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: true, + // tableForm:{ + // isInpuFocusShow: true, // 开启查询弹窗 + // searchListPlaceholder: '请选择客户月台代码', + // searchField: 'code', + // searchTitle: '客户月台基础信息', + // searchAllSchemas: Customerdock.allSchemas, + // searchPage: CustomerDockApi.pageCustomerCodeToCustomerDock, + // searchCondition: [{ + // key: 'available', + // value: 'TRUE', + // },{ + // key: 'customerCode', + // value: 'customerCode', + // isMainValue: true + // }] + // }, + 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: '发货类型', field: 'deliverType', @@ -116,16 +174,9 @@ export const DeliverPlanMain = useCrudSchemas(reactive([ table: { width: 150 }, - }, - { - label: '备注', - field: 'remark', - sort: 'custom', - table: { - width: 150 - }, isTable: false, }, + { label: '创建时间', field: 'createTime', @@ -137,6 +188,7 @@ export const DeliverPlanMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -154,6 +206,7 @@ export const DeliverPlanMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isForm: false, }, { @@ -167,6 +220,7 @@ export const DeliverPlanMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -187,6 +241,7 @@ export const DeliverPlanMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -196,25 +251,13 @@ export const DeliverPlanMain = useCrudSchemas(reactive([ } }, }, - { - label: '状态', - field: 'status', - sort: 'custom', - table: { - width: 150 - }, - dictType: DICT_TYPE.PLAN_STATUS, - dictClass: 'string', - isSearch: true, - isForm:false, - }, { label: '是否可用', field: 'available', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', isSearch: true, - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -229,12 +272,21 @@ export const DeliverPlanMain = useCrudSchemas(reactive([ } } }, + { + label: '备注', + field: 'remark', + sort: 'custom', + table: { + width: 150 + }, + isTable: false, + }, { label: '自动提交', field: 'autoCommit', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, isForm: false, sort: 'custom', table: { @@ -255,7 +307,7 @@ export const DeliverPlanMain = useCrudSchemas(reactive([ field: 'autoAgree', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, isForm: false, sort: 'custom', table: { @@ -276,7 +328,7 @@ export const DeliverPlanMain = useCrudSchemas(reactive([ field: 'autoExecute', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, isForm: false, sort: 'custom', table: { @@ -299,6 +351,7 @@ export const DeliverPlanMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isForm: false, }, { @@ -312,6 +365,7 @@ export const DeliverPlanMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -413,6 +467,35 @@ export const DeliverPlanDetail = useCrudSchemas(reactive([ // } // } // }, + { + label: '客户代码', + field: 'customerCode', + sort: 'custom', + table: { + width: 150 + }, + isTable:false, + isTableForm: false, + tableForm:{ + isInpuFocusShow: true, + searchListPlaceholder: '请选择客户代码', + searchField: 'code', + searchTitle: '客户信息', + searchAllSchemas: Customer.allSchemas, + searchPage: CustomerApi.getCustomerPage + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, + searchListPlaceholder: '请选择客户代码', + searchField: 'code', + searchTitle: '客户信息', + searchAllSchemas: Customer.allSchemas, + searchPage: CustomerApi.getCustomerPage + } + } + }, { label: '客户月台', field: 'customerDockCode', @@ -420,6 +503,7 @@ export const DeliverPlanDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTableForm: false, tableForm:{ isInpuFocusShow: true, // 开启查询弹窗 searchListPlaceholder: '请选择客户月台代码', @@ -456,30 +540,6 @@ export const DeliverPlanDetail = useCrudSchemas(reactive([ } }, }, - { - label: '项目', - field: 'project', - sort: 'custom', - table: { - width: 150 - }, - isTableForm: false, - isForm: false, - }, - { - label: '单据号', - field: 'number', - sort: 'custom', - table: { - width: 180 - }, - isTableForm: false, - form: { - componentProps: { - disabled: true - } - } - }, { label: '物料代码', field: 'itemCode', @@ -488,6 +548,7 @@ export const DeliverPlanDetail = useCrudSchemas(reactive([ width: 150 }, tableForm:{ + multiple:true, isInpuFocusShow: true, // 开启查询弹窗 searchListPlaceholder: '请选择物料代码', searchField: 'itemCode', @@ -524,6 +585,55 @@ export const DeliverPlanDetail = useCrudSchemas(reactive([ } } }, + { + label: '计划数量', + field: 'planQty', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber', + componentProps: { + min: 0, + precision: 6 + } + }, + tableForm: { + type: 'InputNumber', + min: 0, + precision: 6 + } + }, + { + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + tableForm: { + disabled: true, + type: 'Select' + }, + form: { + componentProps: { + disabled: true + } + } + }, + { + label: '到仓库代码', + field: 'toWarehouseCode', + sort: 'custom', + isForm: false, + table: { + width: 150 + }, + }, { label: '到库位代码', field: 'toLocationCode', @@ -570,6 +680,34 @@ export const DeliverPlanDetail = useCrudSchemas(reactive([ } }, }, + { + label: '项目', + field: 'project', + sort: 'custom', + table: { + width: 150 + }, + isTable: false, + isTableForm: false, + isForm: false, + }, + { + label: '单据号', + field: 'number', + sort: 'custom', + table: { + width: 180 + }, + isTable: false, + isTableForm: false, + form: { + componentProps: { + disabled: true + } + } + }, + + { label: '备注', field: 'remark', @@ -577,6 +715,7 @@ export const DeliverPlanDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '创建时间', @@ -589,6 +728,7 @@ export const DeliverPlanDetail = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -607,6 +747,7 @@ export const DeliverPlanDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isTableForm: false, isForm: false, }, @@ -617,6 +758,7 @@ export const DeliverPlanDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, form: { component: 'InputNumber', componentProps: { @@ -630,26 +772,7 @@ export const DeliverPlanDetail = useCrudSchemas(reactive([ precision: 6 } }, - { - label: '计量单位', - field: 'uom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - tableForm: { - disabled: true, - type: 'Select' - }, - form: { - componentProps: { - disabled: true - } - } - }, + { label: '最后更新时间', field: 'updateTime', @@ -661,6 +784,7 @@ export const DeliverPlanDetail = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -679,6 +803,7 @@ export const DeliverPlanDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isTableForm: false, isForm: false, }, @@ -687,7 +812,7 @@ export const DeliverPlanDetail = useCrudSchemas(reactive([ field: 'available', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -712,6 +837,7 @@ export const DeliverPlanDetail = useCrudSchemas(reactive([ width: 150, fixed: 'right' }, + hiddenInMain: true, isTableForm:false, } ])) From 75b6214f16da9a214a116ead288830cbe4d775c1 Mon Sep 17 00:00:00 2001 From: TengXF <302828528@qq.com> Date: Tue, 30 Apr 2024 10:48:24 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E6=89=93=E5=BC=80=E5=BC=B9=E7=AA=97?= =?UTF-8?q?=EF=BC=8C=E9=BB=98=E8=AE=A4=E5=B1=95=E7=A4=BA=E7=AC=AC=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E5=B7=A5=E5=BA=8F=E7=9A=84=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mes/orderDay/components/schedule.vue | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/views/mes/orderDay/components/schedule.vue b/src/views/mes/orderDay/components/schedule.vue index 636560369..3b31342b3 100644 --- a/src/views/mes/orderDay/components/schedule.vue +++ b/src/views/mes/orderDay/components/schedule.vue @@ -378,12 +378,18 @@ const getProcessBom=async (code:any) => { let res = await orderDayconfigApi.getOrderDayBomByOrder(queryParams) materialsData.value=res } +const currentStartNode = ref({ + id:'' +}) //获取配置的工艺路线信息 const getProcessroute = async () => { let res = await orderDayconfigApi.getConfigProcessRoute(queryParams) - //console.log('ddddd',res) graphJson.value=JSON.parse(res.newGraphData) - + //首次打开弹窗，默认打开一个工序的数据 + currentStartNode.value.id = graphJson.value.cells[0].id + // 手动触发点击事件 + nodeClick('','','',currentStartNode.value,'') + currentNode.value = graphJson.value.cells[0] graph.value?.fromJSON(graphJson.value.cells) } //获取配置的工序信息 @@ -407,6 +413,7 @@ const getConfigProcessEquipment= async (code:any) => { equipmentData.value = await orderDayconfigApi.getConfigProcessEquipment(queryParams) } const nodeClick = (e, x, y, node, view) => { + console.log(node.id) getProcessBom(node.id) getConfigProcessWorkstation(node.id) getConfigProcessWorker(node.id) @@ -481,14 +488,14 @@ const doPublishPlan= ()=>{ } let res = OrderDayApi.publishPlan(data) - + res.then(()=>{ message.success("计划发布成功") }).catch(()=>{ //console.log("---doPublishPlan-- 458--",res.msg) message.error("计划发布失败！") }) - + } // 弹层确定返回所选数据 From ad63ddc5d5e01c8bb3abe3cf5eb47bd349d87cec Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Tue, 30 Apr 2024 10:48:50 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E5=8C=85=E8=A3=85=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereturnRequestMain.data.ts | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts index 45d569204..334390767 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts @@ -690,6 +690,16 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive } } }, + { + label: '包装号', + field: 'packingNumber', + sort: 'custom', + table: { + width: 150 + }, + isTable: false, + isTableForm: true + }, { label: '替代批次', field: 'altBatch', From 5964039157b0b4cfa2d61f8a5fc49961df6b8378 Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Tue, 30 Apr 2024 11:15:38 +0800 Subject: [PATCH 05/13] =?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/purchasereturnRequestMain.data.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts index 334390767..805c58a68 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts @@ -773,6 +773,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive } }, tableForm:{ + disabled:true, type:'InputNumber', min:0, precision: 6 @@ -794,6 +795,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive } }, isTable: false, + isTableForm: false, isForm:false, tableForm:{ type:'InputNumber', From 2790143f45713a77cd634fea5aecf66ca5654aa0 Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Tue, 30 Apr 2024 11:24:48 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E5=8C=85=E8=A3=85=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereturn/purchasereturnRequestMain/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue index 8474dc7d1..6fb742c7a 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue @@ -209,7 +209,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) => if (res) tableData.value = res tableData.value.forEach((item) => { item.batch = item.toBatch - item.packingNumber = item.toPackingNumber + + item.packingNumber = '' item.containerNumber = item.toContainerNumber item.receiptQty = item.qty item.toLocationGroupCode = null From 8cd01e035fa83269a2ad50b3db8f153413702a5e Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Tue, 30 Apr 2024 11:49:49 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E5=88=B0=E5=BA=93=E4=BD=8D=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E5=BF=85=E5=A1=AB=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sparereceiptRequestMain/sparereceiptRequestMain.data.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts index 73e0c4892..0bea96be7 100644 --- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts @@ -1301,6 +1301,9 @@ export const PurchasereceiptRequestDetailRules = reactive({ itemCode: [ { required: true, message: '请输入物料代码', trigger: 'change' } ], + defaultToLocationCode: [ + { required: true, message: '请选择到库位代码', trigger: 'blur' } + ], }) From a35a603ebd230c082dbdaf5c1a9d2131c458239e Mon Sep 17 00:00:00 2001 From: chenfang Date: Tue, 30 Apr 2024 11:51:31 +0800 Subject: [PATCH 08/13] =?UTF-8?q?=E5=88=B6=E5=93=81=E4=B8=8A=E6=9E=B6/?= =?UTF-8?q?=E5=9B=9E=E6=94=B6=20=E5=BA=93=E5=AD=98=E4=BD=99=E9=A2=9D?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E4=B8=9A=E5=8A=A1=E7=B1=BB=E5=9E=8B=E7=9A=84?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=BA=93=E5=AD=98=E7=8A=B6=E6=80=81=E8=B5=8B?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productputawayRequestMain.data.ts | 20 +++++++++- .../productredressRequestMain.data.ts | 37 ++++++++++++------- 2 files changed, 41 insertions(+), 16 deletions(-) diff --git a/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts b/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts index 66cd24c8b..0638e6352 100644 --- a/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts +++ b/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts @@ -1,6 +1,7 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import { dateFormatter } from '@/utils/formatTime' import * as getRequestsettingApi from '@/api/wms/requestsetting/index' +import * as getBusinessTypeApi from '@/api/wms/businesstype/index' import * as BalanceApi from '@/api/wms/balance' import { Balance } from '@/views/wms/inventoryManage/balance/balance.data' @@ -14,8 +15,15 @@ const queryParams = { pageSize:10, pageNo:1, code:'ProductPutawayRequest' +} +const businessTypeQueryParams = { + pageSize:10, + pageNo:1, + code:'ProductPutaway' } const data = await getRequestsettingApi.getRequestsettingPage(queryParams) + const businessTypeValue = await getBusinessTypeApi.getBusinesstypePage(businessTypeQueryParams) + const businessTypeData =businessTypeValue?.list[0]||{} const requestsettingData =data?.list[0]||{} // 获取当前操作人的部门 @@ -454,7 +462,11 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive searchField: 'itemCode', // 查询弹窗赋值字段 searchTitle: '库存余额信息', // 查询弹窗标题 searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类 - searchPage: BalanceApi.getBalancePage // 查询弹窗所需分页方法 + searchPage: BalanceApi.getBalancePageByBusinessType, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'businessType', + value: businessTypeData.code, + }] }, form: { // labelMessage: '信息提示说明！！！', @@ -464,7 +476,11 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive searchField: 'itemCode', // 查询弹窗赋值字段 searchTitle: '库存余额信息', // 查询弹窗标题 searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类 - searchPage: BalanceApi.getBalancePage // 查询弹窗所需分页方法 + searchPage: BalanceApi.getBalancePageByBusinessType, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'businessType', + value: businessTypeData.code, + }] } } }, diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts b/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts index 5b447e22d..dcc05b9a8 100644 --- a/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts +++ b/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts @@ -3,7 +3,14 @@ import { dateFormatter } from '@/utils/formatTime' import * as BalanceApi from '@/api/wms/balance' import { Balance } from '@/views/wms/inventoryManage/balance/balance.data' - +import * as getBusinessTypeApi from '@/api/wms/businesstype/index' +const businessTypeQueryParams = { + pageSize:10, + pageNo:1, + code:'Productredress' +} +const businessTypeValue = await getBusinessTypeApi.getBusinesstypePage(businessTypeQueryParams) +const businessTypeData =businessTypeValue?.list[0]||{} // 表单校验 export const ProductredressRequestMainRules = reactive({ autoCommit: [required], @@ -316,13 +323,14 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive searchField: 'itemCode', // 查询弹窗赋值字段 searchTitle: '库存余额信息', // 查询弹窗标题 searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类 - searchPage: BalanceApi.getBalancePage, // 查询弹窗所需分页方法 - searchCondition:[ - { - key: 'inventoryStatus', - value: 'OK', - isMainValue: false - },{ +  searchPage: BalanceApi.getBalancePageByBusinessType, // 查询弹窗所需分页方法 +        searchCondition: [{ +          key: 'businessType', +          value: businessTypeData.code, + action: '==', // 查询拼接条件 + isSearch: true, // 使用自定义拼接条件 + isMainValue: false // 拼接条件必须要 false 同时不能与 isMainValue: true 同用 +        },{ key: 'packingNumber', // 查询列表中字段 value: '', // 指查询具体值 action: 'isNotStr', // 查询拼接条件 @@ -338,12 +346,13 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive searchField: 'itemCode', // 查询弹窗赋值字段 searchTitle: '库存余额信息', // 查询弹窗标题 searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类 - searchPage: BalanceApi.getBalancePage, // 查询弹窗所需分页方法 - searchCondition:[ - { - key: 'inventoryStatus', - value: 'OK', - isMainValue: false + searchPage: BalanceApi.getBalancePageByBusinessType, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'businessType', + value: businessTypeData.code, + action: '==', // 查询拼接条件 + isSearch: true, // 使用自定义拼接条件 + isMainValue: false // 拼接条件必须要 false 同时不能与 isMainValue: true 同用 },{ key: 'packingNumber', // 查询列表中字段 value: '', // 指查询具体值 From 5c3d0825c3f38529412ba41ef296bdf0e04b335e Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Tue, 30 Apr 2024 11:55:15 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereceiptRequestMain/index.vue | 40 +++++-------------- .../purchasereceiptRequestMain.data.ts | 2 +- 2 files changed, 12 insertions(+), 30 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue index faa674a8f..6db8c5f17 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue @@ -418,42 +418,24 @@ const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAcces // 标签打印 const searchTableRef = ref() const labelPrint = async (row) => { - console.log("------------",row); tableObject.loading = true - const subTableDFata = await PackageApi.getLabel(row.masterId) - tableObject.loading = false - const tableObject1 = { - // 当前页 - currentPage: 1, - // 导出加载中 - exportLoading: false, - // 加载中 - loading: false, - // 页数 - pageSize: subTableDFata.length, - params:null, - // 排序 - sort: { - order: '', // 排序规则 - prop: '' // 排序字段 - }, - // 总条数 - total: subTableDFata.length, - // 表格数据 - tableList: subTableDFata, - currentRow:null - } - console.log("标签打印",subTableDFata,tableObject1,SupplierdeliverRequestPackage.allSchemas) + const defaultParams = {'moduleName':'supplier','recordNumber':row.number} + const {tableObject:tableObjectPrint ,tableMethods} = useTable({ + defaultParams, + getListApi: PackageApi.getLabelDetailPage // 分页接口 + }) + // 获得表格的各种操作 + const { getList:getListPrint } = tableMethods + getListPrint() + tableObject.loading = false const tableColumns = SupplierdeliverRequestPackage.allSchemas.tableFormColumns - tableColumns.forEach((item) => { item.width = item.table?.width || 150 }) - searchTableRef.value.openData("标签信息",tableObject1,{tableColumns},true) - - // window.open(src.value + '&asn_number=' + row.asnNumber) + searchTableRef.value.openData("标签信息",tableObjectPrint,{tableColumns},true) } + // 批量打印---采购收货申请 const searchTableSuccess1 = async (formField, searchField, val, formRef, type, row) => { console.log('批量打印',val) diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts index 8a8f397c9..c3aca280e 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts @@ -802,7 +802,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive Date: Tue, 30 Apr 2024 13:43:44 +0800 Subject: [PATCH 10/13] =?UTF-8?q?2024-04-30=20=E5=B7=A5=E8=89=BA=E8=B7=AF?= =?UTF-8?q?=E7=BA=BF=E9=85=8D=E7=BD=AE=E4=BC=98=E5=8C=96=EF=BC=8C=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=88=86=E9=A1=B5=EF=BC=8C=E8=81=94=E5=8A=A8=EF=BC=8C?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processroute/components/configDialog.vue | 146 +++++++-- .../processroute/components/graphbase.data.ts | 6 +- .../mes/workScheduling/components/Detail.vue | 295 ++++++++++-------- src/views/mes/workScheduling/index.vue | 6 +- .../mes/workScheduling/workScheduling.data.ts | 18 +- 5 files changed, 309 insertions(+), 162 deletions(-) diff --git a/src/views/mes/processroute/components/configDialog.vue b/src/views/mes/processroute/components/configDialog.vue index c10f2af27..571e045fb 100644 --- a/src/views/mes/processroute/components/configDialog.vue +++ b/src/views/mes/processroute/components/configDialog.vue @@ -12,8 +12,8 @@
- {{ titleValueRef }} - [{{ titleNameRef }}] + {{ titleNameRef }} + [{{ titleValueRef }}] @@ -37,7 +37,7 @@ >添加工序
- + @@ -48,6 +48,17 @@ +
@@ -81,8 +92,9 @@ 工艺路线基本信息 -

工艺路线名称：{{ productData.name }}

-

工艺路线编码：{{ productData.name }}

+ +

工艺路线名称：{{titleNameRef}}

+

工艺路线编码：{{titleValueRef}}

产品名称：{{ productData.name }}

产品编码：{{ productData.code }}

产品描述：{{ productData.desc1 }}

@@ -92,23 +104,34 @@ > - + + @@ -121,7 +144,7 @@ > @@ -154,6 +177,7 @@ const message = useMessage() // 消息弹窗 //const { t } = useI18n() // 国际化 const route = useRoute() // 路由信息 const routeName = ref() +const currentNode=ref({code:'',name:''}) routeName.value = route.name routeName.value = routeName.value.substring(0, routeName.value.length - 4) + 'ProcessRouteConfig' //const updateKey = ref(0) @@ -165,6 +189,22 @@ const tableProcess = ref() const productData = ref({ name: '', code: '', desc1: '--' }) //产品数据 const materialData=ref() const mouldData = ref() +const page=ref({ + total:0, + current:1, + size:5 +}) +const pageM=ref({ + total:0, + current:1, + size:5 +}) +const showProcessNodeData=ref() //工序分页数据展示 +const showMaterialsData=ref() //物料信息分页展示 +const productCode=ref() +//初始化图形组件 +const graph = ref() +const rowData = ref() const workStationList = ref() //工位数据 // 附件默认数据 const annexData = reactive({ @@ -203,23 +243,25 @@ const searchTableSuccess = (formField, searchField, val, type, row) => { if(val.length>0){ val.forEach(item=>{ if(processData.value.find(obj=>obj.code==item.code)==undefined){ - processData.value.push({code:item.code,name:item.name})} + processData.value.push({code:item.code,name:item.name}) + page.value.total=processData.value.length + showProcessNodeData.value=processData.value.slice((page.value.current-1)*page.value.size,page.value.size) + } }) } } const deleteNode=(row)=>{ processData.value.splice(processData.value.indexOf(row),1) + page.value.total=processData.value.length + page.value.current=1 graph.value.removeNode(row.code) } -const productCode=ref() -//初始化图形组件 -const graph = ref() -const rowData = ref() + const openDetail = (row: any) => { rowData.value = row console.log('rowData',rowData.value) - titleNameRef.value = rowData.value.processrouteCode - titleValueRef.value = rowData.value.processName + titleNameRef.value = rowData.value.processName + titleValueRef.value =rowData.value.processrouteCode processRouteId.value = rowData.value.id productCode.value=rowData.value.productCode routeVersion.value=rowData.value.routeVersion @@ -264,7 +306,7 @@ const getProcessInfo = async (id: any) => { /** 获取产品信息 */ const getItembasicInfo = async (code: String) => { const res = await ProcessrouteApi.getProductInfo(code) - console.log('productData',res) + //console.log('productData',res) productData.value = res } /** 获取物料列表 */ @@ -302,28 +344,37 @@ const getProcessList = async (code) => { //console.log('code',code) const res = await ProcessrouteApi.getProcessrouteNodeList(code) processData.value = res + showProcessNodeData.value=processData.value.slice((page.value.current-1)*page.value.size,page.value.size) //return res } // 并行执行所有异步操作 const nodeClick = (e, x, y, node, view) => { + currentNode.value.code=node.id + currentNode.value.name=node.attrs.title.text Promise.all([ getProcessInfo(node.id), getProcessBomList(productCode.value,node.id), getPatternPage(node.id), getWorkstationPage(node.id) - ]).then(([processIndoList,basicBom, patternPage,workstationInfoList]) => { + ]).then(([processInfoList,basicBom, patternPage,workstationInfoList]) => { // 在这里处理所有异步操作的结果 //message.info(JSON.stringify(processIndoList)) - console.log('basicBom',basicBom) + //console.log('basicBom',basicBom) //获取绑定的物料信息 materialData.value = basicBom + pageM.value.total=materialData.value.length + pageM.value.current=1 + showMaterialsData.value=materialData.value.slice((pageM.value.current-1)*pageM.value.size,pageM.value.size) //获取绑定的模具信息 mouldData.value = patternPage.list //获取绑定的工位信息 workStationList.value = workstationInfoList.list }).catch(error => { - console.error("Error:", error); + //console.error("Error:", error); materialData.value = [] + showMaterialsData.value=[] + pageM.value.total=materialData.value.length + pageM.value.current=1 mouldData.value = [] workStationList.value = [] }); @@ -362,6 +413,7 @@ const userAddNode = (row) => { // ] }) } + nodeClick(undefined,undefined, undefined, node_template, graph.value) } } //------- @@ -382,7 +434,7 @@ const saveResult = async () => { return } let gdata = { - processrouteCode: titleNameRef.value, + processrouteCode: titleValueRef.value, routeVersion:routeVersion.value, graphJson: graph.value.toJSON(), processrouteId: processRouteId.value @@ -442,6 +494,58 @@ const deleteAnnexSuccess = async () => { getFileList() getChangeRecordList() } + +const handleCurrentChange=(value: number)=>{ + let index=(value-1)*page.value.size + page.value.current=value + //console.log('index',index) + showProcessNodeData.value=processData.value.slice(index,index+page.value.size) + //console.log('processData.value-472',processData.value) + //console.log('showProcessNodeData.value-472',showProcessNodeData.value) +} +const handlePrevClick=(value: number)=>{ + page.value.current=value-1 + if(page.value.current==0) { + page.value.current=1 + } + // let index=(value-1)*page.value.size + // showProcessNodeData.value=processData.value.slice(index,page.value.size) + // console.log('showProcessNodeData.value-472',showProcessNodeData.value) +} +const handleNextClick=(value: number)=>{ + page.value.current=value+1 + if(page.value.current>page.value.total/page.value.size) { + page.value.current=page.value.total/page.value.size -1 + } + // let index=(value+1)*page.value.size + // showProcessNodeData.value=processData.value.slice(index,page.value.size) + // console.log('showProcessNodeData.value-472',showProcessNodeData.value) +} +const handleCurrentChangeM=(value: number)=>{ + let index=(value-1)*pageM.value.size + pageM.value.current=value + //console.log('index',index) + showMaterialsData.value=materialData.value.slice(index,index+pageM.value.size) + +} +const handlePrevClickM=(value: number)=>{ + pageM.value.current=value-1 + if(pageM.value.current==0) { + pageM.value.current=1 + } + // let index=(value-1)*page.value.size + // showProcessNodeData.value=processData.value.slice(index,page.value.size) + // console.log('showProcessNodeData.value-472',showProcessNodeData.value) +} +const handleNextClickM=(value: number)=>{ + pageM.value.current=value+1 + if(pageM.value.current>pageM.value.total/page.value.size) { + pageM.value.current=page.value.total/pageM.value.size -1 + } + // let index=(value+1)*page.value.size + // showProcessNodeData.value=processData.value.slice(index,page.value.size) + // console.log('showProcessNodeData.value-472',showProcessNodeData.value) +} // 验证图形 onUnmounted?.(() => {}) const emit = defineEmits(['close']) diff --git a/src/views/mes/processroute/components/graphbase.data.ts b/src/views/mes/processroute/components/graphbase.data.ts index cf14d8073..8426a4415 100644 --- a/src/views/mes/processroute/components/graphbase.data.ts +++ b/src/views/mes/processroute/components/graphbase.data.ts @@ -138,7 +138,7 @@ export const start_node = ref({ id: 'startNode', label: '开始', x: 50, - y: 200, + y: 100, attrs: { body: { rx: 20, @@ -151,8 +151,8 @@ export const start_node = ref({ //结束节点的定义 export const end_node = ref({ id: 'endNode', - x: 200, - y: 200, + x: 400, + y: 100, label: '结束', attrs: { body: { diff --git a/src/views/mes/workScheduling/components/Detail.vue b/src/views/mes/workScheduling/components/Detail.vue index c58a01025..b42ae5cd2 100644 --- a/src/views/mes/workScheduling/components/Detail.vue +++ b/src/views/mes/workScheduling/components/Detail.vue @@ -28,7 +28,16 @@
- + + - +