From 091f8fab6932c5c5d97db53f910794e17bf01fe0 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Mon, 22 Jul 2024 08:59:31 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=97=B6=E9=97=B4=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliverRequestMain/supplierdeliverBasicForm.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue index 7b01aade1..c6918888f 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue @@ -109,7 +109,11 @@ const openFormByCreate = async ( data ) => { let beginTime = data['endTime'] if(data['deliveryDate']){ let deliveryDate = formatDate(data['deliveryDate'],'YYYY-MM-DD') - planArriveTimeStr.value = deliveryDate + ' '+ beginTime+":00" + if(beginTime){ + planArriveTimeStr.value = deliveryDate + ' '+ beginTime+":00" + }else{ + planArriveTimeStr.value = deliveryDate + ' '+ "00:00:00" + } setV['planArriveTime']= new Date(planArriveTimeStr.value).valueOf(); setV['arriveTime']= new Date(planArriveTimeStr.value).valueOf(); } From 7a76b7acdd05bfa93eac7dc95f6a3e9fa8522c38 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Mon, 22 Jul 2024 09:26:18 +0800 Subject: [PATCH 2/3] =?UTF-8?q?SCP=20=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?= =?UTF-8?q?=E8=B4=A7=E7=94=B3=E8=AF=B7=EF=BC=8C=E7=94=9F=E6=88=90=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E6=97=B6=EF=BC=8C=E8=AE=A1=E7=AE=97=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E5=87=BA=E7=8E=B0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliver/supplierdeliverRequestMain/labelForm.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue index 8f6ab2391..6e02b6fb0 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue @@ -235,10 +235,11 @@ const expandChange = (row: any, expandedRows: any[]) => { row.manTuoQty = Math.floor(parseFloat(row.manXiangQty) / parseFloat(row.otherNumber)) // 放满的托数量*一托的箱数量*一箱的数量 获取放满的托一共多少数量 let num1 = accuracyFun.multiply(parseFloat(row.manTuoQty ),parseFloat(row.otherNumber)) - row.tuoInManNumber =accuracyFun.multiply(num1,parseFloat(row.packQty)) + row.tuoInManNumber = accuracyFun.multiply(num1, parseFloat(row.packQty)) + console.log(11,row.tuoInManNumber ) // 数量除以托数量获取余数 row.lastNumber = - parseFloat(row.qty) > parseFloat(row.tuoInManNumber) + parseFloat(row.qty) >= parseFloat(row.tuoInManNumber) ? accuracyFun.subtract( parseFloat(row.qty),parseFloat(row.tuoInManNumber)) : parseFloat(row.qty) // 循环托 From ca7d6962d996d1787b99221313d107c47f421e78 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Mon, 22 Jul 2024 09:42:09 +0800 Subject: [PATCH 3/3] =?UTF-8?q?HL-4298=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 --- .../productreceiptJobMain.data.ts | 11 +++++++++++ .../productreceiptAssembleJobMain.data.ts | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts index 268d5311d..08ddb8dd4 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts @@ -36,6 +36,17 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ width: 150 }, }, + { + label: '生产计划单号', + field: 'productionPlanNumber', + sort: 'custom', + table: { + width: 180 + }, + isSearch: true, + isForm: false, + isTable:true, + }, { label: '车间代码', field: 'workShopCode', diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts index 007f65edc..7da976dcd 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts @@ -36,6 +36,17 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ width: 150 }, }, + { + label: '生产计划单号', + field: 'productionPlanNumber', + sort: 'custom', + table: { + width: 180 + }, + isSearch: true, + isForm: false, + isTable:true, + }, { label: '车间代码', field: 'workshopCode',