From f4a3339b4c612d0b954101fa9396f4f382c90562 Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Fri, 23 Aug 2024 13:56:48 +0800 Subject: [PATCH] =?UTF-8?q?WMS=20=E9=9C=80=E6=B1=82=EF=BC=9AHL-5517=20WMS?= =?UTF-8?q?=E5=8F=91=E6=96=99=E7=AE=A1=E7=90=86-=E9=9A=94=E7=A6=BB?= =?UTF-8?q?=E9=80=80=E6=96=99=E7=94=B3=E8=AF=B7=E5=AD=97=E6=AE=B5=E5=8F=98?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionreturnRequestMain/index.vue | 12 +- .../productionreturnRequestMain.data.ts | 162 +++++++++--------- .../productionreturnRequestMainNo/index.vue | 12 +- .../productionreturnRequestMainNo.data.ts | 103 ++++++----- 4 files changed, 155 insertions(+), 134 deletions(-) diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue index 1b110156f..7438456ca 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue @@ -209,6 +209,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => } else { row['batch'] = '000000' } + row['packUnit'] = val[0]['packUnit'] + row['packQty'] = val[0]['packQty'] // HL-4885 聂喜婷：@邱晨 @王宇飞 先把数量的校验拿掉 // 修改 tableform 属性 数量最大值设置为库存余额中数量 // TODO: tableFormColumns 修改属性目前只限于整个列 并不满足行要求 例如： 第一条数据最大10 第二条数据最大20 那么第一条数据会变成最大20限制 @@ -226,10 +228,12 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => newRow['fromLocationCode'] = item['rawLocationCode'] tableData.value.push(newRow) }) - } else if(formField == 'packUnit') { - row['packUnit'] = val[0]['packUnit'] - row['packQty'] = val[0]['packQty'] - } else { + } + // else if(formField == 'packUnit') { + // row['packUnit'] = val[0]['packUnit'] + // row['packQty'] = val[0]['packQty'] + // } + else { row[formField] = val[0][searchField] } } else { diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts index b31c3985a..9c5da4822 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts @@ -521,9 +521,9 @@ export const ProductionreturnRequestMainRules = reactive({ workshopCode: [ { required: true, message: '请选择车间', trigger: 'change' } ], - productionLineCode: [ - { required: true, message: '请选择生产线代码', trigger: 'change' } - ], + // productionLineCode: [ + // { required: true, message: '请选择生产线代码', trigger: 'change' } + // ], }) /** @@ -623,21 +623,34 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive row['uom'] = val[0]['uom'] row['inventoryStatus'] = val[0]['inventoryStatus'] row['qty'] = Number(val[0]['qty']) + row['packUnit'] = val[0]['packUnit'] + row['packQty'] = val[0]['packQty'] // HL-4885 聂喜婷：@邱晨 @王宇飞 先把数量的校验拿掉 // 修改 tableform 属性 数量最大值设置为库存余额中数量 // ProductionreturnRequestDetail.allSchemas.tableFormColumns.forEach(item => { @@ -212,10 +214,12 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => newRow['fromLocationCode'] = item['rawLocationCode'] tableData.value.push(newRow) }) - } else if(formField == 'packUnit') { - row['packUnit'] = val[0]['packUnit'] - row['packQty'] = val[0]['packQty'] - } else { + } + // else if(formField == 'packUnit') { + // row['packUnit'] = val[0]['packUnit'] + // row['packQty'] = val[0]['packQty'] + // } + else { row[formField] = val[0][searchField] } } else { diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts index 40ace6f98..4b2658f20 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts @@ -129,20 +129,29 @@ export const ProductionreturnRequestDetail = useCrudSchemas( { key: 'available', value: 'TRUE', + action: '==', // 查询拼接条件 + isSearch: true, // 使用自定义拼接条件 isMainValue: false }, { key: 'workshopCode', value: 'workshopCode', message: '请选择车间信息！', - isMainValue: true + action: '==', // 查询拼接条件 + isSearch: true, // 使用自定义拼接条件 + isMainValue: false, // 拼接条件必须要 false 同时不能与 isMainValue: true 同用 + isFormModel:true, // filters中添加筛选的数据--取于formModel + required:true, // 前置添加必有，和isFormModel结合使用 }, { - key: 'productionLineCode', - value: 'productionLineCode', - message: '请选择生产线信息！', - isMainValue: true - } + key: 'productionLineCode', // 查询列表中字段 + value: 'productionLineCode', // 指查询具体值 + action: '==', // 查询拼接条件 + isSearch: true, // 使用自定义拼接条件 + isMainValue: false, // 拼接条件必须要 false 同时不能与 isMainValue: true 同用 + isFormModel:true, // filters中添加筛选的数据--取于formModel + required:false, // 前置添加必有，和isFormModel结合使用 + }, ], verificationPage: WorkstationApi.getWorkstationByCodes, // 校验数去焦点输入是否正确的方法 isShowTableFormSearch: true, @@ -159,10 +168,30 @@ export const ProductionreturnRequestDetail = useCrudSchemas( ] // 失去焦点校验参数 } }, + { + label: '来源库位', + field: 'fromLocationCode', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: true, + tableForm: { + disabled: true + }, + form: { + componentProps: { + disabled: true + } + } + }, { label: '目标库位', field: 'toLocationCode', sort: 'custom', + table: { + width: 150 + }, tableForm: { multiple: true,//多选 isInpuFocusShow: true, // 开启查询弹窗 @@ -405,23 +434,6 @@ export const ProductionreturnRequestDetail = useCrudSchemas( } } }, - { - label: '来源库位', - field: 'fromLocationCode', - sort: 'custom', - table: { - width: 150 - }, - isTableForm: false, - tableForm: { - disabled: true - }, - form: { - componentProps: { - disabled: true - } - } - }, { label: '从货主', field: 'fromOwnerCode', @@ -533,29 +545,30 @@ export const ProductionreturnRequestDetail = useCrudSchemas( table: { width: 120 }, - isTable:false, + isTable:true, isTableForm:true, tableForm: { - isInpuFocusShow: true, - isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择包装规格', // 输入框占位文本 - searchField: 'packUnit', // 查询弹窗赋值字段 - searchTitle: '物料包装信息', // 查询弹窗标题 - searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类 - searchPage: ItempackagingApi.getItempackagingPage, // 查询弹窗所需分页方法 - searchCondition: [ - { - key: 'available', - value: 'TRUE', - isMainValue: false - }, - { - key: 'itemCode', - value: 'itemCode', - message: '请先选择物料代码！', - isMainValue: true - } - ] + disabled: true + // isInpuFocusShow: true, + // isSearchList: true, // 开启查询弹窗 + // searchListPlaceholder: '请选择包装规格', // 输入框占位文本 + // searchField: 'packUnit', // 查询弹窗赋值字段 + // searchTitle: '物料包装信息', // 查询弹窗标题 + // searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类 + // searchPage: ItempackagingApi.getItempackagingPage, // 查询弹窗所需分页方法 + // searchCondition: [ + // { + // key: 'available', + // value: 'TRUE', + // isMainValue: false + // }, + // { + // key: 'itemCode', + // value: 'itemCode', + // message: '请先选择物料代码！', + // isMainValue: true + // } + // ] }, form: { // labelMessage: '信息提示说明！！！', @@ -589,7 +602,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas( table: { width: 120 }, - isTable: false, + isTable: true, isTableForm: true, tableForm: { disabled: true