From 6d4ad5520c1cdc854ead76f338995c3ae649c279 Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: Tue, 08 Oct 2024 16:59:06 +0800
Subject: [PATCH] 修改
---
src/views/hazardousChemicals/warehouseManage/components/addRawDialog.vue | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/views/hazardousChemicals/warehouseManage/components/addRawDialog.vue b/src/views/hazardousChemicals/warehouseManage/components/addRawDialog.vue
index 3847cf5..afcec8b 100644
--- a/src/views/hazardousChemicals/warehouseManage/components/addRawDialog.vue
+++ b/src/views/hazardousChemicals/warehouseManage/components/addRawDialog.vue
@@ -94,8 +94,8 @@
if(value === ''){
callback(new Error('请输入最小包装数量'))
}else{
- if(value > choosePro.value.maxEntry ){
- callback(new Error('输入数量不能大于单次入库最大数量'))
+ if(choosePro.value && value > choosePro.value.maxEntry ){
+ callback(new Error(`输入数量不能大于单次入库最大数量(${choosePro.value.maxEntry})`))
}else {
callback()
}
@@ -134,9 +134,10 @@
title.value = type === 'add' ? '新增' : type ==='edit' ? '编辑':'' ;
if(type === 'edit' ) {
state.form = JSON.parse(JSON.stringify(value));
- state.form.basicName = value.hazmatBasic.name
+ state.form.basicName = value.hazmatBasic.name + '—' + value.hazmatBasic.productSn + ' (' + value.hazmatBasic.metering + value.hazmatBasic.unit+') '
state.form.warehouseName = value.warehouse.name;
choosePro.value = value.hazmatBasic
+ choosePro.value.name = value.hazmatBasic.name + '—' + value.hazmatBasic.productSn + ' (' + value.hazmatBasic.metering + value.hazmatBasic.unit+') '
changeNum()
}
dialogVisible.value = true;
@@ -158,7 +159,7 @@
state.rawList = res.data.list.map(item => {
return{
...item,
- name: item.name + '—' + item.productSn + '(' + item.metering +item.unit+')'
+ name: item.name + '—' + item.productSn + ' (' + item.metering +item.unit+') '
}
})
@@ -236,12 +237,13 @@
state.form.basicId = item.id
console.log('item',item)
choosePro.value = item;
+ changeNum()
}
})
}
const changeNum = () => {
const minPackageType = choosePro.value.minPackage == 0 ? '瓶' :choosePro.value.minPackage == 1?'袋':choosePro.value.minPackage == 2?'桶 ':choosePro.value.minPackage == 3?'盒':choosePro.value.minPackage == 4?'箱':'其他'
- state.message = `您将入库 { ${choosePro.value.name} }，编号：{ ${choosePro.value.productSn} }，最小包装${choosePro.value.metering}${choosePro.value.unit}，类别：${minPackageType}。 \n 共计：${state.form.num}${minPackageType}`
+ state.message = `您将入库 { ${choosePro.value.name.substring(0,choosePro.value.name.lastIndexOf('—')) } }，编号：{ ${choosePro.value.productSn} }，最小包装${choosePro.value.metering}${choosePro.value.unit}，类别：${minPackageType}。 \n 共计：${state.form.num}${minPackageType}`
}
const selectWareValue = (val) => {
state.wareHouseList.forEach(item => {
@@ -270,6 +272,7 @@
state.rawList = [];
state.wareHouseList = [];
state.message = '';
+ choosePro.value = {}
}
defineExpose({
openDialog
--
Gitblit v1.9.2