From c2a0ff325cb7bd2c5d6c8fd84cf806ac7c456fcf Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Sat, 10 Aug 2024 19:01:22 +0800 Subject: [PATCH] =?UTF-8?q?xin-=E5=BA=93=E5=AD=98=E8=BD=AC=E7=A7=BB?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/inventoryManage/package/index.vue | 7 ++++- .../inventoryManage/package/package.data.ts | 16 +++++------ .../inventorymoveRecordMainNew/index.vue | 19 +++++++++---- .../inventorymoveRecordMainNew.data.ts | 28 ++++++++++++++++++- 4 files changed, 55 insertions(+), 15 deletions(-) diff --git a/src/views/wms/inventoryManage/package/index.vue b/src/views/wms/inventoryManage/package/index.vue index 3fcce7858..4c4063eb9 100644 --- a/src/views/wms/inventoryManage/package/index.vue +++ b/src/views/wms/inventoryManage/package/index.vue @@ -120,7 +120,7 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ defaultButtons.defaultAddBtn({hasPermi:'wms:package:create'}), // 新增 - defaultButtons.defaultImportBtn({hasPermi:'wms:package:import'}), // 导入 + // defaultButtons.defaultImportBtn({hasPermi:'wms:package:import'}), // 导入 defaultButtons.defaultExportBtn({hasPermi:'wms:package:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 @@ -259,7 +259,12 @@ const BASE_URL = getJmreportBaseUrl() // form表单提交 const formsSuccess = async (formType,data) => { + if(!data.productionLineCode&&!data.supplierCode){ + message.error(t('供应商代码 和 生产线代码至少填一个！')) + return + } basicFormRef.value.formLoading = true + try { if (formType === 'create') { await PackageApi.createPackage(data) diff --git a/src/views/wms/inventoryManage/package/package.data.ts b/src/views/wms/inventoryManage/package/package.data.ts index 890e785b1..dcfaf35c7 100644 --- a/src/views/wms/inventoryManage/package/package.data.ts +++ b/src/views/wms/inventoryManage/package/package.data.ts @@ -546,14 +546,14 @@ export const Package = useCrudSchemas(reactive([ // width: 150, // }, // }, - // { - // label: '生产线代码', - // field: 'productionLineCode', - // sort: 'custom', - // table: { - // width: 150, - // }, - // }, + { + label: '生产线代码', + field: 'productionLineCode', + sort: 'custom', + table: { + width: 150, + }, + }, // { // label: '班组代码', // field: 'teamCode', diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue index bad8e4967..f6a6ac3b7 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue @@ -133,7 +133,7 @@ const { getList, setSearchParams } = tableMethods const HeadButttondata = [ defaultButtons.defaultAddBtn(null), // 新增 defaultButtons.defaultExportBtn({hasPermi:'wms:inventorymove-record-main:export'}), // 导出 - defaultButtons.defaultImportBtn({hasPermi:'wms:inventorymove-record-main:import'}), // 导入 + // defaultButtons.defaultImportBtn({hasPermi:'wms:inventorymove-record-main:import'}), // 导入 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 @@ -198,19 +198,28 @@ const BASE_URL = getJmreportBaseUrl() // 标签打印 const searchTableRef = ref() const labelType = ref('') // 标签类别 采购还是制造等 -const labelPrint = async (row) => { - tableObject.loading = true - //获取类型 - let resType = await PackageApi.getPackagePage({ +//获取类型 +const getLabelType = async (row,useToPackingNumber)=>{ + let resType = await PackageApi.getPackagePage(useToPackingNumber?{ + number: row.toPackingNumber + }:{ requestNumber: row.number }) + console.log('resType',resType) if(resType.list.length > 0){ if (resType.list[0].productionLineCode != null) { labelType.value = 'zz' } else { labelType.value = 'cg' } + }else{ + getLabelType(row,true) } +} +const labelPrint = async (row) => { + tableObject.loading = true + //获取类型 + await getLabelType(row,false) const defaultParams = {'moduleName':'productreceipt_predict','tableName':'record_productreceipt_main','recordNumber':row.number} const {tableObject:tableObjectPrint ,tableMethods} = useTable({ defaultParams, diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordMainNew.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordMainNew.data.ts index b79354dd0..4688e1c02 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordMainNew.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordMainNew.data.ts @@ -149,6 +149,8 @@ export const InventorymoveRecordMainNew = useCrudSchemas(reactive( table: { width: 150 }, + sortTableDefault:22 + }, { label: '到仓库代码', @@ -157,6 +159,7 @@ export const InventorymoveRecordMainNew = useCrudSchemas(reactive( table: { width: 150 }, + sortTableDefault:23 }, // { // label: '从库区类型范围', @@ -203,6 +206,7 @@ export const InventorymoveRecordMainNew = useCrudSchemas(reactive( table: { width: 150 }, + sortTableDefault:24 }, { label: '入库事务类型', @@ -211,6 +215,7 @@ export const InventorymoveRecordMainNew = useCrudSchemas(reactive( table: { width: 150 }, + sortTableDefault:25 }, { label: '业务类型', @@ -219,6 +224,7 @@ export const InventorymoveRecordMainNew = useCrudSchemas(reactive( table: { width: 150 }, + sortTableDefault:36 }, // { @@ -267,6 +273,7 @@ export const InventorymoveRecordMainNew = useCrudSchemas(reactive( valueFormat: 'x', } }, + sortTableDefault:34 }, { label: '创建者', @@ -275,6 +282,7 @@ export const InventorymoveRecordMainNew = useCrudSchemas(reactive( table: { width: 150 }, + sortTableDefault:35 }, { label: '最后更新时间', @@ -425,6 +433,7 @@ export const InventorymoveRecordDetailNew = useCrudSchemas(reactive