Skip to content

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

no message

parent a4de6d75
Show whitespace changes
Inline Side-by-side
Showing with 423 additions and 91 deletions
src/components/customerManage/customerOrder.vue
View file @ a3b8e0bc
...@@ -399,6 +399,43 @@ ...@@ -399,6 +399,43 @@
item.selectedType = '' item.selectedType = ''
item.checkList = [] item.checkList = []
item.MultipleChoiceList = [] item.MultipleChoiceList = []
item.MoreList = [
{
Name: "取消订单",
Id: "1",
show: item.OrderStatus!=5?true:false,
},
{
Name: "订单转交",
Id: "2",
show: true,
},
{
Name: "修改订单金额",
Id: "3",
show: item.OrderStatus!=5?true:false,
},
{
Name: "修改出票状态",
Id: "4",
show: item.OrderStatus!=5?true:false,
},
{
Name: "修改出签状态",
Id: "5",
show: item.OrderStatus!=5&&item.VisaStatus==1?true:false,
},
{
Name: '完结',
Id: '6',
show: item.OrderStatus==1?true:false
},
{
Name: "操作日志",
Id: "7",
show: true,
}
]
}); });
}; };
addList(data); addList(data);
......
src/components/customerManage/myCustomerOrder.vue
View file @ a3b8e0bc
...@@ -380,6 +380,43 @@ ...@@ -380,6 +380,43 @@
item.selectedType = '' item.selectedType = ''
item.checkList = [] item.checkList = []
item.MultipleChoiceList = [] item.MultipleChoiceList = []
item.MoreList = [
{
Name: "取消订单",
Id: "1",
show: item.OrderStatus!=5?true:false,
},
{
Name: "订单转交",
Id: "2",
show: true,
},
{
Name: "修改订单金额",
Id: "3",
show: item.OrderStatus!=5?true:false,
},
{
Name: "修改出票状态",
Id: "4",
show: item.OrderStatus!=5?true:false,
},
{
Name: "修改出签状态",
Id: "5",
show: item.OrderStatus!=5&&item.VisaStatus==1?true:false,
},
{
Name: '完结',
Id: '6',
show: item.OrderStatus==1?true:false
},
{
Name: "操作日志",
Id: "7",
show: true,
}
]
}); });
}; };
addList(data); addList(data);
......
src/components/customerManage/orderList.vue
View file @ a3b8e0bc
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
{{item.StartCityName}} {{item.StartCityName}}
</td> </td>
<td style="border:none"> <td style="border:none">
<p @click="editOrderAmount(item)" class="cp" <p @click="item.TicketStatus==1&&item.OrderStatus==1?editOrderAmount(item):''" class="cp"
:class="item.TicketStatus==1&&item.OrderStatus==1?'font-color-link':''">{{item.Money}}</p> :class="item.TicketStatus==1&&item.OrderStatus==1?'font-color-link':''">{{item.Money}}</p>
</td> </td>
<td style="border:none"> <td style="border:none">
...@@ -95,7 +95,8 @@ ...@@ -95,7 +95,8 @@
{{item.TaxMoney}} {{item.TaxMoney}}
</td> </td>
<td style="border:none"> <td style="border:none">
<span :style="{color: item.DueinMoney!=0?'red':''}">{{item.DueinMoney}}</span> <span v-if="item.DueinMoney==0">已完成收款</span>
<span v-else :style="{color: item.DueinMoney==0?'blue':'red'}">{{item.DueinMoney}}</span>
</td> </td>
<td style="border:none"> <td style="border:none">
<p class="TicketVoucher-box"> <p class="TicketVoucher-box">
...@@ -146,10 +147,11 @@ ...@@ -146,10 +147,11 @@
v-model="item.More" placeholder="更多" v-model="item.More" placeholder="更多"
@change="chooseMore(item)"> @change="chooseMore(item)">
<el-option <el-option
v-for="item in MoreList" v-for="items in item.MoreList"
:key="item.Id" v-if="items.show"
:label="item.Name" :key="items.Id"
:value="item.Id"> :label="items.Name"
:value="items.Id">
</el-option> </el-option>
</el-select> </el-select>
</div> </div>
...@@ -179,7 +181,9 @@ ...@@ -179,7 +181,9 @@
<div class="documents-right"> <div class="documents-right">
<el-tooltip <el-tooltip
class="item-but" effect="dark" content="制单" placement="top"> class="item-but" effect="dark" content="制单" placement="top">
<i class="iconfont iconwenbenbianji cp blue" @click="makeAdocument(item,index,1)"></i> <i class="iconfont iconwenbenbianji cp"
:class="item.OrderStatus!=2&&item.OrderStatus!=5?'blue':''"
@click="item.OrderStatus!=2&&item.OrderStatus!=5?makeAdocument(item,index,1):''"></i>
</el-tooltip> </el-tooltip>
<div v-show="item.actuallyReceived" class="agreement-IncomeMoney-pop"> <div v-show="item.actuallyReceived" class="agreement-IncomeMoney-pop">
<div class="float-flag-shape"></div> <div class="float-flag-shape"></div>
...@@ -207,7 +211,9 @@ ...@@ -207,7 +211,9 @@
<div class="documents-right"> <div class="documents-right">
<el-tooltip <el-tooltip
class="item-but" effect="dark" content="制单" placement="top"> class="item-but" effect="dark" content="制单" placement="top">
<i class="iconfont iconwenbenbianji cp blue" @click="makeAdocument(item,index,2)"></i> <i class="iconfont iconwenbenbianji cp"
:class="item.OrderStatus!=2&&item.OrderStatus!=5?'blue':''"
@click="item.OrderStatus!=2&&item.OrderStatus!=5?makeAdocument(item,index,2):''"></i>
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
...@@ -222,7 +228,9 @@ ...@@ -222,7 +228,9 @@
<div class="documents-right"> <div class="documents-right">
<el-tooltip <el-tooltip
class="item-but" effect="dark" content="制单" placement="top"> class="item-but" effect="dark" content="制单" placement="top">
<i class="iconfont iconwenbenbianji cp blue" @click="makeAdocument(item,index,3)"></i> <i class="iconfont iconwenbenbianji cp"
:class="item.OrderStatus!=2&&item.OrderStatus!=5?'blue':''"
@click="item.OrderStatus!=2&&item.OrderStatus!=5?makeAdocument(item,index,3):''"></i>
</el-tooltip> </el-tooltip>
<div v-show="item.cost" class="agreement-IncomeMoney-pop"> <div v-show="item.cost" class="agreement-IncomeMoney-pop">
<div class="float-flag-shape"></div> <div class="float-flag-shape"></div>
...@@ -306,19 +314,28 @@ export default { ...@@ -306,19 +314,28 @@ export default {
{ {
Name: "取消订单", Name: "取消订单",
Id: "1", Id: "1",
show: true,
}, },
{ {
Name: "订单转交", Name: "订单转交",
Id: "2", Id: "2",
show: true,
}, },
{ {
Name: "修改出票状态", Name: "修改出票状态",
Id: "4", Id: "4",
show: true,
},
{
Name: '完结',
Id: '6',
show: false
}, },
{ {
Name: "操作日志", Name: "操作日志",
Id: "3", Id: "3",
}, show: true,
}
], ],
clickMore: "", clickMore: "",
drawer: false, drawer: false,
...@@ -335,7 +352,7 @@ export default { ...@@ -335,7 +352,7 @@ export default {
this.loading = val; this.loading = val;
}, },
deep: true, deep: true,
}, }
}, },
mounted() { mounted() {
this.userInfo = this.getLocalStorage(); this.userInfo = this.getLocalStorage();
...@@ -426,37 +443,109 @@ export default { ...@@ -426,37 +443,109 @@ export default {
true true
); );
}, },
// 清空下拉
emptyMore() {
this.dataList.forEach(item => {
return item.More = ''
})
},
chooseMore(row) { chooseMore(row) {
// 取消订单 // 取消订单
if (row.More == "1") { if (row.More == "1") {
this.cancelOrder(row); this.cancelOrder(row);
} }
// 订单转换 // 订单转交
if (row.More == "2") { if (row.More == "2") {
this.convertOrder(row); this.convertOrder(row);
} }
// 操作日志 // 编辑订单金额
if (row.More == "3") { if (row.More == '3') {
this.operationLog(row); // this.editOrderAmount(row)
} }
// 修改出票状态 // 修改出票状态
if (row.More == "4") { if (row.More == '4') {
this.modifyStatus(row); this.modifyStatus(row)
} }
// 编辑订单金额 // 修改出签状态
if (row.More == "5") { if (row.More == "5") {
this.editOrderAmount(row); this.AmendVisa(row)
}
// 完结
if (row.More == "6") {
this.orderCompleted(row)
}
// 操作日志
if (row.More == "7") {
this.operationLog(row);
}
},
// 订单完结
orderCompleted(row){
if (this.superManage) {
this.orderCompletedfun(row)
}else{
if (this.userInfo.EmName != row.EnterName) {
this.ValidateOperator();
} else {
this.orderCompletedfun(row)
}
}
},
orderCompletedfun(row){
let tips = '一旦确认订单完结，你将无法对订单执行任何操作，包括订单相关的财务单据。'
this.$confirm(tips, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.apipost('/api/Order/SetOrderFinish', {
OrderId: row.OrderId,
}, res => {
if (res.data.resultCode == 1) {
this.$message.success(res.data.message);
this.getList()
} }
})
}).catch(() => {
this.emptyMore()
this.$message({
type: 'info',
message: '已取消'
});
});
}, },
// 转换订单 // 转换订单
convertOrder(row) { convertOrder(row) {
if (this.superManage) {
this.convertOrderfun(row)
}else{
if (this.userInfo.EmName != row.EnterName) {
this.ValidateOperator();
} else {
this.convertOrderfun(row)
}
}
},
convertOrderfun(row){
if (row.OrderStatus != '2') {
this.MsgBus.$emit( this.MsgBus.$emit(
"convertOrderTicketOrderBoxOpen", "convertOrderTicketOrderBoxOpen",
row.GuestId, row.GuestId,
row, row,
true true
); );
}else{
this.$confirm('抱歉,该订单已取消,不能转交', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.emptyMore()
}).catch(() => {
this.emptyMore()
});
}
}, },
// 验证操作员 // 验证操作员
ValidateOperator() { ValidateOperator() {
...@@ -464,7 +553,7 @@ export default { ...@@ -464,7 +553,7 @@ export default {
type: "warning", type: "warning",
message: "抱歉,该订单您没有操作权限!", message: "抱歉,该订单您没有操作权限!",
}); });
this.$emit("emptyMore"); this.emptyMore()
}, },
// 制作单据 // 制作单据
makeAdocument(row, index, num) { makeAdocument(row, index, num) {
...@@ -662,9 +751,10 @@ export default { ...@@ -662,9 +751,10 @@ export default {
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning", type: "warning",
}).then(() => { }).then(() => {
this.emptyMore()
}).catch(() => {}) }).catch(() => {
return; this.emptyMore()
})
} else { } else {
this.MsgBus.$emit("reviseTicketOrderBoxOpen", row.GuestId, row, true); this.MsgBus.$emit("reviseTicketOrderBoxOpen", row.GuestId, row, true);
} }
...@@ -703,13 +793,14 @@ export default { ...@@ -703,13 +793,14 @@ export default {
}, },
(res) => { (res) => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.emptyMore()
this.$message.success(res.data.message); this.$message.success(res.data.message);
} }
} }
); );
}) })
.catch(() => { .catch(() => {
this.$emit("emptyMore"); this.emptyMore()
this.$message({ this.$message({
type: "info", type: "info",
message: "已取消", message: "已取消",
...@@ -723,7 +814,7 @@ export default { ...@@ -723,7 +814,7 @@ export default {
}).then(() => { }).then(() => {
}).catch(() => {}) }).catch(() => {})
this.$emit("emptyMore"); this.emptyMore()
} }
}, },
// 编辑订单 // 编辑订单
...@@ -754,7 +845,7 @@ export default { ...@@ -754,7 +845,7 @@ export default {
}).then(() => { }).then(() => {
}).catch(() => {}) }).catch(() => {})
this.$emit("emptyMore"); this.emptyMore()
} }
}, },
// 编辑订单金额 // 编辑订单金额
...@@ -780,7 +871,7 @@ export default { ...@@ -780,7 +871,7 @@ export default {
}).then(() => { }).then(() => {
}).catch(() => {}) }).catch(() => {})
this.$emit("emptyMore"); this.emptyMore()
} }
}, },
openDetails(item) { openDetails(item) {
......
src/components/guestManagement/Agreement.vue
View file @ a3b8e0bc
...@@ -180,14 +180,14 @@ ...@@ -180,14 +180,14 @@
<template> <template>
<div class="Agreement-Business"> <div class="Agreement-Business">
<div class="add-Enclosure"> <div class="add-Enclosure">
<el-row :gutter="16"> <el-row :gutter="22">
<el-col :span="8"> <el-col :span="5">
<el-input size="mini" placeholder="输入订单ID" v-model="msg.OrderId" label="订单ID" <el-input size="mini" placeholder="输入订单ID" v-model="msg.OrderId" label="订单ID"
@keyup.enter.native="getList"></el-input> @keyup.enter.native="getList"></el-input>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="5">
<div style="display: flex;flex-direction: row;align-items: center;"> <div style="display: flex;flex-direction: row;align-items: center;">
<span class="font-size-12" style="padding-right: 10px;flex-shrink: 0;">状态：</span> <span class="font-size-12" style="padding-right: 10px;flex-shrink: 0;">出票状态：</span>
<el-select size="mini" width="200" v-model="msg.TicketStatus" placeholder="请选择" <el-select size="mini" width="200" v-model="msg.TicketStatus" placeholder="请选择"
@change="getList"> @change="getList">
<el-option <el-option
...@@ -196,13 +196,27 @@ ...@@ -196,13 +196,27 @@
</el-select> </el-select>
</div> </div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="5">
<div style="display: flex;flex-direction: row;align-items: center;">
<span class="font-size-12" style="padding-right: 10px;flex-shrink: 0;">出签状态：</span>
<el-select size="mini" width="200" v-model="msg.VisaStatus" placeholder="请选择"
@change="getList">
<el-option
v-for="item in VisaList"
:key="item.Id" :label="item.Name" :value="item.Id"></el-option>
</el-select>
</div>
</el-col>
<el-col :span="5">
<div style="display: flex;flex-direction: row;align-items: center;">
<span class="font-size-12" style="padding-right: 10px;flex-shrink: 0;">订单状态：</span>
<el-select size="mini" width="200" v-model="msg.OrderStatus" placeholder="请选择" <el-select size="mini" width="200" v-model="msg.OrderStatus" placeholder="请选择"
@change="getList"> @change="getList">
<el-option <el-option
v-for="item in orderStatusList" v-for="item in OrderStatusList"
:key="item.Id" :label="item.Name" :value="item.Id"></el-option> :key="item.Id" :label="item.Name" :value="item.Id"></el-option>
</el-select> </el-select>
</div>
</el-col> </el-col>
</el-row> </el-row>
<el-button plain icon="el-icon-plus" type="primary" size="mini" class="margin-right0" @click="addBusiness">创建订单</el-button> <el-button plain icon="el-icon-plus" type="primary" size="mini" class="margin-right0" @click="addBusiness">创建订单</el-button>
...@@ -244,7 +258,7 @@ ...@@ -244,7 +258,7 @@
</el-table-column> </el-table-column>
<el-table-column label="应收" show-overflow-tooltip> <el-table-column label="应收" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<p @click="editOrderAmount(scope.row)" class="cp" <p @click="scope.row.TicketStatus==1&&scope.row.OrderStatus==1?editOrderAmount(scope.row):''" class="cp"
:class="scope.row.TicketStatus==1&&scope.row.OrderStatus==1?'font-color-link':''">{{scope.row.Money}}</p> :class="scope.row.TicketStatus==1&&scope.row.OrderStatus==1?'font-color-link':''">{{scope.row.Money}}</p>
</template> </template>
</el-table-column> </el-table-column>
...@@ -309,7 +323,8 @@ ...@@ -309,7 +323,8 @@
</el-table-column> </el-table-column>
<el-table-column label="待收" show-overflow-tooltip> <el-table-column label="待收" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<p class="ToBeReceived" :class="scope.row.DueinMoney==0?'blue':'red'"> <span v-if="scope.row.DueinMoney==0">已完成收款</span>
<p v-else class="ToBeReceived" :class="scope.row.DueinMoney==0?'blue':'red'">
{{scope.row.DueinMoney}} {{scope.row.DueinMoney}}
</p> </p>
</template> </template>
...@@ -329,6 +344,19 @@ ...@@ -329,6 +344,19 @@
scope.row.CancelVoucherList!=[]&& scope.row.CancelVoucherList!=[]&&
scope.row.TicketStatusName!='无需机票'" class="iconfont iconpingzhengchaxun Credentials" @click="viewCredentials(scope.row)"></i> scope.row.TicketStatusName!='无需机票'" class="iconfont iconpingzhengchaxun Credentials" @click="viewCredentials(scope.row)"></i>
</template> </template>
</el-table-column>
<el-table-column label="出签状态" :width="90">
<template slot-scope="scope">
<span @click="scope.row.VisaStatus=='1'?AmendVisa(scope.row):''"
class="tatusText"
:class="scope.row.VisaStatus==0?'grey':
(scope.row.VisaStatus==2?'success'+' cp':
(scope.row.VisaStatus==1?'Black':''))">
{{scope.row.VisaStatus==1?'未出签':(scope.row.VisaStatus==2?'已出签':'无需签证')}}
</span>
<i v-if="scope.row.VisaStatus==2" class="cp iconfont iconpingzhengchaxun Credentials"
@click="CheckOutDetails(scope.row)"></i>
</template>
</el-table-column> </el-table-column>
<el-table-column label="订单状态" show-overflow-tooltip> <el-table-column label="订单状态" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -382,10 +410,11 @@ ...@@ -382,10 +410,11 @@
v-model="scope.row.More" placeholder="更多" v-model="scope.row.More" placeholder="更多"
@change="chooseMore(scope.row)"> @change="chooseMore(scope.row)">
<el-option <el-option
v-for="item in MoreList" v-for="items in scope.row.MoreList"
:key="item.Id" v-show="items.show"
:label="item.Name" :key="items.Id"
:value="item.Id"> :label="items.Name"
:value="items.Id">
</el-option> </el-option>
</el-select> </el-select>
</div> </div>
...@@ -416,6 +445,11 @@ ...@@ -416,6 +445,11 @@
props: ["ID", "BusinessType"], props: ["ID", "BusinessType"],
data() { data() {
return { return {
VisaList:[
{ Name: "不限", Id: "0" },
{ Name: "未出签", Id: "1" },
{ Name: "已出签", Id: "2" },
],
MultipleChoiceList: [ //多选项目 MultipleChoiceList: [ //多选项目
{ {
Name: '机票', Name: '机票',
...@@ -441,17 +475,18 @@ ...@@ -441,17 +475,18 @@
}, { }, {
Name: '订单转交', Name: '订单转交',
Id: '2' Id: '2'
},
{
Name: "修改出票状态",
Id: "4",
},{
Name: '完结',
Id: '5'
}, { }, {
Name: '操作日志', Name: '操作日志',
Id: '3' Id: '3'
}, ], }, ],
orderStatusList: [{ OrderStatusList: [], //订单状态
Name: '正常',
Id: '1'
}, {
Name: '取消',
Id: '2'
}], //订单状态
ticketingStatusList: [], // 出票状态 ticketingStatusList: [], // 出票状态
dataList: [], dataList: [],
loading: false, loading: false,
...@@ -461,7 +496,8 @@ ...@@ -461,7 +496,8 @@
OrderId: "", OrderId: "",
GuestId: "", GuestId: "",
TicketStatus: '0', TicketStatus: '0',
OrderStatus: "1", VisaStatus:"0",//出签状态
OrderStatus: "0",
StartCityName: "", StartCityName: "",
EndCityName: "", EndCityName: "",
EnterID: "", EnterID: "",
...@@ -484,6 +520,7 @@ ...@@ -484,6 +520,7 @@
this.userInfo = this.getLocalStorage(); this.userInfo = this.getLocalStorage();
this.getList(); this.getList();
this.GetTicketStatusEnumList() this.GetTicketStatusEnumList()
this.GetOrderStatusEnumList() //订单状态枚举
let $this = this let $this = this
$this.MsgBus.$on("closeGetList", function() { $this.MsgBus.$on("closeGetList", function() {
$this.getList() $this.getList()
...@@ -543,33 +580,92 @@ ...@@ -543,33 +580,92 @@
}, },
chooseMore(row) { chooseMore(row) {
// 取消订单 // 取消订单
if (row.More == '1') { if (row.More == "1") {
this.cancelOrder(row) this.cancelOrder(row);
} }
// 订单转换 // 订单转交
if (row.More == '2') { if (row.More == "2") {
this.convertOrder(row) this.convertOrder(row);
} }
// 操作日志 // 编辑订单金额
if (row.More == '3') { if (row.More == '3') {
this.operationLog(row) // this.editOrderAmount(row)
} }
// 修改出票状态 // 修改出票状态
if (row.More == '4') { if (row.More == '4') {
this.modifyStatus(row) this.modifyStatus(row)
} }
// 编辑订单金额 // 修改出签状态
if (row.More == '5') { if (row.More == "5") {
this.editOrderAmount(row) this.AmendVisa(row)
}
// 完结
if (row.More == "6") {
this.orderCompleted(row)
}
// 操作日志
if (row.More == "7") {
this.operationLog(row);
} }
}, },
// 订单完结
orderCompleted(row){
if (this.userInfo.EmName != row.EnterName) {
this.ValidateOperator();
} else {
this.orderCompletedfun(row)
}
},
orderCompletedfun(row){
let tips = '一旦确认订单完结，你将无法对订单执行任何操作，包括订单相关的财务单据。'
this.$confirm(tips, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.apipost('/api/Order/SetOrderFinish', {
OrderId: row.OrderId,
}, res => {
if (res.data.resultCode == 1) {
this.$message.success(res.data.message);
this.getList()
}
})
}).catch(() => {
this.emptyMore()
this.$message({
type: 'info',
message: '已取消'
});
});
},
// 转换订单 // 转换订单
convertOrder(row) { convertOrder(row) {
if (this.userInfo.EmName != row.EnterName) {
this.ValidateOperator();
}else{
this.convertOrderfun(row)
}
},
convertOrderfun(row){
if (row.OrderStatus != '2') { if (row.OrderStatus != '2') {
let $this = this; this.MsgBus.$emit(
this.MsgBus.$emit("convertOrderTicketOrderBoxOpen", $this.ID, row, true); "convertOrderTicketOrderBoxOpen",
row.GuestId,
row,
true
);
}else{
this.$confirm('抱歉,该订单已取消,不能转交', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.emptyMore()
}).catch(() => {
this.emptyMore()
});
} }
}, },
// 验证操作员 // 验证操作员
ValidateOperator() { ValidateOperator() {
...@@ -730,6 +826,27 @@ ...@@ -730,6 +826,27 @@
let $this = this; let $this = this;
this.MsgBus.$emit("logTicketOrderBoxOpen", $this.ID, row, true); this.MsgBus.$emit("logTicketOrderBoxOpen", $this.ID, row, true);
}, },
// 修改签证状态
AmendVisa(row){
if (this.userInfo.EmName != row.EnterName) {
this.ValidateOperator()
} else {
this.AmendVisafun(row);
}
},
AmendVisafun(row){
this.MsgBus.$emit("AmendVisaOrderBoxOpen", row.GuestId, row, true);
},
// 出签凭证详情
CheckOutDetails(row){
let $this = this;
this.MsgBus.$emit(
"CheckOutDetailsOrderBoxOpen",
$this.ID,
row,
true
);
},
// 修改出票状态 // 修改出票状态
modifyStatus(row) { modifyStatus(row) {
if (this.userInfo.EmName != row.EnterName) { if (this.userInfo.EmName != row.EnterName) {
...@@ -748,8 +865,6 @@ ...@@ -748,8 +865,6 @@
} }
} }
} }
}, },
// 取消订单 // 取消订单
cancelOrder(row) { cancelOrder(row) {
...@@ -827,6 +942,21 @@ ...@@ -827,6 +942,21 @@
href = url + 'automaticLogin?token=' + this.getLocalStorage().token + '&data=' + JSON.stringify(data) href = url + 'automaticLogin?token=' + this.getLocalStorage().token + '&data=' + JSON.stringify(data)
window.open(href); window.open(href);
}, },
// 获取订单状态枚举
GetOrderStatusEnumList() {
this.apipost("/api/Order/GetOrderStatusEnumList", {}, (res) => {
if (res.data.resultCode == 1) {
this.OrderStatusList = res.data.data;
let data = {
Name: "不限",
Id: "0",
};
this.OrderStatusList.unshift(data);
} else {
this.$message.error(res.data.message);
}
});
},
// 获取出票状态枚举 // 获取出票状态枚举
GetTicketStatusEnumList() { GetTicketStatusEnumList() {
let $this = this let $this = this
...@@ -864,6 +994,43 @@ ...@@ -864,6 +994,43 @@
item.selectedType = '' item.selectedType = ''
item.checkList = [] item.checkList = []
item.MultipleChoiceList = [] item.MultipleChoiceList = []
item.MoreList = [
{
Name: "取消订单",
Id: "1",
show: item.OrderStatus!=5?true:false,
},
{
Name: "订单转交",
Id: "2",
show: true,
},
{
Name: "修改订单金额",
Id: "3",
show: item.OrderStatus!=5?true:false,
},
{
Name: "修改出票状态",
Id: "4",
show: item.OrderStatus!=5?true:false,
},
{
Name: "修改出签状态",
Id: "5",
show: item.OrderStatus!=5&&item.VisaStatus==1?true:false,
},
{
Name: '完结',
Id: '6',
show: item.OrderStatus==1?true:false
},
{
Name: "操作日志",
Id: "7",
show: true,
}
]
}); });
}; };
addList(data); addList(data);
......
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