From 7e1ec4579d52acfa0bc0bed4f0aef1e546f74ae2 Mon Sep 17 00:00:00 2001 From: yejiaxing <591141169@qq.com> Date: Thu, 21 Dec 2023 09:37:03 +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 --- .../wms/supplierinvoiceRequestMain/index.ts | 5 ++ .../purchaseMain/purchaseMain.data.ts | 51 +++++--------- .../purchasePlanMain/index.vue | 2 +- .../purchasePlanMain/purchasePlanMain.data.ts | 66 ++++++++++--------- .../supplierdeliverRequestMain/index.vue | 4 +- 5 files changed, 57 insertions(+), 71 deletions(-) diff --git a/src/api/wms/supplierinvoiceRequestMain/index.ts b/src/api/wms/supplierinvoiceRequestMain/index.ts index 067f556cb..48e23c953 100644 --- a/src/api/wms/supplierinvoiceRequestMain/index.ts +++ b/src/api/wms/supplierinvoiceRequestMain/index.ts @@ -36,6 +36,11 @@ export const getSupplierinvoiceRequestMain = async (id: number) => { return await request.get({ url: `/wms/supplierinvoice-request-main/get?id=` + id }) } +// 查询供应商发票申请主详情 +export const getNumber = async (params) => { + return await request.get({ url: `/wms/supplierinvoice-request-main/getNumber`, params}) +} + // 新增供应商发票申请主 export const createSupplierinvoiceRequestMain = async (data: SupplierinvoiceRequestMainVO) => { return await request.post({ url: `/wms/supplierinvoice-request-main/create`, data }) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts index 5542e8da7..6721786af 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts @@ -407,6 +407,19 @@ export const PurchaseDetail = useCrudSchemas(reactive([ } } }, + { + label: '单据号', + field: 'number', + isTableForm: false, + table: { + width: 150 + }, + form: { + componentProps: { + disabled: true + } + } + }, { label: '订单数量', field: 'orderQty', @@ -630,41 +643,7 @@ export const PurchaseDetail = useCrudSchemas(reactive([ isTableForm: false, isForm: false }, - { - label: '单据号', - field: 'nuumber', - isTableForm: false, - table: { - width: 150 - }, - form: { - componentProps: { - disabled: true - } - } - }, - { - label: '明细状态', - field: 'status', - dictType: DICT_TYPE.WORK_ORDER_DETAIL_STATUS, - dictClass: 'string', - isSearch: true, - isTable: true, - isForm: false, - isTableForm: false, - table: { - width: 150 - }, - form: { - componentProps: { - disabled: true - }, - value: 'OPEN' - }, - tableForm:{ - type: 'Select' - } - }, + { label: '备注', field: 'remark', @@ -838,4 +817,4 @@ export const PurchaseDetailRules = reactive({ itemCode: [ { required: true, message: '请选择物品代码', trigger: 'change' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue index 2bd8b58e6..e9b92ee48 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue @@ -184,7 +184,7 @@ defaultButtons.mainListPurchasePlanAccBtn({ hide: isShowMainButton(row, ['3']) }), // 接受 defaultButtons.mainListPurchasePlanRejBtn({ hide: isShowMainButton(row, ['3']) }), // 不接受 defaultButtons.mainListPurchasePlanWitBtn({ hide: isShowMainButton(row, ['3']) }), // 下架 - defaultButtons.mainListEditBtn({ hide: isShowMainButton(row, ['1']), hasPermi: 'wms:purchase-plan-main:update' }), // 编辑 + // defaultButtons.mainListEditBtn({ hide: isShowMainButton(row, ['1']), hasPermi: 'wms:purchase-plan-main:update' }), // 编辑 // defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchase-plan-main:delete'}), // 删除 ] } diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts index 586b1d603..d76314b26 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts @@ -125,7 +125,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive([ }, isForm: false, }, - + { label: '备注', field: 'remark', @@ -269,12 +269,12 @@ export const PurchasePlanDetail = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - },{ + }, { key: 'supplierCode', value: 'supplierCode', isMainValue: true } - ,{ + , { key: 'status', value: 2, isMainValue: false @@ -302,17 +302,17 @@ export const PurchasePlanDetail = useCrudSchemas(reactive([ label: '订单行', field: 'poLine', sort: 'custom', - table: { - width: 150 - }, - form: { - componentProps: { - disabled: true - } - }, - tableForm: { - disabled: true - } + table: { + width: 150 + }, + form: { + componentProps: { + disabled: true + } + }, + tableForm: { + disabled: true + } }, { label: '单据号', @@ -344,38 +344,40 @@ export const PurchasePlanDetail = useCrudSchemas(reactive([ disabled: true } }, + { - label: '创建时间', - field: 'createTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, + label: '订单数量', + field: 'orderQty', sort: 'custom', - isTableForm: false, table: { - width: 180 + width: 150 }, - isForm: false, form: { - component: 'DatePicker', componentProps: { - style: { width: '100%' }, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', + disabled: true } + }, + tableForm: { + disabled: true } + }, + { - label: '创建者', - field: 'creator', + label: '已计划数量', + field: 'plannedQty', sort: 'custom', - isTableForm: false, table: { width: 150 }, - isForm: false, + form: { + componentProps: { + disabled: true + } + }, + tableForm: { + disabled: true + } }, { label: '已发货数量', diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue index 339a390c3..2ec1d8101 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue @@ -21,8 +21,8 @@ {{ row.number }} -