From 4b0db9f4cafc13b9dc84ce9502b1da969b00745c Mon Sep 17 00:00:00 2001 From: "YEJIAXING-PC\\lenovo" <591141169@qq.com> Date: Thu, 21 Nov 2024 20:22:53 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BD=99=E9=A2=9D?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/package/index.ts | 5 ++ .../wms/inventoryManage/balance/index.vue | 3 +- .../PurchaseClaimRecordMain.data.ts | 86 +++++++++++-------- 3 files changed, 56 insertions(+), 38 deletions(-) diff --git a/src/api/wms/package/index.ts b/src/api/wms/package/index.ts index 269eeda17..c0975c49a 100644 --- a/src/api/wms/package/index.ts +++ b/src/api/wms/package/index.ts @@ -105,6 +105,11 @@ export const batchPrintingLable = async (data: any) => { export const batchPrintingLableGet = async (params: any) => { return await request.get({ url: `/wms/package/batchPrintingBalanceLable`, params }) } + +// 批量打印标签+创建新标签 +export const batchPrintingBalanceLableForCreate = async (params: any) => { + return await request.get({ url: `/wms/package/batchPrintingBalanceLableForCreate`, params }) +} // 批量打印标签多选 export const batchPrintingLables = async (data: any) => { return await request.post({ url: `/wms/package/batchPrintingLables`, data }) diff --git a/src/views/wms/inventoryManage/balance/index.vue b/src/views/wms/inventoryManage/balance/index.vue index b84a7b5ae..0f9a3798f 100644 --- a/src/views/wms/inventoryManage/balance/index.vue +++ b/src/views/wms/inventoryManage/balance/index.vue @@ -507,13 +507,14 @@ const pointLabel = async () => { packingNumber:detatableData1.value[0].number, batch:detatableData1.value[0].batch, printQty:detatableData1.value[0].printQty, + packQty:detatableData1.value[0].packQty, } // const isHave = detatableData1.value.find(item => parseFloat(item.printQty) <= 0) if(!parseFloat(obj.printQty) ){ message.error(`物料号${obj.itemCode}打印数量不可以为0`) return; } - await PackageApi.batchPrintingLableGet(obj).then(res => { + await PackageApi.batchPrintingBalanceLableForCreate(obj).then(res => { const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()) window.open(src.value+'&asn_number='+res) }).catch(err => { diff --git a/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRecord/PurchaseClaimRecordMain.data.ts b/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRecord/PurchaseClaimRecordMain.data.ts index 1a2c05a4f..a20ceb543 100644 --- a/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRecord/PurchaseClaimRecordMain.data.ts +++ b/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRecord/PurchaseClaimRecordMain.data.ts @@ -83,27 +83,58 @@ export const PurchaseClaimRecordMain = useCrudSchemas(reactive([ } } }, + // { + // label: '索赔时间', + // field: 'claimTime', + // sort: 'custom', + // formatter: dateFormatter, + // table: { + // width: 180 + // }, + // search: { + // component: 'DatePicker', + // componentProps: { + // 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' + // } + // }, + // }, + { label: '索赔时间', field: 'claimTime', - sort: 'custom', formatter: dateFormatter, + isForm:false, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', table: { width: 180 }, - search: { + form: { component: 'DatePicker', componentProps: { - valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', - defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', } }, - form: { + isSearch: false, + search: { component: 'DatePicker', componentProps: { - type: 'datetime', - valueFormat: 'x' + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } }, }, @@ -122,25 +153,6 @@ export const PurchaseClaimRecordMain = useCrudSchemas(reactive([ width: 200 }, }, - { - label: '状态', - field: 'status', - dictType: DICT_TYPE.PURCHASECLAIM_REQUEST_STATUS, - dictClass: 'string', - isTable: false, - isForm:false, - sort: 'custom', - table: { - width: 150 - }, - isSearch: false, - form: { - value: '1', - componentProps: { - disabled: true - } - } - }, { label: '创建时间', field: 'createTime', @@ -180,16 +192,16 @@ export const PurchaseClaimRecordMain = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '操作', - field: 'action', - isForm: false, - isDetail: false, - table: { - width: 150, - fixed: 'right' - } - } + // { + // label: '操作', + // field: 'action', + // isForm: false, + // isDetail: false, + // table: { + // width: 150, + // fixed: 'right' + // } + // } ])) // 表单校验 export const PurchaseClaimRecordDetailRules = reactive({ From 936b870c5d8e02ca877966b01c5df275587b2990 Mon Sep 17 00:00:00 2001 From: "YEJIAXING-PC\\lenovo" <591141169@qq.com> Date: Fri, 22 Nov 2024 07:56:56 +0800 Subject: [PATCH 2/2] =?UTF-8?q?WMS=E7=BC=BA=E9=99=B7=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../unplannedreceiptRecordMain.data.ts | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts index 65fe27451..c4871a5c3 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts @@ -338,14 +338,14 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive( width: 150 }, }, - { - label: '部门', - field: 'departmentCode', - sort: 'custom', - table: { - width: 150 - }, - }, + // { + // label: '部门', + // field: 'departmentCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, { label: '接口类型', field: 'interfaceType', @@ -535,9 +535,9 @@ export const UnplannedreceiptRecordMainRules = reactive({ available: [ { required: true, message: '请输入是否可用', trigger: 'blur' } ], - departmentCode: [ - { required: true, message: '请输入部门', trigger: 'blur' } - ], + // departmentCode: [ + // { required: true, message: '请输入部门', trigger: 'blur' } + // ], interfaceType: [ { required: true, message: '请选择接口类型', trigger: 'change' } ],