Skip to content

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

no message

parent a4de6d75
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 423 additions and 91 deletions
src/components/customerManage/customerOrder.vue
View file @ a3b8e0bc
......@@ -351,18 +351,18 @@
},
// 获取订单状态枚举
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);
}
});
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(){
......@@ -399,6 +399,43 @@
item.selectedType = ''
item.checkList = []
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);
......
src/components/customerManage/myCustomerOrder.vue
View file @ a3b8e0bc
......@@ -380,6 +380,43 @@
item.selectedType = ''
item.checkList = []
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);
......
src/components/customerManage/orderList.vue
View file @ a3b8e0bc
......@@ -79,7 +79,7 @@
{{item.StartCityName}}
</td>
<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>
</td>
<td style="border:none">
......@@ -95,7 +95,8 @@
{{item.TaxMoney}}
</td>
<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 style="border:none">
<p class="TicketVoucher-box">
......@@ -114,7 +115,7 @@
</td>
<td style="border:none">
<p class="TicketVoucher-box">
<span @click="item.VisaStatus=='1'?AmendVisa(item):''"
<span @click="item.VisaStatus=='1'?AmendVisa(item):''"
class="tatusText"
:class="item.VisaStatus==0?'grey':
(item.VisaStatus==2?'success'+' cp':
......@@ -146,10 +147,11 @@
v-model="item.More" placeholder="更多"
@change="chooseMore(item)">
<el-option
v-for="item in MoreList"
:key="item.Id"
:label="item.Name"
:value="item.Id">
v-for="items in item.MoreList"
v-if="items.show"
:key="items.Id"
:label="items.Name"
:value="items.Id">
</el-option>
</el-select>
</div>
......@@ -179,7 +181,9 @@
<div class="documents-right">
<el-tooltip
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>
<div v-show="item.actuallyReceived" class="agreement-IncomeMoney-pop">
<div class="float-flag-shape"></div>
......@@ -207,7 +211,9 @@
<div class="documents-right">
<el-tooltip
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>
</div>
</div>
......@@ -222,7 +228,9 @@
<div class="documents-right">
<el-tooltip
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>
<div v-show="item.cost" class="agreement-IncomeMoney-pop">
<div class="float-flag-shape"></div>
......@@ -306,19 +314,28 @@ export default {
{
Name: "取消订单",
Id: "1",
show: true,
},
{
Name: "订单转交",
Id: "2",
show: true,
},
{
Name: "修改出票状态",
Id: "4",
show: true,
},
{
Name: '完结',
Id: '6',
show: false
},
{
Name: "操作日志",
Id: "3",
},
show: true,
}
],
clickMore: "",
drawer: false,
......@@ -335,7 +352,7 @@ export default {
this.loading = val;
},
deep: true,
},
}
},
mounted() {
this.userInfo = this.getLocalStorage();
......@@ -426,37 +443,109 @@ export default {
true
);
},
// 清空下拉
emptyMore() {
this.dataList.forEach(item => {
return item.More = ''
})
},
chooseMore(row) {
// 取消订单
if (row.More == "1") {
this.cancelOrder(row);
}
// 订单转换
// 订单转交
if (row.More == "2") {
this.convertOrder(row);
}
// 操作日志
if (row.More == "3") {
this.operationLog(row);
// 编辑订单金额
if (row.More == '3') {
// this.editOrderAmount(row)
}
// 修改出票状态
if (row.More == "4") {
this.modifyStatus(row);
if (row.More == '4') {
this.modifyStatus(row)
}
// 编辑订单金额
// 修改出签状态
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) {
this.MsgBus.$emit(
"convertOrderTicketOrderBoxOpen",
row.GuestId,
row,
true
);
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(
"convertOrderTicketOrderBoxOpen",
row.GuestId,
row,
true
);
}else{
this.$confirm('抱歉,该订单已取消,不能转交', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.emptyMore()
}).catch(() => {
this.emptyMore()
});
}
},
// 验证操作员
ValidateOperator() {
......@@ -464,7 +553,7 @@ export default {
type: "warning",
message: "抱歉,该订单您没有操作权限!",
});
this.$emit("emptyMore");
this.emptyMore()
},
// 制作单据
makeAdocument(row, index, num) {
......@@ -662,9 +751,10 @@ export default {
cancelButtonText: "取消",
type: "warning",
}).then(() => {
}).catch(() => {})
return;
this.emptyMore()
}).catch(() => {
this.emptyMore()
})
} else {
this.MsgBus.$emit("reviseTicketOrderBoxOpen", row.GuestId, row, true);
}
......@@ -703,13 +793,14 @@ export default {
},
(res) => {
if (res.data.resultCode == 1) {
this.emptyMore()
this.$message.success(res.data.message);
}
}
);
})
.catch(() => {
this.$emit("emptyMore");
this.emptyMore()
this.$message({
type: "info",
message: "已取消",
......@@ -723,7 +814,7 @@ export default {
}).then(() => {
}).catch(() => {})
this.$emit("emptyMore");
this.emptyMore()
}
},
// 编辑订单
......@@ -754,7 +845,7 @@ export default {
}).then(() => {
}).catch(() => {})
this.$emit("emptyMore");
this.emptyMore()
}
},
// 编辑订单金额
......@@ -780,7 +871,7 @@ export default {
}).then(() => {
}).catch(() => {})
this.$emit("emptyMore");
this.emptyMore()
}
},
openDetails(item) {
......
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