From c7df7a96bbf7ab87af9f522cccc0d978f748efc3 Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: Sat, 14 Sep 2024 15:11:52 +0800
Subject: [PATCH] bug修改
---
src/views/hazardousChemicals/basicInfon/index.vue | 1 +
src/views/hazardousChemicals/finishedBasicInfo/components/finishedBasicDialog.vue | 10 ++++++++--
src/views/hazardousChemicals/warehouseManage/components/addProDialog.vue | 14 +++++++++++++-
src/views/hazardousChemicals/finishedBasicInfo/index.vue | 1 +
src/views/hazardousChemicals/basicInfon/components/basicDialog.vue | 10 ++++++++--
src/views/hazardousChemicals/warehouseManage/components/addRawDialog.vue | 15 ++++++++++++++-
6 files changed, 45 insertions(+), 6 deletions(-)
diff --git a/src/views/hazardousChemicals/basicInfon/components/basicDialog.vue b/src/views/hazardousChemicals/basicInfon/components/basicDialog.vue
index ea62d44..2afd575 100644
--- a/src/views/hazardousChemicals/basicInfon/components/basicDialog.vue
+++ b/src/views/hazardousChemicals/basicInfon/components/basicDialog.vue
@@ -121,6 +121,9 @@
<el-form-item label="超期阈值（小时）:" prop="threshold">
<el-input v-model.trim="state.form.threshold" placeholder="请输入超期阈值" oninput="value=value.replace(/^\.+|[^\d]/g,'')"></el-input>
</el-form-item>
+ <el-form-item label="单次入库最大数量:" prop="maxEntry">
+ <el-input v-model.trim="state.form.maxEntry" placeholder="请输入单次入库最大数量" oninput="value=value.replace(/^\.+|[^\d]/g,'')"></el-input>
+ </el-form-item>
</el-form>
<template #footer>
<span class="dialog-footer">
@@ -189,7 +192,8 @@
minPackage: '',
safeNum: null,
threshold: null,
- kind: ''
+ kind: '',
+ maxEntry: null
},
characterList: [],
formRules:{
@@ -209,6 +213,7 @@
kind: [{ required: true, message: '请选择种类', trigger: 'blur' }],
threshold: [{ required: true, message: '请输入超期阀值', trigger: 'blur' }],
unit: [{ required: true, message: '请选择包装单位', trigger: 'blur' }],
+ maxEntry: [{ required: true, message: '请输入单次入库最大数量', trigger: 'blur' }],
},
typeList: [
@@ -400,7 +405,8 @@
minPackage: '',
safeNum: null,
threshold: null,
- kind: ''
+ kind: '',
+ maxEntry: null
}
state.characterList = []
}
diff --git a/src/views/hazardousChemicals/basicInfon/index.vue b/src/views/hazardousChemicals/basicInfon/index.vue
index 0238d6c..6e4d03a 100644
--- a/src/views/hazardousChemicals/basicInfon/index.vue
+++ b/src/views/hazardousChemicals/basicInfon/index.vue
@@ -92,6 +92,7 @@
</el-table-column>
<el-table-column label="安全库存" prop="safeNum" align="center"/>
<el-table-column label="超期阈值（小时）" prop="threshold" align="center"/>
+ <el-table-column label="单次入库最大数量" prop="maxEntry" align="center"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200" >
<template #default="scope">
<el-button link type="primary" @click="openDialog('edit',scope.row)">编辑</el-button>
diff --git a/src/views/hazardousChemicals/finishedBasicInfo/components/finishedBasicDialog.vue b/src/views/hazardousChemicals/finishedBasicInfo/components/finishedBasicDialog.vue
index 5372392..4eb2272 100644
--- a/src/views/hazardousChemicals/finishedBasicInfo/components/finishedBasicDialog.vue
+++ b/src/views/hazardousChemicals/finishedBasicInfo/components/finishedBasicDialog.vue
@@ -115,6 +115,9 @@
/>
</el-select>
</el-form-item>
+ <el-form-item label="单次入库最大数量:" prop="maxEntry">
+ <el-input v-model.trim="state.form.maxEntry" placeholder="请输入单次入库最大数量" oninput="value=value.replace(/^\.+|[^\d]/g,'')"></el-input>
+ </el-form-item>
<!-- <el-form-item label="安全库存:" prop="safeNum">-->
<!-- <el-input v-model.trim="state.form.safeNum" placeholder="请输入安全库存" oninput="value=value.replace(/^\.+|[^\d]/g,'')"></el-input>-->
<!-- </el-form-item>-->
@@ -190,7 +193,8 @@
minPackage: '',
safeNum: null,
threshold: null,
- kind: ''
+ kind: '',
+ maxEntry: null
},
characterList: [],
formRules:{
@@ -210,6 +214,7 @@
kind: [{ required: true, message: '请选择种类', trigger: 'blur' }],
threshold: [{ required: true, message: '请输入超期阀值', trigger: 'blur' }],
unit: [{ required: true, message: '请选择包装单位', trigger: 'blur' }],
+ maxEntry: [{ required: true, message: '请输入单次入库最大数量', trigger: 'blur' }],
},
typeList: [
@@ -401,7 +406,8 @@
minPackage: '',
safeNum: null,
threshold: null,
- kind: ''
+ kind: '',
+ maxEntry: null
}
state.characterList = []
}
diff --git a/src/views/hazardousChemicals/finishedBasicInfo/index.vue b/src/views/hazardousChemicals/finishedBasicInfo/index.vue
index afc1207..77330a9 100644
--- a/src/views/hazardousChemicals/finishedBasicInfo/index.vue
+++ b/src/views/hazardousChemicals/finishedBasicInfo/index.vue
@@ -89,6 +89,7 @@
<span>{{scope.row.minPackage == 0 ? '瓶' :scope.row.minPackage == 1?'袋':scope.row.minPackage == 2?'桶 ':scope.row.minPackage == 3?'盒':scope.row.minPackage == 4?'箱':'其他'}}</span>
</template>
</el-table-column>
+ <el-table-column label="单次入库最大数量" prop="maxEntry" align="center"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200" >
<template #default="scope">
<el-button link type="primary" @click="openDialog('edit',scope.row)">编辑</el-button>
diff --git a/src/views/hazardousChemicals/warehouseManage/components/addProDialog.vue b/src/views/hazardousChemicals/warehouseManage/components/addProDialog.vue
index a1e89c0..f66ca38 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(value > choosePro.value.maxEntry ){
+ callback(new Error('输入数量不能大于单次入库最大数量'))
+ }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: '请输入批号' }]
diff --git a/src/views/hazardousChemicals/warehouseManage/components/addRawDialog.vue b/src/views/hazardousChemicals/warehouseManage/components/addRawDialog.vue
index 3688e00..3847cf5 100644
--- a/src/views/hazardousChemicals/warehouseManage/components/addRawDialog.vue
+++ b/src/views/hazardousChemicals/warehouseManage/components/addRawDialog.vue
@@ -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: '请输入批号' }]
--
Gitblit v1.9.2