From 219b5c17950211d5802dd2c839bbba2b066ac124 Mon Sep 17 00:00:00 2001 From: yejiaxing <591141169@qq.com> Date: Thu, 14 Dec 2023 15:18:50 +0800 Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliverRecordMain.data.ts | 191 +++--- .../purchaseclaimRequestMain/index.vue | 565 +++++++++--------- 2 files changed, 380 insertions(+), 376 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts index f2d892e51..91f14629f 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts @@ -391,57 +391,136 @@ export const SupplierdeliverRecordMainRules = reactive({ * @returns {Array} 供应商发货记录子表 */ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive([ + // { + // label: '从包装号', + // field: 'fromPackingNumber', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + // { + // label: '到包装号', + // field: 'toPackingNumber', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + // { + // label: '从批次', + // field: 'fromBatch', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + // { + // label: '到批次', + // field: 'toBatch', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + // { + // label: '替代批次', + // field: 'altBatch', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + // { + // label: '从器具号', + // field: 'fromContainerNumber', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + // { + // label: '到器具号', + // field: 'toContainerNumber', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + { + label: '订单号', + field: 'poNumber', + sort: 'custom', + table: { + width: 150 + }, + }, { - label: '从包装号', - field: 'fromPackingNumber', + label: '订单行', + field: 'poLine', sort: 'custom', table: { width: 150 }, }, { - label: '到包装号', - field: 'toPackingNumber', + label: '物品代码', + field: 'itemCode', sort: 'custom', table: { width: 150 }, }, { - label: '从批次', - field: 'fromBatch', + label: '数量', + field: 'qty', sort: 'custom', table: { width: 150 }, + form: { + component: 'InputNumber', + } }, { - label: '到批次', - field: 'toBatch', + label: '标包数量', + field: 'stdPackQty', sort: 'custom', table: { width: 150 }, + form: { + component: 'InputNumber', + } }, { - label: '替代批次', - field: 'altBatch', + label: '标包单位', + field: 'stdPackUnit', + dictType: DICT_TYPE.PACK_UNIT, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 }, }, { - label: '从器具号', - field: 'fromContainerNumber', + label: '供应商计量数量', + field: 'supplierQty', sort: 'custom', table: { width: 150 }, + form: { + component: 'InputNumber', + } }, { - label: '到器具号', - field: 'toContainerNumber', + label: '供应商计量单位', + field: 'supplierUom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 @@ -507,66 +586,7 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive } }, }, - { - label: '订单号', - field: 'poNumber', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '订单行', - field: 'poLine', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '标包数量', - field: 'stdPackQty', - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'InputNumber', - } - }, - { - label: '标包单位', - field: 'stdPackUnit', - dictType: DICT_TYPE.PACK_UNIT, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '供应商计量数量', - field: 'supplierQty', - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'InputNumber', - } - }, - { - label: '供应商计量单位', - field: 'supplierUom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - }, + { label: '从库位代码', field: 'fromLocationCode', @@ -631,14 +651,7 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive width: 150 }, }, - { - label: '物品代码', - field: 'itemCode', - sort: 'custom', - table: { - width: 150 - }, - }, + { label: '物品名称', field: 'itemName', @@ -671,17 +684,7 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive width: 150 }, }, - { - label: '数量', - field: 'qty', - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'InputNumber', - } - }, + { label: '计量单位', field: 'uom', @@ -803,4 +806,4 @@ export const SupplierdeliverRecordDetailRules = reactive({ creator: [ { required: true, message: '请输入创建者', trigger: 'blur' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue index f33c2960d..aafbe5238 100644 --- a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue +++ b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue @@ -7,19 +7,13 @@ - + - @@ -34,317 +28,324 @@
- - + + - + @searchTableSuccessDetail="searchTableSuccessDetail" /> - +