From c3876fd3d58d027af78a1fca2aff2c15c3a12563 Mon Sep 17 00:00:00 2001 From: yejiaxing <591141169@qq.com> Date: Fri, 29 Dec 2023 11:18:57 +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 --- .../purchaseMain/purchaseMain.data.ts | 28 +-- .../supplierdeliverRequestMain.data.ts | 57 ++++-- .../purchaseclaimRequestMain.data.ts | 71 +++---- .../supplierinvoiceRecordMain/index.vue | 2 +- .../supplierinvoiceRecordMain.data.ts | 177 +----------------- .../supplierinvoiceRequestMain/index.vue | 2 +- 6 files changed, 101 insertions(+), 236 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts index 6721786af..10ee5536d 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts @@ -420,6 +420,21 @@ export const PurchaseDetail = useCrudSchemas(reactive([ } } }, + { + label: '计量单位', + field: 'uom', + sort: 'custom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isSearch: true, + isTable: true, + table: { + width: 150 + }, + tableForm: { + type: 'Select' + } + }, { label: '订单数量', field: 'orderQty', @@ -439,19 +454,6 @@ export const PurchaseDetail = useCrudSchemas(reactive([ precision: 6 } }, - { - label: '计量单位', - field: 'uom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', - isTable: true, - table: { - width: 150 - }, - tableForm: { - type: 'Select' - } - }, { label: 'ERP库位', field: 'erpLocationCode', diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts index 6ec63ebcc..1a4c2ea72 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts @@ -784,6 +784,42 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive( width: 150 }, }, + { + label: '物品代码', + field: 'itemCode', + table: { + width: 150 + }, + + }, + { + label: '物品名称', + field: 'itemName', + table: { + width: 150 + }, + }, + { + label: '数量', + field: 'qty', + table: { + width: 150 + }, + }, + { + label: '计量单位', + field: 'uom', + sort: 'custom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isSearch: true, + isTable: true, + table: { + width: 150 + }, + tableForm: { + type: 'Select' + } + }, { label: '批次', field: 'batch', @@ -414,39 +451,7 @@ export const PurchaseclaimRequestDetail = useCrudSchemas(reactive( // disabled:true, // } }, - { - label: '物品代码', - field: 'itemCode', - table: { - width: 150 - }, - - }, - { - label: '物品名称', - field: 'itemName', - table: { - width: 150 - }, - }, - { - label: '数量', - field: 'qty', - table: { - width: 150 - }, - }, - { - label: '计量单位', - field: 'uom', - sort: 'custom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', - isTable: true, - table: { - width: 120 - } , - }, + { label: '备注', field: 'remark', diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue index 2cee15520..a775c8548 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue @@ -56,7 +56,7 @@ :allSchemas="SupplierinvoiceRecordMain.allSchemas" :detailAllSchemas="SupplierinvoiceRecordDetail.allSchemas" :detailAllSchemasRules="SupplierinvoiceRecordDetailRules" - :apiPage="SupplierinvoiceRecordDetailApi.getSupplierinvoiceRecordDetailPage" + :apiPage="SupplierinvoiceRecordDetailApi.getSupplierinvoiceRecordDeatilPage" /> diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts index 03692ce34..5a191f0c5 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts @@ -233,22 +233,6 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive width: 150 }, }, - { - label: '包装号', - field: 'packingNumber', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '器具号', - field: 'containerNumber', - sort: 'custom', - table: { - width: 150 - }, - }, { label: '批次', field: 'batch', @@ -257,14 +241,6 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive width: 150 }, }, - { - label: '替代批次', - field: 'altBatch', - sort: 'custom', - table: { - width: 150 - }, - }, { label: '订单号', field: 'poNumber', @@ -282,41 +258,24 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive }, }, { - label: '标包数量', - field: 'stdPackQty', - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'InputNumber', - } - }, - { - label: '标包单位', - field: 'stdPackUnit', - dictType: DICT_TYPE.PACK_UNIT, - dictClass: 'string', - isTable: true, + label: '单据号', + field: 'number', sort: 'custom', table: { width: 150 }, }, { - label: '供应商计量数量', - field: 'supplierPackQty', + label: '物品代码', + field: 'itemCode', sort: 'custom', table: { width: 150 }, - form: { - component: 'InputNumber', - } }, { - label: '供应商计量单位', - field: 'supplierPackUnit', + label: '计量单位', + field: 'uom', dictType: DICT_TYPE.UOM, dictClass: 'string', isTable: true, @@ -326,15 +285,12 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive }, }, { - label: '转换率', - field: 'convertRate', + label: '数量', + field: 'qty', sort: 'custom', table: { width: 150 }, - form: { - component: 'InputNumber', - } }, { label: '单价', @@ -358,22 +314,6 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive component: 'InputNumber', } }, - { - label: '单据号', - field: 'number', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '物品代码', - field: 'itemCode', - sort: 'custom', - table: { - width: 150 - }, - }, { label: '备注', field: 'remark', @@ -382,105 +322,6 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive width: 150 }, }, - { - label: '创建时间', - field: 'createTime', - isTable: true, - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', - table: { - width: 180 - }, - }, - { - label: '创建者', - field: 'creator', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '物品名称', - field: 'itemName', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '物品描述1', - field: 'itemDesc1', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '物品描述2', - field: 'itemDesc2', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '项目代码', - field: 'projectCode', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '数量', - field: 'qty', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '计量单位', - field: 'uom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '代码', - field: 'code', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '接口类型', - field: 'interfaceType', - dictType: DICT_TYPE.INTERFACE_TYPE, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '任务明细ID', - field: 'jobDetailId', - sort: 'custom', - table: { - width: 150 - }, - }, ])) //表单校验 @@ -518,4 +359,4 @@ export const SupplierinvoiceRecordDetailRules = reactive({ creator: [ { required: true, message: '请输入创建者', trigger: 'blur' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue index cea4ea115..72ff44a08 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue @@ -159,7 +159,7 @@ defaultButtons.mainListPlanSubBtn({ hide: isShowMainButton(row, ['1']) }), // 提交审批 defaultButtons.mainListPlanAppBtn({ hide: isShowMainButton(row, ['2']) }), // 审批通过 defaultButtons.mainListPlanTurBtn({ hide: isShowMainButton(row, ['2']) }), // 驳回按钮 - defaultButtons.mainListEditBtn({ hasPermi: 'wms:supplierinvoice-request-main:update' }), // 编辑 + defaultButtons.mainListEditBtn({ hasPermi: 'wms:supplierinvoice-request-main:update' , hide: isShowMainButton(row, ['1'])}), // 编辑 // 生成记录 { label: '处理',