From 67e49ed1475b4489508ab58542ef335973b5595d Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 27 Nov 2024 11:02:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BD=99=E9=A2=9D=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventoryManage/balance/balance.data.ts | 6 +++ .../wms/inventoryManage/balance/index.vue | 46 +++++++++++-------- 2 files changed, 32 insertions(+), 20 deletions(-) diff --git a/src/views/wms/inventoryManage/balance/balance.data.ts b/src/views/wms/inventoryManage/balance/balance.data.ts index b91e07ca5..4569909ed 100644 --- a/src/views/wms/inventoryManage/balance/balance.data.ts +++ b/src/views/wms/inventoryManage/balance/balance.data.ts @@ -838,6 +838,12 @@ export const BalancePackageRules = reactive({ { required: true, message: '请输入打印数量', trigger: 'blur' }, { validator: validatePositiveNumber, message: '必须是一个正数', trigger: 'change' } ], + supplierItemCode: [ + { required: true, message: '请输入标签供应商代码', trigger: 'blur' } + ], + productionLineCodePackage: [ + { required: true, message: '请输入标签生产线代码', trigger: 'blur' } + ], }) export const BalancePackage = useCrudSchemas(reactive([ { diff --git a/src/views/wms/inventoryManage/balance/index.vue b/src/views/wms/inventoryManage/balance/index.vue index 2b7e655ef..bafb53c7a 100644 --- a/src/views/wms/inventoryManage/balance/index.vue +++ b/src/views/wms/inventoryManage/balance/index.vue @@ -421,7 +421,7 @@ const getLabelDetailPage = async (row, useToPackingNumber) => { sort: '', by: 'ASC', }).then(response => { - row.supplierItemCode = response.list[0].supplierCode + row.productionLineCodePackage = response.list[0].productionLineCode }) } }) @@ -450,26 +450,32 @@ const getLabelDetailPage = async (row, useToPackingNumber) => { // 批量打印--预生产收货 const searchTableSuccessLabel = async (formField, searchField, val, formRef, type, row) => { console.log('批量打印',val) - - if(val.length == 0){ - message.warning("请先选择要打印的数据!") - return + if (type == 'tableForm') { + + } else { + const setV = {} + setV[formField] = val[0][searchField] + formRef.setValues(setV) } - await PackageApi.batchPrintingLable(val.map(item1=>item1.number).join(',')).then(res => { - console.log(res) - // if (labelType.value == 'cg') { - // const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken()) - // window.open(src.value+'&asn_number='+res) - // } else { - // const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()) - // window.open(src.value+'&asn_number='+res) - // } - const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()) - window.open(src.value+'&asn_number='+res) - }).catch(err => { - console.log(err) - message.error('创建标签失败') - }) + // if(val.length == 0){ + // message.warning("请先选择要打印的数据!") + // return + // } + // await PackageApi.batchPrintingLable(val.map(item1=>item1.number).join(',')).then(res => { + // console.log(res) + // // if (labelType.value == 'cg') { + // // const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken()) + // // window.open(src.value+'&asn_number='+res) + // // } else { + // // const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()) + // // window.open(src.value+'&asn_number='+res) + // // } + // const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()) + // window.open(src.value+'&asn_number='+res) + // }).catch(err => { + // console.log(err) + // message.error('创建标签失败') + // }) } /** 删除按钮操作 */