Skip to content

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

no message

parent a407a0ff
Hide whitespace changes
Inline Side-by-side
Showing with 450 additions and 7 deletions
src/components/customerManage/customerOrder.vue
View file @ 6f81cc36
...@@ -300,6 +300,14 @@ ...@@ -300,6 +300,14 @@
this.MsgBus.$on("closeGetList", function() { this.MsgBus.$on("closeGetList", function() {
$this.getList() $this.getList()
}); });
$this.MsgBus.$on("closeBillMaking", function() {
for (let i = 0; i < $this.dataList.length; i++) {
$this.dataList[i].checkList = [];
$this.dataList[i].selectedType = "";
$this.dataList[i].actuallyReceived = false;
$this.dataList[i].cost = false;
}
});
this.getList() this.getList()
}, },
methods: { methods: {
...@@ -431,6 +439,11 @@ ...@@ -431,6 +439,11 @@
show: item.OrderStatus!=2&&item.OrderStatus!=5&&item.DueinMoney==0?true:false show: item.OrderStatus!=2&&item.OrderStatus!=5&&item.DueinMoney==0?true:false
}, },
{ {
Name: '订单收损',
Id: '8',
show: true
},
{
Name: "操作日志", Name: "操作日志",
Id: "7", Id: "7",
show: true, show: true,
......
src/components/customerManage/myCustomerOrder.vue
View file @ 6f81cc36
...@@ -281,6 +281,14 @@ ...@@ -281,6 +281,14 @@
this.MsgBus.$on("closeGetList", function() { this.MsgBus.$on("closeGetList", function() {
$this.getList() $this.getList()
}); });
$this.MsgBus.$on("closeBillMaking", function() {
for (let i = 0; i < $this.dataList.length; i++) {
$this.dataList[i].checkList = [];
$this.dataList[i].selectedType = "";
$this.dataList[i].actuallyReceived = false;
$this.dataList[i].cost = false;
}
});
this.getList() this.getList()
}, },
methods: { methods: {
...@@ -412,6 +420,11 @@ ...@@ -412,6 +420,11 @@
show: item.OrderStatus!=2&&item.OrderStatus!=5&&item.DueinMoney==0?true:false show: item.OrderStatus!=2&&item.OrderStatus!=5&&item.DueinMoney==0?true:false
}, },
{ {
Name: '订单收损',
Id: '8',
show: true
},
{
Name: "操作日志", Name: "操作日志",
Id: "7", Id: "7",
show: true, show: true,
......
src/components/customerManage/orderList.vue
View file @ 6f81cc36
...@@ -360,9 +360,6 @@ export default { ...@@ -360,9 +360,6 @@ export default {
mounted() { mounted() {
this.userInfo = this.getLocalStorage(); this.userInfo = this.getLocalStorage();
let $this = this; let $this = this;
$this.MsgBus.$on("closeGetList", function() {
$this.getList()
});
$this.MsgBus.$on("closeBillMaking", function() { $this.MsgBus.$on("closeBillMaking", function() {
for (let i = 0; i < $this.dataList.length; i++) { for (let i = 0; i < $this.dataList.length; i++) {
$this.dataList[i].checkList = []; $this.dataList[i].checkList = [];
...@@ -484,6 +481,30 @@ export default { ...@@ -484,6 +481,30 @@ export default {
if (row.More == "7") { if (row.More == "7") {
this.operationLog(row); this.operationLog(row);
} }
// 操作日志
if (row.More == "8") {
this.lossOperation(row);
}
},
// 收损
lossOperation(row){
if (this.superManage) {
this.lossOperationfun(row)
}else{
if (this.userInfo.EmName != row.EnterName) {
this.ValidateOperator();
} else {
this.lossOperationfun(row)
}
}
},
lossOperationfun(row){
this.MsgBus.$emit(
"lossOrderBoxOpen",
row.GuestId,
row,
true
);
}, },
// 订单完结 // 订单完结
orderCompleted(row){ orderCompleted(row){
...@@ -510,7 +531,7 @@ export default { ...@@ -510,7 +531,7 @@ export default {
}, res => { }, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.$message.success(res.data.message); this.$message.success(res.data.message);
this.getList() this.MsgBus.$emit("closeGetList");
}else{ }else{
this.$message.warning(res.data.message); this.$message.warning(res.data.message);
} }
......
src/components/customerManage/productDetails.vue
View file @ 6f81cc36
<style> <style scoped>
.orderProductDetails-box{ .orderProductDetails-box{
padding: 20px 0; padding: 20px 0;
background-color: #fff; background-color: #fff;
......
src/components/guestManagement/Agreement.vue
View file @ 6f81cc36
...@@ -613,6 +613,26 @@ ...@@ -613,6 +613,26 @@
if (row.More == "7") { if (row.More == "7") {
this.operationLog(row); this.operationLog(row);
} }
// 操作日志
if (row.More == "8") {
this.lossOperationfun(row);
}
},
// 收损
lossOperation(row){
if (this.userInfo.EmName != row.EnterName) {
this.ValidateOperator();
} else {
this.lossOperationfun(row)
}
},
lossOperationfun(row){
this.MsgBus.$emit(
"lossOrderBoxOpen",
row.GuestId,
row,
true
);
}, },
// 订单完结 // 订单完结
orderCompleted(row){ orderCompleted(row){
...@@ -1034,6 +1054,11 @@ ...@@ -1034,6 +1054,11 @@
show: item.OrderStatus!=2&&item.OrderStatus!=5&&item.DueinMoney==0?true:false show: item.OrderStatus!=2&&item.OrderStatus!=5&&item.DueinMoney==0?true:false
}, },
{ {
Name: '订单收损',
Id: '8',
show: true
},
{
Name: "操作日志", Name: "操作日志",
Id: "7", Id: "7",
show: true, show: true,
......
src/components/guestManagement/ticketOrder.vue
View file @ 6f81cc36
...@@ -278,7 +278,7 @@ ...@@ -278,7 +278,7 @@
.MultipleChoice-left .el-checkbox-group .el-checkbox { .MultipleChoice-left .el-checkbox-group .el-checkbox {
flex: 1; flex: 1;
padding: 10px 19px; padding: 30px 19px 20px 19px;
} }
.MultipleChoice-right { .MultipleChoice-right {
...@@ -317,7 +317,10 @@ ...@@ -317,7 +317,10 @@
padding: 9px 19px 0 19px; padding: 9px 19px 0 19px;
} }
.combo-center:first-child { .combo-center:last-child {
margin-right: 0;
}
.combo-center {
margin-right: 30px; margin-right: 30px;
} }
.BillMaking-box{ .BillMaking-box{
...@@ -592,6 +595,129 @@ ...@@ -592,6 +595,129 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="30" v-if="name=='订单收损'">
<el-col :span="24">
<div class="MultipleChoice-outerLayer">
<el-form-item class="MultipleChoice-OrderType" label="订单类型" prop="OrderType">
<p style="opacity: 0;">{{form.OrderType}}</p>
</el-form-item>
<div class="MultipleChoice-item">
<div class="MultipleChoice-left">
<el-checkbox-group v-model="checkList" @change="clickLossMultipleChoice">
<el-checkbox v-for="(item,index) in lossMultipleChoiceList" :key="index"
:label="item.Id">{{item.Name}}</el-checkbox>
</el-checkbox-group>
</div>
<div class="MultipleChoice-right">
<div class="combo-box" v-if="obj.OrderType.indexOf(1) != -1">
<div class="combo-center"
:class="AirTicketsShow?'active':''">
<el-form-item label="机票金额" prop="">
<br/>
{{form.TicketMoney}}
</el-form-item>
</div>
<div class="combo-center"
:class="AirTicketsShow?'active':''">
<el-form-item label="收损范围" prop="LossAirTicketMoney">
<el-input :min="0" :max="form.TicketMoney" placeholder="请输入收损范围" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');"
v-model="form.LossAirTicketMoney"
:disabled="AirTicketsShow"></el-input>
</el-form-item>
</div>
<div class="combo-center"
:class="AirTicketsShow?'active':''">
<el-form-item label="备注" prop="">
<el-input placeholder="请输入备注"
v-model="AirTicketLoss.Remark"
:disabled="AirTicketsShow"></el-input>
</el-form-item>
</div>
</div>
<div class="combo-box" v-if="obj.OrderType.indexOf(2) != -1">
<div class="combo-center"
:class="visaShow?'active':''">
<el-form-item label="签证金额" prop="">
<br/>
{{form.VisaMoney}}
</el-form-item>
</div>
<div class="combo-center"
:class="visaShow?'active':''">
<el-form-item label="收损范围" prop="LossVisaMoney">
<el-input :min="0" :max="form.VisaMoney" placeholder="请输入收损范围" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');"
v-model="form.LossVisaMoney"
:disabled="visaShow"></el-input>
</el-form-item>
</div>
<div class="combo-center"
:class="visaShow?'active':''">
<el-form-item label="备注" prop="">
<el-input placeholder="请输入说明"
v-model="visaLoss.Remark"
:disabled="visaShow"></el-input>
</el-form-item>
</div>
</div>
<div class="combo-box" v-if="obj.OrderType.indexOf(3) != -1"
:class="groundShow?'active':''">
<div class="combo-center"
:class="groundShow?'active':''">
<el-form-item label="地接金额" prop="">
<br/>
{{form.DiJieMoney}}
</el-form-item>
</div>
<div class="combo-center"
:class="groundShow?'active':''">
<el-form-item label="收损范围" prop="LossGroundMoney">
<el-input :min="0" :max="form.MealMoney" placeholder="请输入收损范围" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');"
v-model="form.LossGroundMoney"
:disabled="groundShow"></el-input>
</el-form-item>
</div>
<div class="combo-center"
:class="groundShow?'active':''">
<el-form-item label="备注" prop="">
<el-input placeholder="请输入备注"
v-model="groundLoss.Remark"
:disabled="groundShow"></el-input>
</el-form-item>
</div>
</div>
<div class="combo-box" v-if="obj.OrderType.indexOf(4) != -1"
>
<div class="combo-center"
:class="comboShow?'active':''">
<el-form-item label="套餐金额" prop="">
<el-input placeholder="请输入套餐金额" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');"
v-model="form.MealMoney"
:disabled="comboShow"></el-input>
</el-form-item>
</div>
<div class="combo-center"
:class="comboShow?'active':''">
<el-form-item label="收损范围" prop="LossComboMoney">
<el-input :min="0" :max="form.MealMoney" placeholder="请输入收损范围" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');"
v-model="form.LossComboMoney"
:disabled="comboShow"></el-input>
</el-form-item>
</div>
<div class="combo-center"
:class="comboShow?'active':''">
<el-form-item label="备注" prop="">
<el-input placeholder="请输入备注"
v-model="comboLoss.Remark"
:disabled="comboShow"></el-input>
</el-form-item>
</div>
</div>
</div>
</div>
</div>
</el-col>
</el-row>
<el-row v-if="name=='新建机票订单'||name=='编辑订单金额'||name=='编辑机票订单'"> <el-row v-if="name=='新建机票订单'||name=='编辑订单金额'||name=='编辑机票订单'">
<el-col :span="24"> <el-col :span="24">
<div class="MyEditForm-item label-pad-left"> <div class="MyEditForm-item label-pad-left">
...@@ -1122,6 +1248,33 @@ ...@@ -1122,6 +1248,33 @@
}, },
data() { data() {
return { return {
// 收损
msgLoss:{
OrderId:'',
OrderLoss:[]
},
comboLoss:{
OrderType:'4',
LossMoney:null,
Remark:''
},
groundLoss:{
OrderType:'3',
LossMoney:null,
Remark:''
},
visaLoss:{
OrderType:'2',
LossMoney:null,
Remark:''
},
AirTicketLoss:{
OrderType:'1',
LossMoney:null,
Remark:''
},
lossRadioList:[{Name:'禁用',Id:'1'},{Name:'激活',Id:'2'}],
lossMultipleChoiceList: [],//订单收损选项目
imgShow:false, imgShow:false,
clickShow:false, clickShow:false,
GetCostTypeList:[],//费用类型 GetCostTypeList:[],//费用类型
...@@ -1274,6 +1427,10 @@ ...@@ -1274,6 +1427,10 @@
VisaMoney: 0, //签证应收 VisaMoney: 0, //签证应收
DiJieMoney: 0, //地接应收 DiJieMoney: 0, //地接应收
MealMoney: 0, //套餐应收 MealMoney: 0, //套餐应收
LossComboMoney: null,
LossGroundMoney: null,
LossVisaMoney: null,
LossAirTicketMoney: null,
}, },
BusinessStatusEnum: [], BusinessStatusEnum: [],
rules: { rules: {
...@@ -1345,6 +1502,26 @@ ...@@ -1345,6 +1502,26 @@
message: "请输入地接金额", message: "请输入地接金额",
trigger: "blur" trigger: "blur"
}], }],
LossAirTicketMoney: [{
required: true,
message: "请输入机票收损金额",
trigger: "blur"
}],
LossVisaMoney: [{
required: true,
message: "请输入签证收损金额",
trigger: "blur"
}],
LossGroundMoney: [{
required: true,
message: "请输入地接收损金额",
trigger: "blur"
}],
LossComboMoney: [{
required: true,
message: "请输入套餐收损金额",
trigger: "blur"
}],
}, },
show: true, show: true,
}; };
...@@ -1546,10 +1723,67 @@ ...@@ -1546,10 +1723,67 @@
if (this.name == '修改出签状态') { if (this.name == '修改出签状态') {
this.text = '出签' this.text = '出签'
} }
if(this.name == '订单收损'){
this.msgLoss.OrderId = this.obj.OrderId
this.form.TicketMoney = this.obj.TicketMoney //机票应收
this.form.VisaMoney = this.obj.VisaMoney //签证应收
this.form.DiJieMoney = this.obj.DiJieMoney //地接应收
this.form.MealMoney = this.obj.MealMoney //套餐应收
let list = this.obj.OrderType&&this.obj.OrderType.split(',')
for(let j=0;j<list.length;j++){
for(let i=0;i<this.MultipleChoiceList.length;i++){
if(list[j]==this.MultipleChoiceList[i].Id){
this.lossMultipleChoiceList.push(this.MultipleChoiceList[i])
}
}
}
this.GetOrderLossInfo()
}
}, },
methods: { methods: {
// 订单收损情况
GetOrderLossInfo(){
let data = {
OrderId: this.msgLoss.OrderId
}
this.apipost("/api/Order/GetOrderLossInfo",data,(res)=>{
if (res.data.resultCode == 1) {
res.data.data&&res.data.data.forEach(item=>{
this.checkList.push(item.OrderType.toString())
if(item.OrderType=='1'){
this.form.TicketMoney = item.Money //机票应收
this.form.LossAirTicketMoney = item.LossMoney
this.AirTicketsShow = false
this.AirTicketLoss.Remark = item.Remark
}
if(item.OrderType=='2'){
this.form.VisaMoney = item.Money//签证应收
this.form.LossVisaMoney = item.LossMoney
this.visaLoss.Remark = item.Remark
this.visaShow = false
}
if(item.OrderType=='3'){
this.form.DiJieMoney = item.Money //地接应收
this.form.LossGroundMoney = item.LossMoney
this.groundLoss.Remark = item.Remark
this.groundShow = false
}
if(item.OrderType=='4'){
this.form.MealMoney = item.Money //套餐应收
this.form.LossComboMoney = item.LossMoney
this.comboLoss.Remark = item.Remark
this.comboShow = false
}
})
} else {
}
})
},
// 获取对应的银行类型 // 获取对应的银行类型
getReceivingAccount(value){ getReceivingAccount(value){
this.accountList.forEach(item=>{ this.accountList.forEach(item=>{
...@@ -1797,6 +2031,55 @@ ...@@ -1797,6 +2031,55 @@
} }
} }
}, },
clickLossMultipleChoice() {
if (this.checkList.length > 0) {
if (this.checkList.slice(-1)[0] == 4) {
this.delType(1)
this.delType(2)
this.delType(3)
this.AirTicketsShow = true
this.visaShow = true
this.groundShow = true
this.comboShow = false
} else {
this.delType(4)
this.checkList.forEach(item => {
if (item == '1') {
this.AirTicketsShow = false
}
if (item == '2') {
this.visaShow = false
}
if (item == '3') {
this.groundShow = false
}
});
if (this.checkList.indexOf('1') == -1) {
this.AirTicketsShow = true
}
if (this.checkList.indexOf('2') == -1) {
this.visaShow = true
}
if (this.checkList.indexOf('3') == -1) {
this.groundShow = true
}
if (this.checkList.indexOf('4') == -1) {
this.comboShow = true
}
}
this.form.OrderType = this.checkList.join(',')
} else if (this.checkList.length == 0) {
this.AirTicketsShow = true
this.visaShow = true
this.groundShow = true
this.comboShow = true
this.form.MealDescription = ""
this.form.OrderType = ""
}
},
// 获取业务员 // 获取业务员
Employee() { Employee() {
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
...@@ -2296,6 +2579,85 @@ ...@@ -2296,6 +2579,85 @@
} }
}) })
}, },
// 订单收损
SetOrderLoss(){
if(this.checkList.length==0){
this.$message.warning('请选择需要收损的订单类型');
return
}
if(this.checkList.indexOf('1')!=-1){
if(!this.form.LossAirTicketMoney){
this.$message.warning('请输入机票收损金额');
return
}else if(this.form.LossAirTicketMoney>this.form.TicketMoney){
this.$message.warning('机票收损金额不得超出应收金额');
return
}else{
this.AirTicketLoss.LossMoney = this.form.LossAirTicketMoney
this.msgLoss.OrderLoss.push(this.AirTicketLoss)
}
}
if(this.checkList.indexOf('2')!=-1){
if(!this.form.LossVisaMoney){
this.$message.warning('请输入签证收损金额');
return
}else if(this.form.LossVisaMoney>this.form.VisaMoney){
this.$message.warning('签证收损金额不得超出应收金额');
return
}else{
this.visaLoss.LossMoney = this.form.LossVisaMoney
this.msgLoss.OrderLoss.push(this.visaLoss)
}
}
if(this.checkList.indexOf('3')!=-1){
if(!this.form.LossGroundMoney){
this.$message.warning('请输入地接损金额');
return
}else if(this.form.LossGroundMoney>this.form.DiJieMoney){
this.$message.warning('地接收损金额不得超出应收金额');
return
}else{
this.visaLoss.LossMoney = this.form.LossGroundMoney
this.msgLoss.OrderLoss.push(this.visaLoss)
}
}
if(this.checkList.indexOf('4')!=-1){
if(!this.form.LossComboMoney){
this.$message.warning('请输入套餐收损金额');
return
}else if(this.form.LossComboMoney>this.form.MealMoney){
this.$message.warning('套餐收损金额不得超出应收金额');
return
}else{
this.comboLoss.LossMoney = this.form.LossComboMoney
this.msgLoss.OrderLoss.push(this.comboLoss)
}
}
this.clickShow = true
this.apipost("/api/Order/SetOrderLoss",this.msgLoss,(res)=>{
if (res.data.resultCode == 1) {
this.clickShow = false
this.dialogTableVisible = false;
this.msgLoss.OrderLoss = []
this.MsgBus.$emit("closeBillMaking");
this.MsgBus.$emit("closeGetList");
this.$confirm(res.data.message, '提示', {
confirmButtonText: '确定',
cancelButtonText: '',
type: 'warning'
}).then(() => {
}).catch(() => {
});
} else {
this.msgLoss.OrderLoss = []
this.clickShow = false
this.$message.error(res.data.message);
}
})
},
submitForm(addMsg) { submitForm(addMsg) {
//提交创建、修改表单 //提交创建、修改表单
if (this.name == '新建机票订单' || this.name == '编辑机票订单') { if (this.name == '新建机票订单' || this.name == '编辑机票订单') {
...@@ -2348,6 +2710,9 @@ ...@@ -2348,6 +2710,9 @@
this.dialogTableVisible = false; this.dialogTableVisible = false;
this.MsgBus.$emit("closeTicketOrderDialogBox"); this.MsgBus.$emit("closeTicketOrderDialogBox");
} }
if(this.name=='订单收损'){
this.SetOrderLoss()
}
}, },
resetForm(formName) { resetForm(formName) {
......
src/views/index.vue
View file @ 6f81cc36
...@@ -327,6 +327,12 @@ ...@@ -327,6 +327,12 @@
$this.obj = obj; $this.obj = obj;
$this.dialogTicketOrderVisible = true; $this.dialogTicketOrderVisible = true;
}); });
this.MsgBus.$on("lossOrderBoxOpen", function (GuestId, obj) {
$this.dialogTicketOrderVisibleName = "订单收损";
$this.GuestId = GuestId;
$this.obj = obj;
$this.dialogTicketOrderVisible = true;
});
this.MsgBus.$on("reviseTicketOrderBoxOpen", function (GuestId, obj) { this.MsgBus.$on("reviseTicketOrderBoxOpen", function (GuestId, obj) {
$this.dialogTicketOrderVisibleName = "修改出票状态"; $this.dialogTicketOrderVisibleName = "修改出票状态";
$this.GuestId = GuestId; $this.GuestId = GuestId;
......
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