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/addProDialog.vue | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/src/views/hazardousChemicals/warehouseManage/components/addProDialog.vue b/src/views/hazardousChemicals/warehouseManage/components/addProDialog.vue
index f66ca38..3a5451c 100644
--- a/src/views/hazardousChemicals/warehouseManage/components/addProDialog.vue
+++ b/src/views/hazardousChemicals/warehouseManage/components/addProDialog.vue
@@ -88,8 +88,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()
}
@@ -127,9 +127,10 @@
title.value = type === 'add' ? '新增' : type ==='edit' ? '编辑':'' ;
if(type === 'edit' ) {
state.form = value;
- state.form.basicName = value.productBasic.name
+ state.form.basicName = value.productBasic.name + '—' + value.productBasic.productSn + ' (' + value.productBasic.metering +value.productBasic.unit+') '
state.form.warehouseName = value.warehouse.name;
choosePro.value = value.productBasic
+ choosePro.value.name = value.productBasic.name + '—' + value.productBasic.productSn + ' (' + value.productBasic.metering + value.productBasic.unit+') '
changeNum()
}
dialogVisible.value = true;
@@ -148,7 +149,13 @@
}
const res = await getFinishBasicList(param)
if(res.code == 200){
- state.proList = res.data.list
+ state.proList = res.data.list.map(item => {
+ return{
+ ...item,
+ name: item.name + '—' + item.productSn + ' (' + item.metering +item.unit+') '
+
+ }
+ })
}else{
ElMessage.warning(res.message)
}
@@ -167,13 +174,7 @@
}
const res = await getWarehouse(param)
if(res.code == 200){
- state.wareHouseList = res.data.list.map(item => {
- return{
- ...item,
- name: item.name + '—' + item.productSn + '(' + item.metering +item.unit+')'
-
- }
- })
+ state.wareHouseList = res.data.list
}else{
ElMessage.warning(res.message)
}
@@ -228,12 +229,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 => {
--
Gitblit v1.9.2