From c7df7a96bbf7ab87af9f522cccc0d978f748efc3 Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: 星期六, 14 九月 2024 15:11:52 +0800
Subject: [PATCH] bug修改
---
src/views/hazardousChemicals/warehouseManage/components/addRawDialog.vue | 41 +++++++++++++++++++++++++++++++----------
1 files changed, 31 insertions(+), 10 deletions(-)
diff --git a/src/views/hazardousChemicals/warehouseManage/components/addRawDialog.vue b/src/views/hazardousChemicals/warehouseManage/components/addRawDialog.vue
index 2bc3776..3847cf5 100644
--- a/src/views/hazardousChemicals/warehouseManage/components/addRawDialog.vue
+++ b/src/views/hazardousChemicals/warehouseManage/components/addRawDialog.vue
@@ -51,7 +51,7 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="最小包装数量:" prop="num" >
+ <el-form-item label="数量:" prop="num" >
<el-input v-model.trim="state.form.num" oninput="value=value.replace(/^\.+|[^\d]/g,'')" placeholder="请输入最小包装数量" @input="changeNum"></el-input>
</el-form-item>
<el-form-item label="批号:" prop="batchNo" >
@@ -90,6 +90,19 @@
const length = ref()
const emit = defineEmits(["getList"]);
+const validateNum = (rule, value, callback)=>{
+ if(value === ''){
+ callback(new Error('请输入最小包装数量'))
+ }else{
+ if(value > choosePro.value.maxEntry ){
+ callback(new Error('输入数量不能大于单次入库最大数量'))
+ }else {
+ callback()
+ }
+
+ }
+}
+
const state = reactive({
form: {
@@ -103,7 +116,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: '请输入批号' }]
@@ -117,9 +130,10 @@
const openDialog = async (type, value) => {
await getRawBasicList("")
await getWareHouseList("")
+ state.form.batchNo = moment(new Date()).format("YYYYMMDD")
title.value = type === 'add' ? '新增' : type ==='edit' ? '编辑':'' ;
if(type === 'edit' ) {
- state.form = value;
+ state.form = JSON.parse(JSON.stringify(value));
state.form.basicName = value.hazmatBasic.name
state.form.warehouseName = value.warehouse.name;
choosePro.value = value.hazmatBasic
@@ -141,7 +155,14 @@
}
const res = await getBasicList(param)
if(res.code == 200){
- state.rawList = res.data.list
+ state.rawList = res.data.list.map(item => {
+ return{
+ ...item,
+ name: item.name + '—' + item.productSn + '(' + item.metering +item.unit+')'
+
+ }
+ })
+ console.log('111',state.rawList)
}else{
ElMessage.warning(res.message)
}
@@ -170,9 +191,9 @@
const valid = await busRef.value.validate();
if(valid){
if(title.value === '新增'){
- if(state.form.batchNo == ''){
- state.form.batchNo = moment(new Date()).format("YYYY-MM-DD")
- }
+ // if(state.form.batchNo == ''){
+ // state.form.batchNo = moment(new Date()).format("YYYY-MM-DD")
+ // }
const {id, ...data} = JSON.parse(JSON.stringify(state.form))
const res = await addRawRecord(data)
if(res.code === 200){
@@ -188,9 +209,9 @@
reset();
dialogVisible.value = false;
}else if(title.value === '编辑'){
- if(state.form.batchNo == ''){
- state.form.batchNo = moment(new Date()).format("YYYY-MM-DD")
- }
+ // if(state.form.batchNo == ''){
+ // state.form.batchNo = moment(new Date()).format("YYYY-MM-DD")
+ // }
const {...data} = JSON.parse(JSON.stringify(state.form))
const res = await editRawRecord(data)
if(res.code === 200){
--
Gitblit v1.9.2