|
|
@@ -751,7 +751,7 @@
|
|
|
|
|
|
<!--报表组件-->
|
|
|
<reportContainer ref="reportContainer"></reportContainer>
|
|
|
- <cashier-item ref="cashier" @update="updateCashier" :disabled="form.status==3"></cashier-item>
|
|
|
+ <cashier-item ref="cashier" @update="updateCashier" :disabled="form.status == 3"></cashier-item>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
@@ -1199,7 +1199,7 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
if (this.form.cashierStatus == 0) {
|
|
|
- return this.$message.error("请申请"+(this.form.dc=="D"?"收费!":"付费!"));
|
|
|
+ return this.$message.error("请申请" + (this.form.dc == "D" ? "收费!" : "付费!"));
|
|
|
}
|
|
|
getListAll({ srcId: this.form.id }).then(res => {
|
|
|
if (res.data.data.length == 0) {
|
|
|
@@ -1207,21 +1207,47 @@ export default {
|
|
|
}
|
|
|
for (let item of res.data.data) {
|
|
|
if (item.status == 0) {
|
|
|
- return this.$message.error("请在指示维护"+(this.form.dc=="D"?"未收款数据!":"未支付数据!"));
|
|
|
+ return this.$message.error("请在指示维护" + (this.form.dc == "D" ? "未收款数据!" : "未支付数据!"));
|
|
|
}
|
|
|
}
|
|
|
- this.$confirm("确定进行确认完成操作?", {
|
|
|
- confirmButtonText: "确定",
|
|
|
- cancelButtonText: "取消",
|
|
|
- type: "warning"
|
|
|
- })
|
|
|
- .then(() => {
|
|
|
- this.editCustomer(type);
|
|
|
- })
|
|
|
- .catch(() => {
|
|
|
- this.pageLoading = false;
|
|
|
- this.saveLoading = false;
|
|
|
+ if (
|
|
|
+ Number(this.form.amountDr) != Number(this.form.actualAmountDr) ||
|
|
|
+ Number(this.form.amountCr) != Number(this.form.actualAmountCr) ||
|
|
|
+ Number(this.form.amountDrUsd) != Number(this.form.actualAmountDrUsd) ||
|
|
|
+ Number(this.form.amountCrUsd) != Number(this.form.actualAmountCrUsd)
|
|
|
+ ) {
|
|
|
+ this.$confirm("对账金额与实际金额不符是否完成?", {
|
|
|
+ confirmButtonText: "确定",
|
|
|
+ cancelButtonText: "取消",
|
|
|
+ type: "warning"
|
|
|
+ }).then(() => {
|
|
|
+ this.$confirm("确定进行确认完成操作?", {
|
|
|
+ confirmButtonText: "确定",
|
|
|
+ cancelButtonText: "取消",
|
|
|
+ type: "warning"
|
|
|
+ })
|
|
|
+ .then(() => {
|
|
|
+ this.editCustomer(type);
|
|
|
+ })
|
|
|
+ .catch(() => {
|
|
|
+ this.pageLoading = false;
|
|
|
+ this.saveLoading = false;
|
|
|
+ });
|
|
|
});
|
|
|
+ } else {
|
|
|
+ this.$confirm("确定进行确认完成操作?", {
|
|
|
+ confirmButtonText: "确定",
|
|
|
+ cancelButtonText: "取消",
|
|
|
+ type: "warning"
|
|
|
+ })
|
|
|
+ .then(() => {
|
|
|
+ this.editCustomer(type);
|
|
|
+ })
|
|
|
+ .catch(() => {
|
|
|
+ this.pageLoading = false;
|
|
|
+ this.saveLoading = false;
|
|
|
+ });
|
|
|
+ }
|
|
|
});
|
|
|
},
|
|
|
// 详情接口
|