diff --git a/src/api/wms/inspectJobMain/index.ts b/src/api/wms/inspectJobMain/index.ts index bfd3d2db3..03bf0b791 100644 --- a/src/api/wms/inspectJobMain/index.ts +++ b/src/api/wms/inspectJobMain/index.ts @@ -92,5 +92,5 @@ export const importTemplate = () => { // 关闭检验任务主 export const closeInspectJobMain = (id: number) => { - return request.download({ url: '/wms/inspect-job-main/close?id=' + id }) + return request.put({ url: '/wms/inspect-job-main/close?id=' + id }) } diff --git a/src/api/wms/purchasereceiptJobMain/index.ts b/src/api/wms/purchasereceiptJobMain/index.ts index 44601138e..3e2f9a27d 100644 --- a/src/api/wms/purchasereceiptJobMain/index.ts +++ b/src/api/wms/purchasereceiptJobMain/index.ts @@ -95,5 +95,5 @@ export const importTemplate = () => { // 关闭采购收货任务主 export const closePurchasereceiptJobMain = (id: number) => { - return request.download({ url: '/wms/purchasereceipt-job-main/close?id=' + id }) + return request.put({ url: '/wms/purchasereceipt-job-main/close?id=' + id }) } diff --git a/src/api/wms/putawayJobMain/index.ts b/src/api/wms/putawayJobMain/index.ts index f072d9287..6437b8608 100644 --- a/src/api/wms/putawayJobMain/index.ts +++ b/src/api/wms/putawayJobMain/index.ts @@ -84,5 +84,5 @@ export const importTemplate = () => { // 关闭上架任务主 export const closePutawayJobMain = (id: number) => { - return request.download({ url: '/wms/putaway-job-main/close?id=' + id }) + return request.put({ url: '/wms/putaway-job-main/close?id=' + id }) } diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue index 986cdf661..3d81e720b 100644 --- a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue @@ -63,11 +63,7 @@ :allSchemas="InspectRequestMain.allSchemas" :detailAllSchemas="InspectRequestDetail.allSchemas" :detailAllSchemasRules="InspectRequestDetailRules" - :apiCreate="InspectRequestDetailApi.createInspectRequestDetail" - :apiUpdate="InspectRequestDetailApi.updateInspectRequestDetail" :apiPage="InspectRequestDetailApi.getInspectRequestDetailPage" - :apiDelete="InspectRequestDetailApi.deleteInspectRequestDetail" - :Echo="Echo" @searchTableSuccessDetail="searchTableSuccessDetail" /> @@ -271,7 +267,7 @@ const handleSubmit = async (id: number) => { try { await message.confirm(t('common.confirmSubmit')) await InspectRequestMainApi.submitInspectRequestMain(id) - message.success(t('common.closeSuccess')) + message.success(t('common.submitSuccess')) await getList() } catch {} } diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts index cf0529ca6..c9fa4cc01 100644 --- a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts @@ -106,8 +106,8 @@ export const InspectRequestMain = useCrudSchemas(reactive([ { label: '从库位类型范围', field: 'fromLocationTypes', - // dictType: DICT_TYPE.LOCATION_TYPE, - // dictClass: 'string', + dictType: DICT_TYPE.LOCATION_TYPE, + dictClass: 'string', isTable: true, sort: 'custom', table: { @@ -325,7 +325,7 @@ export const InspectRequestMain = useCrudSchemas(reactive([ }, { label: '物品代码', - field: 'itemcode', + field: 'itemCode', sort: 'custom', table: { width: 150 @@ -776,17 +776,6 @@ export const InspectRequestDetail = useCrudSchemas(reactive([ tableForm: { type: 'Select' } - }, - { - label: '操作', - field: 'action', - isDetail: false, - isForm: false , - table: { - width: 150, - fixed: 'right' - }, - isTableForm:false, } ])) @@ -804,4 +793,4 @@ export const InspectRequestDetailRules = reactive({ itemCode: [ { required: true, message: '请输入物品代码', trigger: 'blur' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue index 9b9ce77ec..a187bd907 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue @@ -84,7 +84,6 @@ import * as PurchasereceiptRequestMainApi from '@/api/wms/purchasereceiptRequest import * as PurchasereceiptRequestDetailApi from '@/api/wms/purchasereceiptRequestDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import { PurchasereceiptRequestTabsList } from '@/utils/disposition/tabsList' -import { SupplierdeliverRecordMain, SupplierdeliverRecordDetail} from './../../supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data' // 采购收货申请 defineOptions({ name: 'PurchasereceiptRequestMain' })