Skip to content

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

no message

parent 9879337c
Show whitespace changes
Inline Side-by-side
Showing with 303 additions and 164 deletions
src/assets/css/init.css
View file @ 092031c3
......@@ -272,7 +272,7 @@ textarea {
resize: none !important;
}
.el-dialog__wrapper {
background-color: rgb(245, 246, 249);
/* background-color: rgb(245, 246, 249); */
}
.el-dialog {
box-shadow: 2px 1px 3px 0px rgba(0, 0, 0, 0.3);
......
src/components/clueManagement/clueManagement.vue
View file @ 092031c3
......@@ -586,8 +586,6 @@
if (type === 3) {
this.multipleSelection.push(this.CustomerId)
}
this.transferVisible = true
return
if(this.ruleList.length==0){
this.transferVisible = true
}else{
......
src/components/guestManagement/Agreement.vue
View file @ 092031c3
<style>
<style scoped>
.add-Enclosure{
display: flex;
justify-content: space-between;
}
.add-Enclosure-left{
display: flex;
}
</style>
<template>
<div class="Business">
<div class="add-Enclosure">
<el-row :gutter="12">
<el-col :span="8">
<el-input size="mini" placeholder="输入订单ID" v-model="msg.OrderId" label="订单ID" @blur="getList"></el-input>
</el-col>
<el-col :span="8">
<el-select size="mini" width="200" v-model="msg.TicketStatus" placeholder="请选择" @change="getList">
<el-option v-for="(item,index) in ticketingStatusList"
:key="index" :label="item.Name" :value="item.id"></el-option>
</el-select>
</el-col>
</el-row>
<el-button plain icon="el-icon-plus" type="primary" size="mini" class="margin-right0" @click="addBusiness">创建订单</el-button>
</div>
<div class="page-content">
<el-table
v-loading="loading"
stripe
......@@ -14,81 +33,194 @@
style="width: 100%"
row-class-name="font-size-12">
<el-table-column
prop="BusinessName"
prop="CreateByName"
label="下单人"
show-overflow-tooltip>
</el-table-column>
<el-table-column
label="订单号"
show-overflow-tooltip>
<template slot-scope="scope">
<p @click="openDetails(scope)" class="font-color-link cp">{{scope.row.BusinessName}}</p>
<p @click="openDetails(scope)" class="font-color-link cp">{{scope.row.OrderId}}</p>
</template>
</el-table-column>
<el-table-column
label="订单状态"
show-overflow-tooltip>
<template slot-scope="scope">
{{scope.row.OrderStatus==1?"正常":"取消"}}
</template>
</el-table-column>
<el-table-column
label="地址"
show-overflow-tooltip>
<template slot-scope="scope">
{{scope.row.StartCityName}}=>{{scope.row.EndCityName}}
</template>
</el-table-column>
<el-table-column
prop="BudgetPrice"
prop="GuestCount"
label="客人数"
show-overflow-tooltip>
</el-table-column>
<el-table-column
prop="Money"
label="订单金额"
show-overflow-tooltip>
</el-table-column>
<el-table-column
prop="CustomerName"
prop="IncomeMoney"
label="实收"
show-overflow-tooltip>
</el-table-column>
<el-table-column
prop="BusinessStatusStr"
prop="PayMoney"
label="付款"
show-overflow-tooltip>
</el-table-column>
<el-table-column
prop="BackMoney"
label="退款"
show-overflow-tooltip>
</el-table-column>
<el-table-column
prop="TaxMoney"
label="手续费"
show-overflow-tooltip>
</el-table-column>
<el-table-column
prop=""
label="待收"
show-overflow-tooltip>
</el-table-column>
<el-table-column
prop=""
label="成本"
show-overflow-tooltip>
</el-table-column>
<el-table-column
prop="PayFinance"
label="付款单据"
show-overflow-tooltip>
</el-table-column>
<el-table-column
prop="IncomeFinance"
label="收入单据"
show-overflow-tooltip>
</el-table-column>
<el-table-column
prop="BackFinance"
label="退款单据"
show-overflow-tooltip>
</el-table-column>
<el-table-column
prop="TicketStatusName"
label="出票状态"
show-overflow-tooltip>
</el-table-column>
<el-table-column
prop="Remark"
label="客户需求"
show-overflow-tooltip>
</el-table-column>
<el-table-column
prop="EnterName"
label="业务员"
show-overflow-tooltip>
</el-table-column>
<el-table-column
prop="CreateTime"
label="下单时间"
show-overflow-tooltip>
</el-table-column>
<el-table-column
label="操作"
show-overflow-tooltip>
</el-table-column>
</el-table>
</div>
<div v-if="dataList.length">
<el-pagination class="Mypagination" background @current-change="handleCurrentChange"
:page-sizes="[30, 60, 90, 100]" :page-size="msg.pageSize" layout="sizes, prev, pager, next"
@size-change="handleSizeChange" :total="total">
</el-pagination>
</div>
</div>
</template>
<script>
export default {
props: ["ID", "BusinessType"],
data() {
return {
ticketingStatusList:[],
dataList: [],
loading: false,
msg: {
pageIndex: 1,
pageSize: 10,
OrderId:"",
GuestId:"",
TicketStatus: 0,
OrderStatus:"",
StartCityName: "",
EndCityName: "",
EnterID: ""
},
total:0
};
},
watch: {},
watch: {
ID: {
handler(val, oldVal) {
this.getList();
},
deep: true,
},
},
mounted() {
this.GetBusinessList();
this.getList();
this.GetTicketStatusEnumList()
},
methods: {
openDetails(scope) {
console.log(scope.row.ID);
this.MsgBus.$emit("busnessDrawerShow", scope.row.ID, 1);
},
GetBusinessList() {
// 获取出票状态枚举
GetTicketStatusEnumList(){
let $this = this
this.msg.GuestId = $this.ID
console.log(this.msg.GuestId, 'this.msg.GuestId')
this.apipost(
"/api/Order/GetTicketStatusEnumList",
{},
(res) => {
if (res.data.resultCode == 1) {
this.ticketingStatusList = res.data.data;
let data = {
Name:'全部',
id:0
}
this.ticketingStatusList.unshift(data)
} else {
this.$message.error(res.data.message);
}
}
);
},
getList() {
this.loading = true;
this.apipost(
"/api/Customer/GetBusinessList",
{ CustomerId: this.ID, CustomerType: 1 },
"/api/Order/GetGuestOrderPageList",
this.msg,
(res) => {
if (res.data.resultCode == 1) {
console.log(res.data.data);
this.dataList = res.data.data;
this.total = res.data.data.count;
this.loading = false
} else {
this.$message.error(res.data.message);
}
......@@ -101,6 +233,10 @@ export default {
},
guanlian() {},
jiechuguanlian() {},
handleSizeChange(val) {
this.msg.pageSize = val;
this.getList();
},
},
};
</script>
src/components/guestManagement/customerInfoBox.vue
View file @ 092031c3
......@@ -121,7 +121,7 @@
<Business v-if="activeName === '5'" :ID="CustomerId" />
</el-tab-pane>
<el-tab-pane label="订单" name="6">
<Agreement />
<Agreement :ID="CustomerId" />
</el-tab-pane>
<el-tab-pane label="回款" name="7" v-if="false">
<MoneyBack />
......@@ -238,7 +238,8 @@
this.$emit("transferS", 3);
} else if (command === "g") {}
},
handleClick(tab, event) {},
handleClick(tab, event) {
},
editCust() {
this.$emit("editCustS", 1);
},
......
src/components/guestManagement/guestManagement.vue
View file @ 092031c3
......@@ -271,6 +271,7 @@
},
data() {
return {
ruleList:[],
queryType2: [{
label: "客户名称",
show: true,
......@@ -634,7 +635,36 @@
if (type === 3) {
this.multipleSelection.push(this.CustomerId);
}
this.transferVisible = true;
if(this.ruleList.length==0){
this.transferVisible = true
}else{
let tips = '系统已开启自动分配，无法指定推送，是否继续推送?'
this.$confirm(tips, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
let ids
if(this.CustomerId){
ids = this.CustomerId
}else{
ids = this.multipleSelection.join(',')
}
this.apipost('/api/Customer/AutoTransferCustomer', {
IDs: ids
}, res=>{
if (res.data.resultCode == 1) {
this.$message.success(res.data.message);
this.getList()
}
})
}).catch(() => {
this.$message({
type: 'info',
message: '已取消'
});
});
}
} else {
if (this.transferMsg.EmpId === "") {
return this.$message.error("请选择变更负责人！");
......@@ -681,6 +711,15 @@
this.CustomerId = scope.row.ID;
this.CustomerName = scope.row.GusetName;
},
// 获取是否开启规则
GetCustomerAllotRule(){
this.apipost('/api/Customer/GetCustomerAllotRule', {}, res=>{
if (res.data.resultCode == 1) {
this.ruleList = res.data.data.EmpList
}
})
},
handleSizeChange(val) {
this.msg.pageSize = val;
this.getList();
......@@ -710,6 +749,7 @@
});
this.total = res.data.data.count;
this.loading = false;
this.GetCustomerAllotRule()
}
}
);
......
src/components/guestManagement/ticketOrder.vue
View file @ 092031c3
......@@ -143,98 +143,61 @@
<el-row :gutter="30">
<el-col :span="8">
<div class="MyEditForm-item">
<el-form-item label="商机名称" prop="BusinessName">
<el-input placeholder="请输入商机名称" v-model="form.BusinessName"></el-input>
<el-form-item label="预计人数" prop="GuestCount">
<el-input placeholder="请输入预计人数" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" v-model="form.GuestCount"></el-input>
</el-form-item>
</div>
</el-col>
<el-col :span="8">
<div class="MyEditForm-item">
<el-form-item label="客户名称" prop="CustomerId">
<el-select v-model="form.CustomerId" :disabled="type==='1' ? true : false" placeholder="请选择客户" v-if="!isGuest">
<el-option
v-for="item in CustomerList"
:key="item.CustomerId"
:label="item.CustomerName"
:value="item.CustomerId">
</el-option>
</el-select>
<el-select v-model="form.CustomerId" :disabled="type==='1' ? true : false" placeholder="请选择客户" v-else>
<el-option
v-for="item in CustomerList"
:key="item.Id"
:label="item.GuestName"
:value="item.Id">
</el-option>
</el-select>
<el-form-item label="出发城市" prop="StartCityName">
<el-input placeholder="请输入出发城市" v-model="form.StartCityName"></el-input>
</el-form-item>
</div>
</el-col>
<el-col :span="8">
<div class="MyEditForm-item">
<el-form-item label="预计人数" prop="PeopleNumber">
<el-input placeholder="请输入预计人数" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" v-model="form.PeopleNumber"></el-input>
<el-form-item label="到达城市" prop="EndCityName">
<el-input placeholder="请输入到达城市" v-model="form.EndCityName"></el-input>
</el-form-item>
</div>
</el-col>
</el-row>
<el-row :gutter="30">
<el-col :span="8">
<!-- <el-col :span="8">
<div class="MyEditForm-item">
<el-form-item label="预算价格" prop="BudgetPrice">
<el-input placeholder="请输入预算价格" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" v-model="form.BudgetPrice"></el-input>
<el-form-item label="商机名称" prop="BusinessName">
<el-input placeholder="请输入商机名称" v-model="form.BusinessName"></el-input>
</el-form-item>
</div>
</el-col>
<el-col :span="8">
<div class="MyEditForm-item">
<el-form-item label="线路" prop="LineId">
<el-select v-model="form.LineId" filterable @change="getLineTeamList(form.LineId)" placeholder="请选择线路">
<el-form-item label="客户名称" prop="CustomerId">
<el-select v-model="form.CustomerId" :disabled="type==='1' ? true : false" placeholder="请选择客户" v-if="!isGuest">
<el-option
v-for="item in LineList"
:label='item.LineName' :value='item.LineID' :key='item.LineID'>
v-for="item in CustomerList"
:key="item.CustomerId"
:label="item.CustomerName"
:value="item.CustomerId">
</el-option>
</el-select>
</el-form-item>
</div>
</el-col>
<el-col :span="8">
<div class="MyEditForm-item">
<el-form-item label="系列" prop="LineteamId">
<el-select v-model="form.LineteamId" filterable placeholder="请选择系列">
<el-option label='不限' value='0' key='0'></el-option>
<el-select v-model="form.CustomerId" :disabled="type==='1' ? true : false" placeholder="请选择客户" v-else>
<el-option
v-for="item in LineTeamList"
:label='item.name' :value='item.id' :key='item.id'>
v-for="item in CustomerList"
:key="item.Id"
:label="item.GuestName"
:value="item.Id">
</el-option>
</el-select>
</el-form-item>
</div>
</el-col>
</el-col> -->
</el-row>
<el-row :gutter="30">
<el-col :span="8">
<div class="MyEditForm-item MyEditForm-item-time">
<el-form-item label="出发时间" prop="DepartTime">
<el-date-picker
value-format="yyyy-MM-dd HH:mm:ss"
v-model="form.DepartTime"
:clearable="false"
type="datetime"
placeholder="选择出发时间">
</el-date-picker>
</el-form-item>
</div>
</el-col>
<el-col :span="8">
<div class="MyEditForm-item MyEditForm-item-time">
<el-form-item label="商机状态" prop="BusinessStatus">
<el-select v-model="form.BusinessStatus" placeholder="请选择商机状态">
<el-option
v-for="item in BusinessStatusEnum"
:label='item.Name' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
<div class="MyEditForm-item">
<el-form-item label="报价金额" prop="Money">
<el-input placeholder="请输入报价金额" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" v-model="form.Money"></el-input>
</el-form-item>
</div>
</el-col>
......@@ -243,7 +206,7 @@
<el-col :span="24">
<div class="MyEditForm-item label-pad-left">
<el-form-item label="备注">
<el-input type="textarea" placeholder="商机备注" v-model="form.Remark"></el-input>
<el-input type="textarea" placeholder="订单备注" v-model="form.Remark"></el-input>
</el-form-item>
</div>
</el-col>
......@@ -275,40 +238,27 @@ export default {
LineTeamList: [],
dialogTableVisible: false,
form: {
ID: 0,
CustomerId: "",
BudgetPrice: "",
LineId: "",
BusinessName: "",
BusinessStatus: "",
LineteamId: "",
DepartTime: "",
PeopleNumber: 1,
OrderId: 0,
GuestId: null,
GuestCount: 1,
StartCityName: "",
EndCityName: "",
Money: null,
Remark: "",
},
BusinessStatusEnum: [],
rules: {
CustomerId: [
GuestCount: [
{ required: true, message: "请选择客户", trigger: "change" },
],
BusinessName: [
{ required: true, message: "请输入商机名称", trigger: "blur" },
],
BudgetPrice: [
{ required: true, message: "请输入预算价格", trigger: "blur" },
StartCityName: [
{ required: true, message: "请输入出发城市", trigger: "blur" },
],
BusinessStatus: [
{ required: true, message: "请选择商机状态", trigger: "change" },
EndCityName: [
{ required: true, message: "请输入到达城市", trigger: "blur" },
],
LineId: [{ required: true, message: "请选择线路", trigger: "change" }],
LineteamId: [
{ required: true, message: "请选择系列", trigger: "change" },
],
DepartTime: [
{ required: true, message: "请选择时间", trigger: "change" },
],
PeopleNumber: [
{ required: true, message: "请输入预计人数", trigger: "blur" },
Money: [
{ required: true, message: "请输入报价金额", trigger: "change" },
],
Remark: [{ required: true, message: "请输入备注", trigger: "blur" }],
},
......@@ -318,7 +268,8 @@ export default {
watch: {
ID: {
handler(val, oldVal) {
console.log(val);
console.log(val,'-1-11-');
this.form.GuestId = val
},
deep: true,
},
......@@ -341,7 +292,7 @@ export default {
},
},
mounted() {
console.log(this.isGuest);
// console.log(this.isGuest);
if (this.isGuest) {
this.form.CustomerType = 1;
this.getGuestList();
......@@ -422,10 +373,10 @@ export default {
});
},
closedDialog() {
this.MsgBus.$emit("closeBusinessDialogBox");
this.MsgBus.$emit("closeTicketOrderDialogBox");
},
addData() {
this.apipost("/api/Customer/CreateCustomerBusiness", this.form, (res) => {
this.apipost("/api/Order/SetGuestOrderInfo", this.form, (res) => {
if (res.data.resultCode == 1) {
this.dialogTableVisible = false;
// 有id 发送更新抽屉消息
......@@ -444,6 +395,8 @@ export default {
});
},
submitForm(addMsg) {
console.log(this.form, '-----')
return
//提交创建、修改表单
this.$refs[addMsg].validate((valid) => {
if (valid) {
......@@ -454,6 +407,7 @@ export default {
});
},
resetForm(formName) {
this.MsgBus.$emit("closeTicketOrderDialogBox");
// 重置表单
this.form = {
ID: 0,
......@@ -464,7 +418,7 @@ export default {
BusinessStatus: "",
LineteamId: "",
DepartTime: "",
PeopleNumber: 0,
GuestCount: 0,
Remark: "",
};
this.$refs[formName].resetFields();
......
src/views/index.vue
View file @ 092031c3
......@@ -91,7 +91,9 @@
</div>
<!-- 添加机票订单 -->
<div v-if="dialogTicketOrderVisible">
<ticketOrder :name="dialogTicketOrderVisibleName" :ID="TicketOrderID" :GuestId="GuestId" type="1"/>
<ticketOrder :name="dialogTicketOrderVisibleName"
:ID="TicketOrderID" :GuestId="GuestId"
:msg="msg" type="1"/>
</div>
<!-- 客户信息抽屉 -->
<el-drawer
......@@ -285,6 +287,14 @@ export default {
GuestId: 0,
};
},
watch:{
// ID: {
// handler(val, oldVal){
// this.TicketOrderID = val
// },
// deep:true
// }
},
mounted() {
this.userInfo = this.getLocalStorage();
this.Employee();
......@@ -308,7 +318,7 @@ export default {
this.MsgBus.$on("closeBusinessDialogBox", function() {
$this.dialogBusinessVisible = false;
});
this.MsgBus.$on("addTicketOrderBoxOpen", function(GuestId) {
this.MsgBus.$on("addTicketOrderBoxOpen", function(GuestId,a,b) {
$this.GuestId = GuestId;
$this.dialogTicketOrderVisible = true;
this.dialogTicketOrderVisibleName = "新建机票订单";
......
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