Skip to content

C
CRM
Commit 9cc102c3 authored by zhengke's avatar zhengke
Browse files
Options

no message

parent 37d69d18
Hide whitespace changes
Inline Side-by-side
Showing with 111 additions and 6 deletions
src/components/customerManage/customerOrder.vue
View file @ 9cc102c3
...@@ -449,6 +449,11 @@ ...@@ -449,6 +449,11 @@
show: true show: true
}, },
{ {
Name: '收损完结',
Id: '9',
show: item.OrderStatus==3||item.OrderStatus==4&&item.DueinMoney==0?true:false
},
{
Name: "操作日志", Name: "操作日志",
Id: "7", Id: "7",
show: true, show: true,
......
src/components/customerManage/myCustomerOrder.vue
View file @ 9cc102c3
...@@ -430,6 +430,11 @@ ...@@ -430,6 +430,11 @@
show: true show: true
}, },
{ {
Name: '收损完结',
Id: '9',
show: item.OrderStatus==3||item.OrderStatus==4&&item.DueinMoney==0?true:false
},
{
Name: "操作日志", Name: "操作日志",
Id: "7", Id: "7",
show: true, show: true,
......
src/components/customerManage/orderList.vue
View file @ 9cc102c3
...@@ -459,7 +459,7 @@ export default { ...@@ -459,7 +459,7 @@ export default {
} }
// 编辑订单金额 // 编辑订单金额
if (row.More == '3') { if (row.More == '3') {
// this.editOrderAmount(row) this.editOrderAmount(row)
} }
// 修改出票状态 // 修改出票状态
if (row.More == '4') { if (row.More == '4') {
...@@ -477,10 +477,52 @@ export default { ...@@ -477,10 +477,52 @@ export default {
if (row.More == "7") { if (row.More == "7") {
this.operationLog(row); this.operationLog(row);
} }
// 操作日志 // 订单收损
if (row.More == "8") { if (row.More == "8") {
this.lossOperation(row); this.lossOperation(row);
} }
// 订单收损完结
if (row.More == "9") {
this.endOfLoss(row);
}
},
// 订单收损完结
endOfLoss(row){
if (this.superManage) {
this.endOfLossfun(row)
}else{
if (this.userInfo.EmName != row.EnterName) {
this.ValidateOperator();
} else {
this.endOfLossfun(row)
}
}
},
endOfLossfun(row){
let tips = '一旦确认订单收损完结，你将无法对订单执行任何操作，包括订单相关的财务单据。'
this.$confirm(tips, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.apipost('/api/Order/SetOrderLossFinish', {
OrderId: row.OrderId,
}, res => {
if (res.data.resultCode == 1) {
this.$message.success(res.data.message);
this.MsgBus.$emit("closeGetList");
}else{
this.$message.warning(res.data.message);
}
})
}).catch(() => {
this.emptyMore()
this.$message({
type: 'info',
message: '已取消'
});
});
}, },
// 收损 // 收损
lossOperation(row){ lossOperation(row){
......
src/components/guestManagement/Agreement.vue
View file @ 9cc102c3
...@@ -603,7 +603,7 @@ ...@@ -603,7 +603,7 @@
} }
// 编辑订单金额 // 编辑订单金额
if (row.More == '3') { if (row.More == '3') {
// this.editOrderAmount(row) this.editOrderAmount(row)
} }
// 修改出票状态 // 修改出票状态
if (row.More == '4') { if (row.More == '4') {
...@@ -621,10 +621,48 @@ ...@@ -621,10 +621,48 @@
if (row.More == "7") { if (row.More == "7") {
this.operationLog(row); this.operationLog(row);
} }
// 操作日志 // 订单收损
if (row.More == "8") { if (row.More == "8") {
this.lossOperationfun(row); this.lossOperationfun(row);
} }
// 订单收损完结
if (row.More == "9") {
this.endOfLoss(row);
}
},
// 订单收损完结
endOfLoss(row){
if (this.userInfo.EmName != row.EnterName) {
this.ValidateOperator();
} else {
this.endOfLossfun(row)
}
},
endOfLossfun(row){
let tips = '一旦确认订单收损完结，你将无法对订单执行任何操作，包括订单相关的财务单据。'
this.$confirm(tips, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.apipost('/api/Order/SetOrderLossFinish', {
OrderId: row.OrderId,
}, res => {
if (res.data.resultCode == 1) {
this.$message.success(res.data.message);
this.MsgBus.$emit("closeGetList");
}else{
this.$message.warning(res.data.message);
}
})
}).catch(() => {
this.emptyMore()
this.$message({
type: 'info',
message: '已取消'
});
});
}, },
// 收损 // 收损
lossOperation(row){ lossOperation(row){
...@@ -1067,6 +1105,11 @@ ...@@ -1067,6 +1105,11 @@
show: true show: true
}, },
{ {
Name: '收损完结',
Id: '9',
show: item.OrderStatus==3||item.OrderStatus==4&&item.DueinMoney==0?true:false
},
{
Name: "操作日志", Name: "操作日志",
Id: "7", Id: "7",
show: true, show: true,
......
src/components/planeTicketOrder/index.vue
View file @ 9cc102c3
...@@ -222,7 +222,7 @@ ...@@ -222,7 +222,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="GuestCount" label="人数"></el-table-column> <el-table-column prop="GuestCount" label="人数"></el-table-column>
<el-table-column prop="TicketStatusName" label="状态"> <el-table-column label="机票状态">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="scope.row.OrderId === 0"> <div v-if="scope.row.OrderId === 0">
- -
...@@ -232,6 +232,16 @@ ...@@ -232,6 +232,16 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="出签状态">
<template slot-scope="scope">
<div v-if="scope.row.OrderId === 0">
-
</div>
<div v-else>
{{scope.row.VisaStatus==1?'未出签':(scope.row.VisaStatus==2?'已出签':'无需签证')}}
</div>
</template>
</el-table-column>
<el-table-column label="营业收入" width="960"> <el-table-column label="营业收入" width="960">
<el-table-column prop="TicketMoney" label="单机票款" width="100"> <el-table-column prop="TicketMoney" label="单机票款" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -399,7 +409,7 @@ ...@@ -399,7 +409,7 @@
</div > </div >
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="FinancePayer" label="供应商" width="200" show-overflow-tooltip> <el-table-column label="供应商" min-width="200" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<div> <div>
{{scope.row.FinancePayer}} {{scope.row.FinancePayer}}
......
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