Commit 90b78714 authored by zhengke's avatar zhengke

no message

parent ea0f1bf7
...@@ -390,7 +390,7 @@ ...@@ -390,7 +390,7 @@
}, },
// 点击单号 // 点击单号
clickSingleNumber(item){ clickSingleNumber(item){
// this.orderDrawer = true this.orderDrawer = true
}, },
handleClose(done) { handleClose(done) {
done(); done();
...@@ -407,6 +407,7 @@ ...@@ -407,6 +407,7 @@
}, },
chooseMore(row) { chooseMore(row) {
// 取消订单 // 取消订单
if (row.More == '1') { if (row.More == '1') {
this.cancelOrder(row) this.cancelOrder(row)
} }
...@@ -636,7 +637,7 @@ ...@@ -636,7 +637,7 @@
} }
}, },
cancelOrderfun(row) { cancelOrderfun(row) {
if (row.OrderStatus != '2' && row.IncomeFinance == [] && row.BackFinance == [] && row.PayFinance == []) { if (row.OrderStatus != '2' && row.IncomeFinance.length == 0 && row.BackFinance.length == 0 && row.PayFinance.length == 0) {
let tips = '此操作将取消该订单,是否继续取消?' let tips = '此操作将取消该订单,是否继续取消?'
this.$confirm(tips, '提示', { this.$confirm(tips, '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
......
...@@ -717,7 +717,7 @@ ...@@ -717,7 +717,7 @@
if (this.userInfo.EmName != row.EnterName) { if (this.userInfo.EmName != row.EnterName) {
this.ValidateOperator() this.ValidateOperator()
} else { } else {
if (row.OrderStatus != '2' && row.IncomeFinance == [] && row.BackFinance == [] && row.PayFinance == []) { if (row.OrderStatus != '2' && row.IncomeFinance.length == 0 && row.BackFinance.length == 0 && row.PayFinance.length == 0) {
let tips = '此操作将取消该订单,是否继续取消?' let tips = '此操作将取消该订单,是否继续取消?'
this.$confirm(tips, '提示', { this.$confirm(tips, '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
......
...@@ -1348,7 +1348,6 @@ ...@@ -1348,7 +1348,6 @@
}, },
form: { form: {
handler(val, oldVal) { handler(val, oldVal) {
// console.log(val.MealMoney, '---')
val.TicketMoney = val.TicketMoney - 0 val.TicketMoney = val.TicketMoney - 0
val.VisaMoney = val.VisaMoney - 0 val.VisaMoney = val.VisaMoney - 0
val.DiJieMoney = val.DiJieMoney - 0 val.DiJieMoney = val.DiJieMoney - 0
...@@ -1452,6 +1451,7 @@ ...@@ -1452,6 +1451,7 @@
} }
if (this.name == '编辑订单金额') { if (this.name == '编辑订单金额') {
this.width = "600px" this.width = "600px"
this.checkList = this.obj.OrderType.split(',')
this.form = { this.form = {
TicketMoney:this.obj.TicketMoney, TicketMoney:this.obj.TicketMoney,
VisaMoney:this.obj.VisaMoney, VisaMoney:this.obj.VisaMoney,
......
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