Skip to content

C
CRM
Commit 151be522 authored by zhengke's avatar zhengke
Browse files
Options

no message

parent c068dea2
Hide whitespace changes
Inline Side-by-side
Showing with 75 additions and 52 deletions
src/components/customerManage/orderDetailsDrawer.vue
View file @ 151be522
......@@ -139,6 +139,10 @@ export default {
type: Number,
required: true,
},
activeNameNum: {
type: String,
required: true
}
},
data() {
return {
......@@ -156,7 +160,7 @@ export default {
this.orderId = val
},
deep: true,
},
}
},
mounted() {
let $this = this;
......@@ -165,6 +169,9 @@ export default {
this.MsgBus.$on("RefreshInfoBox", function() {
$this.init();
});
if(this.activeNameNum){
this.activeName = this.activeNameNum
}
},
methods: {
init() {
......
src/components/customerManage/orderList.vue
View file @ 151be522
......@@ -810,12 +810,6 @@ export default {
font-size: 12px;
}
.classorder table th {
background-color: #ededed;
height: 34px;
text-indent: 15px;
}
.enrollTotalSearchTable td {
background-color: #ffffff;
padding: 9px 15px;
......@@ -832,12 +826,6 @@ export default {
padding: 9px 15px;
}
.classorder table th {
background-color: #ededed;
height: 34px;
text-indent: 15px;
}
.classorder table td {
background-color: #ffffff;
padding: 9px 15px;
......@@ -1227,13 +1215,6 @@ li {
border: 1px solid #d2d2d2;
font-size: 12px;
}
.classorder table th {
background-color: #ededed;
height: 34px;
text-indent: 15px;
}
.enrollTotalSearchTable td {
background-color: #ffffff;
padding: 9px 15px;
......@@ -1253,7 +1234,8 @@ li {
.classorder table th {
background-color: #ededed;
height: 34px;
text-indent: 15px;
text-indent: 0;
padding: 0 5px;
}
.classorder table td {
......@@ -1304,7 +1286,7 @@ li {
.classorder .enrollTotalSearchTable tr td {
height: 46px;
padding: 10px;
padding: 10px 5px;
}
.classorder .enrollTotalSearchTable tr td > img {
......
src/components/guestManagement/Agreement.vue
View file @ 151be522
<style>
<style scoped>
.add-Enclosure {
display: flex;
justify-content: space-between;
......@@ -87,8 +87,8 @@
padding: 10px 19px 10px 19px;
Box-shadow:5px 5px 10px 5px #ccc;
}
/deep/.el-table .cell{
overflow: initial;
/deep/.Agreement-Business .el-table .cell{
overflow: initial !important;
}
.agreement-Cancel{
text-align: right;
......@@ -116,6 +116,12 @@
/deep/.el-table .cell.el-tooltip{
overflow: hidden !important;
}
/deep/.classorder .Agreement-Business table th{
text-indent:0 !important;
}
/deep/.el-table th>.cell{
text-align: left !important;
}
.OrderType-text-box{
word-break: break-word;
word-wrap: break-word;
......@@ -127,8 +133,8 @@
white-space: pre-wrap;
white-space: pre-line;
}
.OrderType-text-box .text-underline{
font-size: 19px;
.text-underline{
font-size: 16px;
color: rgb(41, 97, 254);
margin-right: 10px;
font-weight: bold;
......@@ -172,7 +178,7 @@
}
</style>
<template>
<div class="Business">
<div class="Agreement-Business">
<div class="add-Enclosure">
<el-row :gutter="16">
<el-col :span="8">
......@@ -213,7 +219,7 @@
row-class-name="font-size-12">
<el-table-column
fixed
label="订单号" width="110">
label="订单号" :width="110">
<template slot-scope="scope">
<div class="OrderType-text-box" @click="clickSingleNumber(scope.row)">
<span class="text-underline">{{scope.row.OrderId}}</span>
......@@ -224,25 +230,25 @@
</template>
</el-table-column>
<el-table-column fixed label="业务员" show-overflow-tooltip :width="120">
<el-table-column fixed label="业务员" show-overflow-tooltip :width="120">
<template slot-scope="scope">
<p>{{scope.row.EnterName}}</p>
<p>{{scope.row.CreateTime}}</p>
</template>
</el-table-column>
<el-table-column label="出行概述" show-overflow-tooltip :width="120">
<el-table-column label="出行概述" show-overflow-tooltip :width="120">
<template slot-scope="scope">
<p>人数：{{scope.row.GuestCount}}人</p>
<p>{{scope.row.StartCityName}}</p>
</template>
</el-table-column>
<el-table-column label="应收" show-overflow-tooltip>
<el-table-column label="应收" show-overflow-tooltip>
<template slot-scope="scope">
<p @click="editOrderAmount(scope.row)" class="cp"
:class="scope.row.TicketStatus==1&&scope.row.OrderStatus==1?'font-color-link':''">{{scope.row.Money}}</p>
</template>
</el-table-column>
<el-table-column label="实收" width="120">
<el-table-column label="实收" :width="120">
<template slot-scope="scope">
<div class="agreement-IncomeMoney-box">
{{scope.row.IncomeMoney}}
......@@ -269,13 +275,13 @@
</template>
</el-table-column>
<el-table-column label="退款" width="120">
<el-table-column label="退款" :width="120">
<template slot-scope="scope">
{{scope.row.BackMoney}}<i v-if="scope.row.OrderStatus==1"
@click="makeAdocument(scope.row,scope.$index,2)" class="iconfont iconjia- numIcon"></i>
</template>
</el-table-column>
<el-table-column label="成本" width="120">
<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"
......@@ -299,16 +305,16 @@
</div>
</template>
</el-table-column>
<el-table-column prop="TaxMoney" label="手续费" show-overflow-tooltip>
<el-table-column prop="TaxMoney" label="手续费" show-overflow-tooltip>
</el-table-column>
<el-table-column label="待收" show-overflow-tooltip>
<el-table-column label="待收" show-overflow-tooltip>
<template slot-scope="scope">
<p class="ToBeReceived" :class="scope.row.DueinMoney==0?'blue':'red'">
{{scope.row.DueinMoney}}
</p>
</template>
</el-table-column>
<el-table-column label="出票状态" width="90">
<el-table-column label="出票状态" :width="90">
<template slot-scope="scope">
<span @click="modifyStatus(scope.row)"
class="cp tatusText"
......@@ -324,12 +330,12 @@
scope.row.TicketStatusName!='无需机票'" class="iconfont iconpingzhengchaxun Credentials" @click="viewCredentials(scope.row)"></i>
</template>
</el-table-column>
<el-table-column label="订单状态" show-overflow-tooltip>
<el-table-column label="订单状态" show-overflow-tooltip>
<template slot-scope="scope">
{{scope.row.OrderStatus==1?"正常":"取消"}}
</template>
</el-table-column>
<el-table-column prop="Remark" label="客户需求" show-overflow-tooltip>
<el-table-column prop="Remark" label="客户需求" show-overflow-tooltip>
</el-table-column>
<el-table-column label="收入单据" show-overflow-tooltip>
......@@ -341,7 +347,7 @@
</p>
</template>
</el-table-column>
<el-table-column label="退款单据" show-overflow-tooltip>
<el-table-column label="退款单据" show-overflow-tooltip>
<template slot-scope="scope">
<p v-for="(item,index) in scope.row.BackFinance" :key="index"
:class="item.Status==1?'income_1':'income_2'"
......@@ -350,7 +356,7 @@
</p>
</template>
</el-table-column>
<el-table-column label="成本单据" show-overflow-tooltip>
<el-table-column label="成本单据" show-overflow-tooltip>
<template slot-scope="scope">
<p v-for="(item,index) in scope.row.PayFinance" :key="index"
:class="item.Status==1?'income_1':'income_2'"
......@@ -359,9 +365,9 @@
</p>
</template>
</el-table-column>
<el-table-column prop="CreateByName" label="创建人" show-overflow-tooltip>
<el-table-column prop="CreateByName" label="创建人" show-overflow-tooltip>
</el-table-column>
<el-table-column fixed="right" label="操作" width="120">
<el-table-column fixed="right" label="操作" :width="120">
<template slot-scope="scope">
<div class="item-but-box">
<div class="enedit-box">
......
src/components/guestManagement/ticketOrder.vue
View file @ 151be522
......@@ -278,7 +278,7 @@
.MultipleChoice-left .el-checkbox-group .el-checkbox {
flex: 1;
padding: 30px 19px;
padding: 10px 19px;
}
.MultipleChoice-right {
......@@ -292,7 +292,7 @@
background: #fff;
flex: 1;
padding: 9px 19px;
margin-bottom: 20px;
margin-bottom: 10px;
}
.MultipleChoice-right-box.active {
......
src/components/planeTicketOrder/index.vue
View file @ 151be522
......@@ -171,7 +171,7 @@
<div v-if="scope.row.OrderId === 0">
-
</div>
<div v-else @click="toOrder(scope.row.OrderId)" class="hover">
<div v-else @click="toOrder(scope.row)" class="hover">
{{scope.row.OrderId}}
</div>
</template>
......@@ -325,11 +325,19 @@
</div>
</div>
<!-- 单号抽屉 -->
<el-drawer @closed="closeOrderDrawerHandler" :with-header="false" size='70%' :append-to-body="true" :visible.sync="orderDrawer" direction="rtl" :before-close="handleClose">
<orderDetailsDrawer v-if="currentOrder" :orderId="currentOrder.OrderId" :activeNameNum="activeNameNum"/>
</el-drawer>
</div>
</template>
<script>
import orderDetailsDrawer from "../customerManage/orderDetailsDrawer";
export default {
components: {
orderDetailsDrawer
},
created() {
// erp自动登陆传过来的参数
if (this.$route.query.erpOrderObj) {
......@@ -375,10 +383,25 @@ export default {
],
EmployeeList: [],
tableData: [],
StatModel:[]
StatModel:[],
currentOrder:null,
orderDrawer:false,
activeNameNum:"2"
};
},
methods: {
// 点击单号
clickSingleNumber(item) {
this.currentOrder = item;
this.orderDrawer = true;
},
closeOrderDrawerHandler() {
this.currentOrder = null;
this.orderDrawer = false;
},
handleClose(done) {
done();
},
// 获取业务员
Employee() {
let userInfo = this.getLocalStorage();
......@@ -429,7 +452,6 @@ export default {
this.tableData = data;
this.msg.pageSize = res.data.data.pageSize
this.total = res.data.data.count;
console.log(this.total)
} else {
this.$message.error(res.data.message);
}
......@@ -466,7 +488,10 @@ export default {
);
},
//订单跳转
toOrder(val){
toOrder(item){
this.currentOrder = item;
this.orderDrawer = true;
return
this.$router.push({path:'/customerOrder',query:{OrderId:val}})
},
//改变状态背景颜色
......@@ -504,9 +529,12 @@ export default {
}
}
}
.hover:hover{
.hover{
color:#2961fe;
cursor: pointer;
color: skyblue;
}
.hover:hover{
text-decoration: underline;
}
}
</style>
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