Skip to content

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

no message

parent 6f81cc36
Hide whitespace changes
Inline Side-by-side
Showing with 100 additions and 66 deletions
src/components/customerManage/customerOrder.vue
View file @ 37d69d18
......@@ -236,19 +236,24 @@
MultipleChoiceList: [ //多选项目
{
Name: '机票',
Id: '1'
Id: '1',
show: false
}, {
Name: '签证',
Id: '2'
Id: '2',
show: false
}, {
Name: '地接',
Id: '3'
Id: '3',
show: false
}, {
Name: '套餐',
Id: '4'
Id: '4',
show: false
}, {
Name: '其他',
Id: '5'
Id: '5',
show: false
}
],
superManage:"订单统计",
......@@ -458,11 +463,22 @@
for(let j=0;j<list.length;j++){
for(let i=0;i<this.MultipleChoiceList.length;i++){
if(list[j]==this.MultipleChoiceList[i].Id){
item.MultipleChoiceList.push(this.MultipleChoiceList[i])
item.MultipleChoiceList.push(JSON.parse(JSON.stringify(this.MultipleChoiceList[i])))
}
}
}
}
if(item.LossList.length>0){
for(let i=0;i<item.LossList.length;i++){
for(let j=0;j<item.MultipleChoiceList.length;j++){
if(item.LossList[i].OrderType==item.MultipleChoiceList[j].Id){
item.MultipleChoiceList[j].show = true
}
}
}
}
})
this.dataList = res.data.data.Data.pageData;
this.total = res.data.data.Data.count;
......
src/components/customerManage/myCustomerOrder.vue
View file @ 37d69d18
......@@ -219,19 +219,24 @@
MultipleChoiceList: [ //多选项目
{
Name: '机票',
Id: '1'
Id: '1',
show: false
}, {
Name: '签证',
Id: '2'
Id: '2',
show: false
}, {
Name: '地接',
Id: '3'
Id: '3',
show: false
}, {
Name: '套餐',
Id: '4'
Id: '4',
show: false
}, {
Name: '其他',
Id: '5'
Id: '5',
show: false
}
],
StatModel:{},// 合计
......@@ -439,9 +444,18 @@
for(let j=0;j<list.length;j++){
for(let i=0;i<this.MultipleChoiceList.length;i++){
if(list[j]==this.MultipleChoiceList[i].Id){
item.MultipleChoiceList.push(this.MultipleChoiceList[i])
item.MultipleChoiceList.push(JSON.parse(JSON.stringify(this.MultipleChoiceList[i])))
}
}
}
}
if(item.LossList.length>0){
for(let i=0;i<item.LossList.length;i++){
for(let j=0;j<item.MultipleChoiceList.length;j++){
if(item.LossList[i].OrderType==item.MultipleChoiceList[j].Id){
item.MultipleChoiceList[j].show = true
}
}
}
}
})
......
src/components/customerManage/orderList.vue
View file @ 37d69d18
......@@ -62,7 +62,12 @@
<p class="OrderId-text" @click="clickSingleNumber(item)">
<span class="text-underline">{{item.OrderId}}</span>
<span class="OrderType-text"
:class="items.Id==1?'one':(items.Id==2?'two':(items.Id==3?'three':(items.Id==4?'four':(items.Id==5?'five':''))))"
:class="[items.Id==1?'one':
(items.Id==2?'two':
(items.Id==3?'three':
(items.Id==4?'four':
(items.Id==5?'five':'')))),{'line-through':items.show}]"
v-for="(items,index) in item.MultipleChoiceList">{{items.Name}}</span>
</p>
<p class="CreateByName-text">{{item.CreateByName}}</p>
......@@ -359,15 +364,6 @@ export default {
},
mounted() {
this.userInfo = this.getLocalStorage();
let $this = this;
$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;
}
});
},
methods: {
// 多选发生变化
......@@ -1326,6 +1322,9 @@ export default {
display: inline-block;
padding: 0 1px;
}
.line-through{
text-decoration: line-through;
}
.OrderType-text.one{
color: rgb(41, 97, 254);
background-color: rgba(41, 97, 254,.2);
......
src/components/guestManagement/Agreement.vue
View file @ 37d69d18
......@@ -138,7 +138,6 @@
color: rgb(41, 97, 254);
margin-right: 10px;
font-weight: bold;
display: inline;
cursor: pointer;
}
.OrderType-text-box .text-underline:hover{
......@@ -236,9 +235,13 @@
label="订单号" :width="110">
<template slot-scope="scope">
<div class="OrderType-text-box" @click="clickSingleNumber(scope.row)">
<span class="text-underline">{{scope.row.OrderId}}</span>
<p class="text-underline">{{scope.row.OrderId}}</p>
<span class="OrderType-text"
:class="items.Id==1?'one':(items.Id==2?'two':(items.Id==3?'three':(items.Id==4?'four':(items.Id==5?'five':''))))"
:class="[items.Id==1?'one':
(items.Id==2?'two':
(items.Id==3?'three':
(items.Id==4?'four':
(items.Id==5?'five':'')))),{'line-through':items.show}]"
v-for="(items,index) in scope.row.MultipleChoiceList">{{items.Name}}</span>
</div>
......@@ -459,19 +462,24 @@
MultipleChoiceList: [ //多选项目
{
Name: '机票',
Id: '1'
Id: '1',
show: false
}, {
Name: '签证',
Id: '2'
Id: '2',
show: false
}, {
Name: '地接',
Id: '3'
Id: '3',
show: false
}, {
Name: '套餐',
Id: '4'
Id: '4',
show: false
}, {
Name: '其他',
Id: '5'
Id: '5',
show: false
}
],
checkList:[],
......@@ -1073,7 +1081,17 @@
for(let j=0;j<list.length;j++){
for(let i=0;i<this.MultipleChoiceList.length;i++){
if(list[j]==this.MultipleChoiceList[i].Id){
item.MultipleChoiceList.push(this.MultipleChoiceList[i])
item.MultipleChoiceList.push(JSON.parse(JSON.stringify(this.MultipleChoiceList[i])))
}
}
}
if(item.LossList.length>0){
let LossList = item.LossList
for(let h=0;h<LossList.length;h++){
for(let i=0;i<item.MultipleChoiceList.length;i++){
if(LossList[h].OrderType==this.MultipleChoiceList[i].Id){
item.MultipleChoiceList[i].show=true
}
}
}
}
......
src/components/guestManagement/ticketOrder.vue
View file @ 37d69d18
......@@ -506,8 +506,10 @@
</div>
<div class="form-box" v-if="show">
<el-form :model="form" ref="form" class="MyEditForm" :rules="rules">
<p class="form-box-tit" v-if="name!='操作日志'&&name!='凭证图'&&name!='制单'"><span class="radius"></span>
{{name!='修改出票状态'&&name!='修改出签状态'?' 基本信息':' 上传'+text+'凭证'}}</p>
<template v-if="name!='订单收损'&&name!='出签凭证图'">
<p class="form-box-tit" v-if="name!='操作日志'&&name!='凭证图'&&name!='制单'"><span class="radius"></span>
{{name!='修改出票状态'&&name!='修改出签状态'?' 基本信息':' 上传'+text+'凭证'}}</p>
</template>
<el-row :gutter="30">
<el-col :span="8" v-if="name=='新建机票订单'||name=='编辑机票订单'">
<div class="MyEditForm-item">
......@@ -619,8 +621,8 @@
</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,'');"
<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>
......@@ -644,8 +646,8 @@
</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,'');"
<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>
......@@ -670,8 +672,8 @@
</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,'');"
<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>
......@@ -697,8 +699,8 @@
</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,'');"
<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>
......@@ -868,7 +870,7 @@
<div v-if="name=='出签凭证图'" class="Credentials-box">
<div class="Credentials-text">
<div class="Credentialstext-box">
<p>出签凭证</p>
<!-- <p>出签凭证</p> -->
<div class="Credentialsimg-box">
<el-image v-for="(items,index) in obj.VisaVoucherList.map(item=>{return domainManager().ViittoFileUrl + item})" :key="index"
:src="items"
......@@ -1690,6 +1692,9 @@
if (this.name == '凭证图') {
this.width = "600px"
}
if (this.name == '出签凭证图') {
this.width = "400px"
}
if(this.name=='制单'){
this.BillMaking = {
IsPublic:this.BillMaking.IsPublic,// 账户类型 0私账 1公账
......@@ -1730,6 +1735,7 @@
this.form.DiJieMoney = this.obj.DiJieMoney //地接应收
this.form.MealMoney = this.obj.MealMoney //套餐应收
let list = this.obj.OrderType&&this.obj.OrderType.split(',')
list = list.sort()
for(let j=0;j<list.length;j++){
for(let i=0;i<this.MultipleChoiceList.length;i++){
if(list[j]==this.MultipleChoiceList[i].Id){
......@@ -2564,15 +2570,7 @@
this.Voucher = []
this.MsgBus.$emit("closeBillMaking");
this.MsgBus.$emit("closeGetList");
this.$confirm(res.data.message, '提示', {
confirmButtonText: '确定',
cancelButtonText: '',
type: 'warning'
}).then(() => {
}).catch(() => {
});
this.$message.success(res.data.message);
} else {
this.clickShow = false
this.$message.error(res.data.message);
......@@ -2581,10 +2579,6 @@
},
// 订单收损
SetOrderLoss(){
if(this.checkList.length==0){
this.$message.warning('请选择需要收损的订单类型');
return
}
if(this.checkList.indexOf('1')!=-1){
if(!this.form.LossAirTicketMoney){
this.$message.warning('请输入机票收损金额');
......@@ -2618,8 +2612,8 @@
this.$message.warning('地接收损金额不得超出应收金额');
return
}else{
this.visaLoss.LossMoney = this.form.LossGroundMoney
this.msgLoss.OrderLoss.push(this.visaLoss)
this.groundLoss.LossMoney = this.form.LossGroundMoney
this.msgLoss.OrderLoss.push(this.groundLoss)
}
}
if(this.checkList.indexOf('4')!=-1){
......@@ -2634,6 +2628,7 @@
this.msgLoss.OrderLoss.push(this.comboLoss)
}
}
this.msgLoss.OrderLoss = this.msgLoss.OrderLoss.sort((a,b)=>a.OrderType-b.OrderType)
this.clickShow = true
this.apipost("/api/Order/SetOrderLoss",this.msgLoss,(res)=>{
if (res.data.resultCode == 1) {
......@@ -2642,15 +2637,7 @@
this.msgLoss.OrderLoss = []
this.MsgBus.$emit("closeBillMaking");
this.MsgBus.$emit("closeGetList");
this.$confirm(res.data.message, '提示', {
confirmButtonText: '确定',
cancelButtonText: '',
type: 'warning'
}).then(() => {
}).catch(() => {
});
this.$message.success(res.data.message);
} else {
this.msgLoss.OrderLoss = []
this.clickShow = 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