From 10297e9f63cb9f428f315f6ecafc0447737717d2 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Tue, 20 Aug 2024 17:50:03 +0800
Subject: [PATCH] =?UTF-8?q?HL-5462=E9=9A=94=E7=A6=BB=E6=8A=A5=E5=B7=A5?=
=?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=98=8E=E7=BB=86=E4=B8=AD=E9=83=A8=E5=88=86?=
=?UTF-8?q?=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../productreceiptscrapRequestMain/index.vue | 31 ++++++++++++++++++-
.../productreceiptscrapRequestMain.data.ts | 3 +-
2 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
index 4b9ad9fd4..45fd2b9d4 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
@@ -59,7 +59,21 @@
@tableSelectionDelete="tableSelectionDelete"
@searchTableSuccess="searchTableSuccess"
@submitForm="submitForm"
- />
+ >
+
+
+
+
0){
+ row['expireTime'] = res[0]['expireTime']
+ }
+
}else if(formField == 'workStationCode'){
//添加明细
val.forEach(item=>{
@@ -595,7 +618,13 @@ const submitForm = async (formType, submitData) => {
if(data.masterId){
data.id = data.masterId
}
+
data.subList = tableData.value // 拼接子表数据参数
+ tableData.value.forEach((row, index) => {
+ row['expireDate'] = row['expireTime']
+ ? addDay(row['produceDate'], row['expireTime']).valueOf()
+ : dayjs('2099-12-31').valueOf()
+ })
if(data.subList.find(item => (item.qty <= 0))) {
message.warning('数量必须大于0')
return
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
index 929e92008..7e2174154 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
@@ -1238,7 +1238,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive
width: 180
},
tableForm: {
- type: 'FormDate',
+ type: 'slot',
+ disabled: true,
valueFormat: 'x',
},
form: {