From e68834200c31d4fca3fd189e90a401ab62c6bbf7 Mon Sep 17 00:00:00 2001 From: chenfang Date: Thu, 1 Aug 2024 16:01:06 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E5=8F=98=E6=9B=B4=E5=89=8D?= =?UTF-8?q?=E6=AE=B5=E9=A1=B5=E9=9D=A2=E5=B1=95=E7=A4=BA=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../relegate/relegateRequest/index.vue | 28 +-- .../relegateRequestMain.data.ts | 188 +++++++----------- 2 files changed, 82 insertions(+), 134 deletions(-) diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue index 9adee35d2..537083042 100644 --- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue +++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue @@ -192,6 +192,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) => newRow['toBatch'] = item['batch'] newRow['fromLocationCode'] = item['locationCode'] newRow['inventoryStatus'] = item['inventoryStatus'] + newRow['packUnit'] = item['packUnit'] + newRow['packQty'] = item['packQty'] tableData.value.push(newRow) }) let itemCodes = [] @@ -229,10 +231,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) => // console.log(row['itemCode']); // ItembasicApi.getItemListByCodes(row['itemCode']) row['downItemCode'] = val[0]['code'] - } else if(formField == 'packUnit'){ - row['packUnit'] = val[0]['packUnit'] - row['packQty'] = val[0]['packQty'] - }else if (formField == 'toLocationCode') { + } else if (formField == 'toLocationCode') { row['toLocationCode'] = val[0]['code'] } else { row[formField] = val[0][searchField] @@ -400,16 +399,17 @@ const butttondata = (row,$index) => { defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:relegate-request-main:agree'}), // 审批通过 defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:relegate-request-main:handle'}), // 处理 defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:relegate-request-main:update'}), // 编辑 - { - label: '创建标签', - name: 'cjbq', - hide: isShowMainButton(row,['3']), - type: 'primary', - icon: '', - color: '', - hasPermi: '', - link: true, // 文本展现按钮 - },defaultButtons.mainListPointBtn({hide:isShowMainButton(row,['3','6','8'])}), // 标签打印 + // { + // label: '创建标签', + // name: 'cjbq', + // hide: isShowMainButton(row,['3']), + // type: 'primary', + // icon: '', + // color: '', + // hasPermi: '', + // link: true, // 文本展现按钮 + // }, + defaultButtons.mainListPointBtn({hide:isShowMainButton(row,['3','6','8'])}), // 标签打印 // defaultButtons.mainListDeleteBtn({hasPermi:'wms:relegate-request-main:delete'}), // 删除 ] } diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts index 65c84c4ae..7d116d022 100644 --- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts +++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts @@ -410,59 +410,35 @@ export const RelegateRequestDetail = useCrudSchemas(reactive([ }, }, { - label: '计量单位', - field: 'uom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', - sort: 'custom', - table: { - width: 80 - }, - tableForm: { - type: 'Select', - disabled: true - }, - form: { - componentProps: { - disabled: true - } - } - }, - { - label: '数量', - field: 'qty', + label: '包装号', + field: 'fromPackingNumber', sort: 'custom', form: { componentProps: { - disabled: true + disabled: true, } }, tableForm: { disabled: true }, table: { - width: 80 + width: 120 }, }, { - label: '从批次', - field: 'fromBatch', + label: '包装规格', + field: 'packUnit', sort: 'custom', - form: { - componentProps: { - disabled: true, - } + table: { + width: 120 }, tableForm: { disabled: true }, - table: { - width: 120 - }, }, { - label: '从包装号', - field: 'fromPackingNumber', + label: '批次', + field: 'fromBatch', sort: 'custom', form: { componentProps: { @@ -477,65 +453,42 @@ export const RelegateRequestDetail = useCrudSchemas(reactive([ }, }, { - label: '到包装号', - field: 'toPackingNumber', - sort: 'custom', - table: { - width: 120 - }, - tableForm: { - disabled: true - }, - }, - { - label: '从库位代码', - field: 'fromLocationCode', + label: '数量', + field: 'qty', sort: 'custom', form: { componentProps: { - disabled: true, + disabled: true } }, tableForm: { disabled: true }, table: { - width: 120 + width: 80 }, }, { - label: '从库区类型', - field: 'fromAreaTypes', - dictType: DICT_TYPE.AREA_TYPE, + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, dictClass: 'string', - isTable: false, - isForm: false, - isTableForm: false, sort: 'custom', - }, - { - label: '从库区代码', - field: 'fromAreaCodes', - sort: 'custom', - isForm:false, - isTableForm: false, table: { - width: 150 + width: 100 }, - }, - { - label: '到批次', - field: 'toBatch', - sort: 'custom', tableForm: { + type: 'Select', disabled: true }, - table: { - width: 120 - }, + form: { + componentProps: { + disabled: true + } + } }, { - label: '到库位代码', + label: '库位代码', field: 'toLocationCode', sort: 'custom', tableForm:{ @@ -562,47 +515,46 @@ export const RelegateRequestDetail = useCrudSchemas(reactive([ }, }, { - label: '包装规格', - field: 'packUnit', + label: '到包装号', + field: 'toPackingNumber', sort: 'custom', - tableForm:{ - isInpuFocusShow: true, // 开启查询弹窗 - searchListPlaceholder: '请选择包装规格', - searchField: 'packUnit', - searchTitle: '包装规格', - searchAllSchemas: Itempackaging.allSchemas, - searchPage: ItempackageApi.getItempackagingPage, - searchCondition:[ - { - key: 'itemCode', - value: 'downItemCode', - message: "请选择物料变更代码", - isMainValue: true - } - ] - }, - form: { - // labelMessage: '信息提示说明！！！', - componentProps: { - isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择包装规格', - searchField: 'packUnit', - searchTitle: '包装规格', - searchAllSchemas: Itempackaging.allSchemas, - searchPage: ItempackageApi.getItempackagingPage, - searchCondition:[ - { - key: 'itemCode', - value: 'downItemCode', - message: "请选择降级物料代码", - isMainValue: true - } - ] - } - }, - table: { - width: 120 - }, + isTable: false, + isForm: false, + isTableForm: false, + }, + { + label: '从库位代码', + field: 'fromLocationCode', + sort: 'custom', + isTable: false, + isTableForm: false, + isForm: false, + }, + { + label: '从库区类型', + field: 'fromAreaTypes', + dictType: DICT_TYPE.AREA_TYPE, + dictClass: 'string', + isTable: false, + isForm: false, + isTableForm: false, + sort: 'custom', + }, + { + label: '从库区代码', + field: 'fromAreaCodes', + sort: 'custom', + isForm:false, + isTableForm: false, + isTable: false, + }, + { + label: '到批次', + field: 'toBatch', + sort: 'custom', + isTable: false, + isTableForm: false, + isForm: false, }, { label: '到库区类型', @@ -617,21 +569,17 @@ export const RelegateRequestDetail = useCrudSchemas(reactive([ label: '到库区代码', field: 'toAreaCodes', sort: 'custom', - isForm:false, isTableForm: false, - table: { - width: 150 - }, + isTable: false, + isForm: false, }, { label: '到仓库代码', field: 'toWarehouseCode', sort: 'custom', - isForm:false, isTableForm: false, - table: { - width: 150 - }, + isTable: false, + isForm: false, }, { label: '是否可用',