From e39acb3659c059cbedc37ff6592ef7b3355bd20c Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: Wed, 09 Oct 2024 10:46:59 +0800
Subject: [PATCH] bug修改
---
src/views/hazardousChemicals/warehouseManage/components/addProDialog.vue | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/src/views/hazardousChemicals/warehouseManage/components/addProDialog.vue b/src/views/hazardousChemicals/warehouseManage/components/addProDialog.vue
index caa5174..3a5451c 100644
--- a/src/views/hazardousChemicals/warehouseManage/components/addProDialog.vue
+++ b/src/views/hazardousChemicals/warehouseManage/components/addProDialog.vue
@@ -84,6 +84,18 @@
const length = ref()
const emit = defineEmits(["getList"]);
+const validateNum = (rule, value, callback)=>{
+ if(value === ''){
+ callback(new Error('请输入最小包装数量'))
+ }else{
+ if(choosePro.value && value > choosePro.value.maxEntry ){
+ callback(new Error(`输入数量不能大于单次入库最大数量(${choosePro.value.maxEntry})`))
+ }else {
+ callback()
+ }
+
+ }
+}
const state = reactive({
form: {
@@ -97,7 +109,7 @@
},
formRules:{
- num: [{ required: true, trigger: "blur", message: '请输入数量' }],
+ num: [{ required: true, trigger: "blur", validator: validateNum }],
warehouseName: [{ required: true, trigger: "blur", message: '请选择入库仓库' }],
basicName: [{ required: true, trigger: "blur", message: '请选择入库成品' }],
// batchNo: [{ required: true, trigger: "blur", message: '请输入批号' }]
@@ -115,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;
@@ -136,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)
}
@@ -210,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