Skip to content

C
CRM
Commit 8e83c18a authored by zhengke's avatar zhengke
Browse files
Options

no message

parent a3b8e0bc
Show whitespace changes
Inline Side-by-side
Showing with 64 additions and 19 deletions
src/components/customerManage/customerOrder.vue
View file @ 8e83c18a
......@@ -428,7 +428,7 @@
{
Name: '完结',
Id: '6',
show: item.OrderStatus==1?true:false
show: item.OrderStatus!=2&&item.OrderStatus!=5&&item.DueinMoney==0?true:false
},
{
Name: "操作日志",
......
src/components/customerManage/myCustomerOrder.vue
View file @ 8e83c18a
......@@ -409,7 +409,7 @@
{
Name: '完结',
Id: '6',
show: item.OrderStatus==1?true:false
show: item.OrderStatus!=2&&item.OrderStatus!=5&&item.DueinMoney==0?true:false
},
{
Name: "操作日志",
......
src/components/customerManage/orderList.vue
View file @ 8e83c18a
......@@ -117,9 +117,9 @@
<p class="TicketVoucher-box">
<span @click="item.VisaStatus=='1'?AmendVisa(item):''"
class="tatusText"
:class="item.VisaStatus==0?'grey':
(item.VisaStatus==2?'success'+' cp':
(item.VisaStatus==1?'Black':''))">
:class="item.VisaStatus==1?'grey'+' cp':
(item.VisaStatus==2?'success':
(item.VisaStatus==0?'Black':''))">
{{item.VisaStatus==1?'未出签':(item.VisaStatus==2?'已出签':'无需签证')}}
</span>
<i v-if="item.VisaStatus==2" class="cp iconfont iconpingzhengchaxun Credentials"
......@@ -128,14 +128,18 @@
</td>
<td style="border:none">
<div style="background: rgba(2, 196, 153, 0.2);width: 70px;border-radius: 2px;text-align: center"
:style="{background:item.OrderStatus==1?'rgba(2, 196, 153, 0.2)':'rgba(0, 0, 0, 0.2)'}">
<span :style="{color: item.OrderStatus==1?'#02C499':''}">{{item.OrderStatus==1?"正常":"取消"}}</span>
<div class="Order-list-Status" :class="item.OrderStatus=='1'?'one':
(item.OrderStatus=='2'?'two':
(item.OrderStatus=='3'?'three':
(item.OrderStatus=='4'?'four':
(item.OrderStatus=='5'?'five':''))))">
<span>{{item.OrderStatusName}}</span>
</div>
</td>
<td style="border:none;width:150px">
<div class="enedit-box">
<el-tooltip
v-if="item.OrderStatus!=2&&item.OrderStatus!=5"
class="item-but" effect="dark" content="编辑订单" placement="top">
<i class="iconfont iconwenbenbianji cp" @click="editOrder(item)"></i>
</el-tooltip>
......@@ -357,6 +361,9 @@ export default {
mounted() {
this.userInfo = this.getLocalStorage();
let $this = this;
$this.MsgBus.$on("closeGetList", function() {
$this.getList()
});
$this.MsgBus.$on("closeBillMaking", function() {
for (let i = 0; i < $this.dataList.length; i++) {
$this.dataList[i].checkList = [];
......@@ -505,6 +512,8 @@ export default {
if (res.data.resultCode == 1) {
this.$message.success(res.data.message);
this.getList()
}else{
this.$message.warning(res.data.message);
}
})
}).catch(() => {
......@@ -1709,4 +1718,29 @@ li {
.font-color-link {
cursor: pointer;
}
.Order-list-Status{
width: 70px;
border-radius: 2px;
text-align: center
}
.Order-list-Status.one{
background: rgba(2, 196, 153, 0.2);
color: #02C499;
}
.Order-list-Status.two{
background: rgba(0, 0, 0, 0.2);
color: #333;
}
.Order-list-Status.three{
color: rgb(63, 196, 255);
background-color: rgba(63, 196, 255,.2);
}
.Order-list-Status.four{
color: rgb(255,111,0);
background-color: rgba(255,111,0,.2);
}
.Order-list-Status.five{
color: rgb(197,225,165);
background-color: rgba(97,225,165,.2);
}
</style>
src/components/guestManagement/Agreement.vue
View file @ 8e83c18a
......@@ -266,7 +266,7 @@
<template slot-scope="scope">
<div class="agreement-IncomeMoney-box">
{{scope.row.IncomeMoney}}
<i v-if="scope.row.OrderStatus==1"
<i v-if="scope.row.OrderStatus!=2&&scope.row.OrderStatus!=5"
@click="makeAdocument(scope.row,scope.$index,1)"
class="iconfont iconjia- numIcon">
<div v-show="scope.row.actuallyReceived" class="agreement-IncomeMoney-pop">
......@@ -291,14 +291,14 @@
</el-table-column>
<el-table-column label="退款" :width="120">
<template slot-scope="scope">
{{scope.row.BackMoney}}<i v-if="scope.row.OrderStatus==1"
{{scope.row.BackMoney}}<i v-if="scope.row.OrderStatus!=2&&scope.row.OrderStatus!=5"
@click="makeAdocument(scope.row,scope.$index,2)" class="iconfont iconjia- numIcon"></i>
</template>
</el-table-column>
<el-table-column label="成本" :width="120">
<template slot-scope="scope">
<div class="agreement-IncomeMoney-box">
{{scope.row.PayMoney}}<i v-if="scope.row.OrderStatus==1"
{{scope.row.PayMoney}}<i v-if="scope.row.OrderStatus!=2&&scope.row.OrderStatus!=5"
@click="makeAdocument(scope.row,scope.$index,3)" class="iconfont iconjia- numIcon">
<div v-show="scope.row.cost" class="agreement-IncomeMoney-pop">
<div class="float-flag-shape"></div>
......@@ -349,9 +349,9 @@
<template slot-scope="scope">
<span @click="scope.row.VisaStatus=='1'?AmendVisa(scope.row):''"
class="tatusText"
:class="scope.row.VisaStatus==0?'grey':
(scope.row.VisaStatus==2?'success'+' cp':
(scope.row.VisaStatus==1?'Black':''))">
:class="scope.row.VisaStatus==1?'grey'+' cp':
(scope.row.VisaStatus==2?'success':
(scope.row.VisaStatus==0?'Black':''))">
{{scope.row.VisaStatus==1?'未出签':(scope.row.VisaStatus==2?'已出签':'无需签证')}}
</span>
<i v-if="scope.row.VisaStatus==2" class="cp iconfont iconpingzhengchaxun Credentials"
......@@ -360,7 +360,13 @@
</el-table-column>
<el-table-column label="订单状态" show-overflow-tooltip>
<template slot-scope="scope">
{{scope.row.OrderStatus==1?"正常":"取消"}}
<div class="Order-list-Status" :class="scope.row.OrderStatus=='1'?'one':
(scope.row.OrderStatus=='2'?'two':
(scope.row.OrderStatus=='3'?'three':
(scope.row.OrderStatus=='4'?'four':
(scope.row.OrderStatus=='5'?'five':''))))">
<span>{{scope.row.OrderStatusName}}</span>
</div>
</template>
</el-table-column>
<el-table-column prop="Remark" label="客户需求" show-overflow-tooltip>
......@@ -400,6 +406,7 @@
<div class="item-but-box">
<div class="enedit-box">
<el-tooltip
v-if="scope.row.OrderStatus!=2&&scope.row.OrderStatus!=5"
class="item-but" effect="dark" content="编辑订单" placement="top">
<i class="iconfont iconwenbenbianji cp" @click="editOrder(scope.row)"></i>
</el-tooltip>
......@@ -629,6 +636,8 @@
if (res.data.resultCode == 1) {
this.$message.success(res.data.message);
this.getList()
}else{
this.$message.warning(res.data.message);
}
})
}).catch(() => {
......@@ -1023,7 +1032,7 @@
{
Name: '完结',
Id: '6',
show: item.OrderStatus==1?true:false
show: item.OrderStatus!=2&&item.OrderStatus!=5&&item.DueinMoney==0?true:false
},
{
Name: "操作日志",
......
src/components/guestManagement/ticketOrder.vue
View file @ 8e83c18a
......@@ -2245,6 +2245,7 @@
this.clickShow = false
this.dialogTableVisible = false;
this.MsgBus.$emit("closeBillMaking");
this.MsgBus.$emit("closeGetList");
this.msgList=[]
this.$confirm(res.data.message, '提示', {
confirmButtonText: '确定',
......@@ -2273,12 +2274,13 @@
Voucher:this.Voucher
}
this.clickShow = true
this.apipost("api/Order/SetOrderVisaState",data,(res)=>{
this.apipost("/api/Order/SetOrderVisaState",data,(res)=>{
if (res.data.resultCode == 1) {
this.clickShow = false
this.dialogTableVisible = false;
this.Voucher = []
this.MsgBus.$emit("closeBillMaking");
this.MsgBus.$emit("closeGetList");
this.$confirm(res.data.message, '提示', {
confirmButtonText: '确定',
cancelButtonText: '',
......
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