|
@@ -1862,35 +1862,28 @@
|
|
|
// });
|
|
// });
|
|
|
// },
|
|
// },
|
|
|
getValidate() {
|
|
getValidate() {
|
|
|
- return Promise.all([
|
|
|
|
|
- new Promise((resolve, reject) => {
|
|
|
|
|
|
|
+ return new Promise((resolve, reject) => {
|
|
|
|
|
+ const validateForm = () => {
|
|
|
this.$refs.form.validate((valid) => {
|
|
this.$refs.form.validate((valid) => {
|
|
|
if (!valid) {
|
|
if (!valid) {
|
|
|
reject(false);
|
|
reject(false);
|
|
|
} else {
|
|
} else {
|
|
|
- resolve(true);
|
|
|
|
|
|
|
+ validateInventoryTable();
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
|
- }),
|
|
|
|
|
- new Promise((resolve, reject) => {
|
|
|
|
|
|
|
+ };
|
|
|
|
|
+
|
|
|
|
|
+ const validateInventoryTable = () => {
|
|
|
this.$refs.inventoryTable.validateForm((valid) => {
|
|
this.$refs.inventoryTable.validateForm((valid) => {
|
|
|
if (!valid) {
|
|
if (!valid) {
|
|
|
reject(false);
|
|
reject(false);
|
|
|
} else {
|
|
} else {
|
|
|
- resolve(true);
|
|
|
|
|
|
|
+ validatePaymentCollectionPlan();
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
|
- }),
|
|
|
|
|
- // new Promise((resolve, reject) => {
|
|
|
|
|
- // this.$refs.paymentListTable.validateForm((valid) => {
|
|
|
|
|
- // if (!valid) {
|
|
|
|
|
- // reject(false);
|
|
|
|
|
- // } else {
|
|
|
|
|
- // resolve(true);
|
|
|
|
|
- // }
|
|
|
|
|
- // });
|
|
|
|
|
- // }),
|
|
|
|
|
- new Promise((resolve, reject) => {
|
|
|
|
|
|
|
+ };
|
|
|
|
|
+
|
|
|
|
|
+ const validatePaymentCollectionPlan = () => {
|
|
|
this.$refs.paymentCollectionPlanRef.validateForm((valid) => {
|
|
this.$refs.paymentCollectionPlanRef.validateForm((valid) => {
|
|
|
if (!valid) {
|
|
if (!valid) {
|
|
|
reject(false);
|
|
reject(false);
|
|
@@ -1898,8 +1891,10 @@
|
|
|
resolve(true);
|
|
resolve(true);
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
|
- })
|
|
|
|
|
- ]);
|
|
|
|
|
|
|
+ };
|
|
|
|
|
+
|
|
|
|
|
+ validateForm();
|
|
|
|
|
+ });
|
|
|
},
|
|
},
|
|
|
async save(type) {
|
|
async save(type) {
|
|
|
try {
|
|
try {
|