Commit 3d97cf4f authored by chicheng's avatar chicheng

添加要货审批必填项白名单(新建数据表),如果在白名单经销商,要货审批时的情况说明不必填。

parent 14700e8a
...@@ -235,7 +235,7 @@ ...@@ -235,7 +235,7 @@
label="要货量(件)" label="要货量(件)"
type="number" type="number"
placeholder="请输入" placeholder="请输入"
required :required="isOpinionRequired"
/> />
<van-field <van-field
v-model="form.systemStock" v-model="form.systemStock"
...@@ -243,7 +243,7 @@ ...@@ -243,7 +243,7 @@
label="系统库存量(件)" label="系统库存量(件)"
type="number" type="number"
placeholder="请输入" placeholder="请输入"
required :required="isOpinionRequired"
/> />
<van-field <van-field
v-model="form.realTimeStock" v-model="form.realTimeStock"
...@@ -251,7 +251,7 @@ ...@@ -251,7 +251,7 @@
label="实时库存量(件)" label="实时库存量(件)"
type="number" type="number"
placeholder="请输入" placeholder="请输入"
required :required="isOpinionRequired"
/> />
</template> </template>
<template v-else> <template v-else>
...@@ -383,6 +383,10 @@ export default { ...@@ -383,6 +383,10 @@ export default {
firstApprovalOpinion() { firstApprovalOpinion() {
const node = this.firstApprovalNode const node = this.firstApprovalNode
return node ? (node.opinion || '') : '' return node ? (node.opinion || '') : ''
},
// 判断是否必填审批意见
isOpinionRequired() {
return this.conditions.approvalOpinionRequired !== false
} }
}, },
created() { created() {
...@@ -530,6 +534,9 @@ export default { ...@@ -530,6 +534,9 @@ export default {
return parts.join(',') return parts.join(',')
}, },
validateFirstNodeFields() { validateFirstNodeFields() {
if (!this.isOpinionRequired) {
return true
}
if (this.form.orderQuantity === '' || this.form.orderQuantity === null || this.form.orderQuantity === undefined) { if (this.form.orderQuantity === '' || this.form.orderQuantity === null || this.form.orderQuantity === undefined) {
Toast('要货量不能为空') Toast('要货量不能为空')
return false return false
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment