Skip to content

C
CRM
Commit 9a5bf1c4 authored by liudong1993's avatar liudong1993
Browse files
Options

1

parent 5a8cac8f
Show whitespace changes
Inline Side-by-side
Showing with 15 additions and 30 deletions
src/components/customerManage/customerOrder.vue
View file @ 9a5bf1c4
...@@ -532,7 +532,7 @@ export default { ...@@ -532,7 +532,7 @@ export default {
Name: "收损完结", Name: "收损完结",
Id: "9", Id: "9",
show: show:
(item.OrderStatus == 1 || item.OrderStatus == 3 || item.OrderStatus == 4 || item.OrderStatus == 5)&& (item.OrderStatus == 3 || item.OrderStatus == 4)&&
item.DueinMoney == 0 item.DueinMoney == 0
? true ? true
: false, : false,
......
src/components/customerManage/myCustomerOrder.vue
View file @ 9a5bf1c4
...@@ -495,7 +495,7 @@ export default { ...@@ -495,7 +495,7 @@ export default {
Name: "收损完结", Name: "收损完结",
Id: "9", Id: "9",
show: show:
(item.OrderStatus == 1 || item.OrderStatus == 3 || item.OrderStatus == 4|| item.OrderStatus == 5) && (item.OrderStatus == 3 || item.OrderStatus == 4) &&
item.DueinMoney == 0 item.DueinMoney == 0
? true ? true
: false, : false,
......
src/components/customerManage/orderList.vue
View file @ 9a5bf1c4
...@@ -196,8 +196,8 @@ ...@@ -196,8 +196,8 @@
<el-tooltip <el-tooltip
class="item-but" effect="dark" content="制单" placement="top"> class="item-but" effect="dark" content="制单" placement="top">
<i class="iconfont iconwenbenbianji cp" <i class="iconfont iconwenbenbianji cp"
:class="item.OrderStatus!=2&&item.OrderStatus!=5?'blue':''" :class="item.OrderStatus!=2&&item.OrderStatus!=5&&item.OrderStatus!=6?'blue':''"
@click="item.OrderStatus!=2&&item.OrderStatus!=5?makeAdocument(item,index,1):''"></i> @click="item.OrderStatus!=2&&item.OrderStatus!=5&&item.OrderStatus!=6?makeAdocument(item,index,1):''"></i>
</el-tooltip> </el-tooltip>
<div v-show="item.actuallyReceived" class="agreement-IncomeMoney-pop"> <div v-show="item.actuallyReceived" class="agreement-IncomeMoney-pop">
<div class="float-flag-shape"></div> <div class="float-flag-shape"></div>
...@@ -226,8 +226,8 @@ ...@@ -226,8 +226,8 @@
<el-tooltip <el-tooltip
class="item-but" effect="dark" content="制单" placement="top"> class="item-but" effect="dark" content="制单" placement="top">
<i class="iconfont iconwenbenbianji cp" <i class="iconfont iconwenbenbianji cp"
:class="item.OrderStatus!=2&&item.OrderStatus!=5?'blue':''" :class="item.OrderStatus!=2&&item.OrderStatus!=5&&item.OrderStatus!=6?'blue':''"
@click="item.OrderStatus!=2&&item.OrderStatus!=5?makeAdocument(item,index,2):''"></i> @click="item.OrderStatus!=2&&item.OrderStatus!=5&&item.OrderStatus!=6?makeAdocument(item,index,2):''"></i>
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
...@@ -243,8 +243,8 @@ ...@@ -243,8 +243,8 @@
<el-tooltip <el-tooltip
class="item-but" effect="dark" content="制单" placement="top"> class="item-but" effect="dark" content="制单" placement="top">
<i class="iconfont iconwenbenbianji cp" <i class="iconfont iconwenbenbianji cp"
:class="item.OrderStatus!=2&&item.OrderStatus!=5?'blue':''" :class="item.OrderStatus!=2&&item.OrderStatus!=5&&item.OrderStatus!=6?'blue':''"
@click="item.OrderStatus!=2&&item.OrderStatus!=5?makeAdocument(item,index,3):''"></i> @click="item.OrderStatus!=2&&item.OrderStatus!=5&&item.OrderStatus!=6?makeAdocument(item,index,3):''"></i>
</el-tooltip> </el-tooltip>
<div v-show="item.cost" class="agreement-IncomeMoney-pop"> <div v-show="item.cost" class="agreement-IncomeMoney-pop">
<div class="float-flag-shape"></div> <div class="float-flag-shape"></div>
......
src/components/guestManagement/Agreement.vue
View file @ 9a5bf1c4
...@@ -1102,8 +1102,8 @@ ...@@ -1102,8 +1102,8 @@
{ {
Name: '收损完结', Name: '收损完结',
Id: '9', Id: '9',
show: (item.OrderStatus == 1 || item.OrderStatus == 3 || item.OrderStatus == show: (item.OrderStatus == 3 || item.OrderStatus == 4)
4 || item.OrderStatus == 5) && item.DueinMoney == 0 ? true : false && item.DueinMoney == 0 ? true : false
}, },
{ {
Name: '订单完结', Name: '订单完结',
......
src/components/guestManagement/ticketOrder.vue
View file @ 9a5bf1c4
...@@ -622,7 +622,7 @@ ...@@ -622,7 +622,7 @@
<div class="combo-center" <div class="combo-center"
:class="AirTicketsShow?'active':''"> :class="AirTicketsShow?'active':''">
<el-form-item label="收损金额" prop="LossAirTicketMoney"> <el-form-item label="收损金额" prop="LossAirTicketMoney">
<el-input :min="0" :max="form.TicketMoney" placeholder="请输入收损金额" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" <el-input :min="0" placeholder="请输入收损金额" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');"
v-model="form.LossAirTicketMoney" v-model="form.LossAirTicketMoney"
:disabled="AirTicketsShow"></el-input> :disabled="AirTicketsShow"></el-input>
</el-form-item> </el-form-item>
...@@ -647,7 +647,7 @@ ...@@ -647,7 +647,7 @@
<div class="combo-center" <div class="combo-center"
:class="visaShow?'active':''"> :class="visaShow?'active':''">
<el-form-item label="收损金额" prop="LossVisaMoney"> <el-form-item label="收损金额" prop="LossVisaMoney">
<el-input :min="0" :max="form.VisaMoney" placeholder="请输入收损金额" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" <el-input :min="0" placeholder="请输入收损金额" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');"
v-model="form.LossVisaMoney" v-model="form.LossVisaMoney"
:disabled="visaShow"></el-input> :disabled="visaShow"></el-input>
</el-form-item> </el-form-item>
...@@ -673,7 +673,7 @@ ...@@ -673,7 +673,7 @@
<div class="combo-center" <div class="combo-center"
:class="groundShow?'active':''"> :class="groundShow?'active':''">
<el-form-item label="收损金额" prop="LossGroundMoney"> <el-form-item label="收损金额" prop="LossGroundMoney">
<el-input :min="0" :max="form.MealMoney" placeholder="请输入收损金额" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" <el-input :min="0" placeholder="请输入收损金额" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');"
v-model="form.LossGroundMoney" v-model="form.LossGroundMoney"
:disabled="groundShow"></el-input> :disabled="groundShow"></el-input>
</el-form-item> </el-form-item>
...@@ -700,7 +700,7 @@ ...@@ -700,7 +700,7 @@
<div class="combo-center" <div class="combo-center"
:class="comboShow?'active':''"> :class="comboShow?'active':''">
<el-form-item label="收损金额" prop="LossComboMoney"> <el-form-item label="收损金额" prop="LossComboMoney">
<el-input :min="0" :max="form.MealMoney" placeholder="请输入收损金额" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" <el-input :min="0" placeholder="请输入收损金额" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');"
v-model="form.LossComboMoney" v-model="form.LossComboMoney"
:disabled="comboShow"></el-input> :disabled="comboShow"></el-input>
</el-form-item> </el-form-item>
...@@ -2748,9 +2748,6 @@ ...@@ -2748,9 +2748,6 @@
if(!this.form.LossAirTicketMoney){ if(!this.form.LossAirTicketMoney){
this.$message.warning('请输入机票收损金额'); this.$message.warning('请输入机票收损金额');
return return
}else if(this.form.LossAirTicketMoney>this.form.TicketMoney){
this.$message.warning('机票收损金额不得超出应收金额');
return
}else{ }else{
this.AirTicketLoss.LossMoney = this.form.LossAirTicketMoney this.AirTicketLoss.LossMoney = this.form.LossAirTicketMoney
this.msgLoss.OrderLoss.push(this.AirTicketLoss) this.msgLoss.OrderLoss.push(this.AirTicketLoss)
...@@ -2761,9 +2758,6 @@ ...@@ -2761,9 +2758,6 @@
if(!this.form.LossVisaMoney){ if(!this.form.LossVisaMoney){
this.$message.warning('请输入签证收损金额'); this.$message.warning('请输入签证收损金额');
return return
}else if(this.form.LossVisaMoney>this.form.VisaMoney){
this.$message.warning('签证收损金额不得超出应收金额');
return
}else{ }else{
this.visaLoss.LossMoney = this.form.LossVisaMoney this.visaLoss.LossMoney = this.form.LossVisaMoney
this.msgLoss.OrderLoss.push(this.visaLoss) this.msgLoss.OrderLoss.push(this.visaLoss)
...@@ -2773,9 +2767,6 @@ ...@@ -2773,9 +2767,6 @@
if(!this.form.LossGroundMoney){ if(!this.form.LossGroundMoney){
this.$message.warning('请输入地接损金额'); this.$message.warning('请输入地接损金额');
return return
}else if(this.form.LossGroundMoney>this.form.DiJieMoney){
this.$message.warning('地接收损金额不得超出应收金额');
return
}else{ }else{
this.groundLoss.LossMoney = this.form.LossGroundMoney this.groundLoss.LossMoney = this.form.LossGroundMoney
this.msgLoss.OrderLoss.push(this.groundLoss) this.msgLoss.OrderLoss.push(this.groundLoss)
...@@ -2785,9 +2776,6 @@ ...@@ -2785,9 +2776,6 @@
if(!this.form.LossComboMoney){ if(!this.form.LossComboMoney){
this.$message.warning('请输入套餐收损金额'); this.$message.warning('请输入套餐收损金额');
return return
}else if(this.form.LossComboMoney>this.form.MealMoney){
this.$message.warning('套餐收损金额不得超出应收金额');
return
}else{ }else{
this.comboLoss.LossMoney = this.form.LossComboMoney this.comboLoss.LossMoney = this.form.LossComboMoney
this.msgLoss.OrderLoss.push(this.comboLoss) this.msgLoss.OrderLoss.push(this.comboLoss)
......
src/components/workStatistics/rightDrawer.vue
View file @ 9a5bf1c4
...@@ -194,10 +194,7 @@ export default { ...@@ -194,10 +194,7 @@ export default {
Id: "9", Id: "9",
show: show:
(item.OrderStatus == 3 || item.OrderStatus == 4) && (item.OrderStatus == 3 || item.OrderStatus == 4) &&
item.DueinMoney == 0 && item.DueinMoney == 0
item.OrderStatus != 2 &&
item.OrderStatus != 5 &&
item.OrderStatus != 6
? true ? true
: false, : 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