diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts index f44468c43..50eb1ceec 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts @@ -814,6 +814,28 @@ export const PurchasePlanDetail = useCrudSchemas(reactive([ disabled:true, } }, + { + label: '受入号', + field: 'receivedNumber', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false, + sortTableDefault:13, + }, + { + label: '受入地', + field: 'receivedLocation', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false, + sortTableDefault:14, + }, { label: '是否可用', field: 'available', diff --git a/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRequest/PurchaseClaimRequestMain.data.ts b/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRequest/PurchaseClaimRequestMain.data.ts index e653b5caa..6b8d49690 100644 --- a/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRequest/PurchaseClaimRequestMain.data.ts +++ b/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRequest/PurchaseClaimRequestMain.data.ts @@ -68,11 +68,11 @@ export const PurchaseClaimRequestMain = useCrudSchemas(reactive([ }, { label: '索赔时间', - field: 'invoiceTime', + field: 'claimTime', sort: 'custom', formatter: dateFormatter, table: { - width: 110 + width: 180 }, search: { component: 'DatePicker', @@ -167,6 +167,7 @@ export const PurchaseClaimRequestMain = useCrudSchemas(reactive([ label: '操作', field: 'action', isForm: false, + isDetail: false, table: { width: 150, fixed: 'right' @@ -193,7 +194,8 @@ export const PurchaseClaimRequestDetail = useCrudSchemas(reactive( sort: 'custom', isSearch: false, table: { - width: 150 + width: 150, + }, tableForm:{ multiple:false,//多选 @@ -320,4 +322,16 @@ export const PurchaseClaimRequestDetail = useCrudSchemas(reactive( precision: 5 } }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false, + hiddenInMain:true, + table: { + width: 150, + fixed: 'right' + }, + isTableForm: false, + } ])) diff --git a/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRequest/index.vue b/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRequest/index.vue index 7bf093423..d2526b38c 100644 --- a/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRequest/index.vue +++ b/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRequest/index.vue @@ -273,9 +273,9 @@ const buttonTableClick = async (val, row) => { if (val == 'edit') { // 编辑 openForm('update', row) - } else if (val == 'delete') { + } else if (val == 'mainPlanSub') { // 提交审批 - handleSub(row.id) + handleSub(row.masterId) } else if (val == 'delete') { // 删除 @@ -285,13 +285,13 @@ const buttonTableClick = async (val, row) => { /** 提交审批按钮操作 */ -const handleSub = async (id: number) => { +const handleSub = async (masterId: number) => { try { // 关闭的二次确认 await message.confirm(t('ts.是否提交审批所选中数据?')) tableObject.loading = true // 发起关闭 - await PurchaseClaimRequestMainApi.subPurchaseClaimRequestMain(id) + await PurchaseClaimRequestMainApi.subPurchaseClaimRequestMain(masterId) message.success(t('ts.提交审批成功!')) tableObject.loading = false // 刷新列表