diff --git a/src/api/wms/purchasereceiptJobMain/index.ts b/src/api/wms/purchasereceiptJobMain/index.ts index ac751a5b6..67b1e982a 100644 --- a/src/api/wms/purchasereceiptJobMain/index.ts +++ b/src/api/wms/purchasereceiptJobMain/index.ts @@ -58,6 +58,18 @@ export const getPurchasereceiptJobMainPage = async (params) => { } } +// 查询备件收货任务主列表 +export const getPurchasereceiptJobMainPageSpare = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/purchasereceipt-job-main/seniorSpare', data }) + } else { + return await request.get({ url: `/wms/purchasereceipt-job-main/pageSpare`, params }) + } +} + + // 查询采购收货任务主详情 export const getPurchasereceiptJobMain = async (id: number) => { return await request.get({ url: `/wms/purchasereceipt-job-main/get?id=` + id }) diff --git a/src/api/wms/purchasereceiptRecordMain/index.ts b/src/api/wms/purchasereceiptRecordMain/index.ts index 9fab97c09..b3eccfdf4 100644 --- a/src/api/wms/purchasereceiptRecordMain/index.ts +++ b/src/api/wms/purchasereceiptRecordMain/index.ts @@ -48,6 +48,17 @@ export const getPurchasereceiptRecordMainPage = async (params) => { } } +// 查询备件收货记录主列表 +export const getPurchasereceiptRecordMainPageSpare = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/purchasereceipt-record-main/seniorSpare', data }) + } else { + return await request.get({ url: `/wms/purchasereceipt-record-main/pageSpare`, params }) + } +} + // 查询采购收货记录主详情 export const getPurchasereceiptRecordMain = async (id: number) => { return await request.get({ url: `/wms/purchasereceipt-record-main/get?id=` + id }) diff --git a/src/api/wms/purchasereceiptRequestMain/index.ts b/src/api/wms/purchasereceiptRequestMain/index.ts index ff76ed54e..58d866b5f 100644 --- a/src/api/wms/purchasereceiptRequestMain/index.ts +++ b/src/api/wms/purchasereceiptRequestMain/index.ts @@ -42,6 +42,17 @@ export const getPurchasereceiptRequestMainPage = async (params) => { } } +// 查询备件收货申请主列表 +export const getPurchasereceiptRequestMainPageSpare = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/purchasereceipt-request-main/seniorSpare', data }) + } else { + return await request.get({ url: `/wms/purchasereceipt-request-main/pageSpare`, params }) + } +} + // 查询采购收货申请主详情 export const getPurchasereceiptRequestMain = async (id: number) => { return await request.get({ url: `/wms/purchasereceipt-request-main/get?id=` + id }) diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts index 75cfd7d43..e6ce661d6 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts @@ -65,6 +65,21 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ width: 150 }, }, + { + label: '数据来源', + field: 'sourceType', + dictType: DICT_TYPE.PURCHASERECEIPT_SOURCE_TYPE, + sort: 'custom', + table: { + width: 150 + }, + form: { + componentProps: { + disabled: true + } + }, + isSearch: false, + }, { label: '运输方式', field: 'transferMode', diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index 128b9623e..6026e73f1 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -83,6 +83,21 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ width: 150 }, }, + { + label: '数据来源', + field: 'sourceType', + dictType: DICT_TYPE.PURCHASERECEIPT_SOURCE_TYPE, + sort: 'custom', + table: { + width: 150 + }, + form: { + componentProps: { + disabled: true + } + }, + isSearch: false, + }, { label: '车牌号', field: 'vehiclePlateNumber', diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts index 7137a3ed6..df3bb46c9 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts @@ -1,41 +1,39 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' -const { t } = useI18n() // 国际化 import * as getRequestsettingApi from '@/api/wms/requestsetting/index' import * as SupplierApi from '@/api/wms/supplier' import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data' -import * as ItembasicApi from '@/api/wms/itembasic' import * as PurchaseMainApi from '@/api/wms/purchaseMain' import * as PurchaseDetailApi from '@/api/wms/purchaseDetail' import * as PurchasePlanMainApi from '@/api/wms/purchasePlanMain' import * as LocationApi from '@/api/wms/location' import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data' -import { PurchasePlanDetail, PurchasePlanMain } from '../../supplierdeliver/purchasePlanMain/purchasePlanMain.data' +import { PurchasePlanMain } from '../../supplierdeliver/purchasePlanMain/purchasePlanMain.data' import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data' import * as ItemPackageApi from '@/api/wms/itempackage/index' +import { PurchaseDetail, PurchaseMain } from '../../supplierdeliver/purchaseMain/purchaseMain.data' +import { useUserStore } from '@/store/modules/user' +import { TableColumn } from '@/types/table' + +const { t } = useI18n() // 国际化 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值 const queryParams = { pageSize:10, pageNo:1, code:'PurchaseReceiptRequest' } - const data = await getRequestsettingApi.getRequestsettingPage(queryParams) - const requestsettingData =data?.list[0]||{} +const data = await getRequestsettingApi.getRequestsettingPage(queryParams) +const requestsettingData =data?.list[0]||{} -import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data' -import { PurchaseDetail, PurchaseMain } from '../../supplierdeliver/purchaseMain/purchaseMain.data' // 获取当前操作人的部门 - import { useUserStore } from '@/store/modules/user' - import { TableColumn } from '@/types/table' - const userStore = useUserStore() - const userDept = userStore.userSelfInfo.dept - // id 转str 否则form回显匹配不到 - userDept.id = userDept.id.toString() - const userDeptArray:any = [userDept] +const userStore = useUserStore() +const userDept = userStore.userSelfInfo.dept +// id 转str 否则form回显匹配不到 +userDept.id = userDept.id.toString() +const userDeptArray:any = [userDept] - /** * @returns {Array} 采购收货申请主表 */ @@ -143,16 +141,6 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive( width: 150 }, }, - { - label: '运输方式', - field: 'transferMode', - dictType: DICT_TYPE.TRANSFER_MODE, - sort: 'custom', - table: { - width: 150 - }, - isSearch: true, - }, { label: '数据来源', field: 'sourceType', diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue index d7be2fdf1..252cbbfdf 100644 --- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue +++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue @@ -128,7 +128,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => const Echo = [] const { tableObject, tableMethods } = useTable({ - getListApi: PurchasereceiptJobMainApi.getPurchasereceiptJobMainPage // 分页接口 + getListApi: PurchasereceiptJobMainApi.getPurchasereceiptJobMainPageSpare // 分页接口 }) // 获得表格的各种操作 @@ -237,5 +237,4 @@ const searchFormClick = (searchData) => { onMounted(async () => { getList() }) - -./sparereceiptJobMain.data \ No newline at end of file + \ No newline at end of file diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts index 75cfd7d43..1e5574de4 100644 --- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts +++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts @@ -49,6 +49,21 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ }, isSearch: true, }, + { + label: '数据来源', + field: 'sourceType', + dictType: DICT_TYPE.PURCHASERECEIPT_SOURCE_TYPE, + sort: 'custom', + table: { + width: 150 + }, + form: { + componentProps: { + disabled: true + } + }, + isSearch: false, + }, { label: '到月台代码', field: 'toDockCode', diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue index a1f20362f..0bbfaea12 100644 --- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue @@ -90,7 +90,7 @@ const updataTableColumns = (val) => { } const { tableObject, tableMethods } = useTable({ - getListApi: PurchasereceiptRecordMainApi.getPurchasereceiptRecordMainPage // 分页接口 + getListApi: PurchasereceiptRecordMainApi.getPurchasereceiptRecordMainPageSpare // 分页接口 }) // 获得表格的各种操作 @@ -212,5 +212,4 @@ const changeTabs = (data) =>{ onMounted(async () => { getList() }) - -./sparereceiptRecordMain.data \ No newline at end of file + \ No newline at end of file diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts index 128b9623e..6026e73f1 100644 --- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts @@ -83,6 +83,21 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ width: 150 }, }, + { + label: '数据来源', + field: 'sourceType', + dictType: DICT_TYPE.PURCHASERECEIPT_SOURCE_TYPE, + sort: 'custom', + table: { + width: 150 + }, + form: { + componentProps: { + disabled: true + } + }, + isSearch: false, + }, { label: '车牌号', field: 'vehiclePlateNumber', diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue index 2ce78a288..856f5d31a 100644 --- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue @@ -188,7 +188,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => { } const { tableObject, tableMethods } = useTable({ - getListApi: PurchasereceiptRequestMainApi.getPurchasereceiptRequestMainPage // 分页接口 + getListApi: PurchasereceiptRequestMainApi.getPurchasereceiptRequestMainPageSpare // 分页接口 }) // 获得表格的各种操作 @@ -532,5 +532,4 @@ onMounted(async () => { getList() importTemplateData.templateUrl = await PurchasereceiptRequestMainApi.importTemplate() }) - -./sparereceiptRequestMain.data \ No newline at end of file + \ No newline at end of file diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts index 7e7543fb6..a29cafc4a 100644 --- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts @@ -142,16 +142,6 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive( width: 150 }, }, - { - label: '运输方式', - field: 'transferMode', - dictType: DICT_TYPE.TRANSFER_MODE, - sort: 'custom', - table: { - width: 150 - }, - isSearch: true, - }, { label: '数据来源', field: 'sourceType', @@ -161,7 +151,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive( width: 150 }, form: { - value: 'ASN_ExternalReceipt', + value: 'spare_PartsReceipt', componentProps: { disabled: true }