From 998f0aadc7bcba46683465500443e8065b6d3e14 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 26 Dec 2023 17:29:32 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7?= =?UTF-8?q?=E5=BA=93=E4=BD=8D=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereturn/purchasereturnRequestMain/index.vue | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue index 595021196..204a64935 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue @@ -177,9 +177,6 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) => item.batch = item.toBatch item.packingNumber = item.toPackingNumber item.containerNumber = item.toContainerNumber - let fromLocationCode = item.fromLocationCode - item.fromLocationCode = item.toLocationCode - item.toLocationCode = fromLocationCode }) isShowButton.value = false PurchasereturnRequestDetail.allSchemas.tableFormColumns.map((item) => { From 16aa4793d97aac3cd1d4bccacb2f31eccf85bb84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Tue, 26 Dec 2023 18:34:03 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E5=88=B6=E5=93=81=E6=8B=86=E8=A7=A3?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=20=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E5=85=B3=E9=97=AD=E7=AA=97=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../orderManage/team/team.data.ts | 17 ----------------- .../productdismantleRequestMain/index.vue | 2 +- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/src/views/wms/basicDataManage/orderManage/team/team.data.ts b/src/views/wms/basicDataManage/orderManage/team/team.data.ts index 6b48838cc..0bc377788 100644 --- a/src/views/wms/basicDataManage/orderManage/team/team.data.ts +++ b/src/views/wms/basicDataManage/orderManage/team/team.data.ts @@ -13,7 +13,6 @@ export const Team = useCrudSchemas(reactive([ field: 'code', sort: 'custom', table: { - width: 150, fixed: 'left' }, isSearch: true, @@ -22,18 +21,12 @@ export const Team = useCrudSchemas(reactive([ label: '名称', field: 'name', sort: 'custom', - table: { - width: 150 - }, isSearch: true, }, { label: '成员', field: 'members', sort: 'custom', - table: { - width: 150 - }, isSearch: true, }, { @@ -44,9 +37,6 @@ export const Team = useCrudSchemas(reactive([ isTable: true, isSearch: true, sort: 'custom', - table: { - width: 150 - }, form: { component: 'Switch', value: 'TRUE', @@ -104,9 +94,6 @@ export const Team = useCrudSchemas(reactive([ label: '备注', field: 'remark', sort: 'custom', - table: { - width: 150 - }, }, { label: '创建时间', @@ -135,9 +122,6 @@ export const Team = useCrudSchemas(reactive([ label: '创建者', field: 'creator', sort: 'custom', - table: { - width: 150 - }, isForm: false, isTable: false, }, @@ -147,7 +131,6 @@ export const Team = useCrudSchemas(reactive([ isDetail: false, isForm: false , table: { - width: 150, fixed: 'right' } } diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue index c95e1f99c..655bbe789 100644 --- a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue +++ b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue @@ -453,7 +453,7 @@ const submitForm = async (formType, data) => { }) if (!childListRs) { message.warning('请填写Bom信息！') - formRef.value.dialogVisible = false + formRef.value.formLoading = false return } try { From 1da0f9e57413a53cb795f70ae2b8cb03adc21b0a Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 26 Dec 2023 18:37:43 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E5=B0=86=E9=87=87=E8=B4=AD=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E7=94=B3=E8=AF=B7=E5=BE=97=E7=BC=BA=E8=B4=A7=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E5=8F=98=E6=88=90=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E9=87=8C=E9=9D=A2=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/purchasereceiptRecordDetail/index.ts | 10 +++++++++ .../wms/purchasereceiptRequestDetail/index.ts | 11 +--------- .../purchasereceiptRecordMain/index.vue | 21 +++++++++++++++++-- .../purchasereceiptRequestMain/index.vue | 21 ++++++++----------- 4 files changed, 39 insertions(+), 24 deletions(-) diff --git a/src/api/wms/purchasereceiptRecordDetail/index.ts b/src/api/wms/purchasereceiptRecordDetail/index.ts index 2b97df643..b326094dc 100644 --- a/src/api/wms/purchasereceiptRecordDetail/index.ts +++ b/src/api/wms/purchasereceiptRecordDetail/index.ts @@ -90,4 +90,14 @@ export const exportPurchasereceiptRecordDetail = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/purchasereceipt-record-detail/get-import-template' }) +} +// 缺货明细 +export const getScarceGoodsDetailPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/purchaseshortage-detail/senior', data }) + } else { + return await request.get({ url: `/wms/purchaseshortage-detail/page`, params }) + } } \ No newline at end of file diff --git a/src/api/wms/purchasereceiptRequestDetail/index.ts b/src/api/wms/purchasereceiptRequestDetail/index.ts index ab8f7d936..20f40f658 100644 --- a/src/api/wms/purchasereceiptRequestDetail/index.ts +++ b/src/api/wms/purchasereceiptRequestDetail/index.ts @@ -65,16 +65,7 @@ export const deletePurchasereceiptRequestDetail = async (id: number) => { return await request.delete({ url: `/wms/purchasereceipt-request-detail/delete?id=` + id }) } -// 缺货明细 -export const getScarceGoodsDetailPage = async (params) => { - if (params.isSearch) { - delete params.isSearch - const data = {...params} - return await request.post({ url: '/wms/purchaseshortage-detail/senior', data }) - } else { - return await request.get({ url: `/wms/purchaseshortage-detail/page`, params }) - } -} + // 导出采购收货申请子 Excel export const exportPurchasereceiptRequestDetail = async (params) => { diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue index add12c4f8..3e941c55b 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue @@ -54,9 +54,11 @@ ref="detailRef" :isBasic="false" :allSchemas="PurchasereceiptRecordMain.allSchemas" - :detailAllSchemas="PurchasereceiptRecordDetail.allSchemas" + :detailAllSchemas="detailAllSchemas" :detailAllSchemasRules="PurchasereceiptRecordDetailRules" - :apiPage="PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPage" + :apiPage="apiPage" + :tabs="PurchasereceiptRequestTabsList" + @changeTabs="changeTabs" /> @@ -66,10 +68,13 @@ import { PurchasereceiptRecordMain,PurchasereceiptRecordMainRules,Purchasereceip import * as PurchasereceiptRecordMainApi from '@/api/wms/purchasereceiptRecordMain' import * as PurchasereceiptRecordDetailApi from '@/api/wms/purchasereceiptRecordDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' +import { PurchasereceiptRequestTabsList } from '@/utils/disposition/tabsList' // 采购收货记录主 defineOptions({ name: 'PurchasereceiptRecordMain' }) +const apiPage = ref(PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPage) + const message = useMessage() // 消息弹窗 const { t } = useI18n() // 国际化 @@ -77,6 +82,7 @@ const route = useRoute() // 路由信息 const routeName = ref() routeName.value = route.name const tableColumns = ref(PurchasereceiptRecordMain.allSchemas.tableColumns) +const detailAllSchemas = ref(PurchasereceiptRecordDetail.allSchemas) // 字段设置 更新主列表字段 const updataTableColumns = (val) => { @@ -154,6 +160,17 @@ const searchFormClick = (searchData) => { } getList() // 刷新当前列表 } +// tabs 切换事件 +const changeTabs = (data) =>{ + if(data.prop == 'receiptDetail'){ + console.log(data) + apiPage.value = PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPage + detailAllSchemas.value = PurchasereceiptRecordDetail.allSchemas + }else if(data.prop == 'scarceGoodsDetail'){ + apiPage.value = PurchasereceiptRecordDetailApi.getScarceGoodsDetailPage + detailAllSchemas.value = PurchasereceiptRecordDetail.allSchemas + } +} /** 初始化 **/ onMounted(async () => { diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue index 114061bd4..f4707ada7 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue @@ -68,9 +68,7 @@ :apiPage="apiPage" :apiDelete="PurchasereceiptRequestDetailApi.deletePurchasereceiptRequestDetail" :Echo="Echo" - :tabs="PurchasereceiptRequestTabsList" @searchTableSuccessDetail="searchTableSuccessDetail" - @changeTabs="changeTabs" /> @@ -83,7 +81,6 @@ import { PurchasereceiptRequestMain,PurchasereceiptRequestMainRules,Purchaserece import * as PurchasereceiptRequestMainApi from '@/api/wms/purchasereceiptRequestMain' import * as PurchasereceiptRequestDetailApi from '@/api/wms/purchasereceiptRequestDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' -import { PurchasereceiptRequestTabsList } from '@/utils/disposition/tabsList' // 采购收货申请 defineOptions({ name: 'PurchasereceiptRequestMain' }) @@ -368,15 +365,15 @@ const searchFormClick = (searchData) => { } // tabs 切换事件 -const changeTabs = (data) =>{ - if(data.prop == 'receiptDetail'){ - apiPage.value = PurchasereceiptRequestDetailApi.getPurchasereceiptRequestDetailPage - detailAllSchemas.value = PurchasereceiptRequestDetail.allSchemas - }else if(data.prop == 'scarceGoodsDetail'){ - apiPage.value = PurchasereceiptRequestDetailApi.getScarceGoodsDetailPage - detailAllSchemas.value = PurchasereceiptRequestDetail.allSchemas - } -} +// const changeTabs = (data) =>{ +// if(data.prop == 'receiptDetail'){ +// apiPage.value = PurchasereceiptRequestDetailApi.getPurchasereceiptRequestDetailPage +// detailAllSchemas.value = PurchasereceiptRequestDetail.allSchemas +// }else if(data.prop == 'scarceGoodsDetail'){ +// apiPage.value = PurchasereceiptRequestDetailApi.getScarceGoodsDetailPage +// detailAllSchemas.value = PurchasereceiptRequestDetail.allSchemas +// } +// } /** 初始化 **/ onMounted(async () => { From c162b8ece02441d44f753ca7cf91f8d824df215c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Wed, 27 Dec 2023 08:28:25 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E5=90=88=E5=8C=85=20=E6=8B=86=E5=8C=85?= =?UTF-8?q?=20=E7=BF=BB=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/packagemergeDetail/index.ts | 8 +++++++- src/api/wms/packageoverDetail/index.ts | 8 +++++++- src/api/wms/packagesplitDetail/index.ts | 8 +++++++- .../labelManage/manufacturePackage/index.vue | 1 + .../basicDataManage/labelManage/purchasePackage/index.vue | 1 + .../basicDataManage/labelManage/utensilPackage/index.vue | 1 + 6 files changed, 24 insertions(+), 3 deletions(-) diff --git a/src/api/wms/packagemergeDetail/index.ts b/src/api/wms/packagemergeDetail/index.ts index c2d89ad88..3322cfe52 100644 --- a/src/api/wms/packagemergeDetail/index.ts +++ b/src/api/wms/packagemergeDetail/index.ts @@ -32,7 +32,13 @@ export interface PackagemergeDetailVO { // 查询合包记录子列表 export const getPackagemergeDetailPage = async (params) => { - return await request.get({ url: '/wms/packagemerge-detail/page', params }) + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/packagemerge-detail/senior', data }) + } else { + return await request.get({ url: `/wms/packagemerge-detail/page`, params }) + } } // 查询合包记录子详情 diff --git a/src/api/wms/packageoverDetail/index.ts b/src/api/wms/packageoverDetail/index.ts index fe3c007a1..52a9f97e9 100644 --- a/src/api/wms/packageoverDetail/index.ts +++ b/src/api/wms/packageoverDetail/index.ts @@ -32,7 +32,13 @@ export interface PackageoverDetailVO { // 查询翻包记录子列表 export const getPackageoverDetailPage = async (params) => { - return await request.get({ url: '/wms/packageover-detail/page', params }) + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/packageover-detail/senior', data }) + } else { + return await request.get({ url: `/wms/packageover-detail/page`, params }) + } } // 查询翻包记录子详情 diff --git a/src/api/wms/packagesplitDetail/index.ts b/src/api/wms/packagesplitDetail/index.ts index 0a026f642..23f787622 100644 --- a/src/api/wms/packagesplitDetail/index.ts +++ b/src/api/wms/packagesplitDetail/index.ts @@ -32,7 +32,13 @@ export interface PackagesplitDetailVO { // 查询拆包记录子列表 export const getPackagesplitDetailPage = async (params) => { - return await request.get({ url: '/wms/packagesplit-detail/page', params }) + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/packagesplit-detail/senior', data }) + } else { + return await request.get({ url: `/wms/packagesplit-detail/page`, params }) + } } // 查询拆包记录子详情 diff --git a/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue b/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue index e8501a0fe..385646c95 100644 --- a/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue +++ b/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue @@ -65,6 +65,7 @@ import { Package,PackageRules } from './manufacturePackage.data' import * as PackageApi from '@/api/wms/package' import * as defaultButtons from '@/utils/disposition/defaultButtons' +// 制造件标签 defineOptions({ name: 'ManufacturePackage' }) const message = useMessage() // 消息弹窗 diff --git a/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue b/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue index 63f4b5dc9..456fa5ec5 100644 --- a/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue +++ b/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue @@ -65,6 +65,7 @@ import { Package,PackageRules } from './purchasePackage.data' import * as PackageApi from '@/api/wms/package' import * as defaultButtons from '@/utils/disposition/defaultButtons' +// 采购标签 defineOptions({ name: 'PurchasePackage' }) const message = useMessage() // 消息弹窗 diff --git a/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue b/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue index b62e0bbf8..225adcd54 100644 --- a/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue +++ b/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue @@ -65,6 +65,7 @@ import { Package,PackageRules } from './utensilPackage.data' import * as PackageApi from '@/api/wms/package' import * as defaultButtons from '@/utils/disposition/defaultButtons' +// 器具标签 defineOptions({ name: 'UtensilPackage' }) const message = useMessage() // 消息弹窗 From 192e3a1cc866ff06fb8cf7bac498be765430a7c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Wed, 27 Dec 2023 09:14:57 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/HeaderSearch/index.vue | 190 ++++++++++++++++++++++++++ src/layout/components/ToolHeader.vue | 1 + 2 files changed, 191 insertions(+) create mode 100644 src/components/HeaderSearch/index.vue diff --git a/src/components/HeaderSearch/index.vue b/src/components/HeaderSearch/index.vue new file mode 100644 index 000000000..86d9cff8e --- /dev/null +++ b/src/components/HeaderSearch/index.vue @@ -0,0 +1,190 @@ + + + + + diff --git a/src/layout/components/ToolHeader.vue b/src/layout/components/ToolHeader.vue index ec7882de8..1a8cbc7d6 100644 --- a/src/layout/components/ToolHeader.vue +++ b/src/layout/components/ToolHeader.vue @@ -10,6 +10,7 @@ import { LocaleDropdown } from '@/layout/components/LocaleDropdown' import { useAppStore } from '@/store/modules/app' import { useDesign } from '@/hooks/web/useDesign' +// 头部工具 const { getPrefixCls, variables } = useDesign() const prefixCls = getPrefixCls('tool-header') From f41336486dde31a703a8bbad0f324c608b90c57e Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 27 Dec 2023 09:17:39 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=92=8C=E5=88=B0=E6=88=B7=E6=A3=80=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inspectRequestMain/inspectRequestMain.data.ts | 5 +++++ .../purchasereturn/purchasereturnRequestMain/index.vue | 10 ++++++++-- .../purchasereturnRequestMain.data.ts | 9 ++++++++- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts index c9fa4cc01..abd673e95 100644 --- a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts @@ -59,6 +59,11 @@ export const InspectRequestMain = useCrudSchemas(reactive([ width: 150 }, isSearch: true, + form:{ + componentProps:{ + disabled:true + } + } }, { label: '单据号', diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue index 204a64935..9cdf14b86 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue @@ -144,9 +144,11 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) => row['supplierUom'] = val[0]['supplierUom'] row['inventoryStatus'] = val[0]['inventoryStatus'] row['fromLocationCode'] = val[0]['fromLocationCode'] - row['toLocationCode'] = '' + row['toLocationCode'] = null row['fromLocationGroupCode'] = val[0]['fromLocationGroupCode'] - row['toLocationGroupCode'] = '' + row['toLocationGroupCode'] = null + row['toWarehouseCode'] = null + row['toLocationTypes'] = null row['fromAreaCode'] = val[0]['areaCode'] row['toAreaCode'] = val[0]['toAreaCode'] row['fromQwnerCode'] = val[0]['fromQwnerCode'] @@ -177,6 +179,10 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) => item.batch = item.toBatch item.packingNumber = item.toPackingNumber item.containerNumber = item.toContainerNumber + item.toLocationGroupCode = null + item.toWarehouseCode = null + item.toLocationTypes = null + item.toLocationCode = null }) isShowButton.value = false PurchasereturnRequestDetail.allSchemas.tableFormColumns.map((item) => { diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts index b6c99601a..d2e6395d2 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts @@ -75,6 +75,11 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive([ width: 150 }, isSearch: true, + form:{ + componentProps:{ + disabled:true + } + } }, { label: '承运商', @@ -118,6 +123,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTableForm:false, isForm: false, }, { @@ -142,6 +148,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTableForm:false, isForm: false, }, { @@ -161,6 +168,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive([ width: 150 }, isForm: false, + isTableForm:false, }, { label: '从月台代码', @@ -735,7 +743,6 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive table: { width: 150 }, - isTableForm:false, tableForm:{ disabled:true } From 4e5d5f41988a9f64d199a6c12d0e6c544331da2d Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 27 Dec 2023 09:55:20 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereturnRequestMain/index.vue | 41 +++++++++++++------ .../purchasereturnRequestMain.data.ts | 2 +- 2 files changed, 30 insertions(+), 13 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue index 9cdf14b86..f5a867151 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue @@ -143,9 +143,9 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) => row['supplierQty'] = val[0]['supplierQty'] row['supplierUom'] = val[0]['supplierUom'] row['inventoryStatus'] = val[0]['inventoryStatus'] - row['fromLocationCode'] = val[0]['fromLocationCode'] + row['fromLocationCode'] = val[0]['locationCode'] row['toLocationCode'] = null - row['fromLocationGroupCode'] = val[0]['fromLocationGroupCode'] + row['fromLocationGroupCode'] = val[0]['locationGroupCode'] row['toLocationGroupCode'] = null row['toWarehouseCode'] = null row['toLocationTypes'] = null @@ -183,8 +183,17 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) => item.toWarehouseCode = null item.toLocationTypes = null item.toLocationCode = null + // item.fromLocationCode = item.fromLocationCode + // item.fromLocationGroupCode = item.fromLocationGroupCode }) isShowButton.value = false + console.log('formSchema', PurchasereturnRequestMain.allSchemas.formSchema) + + PurchasereturnRequestMain.allSchemas.formSchema.forEach((item) => { + if (item.field == 'supplierCode') { + item.componentProps.disabled = true + } + }) PurchasereturnRequestDetail.allSchemas.tableFormColumns.map((item) => { item.tableForm.disabled = true if (item.field == 'remark') { @@ -337,6 +346,11 @@ const formRef = ref() const openForm = async (type: string, row?: number) => { tableData.value = [] // 重置明细数据 isShowButton.value = true + PurchasereturnRequestMain.allSchemas.formSchema.forEach((item) => { + if (item.field == 'supplierCode') { + item.componentProps.disabled = false + } + }) formRef.value.open(type, row) } @@ -446,25 +460,28 @@ const handleAddTable = () => { item.tableForm.disabled = false } if (item.field == 'itemCode') { - item.tableForm.isInpuFocusShow = true - } + item.tableForm.isInpuFocusShow = true + } }) } // 删除明细 -const handleDeleteTable = (item, index,formRef) => { +const handleDeleteTable = (item, index, formRef) => { tableData.value.splice(index, 1) if (tableData.value.length == 0) { isShowButton.value = true - nextTick(() => { - - const setV = {} - - setV['purchaseReceiptRecordNumber'] = '' + PurchasereturnRequestMain.allSchemas.formSchema.forEach((item) => { + if (item.field == 'supplierCode') { + item.componentProps.disabled = false + } + }) + nextTick(() => { + const setV = {} + + setV['purchaseReceiptRecordNumber'] = '' setV['supplierCode'] = '' formRef.setValues(setV) - }) + }) } - } // 主子数据 提交 diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts index d2e6395d2..a0c4cf125 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts @@ -77,7 +77,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive([ isSearch: true, form:{ componentProps:{ - disabled:true + disabled:false } } }, From dbf22417562735f77bce35a94b90b0f072100a29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Wed, 27 Dec 2023 10:38:03 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E9=87=87=E8=B4=AD=20=E5=88=B6=E9=80=A0?= =?UTF-8?q?=20=E5=99=A8=E5=85=B7=E6=A0=87=E7=AD=BE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../labelManage/manufacturePackage/index.vue | 44 +- .../manufacturePackage.data.ts | 382 ++--------------- .../labelManage/purchasePackage/index.vue | 32 +- .../purchasePackage/purchasePackage.data.ts | 383 ++---------------- .../labelManage/utensilPackage/index.vue | 36 +- .../utensilPackage/utensilPackage.data.ts | 371 ++--------------- 6 files changed, 151 insertions(+), 1097 deletions(-) diff --git a/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue b/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue index 385646c95..63bd9f99d 100644 --- a/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue +++ b/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue @@ -45,8 +45,8 @@ :rules="PackageRules" :formAllSchemas="Package.allSchemas" :searchTableParams="searchTableParams" - :apiUpdate="PackageApi.updatePackage" - :apiCreate="PackageApi.createPackage" + :apiUpdate="BarbasicApi.updateBarbasic" + :apiCreate="BarbasicApi.createBarbasic" @searchTableSuccess="searchTableSuccess" :isBusiness="false" /> @@ -62,7 +62,7 @@ import download from '@/utils/download' import { getAccessToken } from '@/utils/auth' import { Package,PackageRules } from './manufacturePackage.data' -import * as PackageApi from '@/api/wms/package' +import * as BarbasicApi from '@/api/wms/barbasic' import * as defaultButtons from '@/utils/disposition/defaultButtons' // 制造件标签 @@ -76,29 +76,21 @@ const routeName = ref() routeName.value = route.name const tableColumns = ref(Package.allSchemas.tableColumns) - /** - * PurchasePackage regularParams = procure采购件标签记录页面 - * ManufacturePackage regularParams = manufacture 制造件标签记录页面 - * UtensilPackage regularParams = utensil 器具标签记录页面 - * SupplierPackage regularParams = procure 供应商发货标签记录(用采购标签) + * PurchasePackage type = PurchaseLabel 采购件标签记录页面 + * ManufacturePackage type = MakeLabel 制造件标签记录页面 + * UtensilPackage type = ContainerLabel 器具标签记录页面 + * SupplierPackage type = PurchaseLabel 供应商发货标签记录(用采购标签) */ - const regularParams = ref(route.name == 'PurchasePackage'?'procure':route.name == 'ManufacturePackage'?'manufacture':route.name == 'UtensilPackage'?'utensil':route.name == 'SupplierPackage'?'procure':'') + const type = ref(route.name == 'PurchasePackage'?'PurchaseLabel':route.name == 'ManufacturePackage'?'MakeLabel':route.name == 'UtensilPackage'?'ContainerLabel':route.name == 'SupplierPackage'?'PurchaseLabel':'') // 字段设置 更新主列表字段 const updataTableColumns = (val) => { tableColumns.value = val } - // 查询列表页面参数设置 const searchTableParams = ref([ -//{ -// formField: 'productItemCode', -// searchTableTitle: '物料信息', -// searchTableAllSchemas: Itembasic.allSchemas, -// searchTablePage: ItembasicApi.getItembasicPage -//} ]) // 查询页面返回 @@ -111,9 +103,9 @@ const searchTableSuccess = (formField, searchField, val, basicFormRef, type, row } const { tableObject, tableMethods } = useTable({ - getListApi: PackageApi.getPackagePage // 分页接口 + getListApi: BarbasicApi.getBarbasicPage // 分页接口 }) -tableObject.params.regularParams = regularParams.value +tableObject.params.type = type.value // 获得表格的各种操作 const { getList, setSearchParams } = tableMethods @@ -183,7 +175,7 @@ const buttonTableClick = async (val, row) => { } else if (val == 'delete') { // 删除 handleDelete(row.id) } else if (val == 'point') { // 标签打印 - handlePoint(row.id) + handlePoint(row.relateNumber) } } @@ -205,7 +197,7 @@ const handleDelete = async (id: number) => { // 删除的二次确认 await message.delConfirm() // 发起删除 - await PackageApi.deletePackage(id) + await BarbasicApi.deleteBarbasic(id) message.success(t('common.delSuccess')) // 刷新列表 await getList() @@ -220,8 +212,8 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true - const data = await PackageApi.exportPackage(setSearchParams) - download.excel(data, '包装.xlsx') + const data = await BarbasicApi.exportBarbasic(tableObject.params) + download.excel(data, '制造件标签.xlsx') } catch { } finally { exportLoading.value = false @@ -229,10 +221,10 @@ const handleExport = async () => { } const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL -const src = ref(BASE_URL + '/jmreport/view/894718245021065216?token=' + getAccessToken()) +const src = ref(BASE_URL + '/jmreport/view/899811206721347584?token=' + getAccessToken()) // 标签打印 -const handlePoint = async (id) => { - window.open(src.value+'&id='+id) +const handlePoint = async (number) => { + window.open(src.value+'&number='+number) } /** 导入 */ @@ -257,7 +249,7 @@ const searchFormClick = (searchData) => { tableObject.params = { isSearch: true, filters: searchData.filters, - regularParams:regularParams.value + type:type.value } getList() // 刷新当前列表 } diff --git a/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts b/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts index c7d72ffcd..c5f372059 100644 --- a/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts +++ b/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts @@ -7,107 +7,54 @@ export const PackageRules = reactive({ itemCode: [required], itemName: [required], }) -export const Package2 = useCrudSchemas(reactive([ - { - label: '包装号', - field: 'number', - sort: 'custom', - isSearch: true, - table: { - width: 150, - fixed: 'left' - }, - }, -])) + export const Package = useCrudSchemas(reactive([ { - label: '包装号', + label: '标签号', field: 'number', sort: 'custom', isSearch: true, table: { - width: 150, fixed: 'left' - }, + } }, { - label: '物料代码', - field: 'itemCode', + label: '标签类型', + field: 'type', sort: 'custom', isSearch: true, - table: { - width: 150, - }, - }, - { - label: '物品名称', - field: 'itemName', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '物品描述1', - field: 'itemDesc1', - sort: 'custom', - table: { - width: 150, - }, + dictType: DICT_TYPE.LABEL_TYPE, + dictClass: 'string' }, { - label: '物品描述2', - field: 'itemDesc2', + label: '标签模板', + field: 'template', sort: 'custom', - table: { - width: 150, - }, }, { - label: '批次', - field: 'batch', + label: '标签状态', + field: 'status', sort: 'custom', isSearch: true, - table: { - width: 150, - }, + dictType: DICT_TYPE.LABEL_STATUS, + dictClass: 'string' }, { - label: '替代批次', - field: 'altBatch', + label: '关联号', + field: 'relateNumber', sort: 'custom', - table: { - width: 150, - }, }, { - label: '生产日期', - field: 'produceDate', + label: '标签条码字符串', + field: 'barcodeString', sort: 'custom', - formatter: dateFormatter, - search: { - component: 'DatePicker', - componentProps: { - style: {width:'100%'}, - valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', - defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] - } - }, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - valueFormat: 'x' - } - }, table: { - width: 180, - }, + width: 170, + } }, { - label: '有效期(日)', - field: 'validityDays', + label: '打印次数', + field: 'printTimes', sort: 'custom', form: { component: 'InputNumber', @@ -116,297 +63,34 @@ export const Package = useCrudSchemas(reactive([ }, value: 0 }, - table: { - width: 150, - }, }, { - label: '失效日期', - field: 'expireDate', + label: '最后打印时间', + field: 'lastPrintTime', sort: 'custom', formatter: dateFormatter, - search: { - component: 'DatePicker', - componentProps: { - style: {width:'100%'}, - valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', - defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] - } - }, form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', - valueFormat: 'x' + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', } }, - table: { - width: 180, - }, }, { - label: '计量单位', - field: 'uom', - sort: 'custom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', // 默认都是字符串类型其他暂不考虑 - form: { - component: 'SelectV2' - }, - table: { - width: 150, - }, - }, - { - label: '数量', - field: 'qty', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '替代计量单位', - field: 'altUom', - sort: 'custom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', // 默认都是字符串类型其他暂不考虑 - form: { - component: 'SelectV2' - }, - table: { - width: 150, - }, - }, - { - label: '替代数量', - field: 'altQty', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '转换率', - field: 'convertRate', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '标包数量', - field: 'stdPackQty', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '标包单位', - field: 'stdPackUnit', - sort: 'custom', - dictType: DICT_TYPE.PACK_UNIT, - dictClass: 'string', // 默认都是字符串类型其他暂不考虑 - form: { - component: 'SelectV2' - }, - table: { - width: 150, - }, + label: '最后打印人ID', + field: 'lastPrintUserId', + sort: 'custom' }, { - label: '仓库代码', - field: 'toWarehouseCode', + label: '最后打印人用户名', + field: 'lastPrintUserName', sort: 'custom', table: { - width: 150, - }, - }, - { - label: '月台代码', - field: 'toDockCode', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '库位代码', - field: 'toLocationCode', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '供应商代码', - field: 'supplierCode', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '供应商物品代码', - field: 'supplierItemCode', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '采购订单号', - field: 'poNumber', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '采购订单行', - field: 'poLine', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '采购计划单号', - field: 'rpNumber', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '发货单号', - field: 'asnNumber', - sort: 'custom', - table: { - width: 182, - }, - }, - { - label: '生产订单号', - field: 'woNumber', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '生产订单行', - field: 'woLine', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '生产线代码', - field: 'productionLineCode', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '班组代码', - field: 'teamCode', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '班次代码', - field: 'shiftCode', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '客户代码', - field: 'customerCode', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '客户月台代码', - field: 'customerDockCode', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '客户物品代码', - field: 'customerItemCode', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '销售订单号', - field: 'soNumber', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '销售订单行', - field: 'soLine', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '质量等级', - field: 'eqLevel', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '货主代码', - field: 'ownerCode', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '重量', - field: 'weight', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '面积', - field: 'area', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '体积', - field: 'volume', - sort: 'custom', - table: { - width: 150, - }, + width: 170, + } }, { label: '操作', diff --git a/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue b/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue index 456fa5ec5..4046566df 100644 --- a/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue +++ b/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue @@ -45,8 +45,8 @@ :rules="PackageRules" :formAllSchemas="Package.allSchemas" :searchTableParams="searchTableParams" - :apiUpdate="PackageApi.updatePackage" - :apiCreate="PackageApi.createPackage" + :apiUpdate="BarbasicApi.updateBarbasic" + :apiCreate="BarbasicApi.createBarbasic" @searchTableSuccess="searchTableSuccess" :isBusiness="false" /> @@ -62,7 +62,7 @@ import download from '@/utils/download' import { getAccessToken } from '@/utils/auth' import { Package,PackageRules } from './purchasePackage.data' -import * as PackageApi from '@/api/wms/package' +import * as BarbasicApi from '@/api/wms/barbasic' import * as defaultButtons from '@/utils/disposition/defaultButtons' // 采购标签 @@ -78,12 +78,12 @@ const tableColumns = ref(Package.allSchemas.tableColumns) /** - * PurchasePackage regularParams = procure采购件标签记录页面 - * ManufacturePackage regularParams = manufacture 制造件标签记录页面 - * UtensilPackage regularParams = utensil 器具标签记录页面 - * SupplierPackage regularParams = procure 供应商发货标签记录(用采购标签) + * PurchasePackage type = PurchaseLabel 采购件标签记录页面 + * ManufacturePackage type = MakeLabel 制造件标签记录页面 + * UtensilPackage type = ContainerLabel 器具标签记录页面 + * SupplierPackage type = PurchaseLabel 供应商发货标签记录(用采购标签) */ -const regularParams = ref(route.name == 'PurchasePackage'?'procure':route.name == 'ManufacturePackage'?'manufacture':route.name == 'UtensilPackage'?'utensil':route.name == 'SupplierPackage'?'procure':'') + const type = ref(route.name == 'PurchasePackage'?'PurchaseLabel':route.name == 'ManufacturePackage'?'MakeLabel':route.name == 'UtensilPackage'?'ContainerLabel':route.name == 'SupplierPackage'?'PurchaseLabel':'') // 字段设置 更新主列表字段 const updataTableColumns = (val) => { @@ -111,9 +111,9 @@ const searchTableSuccess = (formField, searchField, val, basicFormRef, type, row } const { tableObject, tableMethods } = useTable({ - getListApi: PackageApi.getPackagePage // 分页接口 + getListApi: BarbasicApi.getBarbasicPage // 分页接口 }) -tableObject.params.regularParams = regularParams.value +tableObject.params.type = type.value // 获得表格的各种操作 const { getList, setSearchParams } = tableMethods @@ -205,7 +205,7 @@ const handleDelete = async (id: number) => { // 删除的二次确认 await message.delConfirm() // 发起删除 - await PackageApi.deletePackage(id) + await BarbasicApi.deleteBarbasic(id) message.success(t('common.delSuccess')) // 刷新列表 await getList() @@ -220,8 +220,8 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true - const data = await PackageApi.exportPackage(tableObject.params) - download.excel(data, '包装.xlsx') + const data = await BarbasicApi.exportBarbasic(tableObject.params) + download.excel(data, '采购件标签.xlsx') } catch { } finally { exportLoading.value = false @@ -229,10 +229,10 @@ const handleExport = async () => { } const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL -const src = ref(BASE_URL + '/jmreport/view/894703223549108224?token=' + getAccessToken()) +const src = ref(BASE_URL + '/jmreport/view/899807302088564736?token=' + getAccessToken()) // 标签打印 const handlePoint = async (row) => { - window.open(src.value+'&id='+row.id) + window.open(src.value+'&number='+row.relateNumber) } /** 导入 */ @@ -257,7 +257,7 @@ const searchFormClick = (searchData) => { tableObject.params = { isSearch: true, filters: searchData.filters, - regularParams:regularParams.value + type:type.value } getList() // 刷新当前列表 } diff --git a/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts b/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts index c7d72ffcd..3698d03a8 100644 --- a/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts +++ b/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts @@ -7,107 +7,53 @@ export const PackageRules = reactive({ itemCode: [required], itemName: [required], }) -export const Package2 = useCrudSchemas(reactive([ - { - label: '包装号', - field: 'number', - sort: 'custom', - isSearch: true, - table: { - width: 150, - fixed: 'left' - }, - }, -])) export const Package = useCrudSchemas(reactive([ { - label: '包装号', + label: '标签号', field: 'number', sort: 'custom', isSearch: true, table: { - width: 150, fixed: 'left' - }, + } }, { - label: '物料代码', - field: 'itemCode', + label: '标签类型', + field: 'type', sort: 'custom', isSearch: true, - table: { - width: 150, - }, + dictType: DICT_TYPE.LABEL_TYPE, + dictClass: 'string' }, { - label: '物品名称', - field: 'itemName', + label: '标签模板', + field: 'template', 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: 'batch', + label: '标签状态', + field: 'status', sort: 'custom', isSearch: true, - table: { - width: 150, - }, + dictType: DICT_TYPE.LABEL_STATUS, + dictClass: 'string' }, { - label: '替代批次', - field: 'altBatch', + label: '关联号', + field: 'relateNumber', sort: 'custom', - table: { - width: 150, - }, }, { - label: '生产日期', - field: 'produceDate', + label: '标签条码字符串', + field: 'barcodeString', sort: 'custom', - formatter: dateFormatter, - search: { - component: 'DatePicker', - componentProps: { - style: {width:'100%'}, - valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', - defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] - } - }, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - valueFormat: 'x' - } - }, table: { - width: 180, - }, + width: 170, + } }, { - label: '有效期(日)', - field: 'validityDays', + label: '打印次数', + field: 'printTimes', sort: 'custom', form: { component: 'InputNumber', @@ -116,297 +62,34 @@ export const Package = useCrudSchemas(reactive([ }, value: 0 }, - table: { - width: 150, - }, }, { - label: '失效日期', - field: 'expireDate', + label: '最后打印时间', + field: 'lastPrintTime', sort: 'custom', formatter: dateFormatter, - search: { - component: 'DatePicker', - componentProps: { - style: {width:'100%'}, - valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', - defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] - } - }, form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', - valueFormat: 'x' + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', } }, - table: { - width: 180, - }, - }, - { - label: '计量单位', - field: 'uom', - sort: 'custom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', // 默认都是字符串类型其他暂不考虑 - form: { - component: 'SelectV2' - }, - table: { - width: 150, - }, - }, - { - label: '数量', - field: 'qty', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '替代计量单位', - field: 'altUom', - sort: 'custom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', // 默认都是字符串类型其他暂不考虑 - form: { - component: 'SelectV2' - }, - table: { - width: 150, - }, - }, - { - label: '替代数量', - field: 'altQty', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '转换率', - field: 'convertRate', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '标包数量', - field: 'stdPackQty', - sort: 'custom', - table: { - width: 150, - }, }, { - label: '标包单位', - field: 'stdPackUnit', - sort: 'custom', - dictType: DICT_TYPE.PACK_UNIT, - dictClass: 'string', // 默认都是字符串类型其他暂不考虑 - form: { - component: 'SelectV2' - }, - table: { - width: 150, - }, + label: '最后打印人ID', + field: 'lastPrintUserId', + sort: 'custom' }, { - label: '仓库代码', - field: 'toWarehouseCode', + label: '最后打印人用户名', + field: 'lastPrintUserName', sort: 'custom', table: { - width: 150, - }, - }, - { - label: '月台代码', - field: 'toDockCode', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '库位代码', - field: 'toLocationCode', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '供应商代码', - field: 'supplierCode', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '供应商物品代码', - field: 'supplierItemCode', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '采购订单号', - field: 'poNumber', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '采购订单行', - field: 'poLine', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '采购计划单号', - field: 'rpNumber', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '发货单号', - field: 'asnNumber', - sort: 'custom', - table: { - width: 182, - }, - }, - { - label: '生产订单号', - field: 'woNumber', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '生产订单行', - field: 'woLine', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '生产线代码', - field: 'productionLineCode', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '班组代码', - field: 'teamCode', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '班次代码', - field: 'shiftCode', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '客户代码', - field: 'customerCode', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '客户月台代码', - field: 'customerDockCode', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '客户物品代码', - field: 'customerItemCode', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '销售订单号', - field: 'soNumber', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '销售订单行', - field: 'soLine', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '质量等级', - field: 'eqLevel', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '货主代码', - field: 'ownerCode', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '重量', - field: 'weight', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '面积', - field: 'area', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '体积', - field: 'volume', - sort: 'custom', - table: { - width: 150, - }, + width: 170, + } }, { label: '操作', @@ -417,4 +100,4 @@ export const Package = useCrudSchemas(reactive([ fixed: 'right' } } -])) +])) \ No newline at end of file diff --git a/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue b/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue index 225adcd54..5bfb5b14e 100644 --- a/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue +++ b/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue @@ -45,8 +45,8 @@ :rules="PackageRules" :formAllSchemas="Package.allSchemas" :searchTableParams="searchTableParams" - :apiUpdate="PackageApi.updatePackage" - :apiCreate="PackageApi.createPackage" + :apiUpdate="BarbasicApi.updateBarbasic" + :apiCreate="BarbasicApi.createBarbasic" @searchTableSuccess="searchTableSuccess" :isBusiness="false" /> @@ -62,7 +62,7 @@ import download from '@/utils/download' import { getAccessToken } from '@/utils/auth' import { Package,PackageRules } from './utensilPackage.data' -import * as PackageApi from '@/api/wms/package' +import * as BarbasicApi from '@/api/wms/barbasic' import * as defaultButtons from '@/utils/disposition/defaultButtons' // 器具标签 @@ -78,12 +78,12 @@ const tableColumns = ref(Package.allSchemas.tableColumns) /** - * PurchasePackage regularParams = procure采购件标签记录页面 - * ManufacturePackage regularParams = manufacture 制造件标签记录页面 - * UtensilPackage regularParams = utensil 器具标签记录页面 - * SupplierPackage regularParams = procure 供应商发货标签记录(用采购标签) + * PurchasePackage type = PurchaseLabel 采购件标签记录页面 + * ManufacturePackage type = MakeLabel 制造件标签记录页面 + * UtensilPackage type = ContainerLabel 器具标签记录页面 + * SupplierPackage type = PurchaseLabel 供应商发货标签记录(用采购标签) */ - const regularParams = ref(route.name == 'PurchasePackage'?'procure':route.name == 'ManufacturePackage'?'manufacture':route.name == 'UtensilPackage'?'utensil':route.name == 'SupplierPackage'?'procure':'') + const type = ref(route.name == 'PurchasePackage'?'PurchaseLabel':route.name == 'ManufacturePackage'?'MakeLabel':route.name == 'UtensilPackage'?'ContainerLabel':route.name == 'SupplierPackage'?'PurchaseLabel':'') // 字段设置 更新主列表字段 const updataTableColumns = (val) => { @@ -111,9 +111,9 @@ const searchTableSuccess = (formField, searchField, val, basicFormRef, type, row } const { tableObject, tableMethods } = useTable({ - getListApi: PackageApi.getPackagePage // 分页接口 + getListApi: BarbasicApi.getBarbasicPage // 分页接口 }) -tableObject.params.regularParams = regularParams.value +tableObject.params.type = type.value // 获得表格的各种操作 const { getList, setSearchParams } = tableMethods @@ -183,7 +183,7 @@ const buttonTableClick = async (val, row) => { } else if (val == 'delete') { // 删除 handleDelete(row.id) } else if (val == 'point') { // 标签打印 - handlePoint(row.id) + handlePoint(row) } } @@ -205,7 +205,7 @@ const handleDelete = async (id: number) => { // 删除的二次确认 await message.delConfirm() // 发起删除 - await PackageApi.deletePackage(id) + await BarbasicApi.deleteBarbasic(id) message.success(t('common.delSuccess')) // 刷新列表 await getList() @@ -220,8 +220,8 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true - const data = await PackageApi.exportPackage(setSearchParams) - download.excel(data, '包装.xlsx') + const data = await BarbasicApi.exportBarbasic(tableObject.params) + download.excel(data, '器具标签.xlsx') } catch { } finally { exportLoading.value = false @@ -229,10 +229,10 @@ const handleExport = async () => { } const BASE_URL = 'http://dev.ccwin-in.com:25110' -const src = ref(BASE_URL + '/jmreport/view/881303562245316608?token=' + getAccessToken()) +const src = ref(BASE_URL + '/jmreport/view/899807302088564736?token=' + getAccessToken()) // 标签打印 -const handlePoint = async (id) => { - window.open(src.value+'&id='+id) +const handlePoint = async (row) => { + window.open(src.value+'&number='+row.relateNumber) } /** 导入 */ @@ -257,7 +257,7 @@ const searchFormClick = (searchData) => { tableObject.params = { isSearch: true, filters: searchData.filters, - regularParams:regularParams.value + type:type.value } getList() // 刷新当前列表 } diff --git a/src/views/wms/basicDataManage/labelManage/utensilPackage/utensilPackage.data.ts b/src/views/wms/basicDataManage/labelManage/utensilPackage/utensilPackage.data.ts index c7d72ffcd..d82ab1f4d 100644 --- a/src/views/wms/basicDataManage/labelManage/utensilPackage/utensilPackage.data.ts +++ b/src/views/wms/basicDataManage/labelManage/utensilPackage/utensilPackage.data.ts @@ -21,93 +21,51 @@ export const Package2 = useCrudSchemas(reactive([ ])) export const Package = useCrudSchemas(reactive([ { - label: '包装号', + label: '标签号', field: 'number', sort: 'custom', isSearch: true, table: { - width: 150, fixed: 'left' - }, + } }, { - label: '物料代码', - field: 'itemCode', + label: '标签类型', + field: 'type', sort: 'custom', isSearch: true, - table: { - width: 150, - }, - }, - { - label: '物品名称', - field: 'itemName', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '物品描述1', - field: 'itemDesc1', - sort: 'custom', - table: { - width: 150, - }, + dictType: DICT_TYPE.LABEL_TYPE, + dictClass: 'string' }, { - label: '物品描述2', - field: 'itemDesc2', + label: '标签模板', + field: 'template', sort: 'custom', - table: { - width: 150, - }, }, { - label: '批次', - field: 'batch', + label: '标签状态', + field: 'status', sort: 'custom', isSearch: true, - table: { - width: 150, - }, + dictType: DICT_TYPE.LABEL_STATUS, + dictClass: 'string' }, { - label: '替代批次', - field: 'altBatch', + label: '关联号', + field: 'relateNumber', sort: 'custom', - table: { - width: 150, - }, }, { - label: '生产日期', - field: 'produceDate', + label: '标签条码字符串', + field: 'barcodeString', sort: 'custom', - formatter: dateFormatter, - search: { - component: 'DatePicker', - componentProps: { - style: {width:'100%'}, - valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', - defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] - } - }, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - valueFormat: 'x' - } - }, table: { - width: 180, - }, + width: 170, + } }, { - label: '有效期(日)', - field: 'validityDays', + label: '打印次数', + field: 'printTimes', sort: 'custom', form: { component: 'InputNumber', @@ -116,297 +74,34 @@ export const Package = useCrudSchemas(reactive([ }, value: 0 }, - table: { - width: 150, - }, }, { - label: '失效日期', - field: 'expireDate', + label: '最后打印时间', + field: 'lastPrintTime', sort: 'custom', formatter: dateFormatter, - search: { - component: 'DatePicker', - componentProps: { - style: {width:'100%'}, - valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', - defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] - } - }, form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', - valueFormat: 'x' + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', } }, - table: { - width: 180, - }, - }, - { - label: '计量单位', - field: 'uom', - sort: 'custom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', // 默认都是字符串类型其他暂不考虑 - form: { - component: 'SelectV2' - }, - table: { - width: 150, - }, - }, - { - label: '数量', - field: 'qty', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '替代计量单位', - field: 'altUom', - sort: 'custom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', // 默认都是字符串类型其他暂不考虑 - form: { - component: 'SelectV2' - }, - table: { - width: 150, - }, - }, - { - label: '替代数量', - field: 'altQty', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '转换率', - field: 'convertRate', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '标包数量', - field: 'stdPackQty', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '标包单位', - field: 'stdPackUnit', - sort: 'custom', - dictType: DICT_TYPE.PACK_UNIT, - dictClass: 'string', // 默认都是字符串类型其他暂不考虑 - form: { - component: 'SelectV2' - }, - table: { - width: 150, - }, - }, - { - label: '仓库代码', - field: 'toWarehouseCode', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '月台代码', - field: 'toDockCode', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '库位代码', - field: 'toLocationCode', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '供应商代码', - field: 'supplierCode', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '供应商物品代码', - field: 'supplierItemCode', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '采购订单号', - field: 'poNumber', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '采购订单行', - field: 'poLine', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '采购计划单号', - field: 'rpNumber', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '发货单号', - field: 'asnNumber', - sort: 'custom', - table: { - width: 182, - }, - }, - { - label: '生产订单号', - field: 'woNumber', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '生产订单行', - field: 'woLine', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '生产线代码', - field: 'productionLineCode', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '班组代码', - field: 'teamCode', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '班次代码', - field: 'shiftCode', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '客户代码', - field: 'customerCode', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '客户月台代码', - field: 'customerDockCode', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '客户物品代码', - field: 'customerItemCode', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '销售订单号', - field: 'soNumber', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '销售订单行', - field: 'soLine', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '质量等级', - field: 'eqLevel', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '货主代码', - field: 'ownerCode', - sort: 'custom', - table: { - width: 150, - }, }, { - label: '重量', - field: 'weight', - sort: 'custom', - table: { - width: 150, - }, + label: '最后打印人ID', + field: 'lastPrintUserId', + sort: 'custom' }, { - label: '面积', - field: 'area', + label: '最后打印人用户名', + field: 'lastPrintUserName', sort: 'custom', table: { - width: 150, - }, - }, - { - label: '体积', - field: 'volume', - sort: 'custom', - table: { - width: 150, - }, + width: 170, + } }, { label: '操作', @@ -417,4 +112,4 @@ export const Package = useCrudSchemas(reactive([ fixed: 'right' } } -])) +])) \ No newline at end of file From 4fee1e86f8e31d154e9902e3503005a5be26386a Mon Sep 17 00:00:00 2001 From: yejiaxing <591141169@qq.com> Date: Wed, 27 Dec 2023 11:07:58 +0800 Subject: [PATCH 09/12] =?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/supplierdeliverRequestMain/index.ts | 2 +- .../wms/supplierinvoiceRequestDetail/index.ts | 7 +- .../wms/supplierinvoiceRequestMain/index.ts | 24 + .../supplierinvoiceRequestMain/index.vue | 590 ++++++++++-------- .../supplierinvoiceRequestMain.data.ts | 281 ++++++--- 5 files changed, 555 insertions(+), 349 deletions(-) diff --git a/src/api/wms/supplierdeliverRequestMain/index.ts b/src/api/wms/supplierdeliverRequestMain/index.ts index 82ac6b9c5..740675754 100644 --- a/src/api/wms/supplierdeliverRequestMain/index.ts +++ b/src/api/wms/supplierdeliverRequestMain/index.ts @@ -88,7 +88,7 @@ export const genLabel = async (id) => { return await request.post({ url: `/wms/supplierdeliver-request-main/genLabel?id=` + id }) } // 生成记录 -export const genRecordsSupplierdeliverRequestMain = async (id) => { +export const genRecordsSupplierinvoiceRequestMain = async (id) => { return await request.post({ url: `/wms/supplierdeliver-request-main/genRecords?id=` + id }) } // 导出供应商发货申请主 Excel diff --git a/src/api/wms/supplierinvoiceRequestDetail/index.ts b/src/api/wms/supplierinvoiceRequestDetail/index.ts index 16de55f22..8633e63b6 100644 --- a/src/api/wms/supplierinvoiceRequestDetail/index.ts +++ b/src/api/wms/supplierinvoiceRequestDetail/index.ts @@ -34,6 +34,11 @@ export const getSupplierinvoiceRequestDetailPage = async (params) => { } } +// 查询供应商发票申请主详情 +export const getPoNumber = async (params) => { + return await request.get({ url: `/wms/supplierinvoice-request-detail/getPoNumber`, params}) +} + // 查询供应商发票申请子详情 export const getSupplierinvoiceRequestDetail = async (id: number) => { return await request.get({ url: `/wms/supplierinvoice-request-detail/get?id=` + id }) @@ -62,4 +67,4 @@ export const exportSupplierinvoiceRequestDetail = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/supplierinvoice-request-detail/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/api/wms/supplierinvoiceRequestMain/index.ts b/src/api/wms/supplierinvoiceRequestMain/index.ts index 48e23c953..62d9231b5 100644 --- a/src/api/wms/supplierinvoiceRequestMain/index.ts +++ b/src/api/wms/supplierinvoiceRequestMain/index.ts @@ -56,6 +56,30 @@ export const deleteSupplierinvoiceRequestMain = async (id: number) => { return await request.delete({ url: `/wms/supplierinvoice-request-main/delete?id=` + id }) } +// 打开供应商发货申请主 +export const opeSupplierinvoiceRequestMain = async (id: number) => { + return await request.post({ url: `/wms/supplierinvoice-request-main/open?id=` + id }) +} +// 关闭供应商发货申请主 +export const cloSupplierinvoiceRequestMain = async (id: number) => { + return await request.post({ url: `/wms/supplierinvoice-request-main/close?id=` + id }) +} +// 提交审批供应商发货申请主 +export const subSupplierinvoiceRequestMain = async (id: number) => { + return await request.post({ url: `/wms/supplierinvoice-request-main/sub?id=` + id }) +} +// 审批通过供应商发货申请主 +export const appSupplierinvoiceRequestMain = async (id: number) => { + return await request.post({ url: `/wms/supplierinvoice-request-main/app?id=` + id }) +} +// 驳回供应商发货申请主 +export const rejSupplierinvoiceRequestMain = async (id: number) => { + return await request.post({ url: `/wms/supplierinvoice-request-main/rej?id=` + id }) +} +// 生成记录 +export const genRecordsSupplierinvoiceRequestMain = async (id) => { + return await request.post({ url: `/wms/supplierinvoice-request-main/genRecords?id=` + id }) +} // 导出供应商发票申请主 Excel export const exportSupplierinvoiceRequestMain = async (params) => { return await request.download({ url: `/wms/supplierinvoice-request-main/export-excel`, params }) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue index d1cecca12..cea4ea115 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue @@ -1,32 +1,21 @@