Skip to content

C
CRM
Commit 1a024d62 authored by 罗超's avatar 罗超
Browse files
Options

no message

parent cfba1324
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1300 additions and 23 deletions
src/components/customerManage/customerOrder.vue 0 → 100644
View file @ 1a024d62
This diff is collapsed.
src/components/customerManage/orderList.vue 0 → 100644
View file @ 1a024d62
This diff is collapsed.
src/components/guestManagement/Agreement.vue
View file @ 1a024d62
......@@ -41,6 +41,13 @@
.income_2{
color: #3FC4FF;
}
.enedit-box{
display: flex;
align-items: center;
}
.select-right{
margin-left: 5px;
}
</style>
<template>
<div class="Business">
......@@ -213,10 +220,10 @@
<el-table-column
fixed="right"
label="操作"
width="100">
width="200">
<template slot-scope="scope">
<div class="item-but-box">
<el-tooltip
<!-- <el-tooltip
class="item-but" effect="dark" content="编辑订单" placement="top">
<i class="iconfont iconwenbenbianji cp" @click="editOrder(scope.row)"></i>
</el-tooltip>
......@@ -228,17 +235,28 @@
<el-tooltip
class="item-but" effect="dark" content="操作日志" placement="top">
<i class="iconfont iconcopy cp" @click="operationLog(scope.row)"></i>
</el-tooltip>
<!-- <el-tooltip effect="dark" placement="top-start" disabled style="float:left">
<el-popover width='100' trigger="hover">
<div class="groupTourOrder_more">
<div @click="operationLog(scope.row)">
操作日志
</div>
</div>
<span slot="reference">更多</span>
</el-popover>
</el-tooltip> -->
<div class="enedit-box">
<el-tooltip
class="item-but" effect="dark" content="编辑订单" placement="top">
<i class="iconfont iconwenbenbianji cp" @click="editOrder(scope.row)"></i>
</el-tooltip>
<div>
<el-select style="width:130px" class="select-right"
clearable
size="mini"
v-model="scope.row.More" placeholder="更多"
@change="chooseMore(scope.row)">
<el-option
v-for="item in MoreList"
:key="item.Id"
:label="item.Name"
:value="item.Id">
</el-option>
</el-select>
</div>
</div>
</div>
</template>
......@@ -258,6 +276,13 @@ export default {
props: ["ID", "BusinessType"],
data() {
return {
MoreList:[
{Name:'编辑订单金额',Id:'5'},
{Name:'取消订单',Id:'1'},
{Name:'订单转交',Id:'2'},
{Name:'修改出票状态',Id:'4'},
{Name:'操作日志',Id:'3'},
],
orderStatusList:[
{Name:'正常',Id:'1'},
{Name:'取消',Id:'2'}
......@@ -298,6 +323,38 @@ export default {
});
},
methods: {
// 清空下拉
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=='4'){
this.modifyStatus(row)
}
// 编辑订单金额
if(row.More=='5'){
this.editOrderAmount(row)
}
},
// 转换订单
convertOrder(row){
this.MsgBus.$emit("convertOrderTicketOrderBoxOpen", $this.ID, row, true);
},
// 验证操作员
ValidateOperator(){
let tips = '您没有操作权限'
......@@ -306,9 +363,9 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.emptyMore()
}).catch(() => {
this.emptyMore()
});
},
// 制作单据
......@@ -356,9 +413,9 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.emptyMore()
}).catch(() => {
this.emptyMore()
});
}else{
if(row.TicketStatus==3){
......@@ -395,6 +452,7 @@ export default {
}
})
}).catch(() => {
this.emptyMore()
this.$message({
type: 'info',
message: '已取消'
......@@ -430,9 +488,9 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.emptyMore()
}).catch(() => {
this.emptyMore()
});
}
}
......@@ -464,9 +522,9 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.emptyMore()
}).catch(() => {
this.emptyMore()
});
}
}
......@@ -506,6 +564,13 @@ export default {
this.msg,
(res) => {
if (res.data.resultCode == 1) {
let data = res.data.data.pageData;;
let addList = function(arr) {
arr.forEach(item => {
item.More = ''
});
};
addList(data);
this.dataList = res.data.data.pageData;
this.total = res.data.data.count;
this.loading = false
......
src/components/guestManagement/ticketOrder.vue
View file @ 1a024d62
......@@ -181,7 +181,11 @@
}
</style>
<template>
<el-dialog :visible.sync="dialogTableVisible" @closed="closedDialog" :close-on-click-modal="false" class="add-box add-box1 customerDialogBox">
<el-dialog :visible.sync="dialogTableVisible"
@closed="closedDialog"
:close-on-click-modal="false"
class="add-box add-box1 customerDialogBox"
:width="width">
<div class="add-tit" slot="title">
<p><span></span>{{name}}</p>
<span icon="el-icon-close"></span>
......@@ -212,7 +216,6 @@
</el-form-item>
</div>
</el-col>
</el-row>
<el-row :gutter="30" v-if="name=='新建机票订单'||name=='编辑订单金额'||name=='编辑机票订单'">
<el-col :span="8">
......@@ -287,6 +290,15 @@
</el-col>
</el-row>
<el-row v-if="name=='订单转交'">
<el-col>
<div class="MyEditForm-item">
<el-form-item label="转交id" prop="EnterId">
<el-input placeholder="请输入转交人id" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" v-model="form.EnterId"></el-input>
</el-form-item>
</div>
</el-col>
</el-row>
</el-form>
<div v-if="name=='操作日志'">
<div v-for="(item,index) in logData" :key="index">
......@@ -352,6 +364,7 @@ export default {
},
data() {
return {
width:"",
logData:[],
total:0,
msg:{
......@@ -379,7 +392,8 @@ export default {
Money: null,
Remark: "",
Type: "",
Voucher: []
Voucher: [],
EnterId: ""
},
BusinessStatusEnum: [],
rules: {
......@@ -400,6 +414,7 @@ export default {
{ required: true, message: "选择出票状态", trigger: "change" },
],
Voucher: [{ required: true, message: "上传凭据", trigger: "blur" }],
EnterId: [{ required: true, message: "请输入转交人id", trigger: "blur" }],
},
show: true,
};
......@@ -442,13 +457,21 @@ export default {
Money: this.obj.Money,
Remark: this.obj.Remark,
}
}
if(this.obj.TicketStatus==1){
this.text = '出票'
}
if(this.name=='操作日志'){
this.width="600px"
this.getList()
}
if(this.name=='订单转交'){
this.width="400px"
}
if(this.name=='编辑订单金额'){
this.width="600px"
}
let $this = this;
setTimeout(() => {
$this.dialogTableVisible = true;
......@@ -588,6 +611,26 @@ export default {
}
});
},
ConvertData(){
if(this.obj.OrderId){
this.form.OrderId = this.obj.OrderId
}
let data = {
OrderId: this.form.OrderId,
EnterId : this.form.EnterId,
}
this.apipost("/api/Order/SetGuestOrderCareOf", data, (res) => {
if (res.data.resultCode == 1) {
this.dialogTableVisible = false;
this.$message.success("操作成功");
this.MsgBus.$emit("closeTicketOrderDialogBox");
this.MsgBus.$emit("closeGetList");
this.resetForm("form");
} else {
this.$message.error(res.data.message);
}
});
},
submitForm(addMsg) {
//提交创建、修改表单
if(this.name=='新建机票订单'||this.name=='编辑机票订单'){
......@@ -619,6 +662,15 @@ export default {
this.dialogTableVisible = false;
this.MsgBus.$emit("closeTicketOrderDialogBox");
}
if(this.name=='订单转交'){
this.$refs[addMsg].validate((valid) => {
if (valid) {
this.ConvertData();
} else {
return false;
}
});
}
},
resetForm(formName) {
......@@ -633,6 +685,7 @@ export default {
EndCityName: "",
Money: null,
Remark: "",
EnterId: ""
};
this.$refs[formName].resetFields();
},
......
src/router.js
View file @ 1a024d62
......@@ -16,6 +16,7 @@ import guestManagement from "./components/guestManagement/guestManagement"
import customerApr from "./components/approval/customerApr"
import customerMap from "./components/customerManage/customerMap"
import customerConfiguration from "./components/customerManage/customerConfiguration"
import customerOrder from "./components/customerManage/customerOrder"
Vue.use(Router);
export default new Router({
......@@ -426,6 +427,14 @@ export default new Router({
meta: {
title: "客户配置"
}
},
{
path: "/customerOrder",
name: "customerOrder",
component: customerOrder,
meta: {
title: "客户订单"
}
}
]
},
......
src/views/index.vue
View file @ 1a024d62
......@@ -339,6 +339,12 @@
$this.obj = obj;
$this.dialogTicketOrderVisible = true;
});
this.MsgBus.$on("convertOrderTicketOrderBoxOpen", function (GuestId, obj) {
$this.dialogTicketOrderVisibleName = "订单转交";
$this.GuestId = GuestId;
$this.obj = obj;
$this.dialogTicketOrderVisible = true;
});
this.MsgBus.$on("closeTicketOrderDialogBox", function () {
$this.dialogTicketOrderVisible = false;
this.$emit("getList");
......
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