|
@@ -92,8 +92,8 @@
|
|
|
<span>{{ item.effectType==1?'当前':'次月' }}增量补贴({{ pageType==='SUBSIDY_QUARTER_FEE'?'季':'年' }}度):</span>
|
|
|
<div>
|
|
|
<p v-if="item.ruleTarget1">大于等于{{ item.ruleTarget1 }}条,每条补贴{{ item.ruleValue1 }}元;</p>
|
|
|
- <p v-if="item.ruleTarget2">大于等于{{ item.ruleTarget1 }}条,每条补贴{{ item.ruleValue2 }}元;</p>
|
|
|
- <p v-if="item.ruleTarget3">大于等于{{ item.ruleTarget1 }}条,每条补贴{{ item.ruleValue3 }}元;</p>
|
|
|
+ <p v-if="item.ruleTarget2">大于等于{{ item.ruleTarget2 }}条,每条补贴{{ item.ruleValue2 }}元;</p>
|
|
|
+ <p v-if="item.ruleTarget3">大于等于{{ item.ruleTarget3 }}条,每条补贴{{ item.ruleValue3 }}元;</p>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -194,6 +194,7 @@ export default {
|
|
|
const newForm = JSON.parse(JSON.stringify(_this.form))
|
|
|
delete newForm.defaultFlag
|
|
|
delete newForm.dealerSn
|
|
|
+ delete newForm.ruleType
|
|
|
const flag = _this.isValid(newForm)
|
|
|
if (!flag) {
|
|
|
_this.$message.error('季度增量补贴【条数】与【补贴】不符合填写规则!')
|
|
@@ -225,24 +226,29 @@ export default {
|
|
|
const { ruleTarget1, ruleValue1, ruleTarget2, ruleValue2, ruleTarget3, ruleValue3 } = obj
|
|
|
|
|
|
// 检查第一阶梯是否填写
|
|
|
- if (ruleTarget1 === undefined || ruleValue1 === undefined || typeof ruleValue1 !== 'number') {
|
|
|
+ if (!ruleTarget1 || !ruleValue1) {
|
|
|
return false
|
|
|
}
|
|
|
|
|
|
// 如果第三阶梯存在,检查第二阶梯是否存在以及值是否正确
|
|
|
- if (ruleTarget3 !== undefined || ruleValue3 !== undefined) {
|
|
|
- if (ruleTarget2 === undefined || ruleValue2 === undefined || typeof ruleValue2 !== 'number') {
|
|
|
- return false
|
|
|
- }
|
|
|
- if (ruleValue1 >= ruleValue2 || (ruleValue3 !== undefined && ruleValue2 >= ruleValue3) || ruleTarget1 >= ruleTarget2 || (ruleTarget3 !== undefined && ruleTarget2 >= ruleTarget3)) {
|
|
|
+ if (ruleTarget3 || ruleValue3) {
|
|
|
+ if ((!ruleTarget2 || !ruleValue2) || (!ruleTarget3 || !ruleValue3)) {
|
|
|
return false
|
|
|
+ } else {
|
|
|
+ if (ruleValue1 >= ruleValue2 || ruleValue2 >= ruleValue3 || ruleTarget1 >= ruleTarget2 || ruleTarget2 >= ruleTarget3) {
|
|
|
+ return false
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|
|
|
// 如果只有第二阶梯存在(没有第三阶梯),检查值是否正确
|
|
|
- if (ruleTarget2 !== undefined && ruleValue2 !== undefined && (ruleTarget3 === undefined && ruleValue3 === undefined)) {
|
|
|
- if (ruleValue1 >= ruleValue2 || ruleTarget1 >= ruleTarget2) {
|
|
|
+ if ((ruleTarget2 || ruleValue2) && (!ruleTarget3 && !ruleValue3)) {
|
|
|
+ if (!ruleTarget2 || !ruleValue2) {
|
|
|
return false
|
|
|
+ } else {
|
|
|
+ if (ruleValue1 >= ruleValue2 || ruleTarget1 >= ruleTarget2) {
|
|
|
+ return false
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
// 所有条件都满足,返回true
|
|
@@ -278,6 +284,9 @@ export default {
|
|
|
},
|
|
|
// 重置
|
|
|
resetFormData () {
|
|
|
+ if (this.form.defaultFlag == 0) {
|
|
|
+ this.$refs.dealerSubareaScopeList.resetForm()
|
|
|
+ }
|
|
|
this.form.defaultFlag = 0
|
|
|
this.form.dealerSn = undefined
|
|
|
this.form.ruleTarget1 = undefined
|
|
@@ -286,9 +295,6 @@ export default {
|
|
|
this.form.ruleValue2 = undefined
|
|
|
this.form.ruleTarget3 = undefined
|
|
|
this.form.ruleValue3 = undefined
|
|
|
- if (this.form.defaultFlag == 0) {
|
|
|
- this.$refs.dealerSubareaScopeList.resetForm()
|
|
|
- }
|
|
|
this.feeDataList = null
|
|
|
this.$refs.ruleForm.resetFields()
|
|
|
}
|