|
@@ -375,10 +375,18 @@ export default {
|
|
|
form.errorText = ''
|
|
|
return;
|
|
|
}
|
|
|
-
|
|
|
+ let num = 0;
|
|
|
+ if (forms.type === 2) {
|
|
|
+ num = 100;
|
|
|
+ } else if (forms.type === 1) {
|
|
|
+ num = 10;
|
|
|
+ }
|
|
|
let countScale = 0;
|
|
|
let selectFeeCount = 0,
|
|
|
selectFeeCount2 = 0
|
|
|
+ let isFeeFlag = false,
|
|
|
+ isOrganId = false,
|
|
|
+ isScale = false
|
|
|
domains.forEach(item => {
|
|
|
countScale += Number(item.scale);
|
|
|
if(forms.type == 2) {
|
|
@@ -390,6 +398,18 @@ export default {
|
|
|
selectFeeCount2++
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ if(!isFeeFlag) {
|
|
|
+ isFeeFlag = !item.feeFlag ? true : false
|
|
|
+ }
|
|
|
+
|
|
|
+ if(!isOrganId) {
|
|
|
+ isOrganId = !item.organId ? true : false
|
|
|
+ }
|
|
|
+
|
|
|
+ if(!isScale) {
|
|
|
+ isScale = !item.scale ? true: false
|
|
|
+ }
|
|
|
});
|
|
|
if(selectFeeCount > 1) {
|
|
|
form.errorText = `承担手续费只能设置一次“是”`;
|
|
@@ -398,12 +418,6 @@ export default {
|
|
|
form.errorText = `承担手续费只能设置“是”`;
|
|
|
return
|
|
|
}
|
|
|
- let num = 0;
|
|
|
- if (forms.type === 2) {
|
|
|
- num = 100;
|
|
|
- } else if (forms.type === 1) {
|
|
|
- num = 10;
|
|
|
- }
|
|
|
|
|
|
if (!lastDate.organId) {
|
|
|
form.errorText = "选择分部不能为空";
|
|
@@ -437,8 +451,16 @@ export default {
|
|
|
key: Date.now()
|
|
|
});
|
|
|
} else {
|
|
|
- if (parseInt(countScale) != num) {
|
|
|
- form.errorText = "比例总和应为" + num;
|
|
|
+ if (isOrganId) {
|
|
|
+ form.errorText = "选择分部不能为空";
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ if (isScale) {
|
|
|
+ form.errorText = "比例不能为空";
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ if(isFeeFlag) {
|
|
|
+ form.errorText = "请选择是否承担手续费";
|
|
|
return;
|
|
|
}
|
|
|
if(forms.type == 2) {
|