Skip to content

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

no message

parent 412d6e51
Hide whitespace changes
Inline Side-by-side
Showing with 176 additions and 233 deletions
src/components/guestManagement/Agreement.vue
View file @ dc9c857a
...@@ -15,132 +15,138 @@ ...@@ -15,132 +15,138 @@
<el-input size="mini" placeholder="输入订单ID" v-model="msg.OrderId" label="订单ID" @blur="getList"></el-input> <el-input size="mini" placeholder="输入订单ID" v-model="msg.OrderId" label="订单ID" @blur="getList"></el-input>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-select size="mini" width="200" v-model="msg.TicketStatus" placeholder="请选择" @change="getList"> <el-select size="mini" width="200" v-model="msg.TicketStatus" placeholder="请选择"
<el-option v-for="(item,index) in ticketingStatusList" @change="getList">
:key="index" :label="item.Name" :value="item.id"></el-option> <el-option
v-for="item in ticketingStatusList"
:key="item.id" :label="item.Name" :value="item.Id"></el-option>
</el-select> </el-select>
</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>
</div> </div>
<div class="page-content"> <div class="page-content">
<el-table <el-table
v-loading="loading" v-loading="loading"
stripe stripe
ref="multipleTable" ref="multipleTable"
:data="dataList" :data="dataList"
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100%" style="width: 100%"
row-class-name="font-size-12"> row-class-name="font-size-12">
<el-table-column <el-table-column
prop="CreateByName" prop="CreateByName"
label="下单人" label="下单人"
show-overflow-tooltip> show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="订单号" label="订单号"
show-overflow-tooltip> show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<p @click="openDetails(scope)" class="font-color-link cp">{{scope.row.OrderId}}</p> {{scope.row.OrderId}}
</template> <!-- <p @click="openDetails(scope)" class="font-color-link cp">{{scope.row.OrderId}}</p> -->
</el-table-column> </template>
<el-table-column </el-table-column>
label="订单状态" <el-table-column
show-overflow-tooltip> label="订单状态"
<template slot-scope="scope"> show-overflow-tooltip>
{{scope.row.OrderStatus==1?"正常":"取消"}} <template slot-scope="scope">
</template> {{scope.row.OrderStatus==1?"正常":"取消"}}
</el-table-column> </template>
<el-table-column </el-table-column>
label="地址" <el-table-column
show-overflow-tooltip> label="起始地址"
<template slot-scope="scope"> show-overflow-tooltip>
{{scope.row.StartCityName}}=>{{scope.row.EndCityName}} <template slot-scope="scope">
</template> {{scope.row.StartCityName}} —— {{scope.row.EndCityName}}
</el-table-column> </template>
<el-table-column </el-table-column>
prop="GuestCount" <el-table-column
label="客人数" prop="GuestCount"
show-overflow-tooltip> label="客人数"
</el-table-column> show-overflow-tooltip>
<el-table-column </el-table-column>
prop="Money" <el-table-column
label="订单金额" label="订单金额"
show-overflow-tooltip> show-overflow-tooltip>
</el-table-column> <template slot-scope="scope">
<el-table-column <!-- Edit order amount -->
prop="IncomeMoney" <p @click="editOrderAmount(scope)" class="font-color-link cp">{{scope.row.Money}}</p>
label="实收" </template>
show-overflow-tooltip> </el-table-column>
</el-table-column> <el-table-column
<el-table-column prop="IncomeMoney"
prop="PayMoney" label="实收"
label="付款" show-overflow-tooltip>
show-overflow-tooltip> </el-table-column>
</el-table-column> <el-table-column
<el-table-column prop="PayMoney"
prop="BackMoney" label="付款"
label="退款" show-overflow-tooltip>
show-overflow-tooltip> </el-table-column>
</el-table-column> <el-table-column
<el-table-column prop="BackMoney"
prop="TaxMoney" label="退款"
label="手续费" show-overflow-tooltip>
show-overflow-tooltip> </el-table-column>
</el-table-column> <el-table-column
<el-table-column prop="TaxMoney"
prop="" label="手续费"
label="待收" show-overflow-tooltip>
show-overflow-tooltip> </el-table-column>
</el-table-column> <el-table-column
<el-table-column prop=""
prop="" label="待收"
label="成本" show-overflow-tooltip>
show-overflow-tooltip> </el-table-column>
</el-table-column> <el-table-column
<el-table-column prop=""
prop="PayFinance" label="成本"
label="付款单据" show-overflow-tooltip>
show-overflow-tooltip> </el-table-column>
</el-table-column> <el-table-column
<el-table-column prop="PayFinance"
prop="IncomeFinance" label="付款单据"
label="收入单据" show-overflow-tooltip>
show-overflow-tooltip> </el-table-column>
</el-table-column> <el-table-column
<el-table-column prop="IncomeFinance"
prop="BackFinance" label="收入单据"
label="退款单据" show-overflow-tooltip>
show-overflow-tooltip> </el-table-column>
</el-table-column> <el-table-column
<el-table-column prop="BackFinance"
prop="TicketStatusName" label="退款单据"
label="出票状态" show-overflow-tooltip>
show-overflow-tooltip> </el-table-column>
</el-table-column> <el-table-column
<el-table-column prop="TicketStatusName"
prop="Remark" label="出票状态"
label="客户需求" show-overflow-tooltip>
show-overflow-tooltip> </el-table-column>
</el-table-column> <el-table-column
<el-table-column prop="Remark"
prop="EnterName" label="客户需求"
label="业务员" show-overflow-tooltip>
show-overflow-tooltip> </el-table-column>
</el-table-column> <el-table-column
<el-table-column prop="EnterName"
prop="CreateTime" label="业务员"
label="下单时间" show-overflow-tooltip>
show-overflow-tooltip> </el-table-column>
</el-table-column> <el-table-column
<el-table-column prop="CreateTime"
label="操作" label="下单时间"
show-overflow-tooltip> show-overflow-tooltip>
</el-table-column> </el-table-column>
</el-table> <el-table-column
label="操作"
show-overflow-tooltip>
</el-table-column>
</el-table>
</div> </div>
<div v-if="dataList.length"> <div v-if="total>0">
<el-pagination class="Mypagination" background @current-change="handleCurrentChange" <el-pagination class="Mypagination" background @current-change="handleCurrentChange"
:page-sizes="[30, 60, 90, 100]" :page-size="msg.pageSize" layout="sizes, prev, pager, next" :page-sizes="[30, 60, 90, 100]" :page-size="msg.pageSize" layout="sizes, prev, pager, next"
@size-change="handleSizeChange" :total="total"> @size-change="handleSizeChange" :total="total">
...@@ -161,7 +167,7 @@ export default { ...@@ -161,7 +167,7 @@ export default {
pageSize: 10, pageSize: 10,
OrderId:"", OrderId:"",
GuestId:"", GuestId:"",
TicketStatus: 0, TicketStatus: '0',
OrderStatus:"", OrderStatus:"",
StartCityName: "", StartCityName: "",
EndCityName: "", EndCityName: "",
...@@ -184,6 +190,12 @@ export default { ...@@ -184,6 +190,12 @@ export default {
this.GetTicketStatusEnumList() this.GetTicketStatusEnumList()
}, },
methods: { methods: {
// 编辑订单金额
editOrderAmount(scope){
console.log(scope.row, '111111')
let $this = this;
this.MsgBus.$emit("editTicketOrderBoxOpen", $this.ID, scope.row, true);
},
openDetails(scope) { openDetails(scope) {
console.log(scope.row.ID); console.log(scope.row.ID);
this.MsgBus.$emit("busnessDrawerShow", scope.row.ID, 1); this.MsgBus.$emit("busnessDrawerShow", scope.row.ID, 1);
...@@ -192,7 +204,6 @@ export default { ...@@ -192,7 +204,6 @@ export default {
GetTicketStatusEnumList(){ GetTicketStatusEnumList(){
let $this = this let $this = this
this.msg.GuestId = $this.ID this.msg.GuestId = $this.ID
console.log(this.msg.GuestId, 'this.msg.GuestId')
this.apipost( this.apipost(
"/api/Order/GetTicketStatusEnumList", "/api/Order/GetTicketStatusEnumList",
{}, {},
...@@ -201,7 +212,7 @@ export default { ...@@ -201,7 +212,7 @@ export default {
this.ticketingStatusList = res.data.data; this.ticketingStatusList = res.data.data;
let data = { let data = {
Name:'全部', Name:'全部',
id:0 Id:'0'
} }
this.ticketingStatusList.unshift(data) this.ticketingStatusList.unshift(data)
} else { } else {
...@@ -210,6 +221,7 @@ export default { ...@@ -210,6 +221,7 @@ export default {
} }
); );
}, },
// 获取订单列表
getList() { getList() {
this.loading = true; this.loading = true;
this.apipost( this.apipost(
...@@ -217,8 +229,7 @@ export default { ...@@ -217,8 +229,7 @@ export default {
this.msg, this.msg,
(res) => { (res) => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
console.log(res.data.data); this.dataList = res.data.data.pageData;
this.dataList = res.data.data;
this.total = res.data.data.count; this.total = res.data.data.count;
this.loading = false this.loading = false
} else { } else {
...@@ -227,6 +238,7 @@ export default { ...@@ -227,6 +238,7 @@ export default {
} }
); );
}, },
// 添加订单
addBusiness() { addBusiness() {
let $this = this; let $this = this;
this.MsgBus.$emit("addTicketOrderBoxOpen", $this.ID, 0, true); this.MsgBus.$emit("addTicketOrderBoxOpen", $this.ID, 0, true);
...@@ -237,6 +249,10 @@ export default { ...@@ -237,6 +249,10 @@ export default {
this.msg.pageSize = val; this.msg.pageSize = val;
this.getList(); this.getList();
}, },
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
}, },
}; };
</script> </script>
src/components/guestManagement/customerInfoBox.vue
View file @ dc9c857a
...@@ -120,9 +120,9 @@ ...@@ -120,9 +120,9 @@
<el-tab-pane label="商机" name="5"> <el-tab-pane label="商机" name="5">
<Business v-if="activeName === '5'" :ID="CustomerId" /> <Business v-if="activeName === '5'" :ID="CustomerId" />
</el-tab-pane> </el-tab-pane>
<!-- <el-tab-pane label="订单" name="6"> <el-tab-pane label="订单" name="6">
<Agreement :ID="CustomerId" /> <Agreement v-if="activeName === '6'" :ID="CustomerId" />
</el-tab-pane> --> </el-tab-pane>
<el-tab-pane label="回款" name="7" v-if="false"> <el-tab-pane label="回款" name="7" v-if="false">
<!-- <MoneyBack /> --> <!-- <MoneyBack /> -->
</el-tab-pane> </el-tab-pane>
......
src/components/guestManagement/ticketOrder.vue
View file @ dc9c857a
...@@ -230,6 +230,7 @@ export default { ...@@ -230,6 +230,7 @@ export default {
"isGuest", "isGuest",
"TicketOrderId", "TicketOrderId",
"GuestId", "GuestId",
"OrderId"
], ],
data() { data() {
return { return {
...@@ -268,110 +269,35 @@ export default { ...@@ -268,110 +269,35 @@ export default {
watch: { watch: {
ID: { ID: {
handler(val, oldVal) { handler(val, oldVal) {
console.log(val,'-1-11-'); // console.log(val,'-1-11-');
this.form.GuestId = val // this.form.GuestId = val
}, },
deep: true, deep: true,
}, },
CustomerId: { GuestId: {
handler(val, oldVal) { handler(val, oldVal) {
console.log(val); this.form.GuestId = val
}, },
deep: true, deep: true,
}, },
isGuest: { CustomerId: {
handler(val, oldVal) { handler(val, oldVal) {
if (val) { console.log(val);
this.form.CustomerType = 1;
this.getGuestList();
} else {
this.getCustomerList();
}
}, },
deep: true, deep: true,
}, },
}, },
mounted() { mounted() {
// console.log(this.isGuest);
// if (this.isGuest) { this.form.GuestId = this.GuestId
// this.form.CustomerType = 1; this.form.OrderId = this.OrderId
// this.getGuestList(); // console.log(this.GuestId, '----------')
// } else {
// this.getCustomerList();
// }
this.getLineList();
this.GetBusinessStatusEnum();
let $this = this; let $this = this;
if (this.CustomerId !== 0) {
this.form.CustomerId = this.CustomerId;
}
setTimeout(() => { setTimeout(() => {
$this.dialogTableVisible = true; $this.dialogTableVisible = true;
}, 50); }, 50);
if (this.ID !== 0) {
let msg = {
BusinessId: this.ID,
};
if (this.isGuest) {
msg.CustomerType = 1;
}
this.apipost("/api/Customer/GetAllBusinessModel", msg, (res) => {
if (res.data.resultCode == 1) {
let data = res.data.data;
if (data.LineId) {
this.getLineTeamList(data.LineId, 1);
}
this.form = data;
}
});
}
}, },
methods: { methods: {
//获取系列列表
getLineTeamList(lineId, type) {
if (!type) {
this.form.LineteamId = "";
}
this.apipost2(
"b2b_get_GetLineTeam",
{
lineId: lineId,
},
(res) => {
if (res.data.resultCode == 1) {
this.LineTeamList = res.data.data;
}
}
);
},
getLineList() {
this.apipost2("line_post_GetAllList", {}, (res) => {
if (res.data.resultCode == 1) {
this.LineList = res.data.data;
}
});
},
GetBusinessStatusEnum() {
this.apipost("/api/Customer/GetBusinessStatusEnum", {}, (res) => {
if (res.data.resultCode == 1) {
this.BusinessStatusEnum = res.data.data;
}
});
},
getGuestList() {
this.apipost("/api/Customer/GetGuesstCustomerByCreateList", {}, (res) => {
if (res.data.resultCode == 1) {
this.CustomerList = res.data.data;
}
});
},
getCustomerList() {
this.apipost("/api/Customer/GetCustomerListByCreateInfo", {}, (res) => {
if (res.data.resultCode == 1) {
this.CustomerList = res.data.data;
}
});
},
closedDialog() { closedDialog() {
this.MsgBus.$emit("closeTicketOrderDialogBox"); this.MsgBus.$emit("closeTicketOrderDialogBox");
}, },
...@@ -379,15 +305,8 @@ export default { ...@@ -379,15 +305,8 @@ export default {
this.apipost("/api/Order/SetGuestOrderInfo", this.form, (res) => { this.apipost("/api/Order/SetGuestOrderInfo", this.form, (res) => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.dialogTableVisible = false; this.dialogTableVisible = false;
// 有id 发送更新抽屉消息 this.$message.success("操作成功");
if (this.CustomerId !== 0) { this.MsgBus.$emit("closeTicketOrderDialogBox");
this.$message.success("操作成功");
this.MsgBus.$emit("RefreshInfoBox");
} else {
this.$message.success("操作成功");
}
this.$emit("getList");
this.MsgBus.$emit("RefreshbusSelect");
this.resetForm("form"); this.resetForm("form");
} else { } else {
this.$message.error(res.data.message); this.$message.error(res.data.message);
...@@ -395,8 +314,8 @@ export default { ...@@ -395,8 +314,8 @@ export default {
}); });
}, },
submitForm(addMsg) { submitForm(addMsg) {
console.log(this.form, '-----') // console.log(this.form, '-----')
return // return
//提交创建、修改表单 //提交创建、修改表单
this.$refs[addMsg].validate((valid) => { this.$refs[addMsg].validate((valid) => {
if (valid) { if (valid) {
......
src/views/index.vue
View file @ dc9c857a
...@@ -92,8 +92,8 @@ ...@@ -92,8 +92,8 @@
<!-- 添加机票订单 --> <!-- 添加机票订单 -->
<div v-if="dialogTicketOrderVisible"> <div v-if="dialogTicketOrderVisible">
<ticketOrder :name="dialogTicketOrderVisibleName" <ticketOrder :name="dialogTicketOrderVisibleName"
:ID="TicketOrderID" :GuestId="GuestId" :ID="TicketOrderID" :GuestId="GuestId" :obj="obj"
:msg="msg" type="1"/> type="1"/>
</div> </div>
<!-- 客户信息抽屉 --> <!-- 客户信息抽屉 -->
<el-drawer <el-drawer
...@@ -285,15 +285,16 @@ export default { ...@@ -285,15 +285,16 @@ export default {
SceneID: 0, SceneID: 0,
TicketOrderID: 0, TicketOrderID: 0,
GuestId: 0, GuestId: 0,
obj: {}
}; };
}, },
watch:{ watch:{
// ID: { ID: {
// handler(val, oldVal){ handler(val, oldVal){
// this.TicketOrderID = val this.TicketOrderID = val
// }, },
// deep:true deep:true
// } }
}, },
mounted() { mounted() {
this.userInfo = this.getLocalStorage(); this.userInfo = this.getLocalStorage();
...@@ -318,13 +319,20 @@ export default { ...@@ -318,13 +319,20 @@ export default {
this.MsgBus.$on("closeBusinessDialogBox", function() { this.MsgBus.$on("closeBusinessDialogBox", function() {
$this.dialogBusinessVisible = false; $this.dialogBusinessVisible = false;
}); });
this.MsgBus.$on("addTicketOrderBoxOpen", function(GuestId,a,b) { this.MsgBus.$on("addTicketOrderBoxOpen", function(GuestId) {
$this.dialogTicketOrderVisibleName = "新建机票订单";
$this.GuestId = GuestId;
$this.dialogTicketOrderVisible = true;
});
this.MsgBus.$on("editTicketOrderBoxOpen", function(GuestId,obj) {
$this.dialogTicketOrderVisibleName = "编辑订单金额";
$this.GuestId = GuestId; $this.GuestId = GuestId;
$this.obj = obj;
$this.dialogTicketOrderVisible = true; $this.dialogTicketOrderVisible = true;
this.dialogTicketOrderVisibleName = "新建机票订单";
}); });
this.MsgBus.$on("closeTicketOrderDialogBox", function() { this.MsgBus.$on("closeTicketOrderDialogBox", function() {
$this.dialogTicketOrderVisible = false; $this.dialogTicketOrderVisible = false;
this.$emit("getList");
}); });
this.MsgBus.$on("closeCustomerDialogBox", function() { this.MsgBus.$on("closeCustomerDialogBox", function() {
$this.dialogCustomerVisible = false; $this.dialogCustomerVisible = false;
......
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