Skip to content

C
CRM
Commit fa99aa85 authored by 罗超's avatar 罗超
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/huaguohao/crm

parents 6b7b32ce 27c1e85c
Show whitespace changes
Inline Side-by-side
Showing with 490 additions and 33 deletions
src/components/customerManage/orderList.vue
View file @ fa99aa85
...@@ -59,7 +59,9 @@ ...@@ -59,7 +59,9 @@
<tr> <tr>
<td :rowspan="3"> <td :rowspan="3">
<p class="OrderId-text" @click="clickSingleNumber(item)">{{item.OrderId}} <p class="OrderId-text" @click="clickSingleNumber(item)">{{item.OrderId}}
<!-- <span class="OrderType-text" v-for="(items,index) in item.MultipleChoiceList">{{items.Name}}</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':''))))"
v-for="(items,index) in item.MultipleChoiceList">{{items.Name}}</span>
</p> </p>
<p class="CreateByName-text">{{item.CreateByName}}</p> <p class="CreateByName-text">{{item.CreateByName}}</p>
<p class="CreateByName-text">业务员：<span class="colorblue">{{item.EnterName}}</span></p> <p class="CreateByName-text">业务员：<span class="colorblue">{{item.EnterName}}</span></p>
...@@ -263,24 +265,23 @@ export default { ...@@ -263,24 +265,23 @@ export default {
}, },
data() { data() {
return { return {
MultipleChoiceList: [ MultipleChoiceList: [ //多选项目
//多选项目
{ {
Name: "机票", Name: '机票',
Id: "1", Id: '1'
}, }, {
{ Name: '签证',
Name: "签证", Id: '2'
Id: "2", }, {
}, Name: '地接',
{ Id: '3'
Name: "地接", }, {
Id: "3", Name: '套餐',
}, Id: '4'
{ }, {
Name: "套餐", Name: '套餐',
Id: "4", Id: '5'
}, }
], ],
userInfo: {}, userInfo: {},
MoreList: [ MoreList: [
...@@ -383,7 +384,7 @@ export default { ...@@ -383,7 +384,7 @@ export default {
// 点击单号 // 点击单号
clickSingleNumber(item) { clickSingleNumber(item) {
this.currentOrder = item; this.currentOrder = item;
this.orderDrawer = true; // this.orderDrawer = true;
}, },
closeOrderDrawerHandler() { closeOrderDrawerHandler() {
this.currentOrder = null; this.currentOrder = null;
...@@ -742,6 +743,424 @@ export default { ...@@ -742,6 +743,424 @@ export default {
}; };
</script> </script>
<style> <style>
li {
list-style-type: none;
}
.classorder ul {
padding: 0px;
}
.classorder .price-popup {
border-radius: 4px;
}
.classorder .el-range-editor .el-range-input {
background: none;
}
.classorder .el-range-editor.el-input__inner {
background-color: transparent;
}
.classorder .q-mb-md {
margin-bottom: 0;
}
.classorder .stics {
padding: 10px 20px;
background: #dddee0;
border-radius: 4px;
font-size: 14px;
color: #000000;
font-weight: bold;
}
.classorder .stics .stics-name {
color: #2d2d2d;
font-weight: 600;
margin-right: 10px;
}
.classorder .tis {
margin: 10px 0;
align-items: center;
}
.classorder .tis .tis-k {
width: 10px;
height: 10px;
margin-right: 8px;
}
.classorder .tis span {
font-size: 14px;
color: #2d2d2d;
font-weight: 600;
margin-right: 20px;
}
.classorder table {
padding: 10px 0;
width: 100%;
background-color: #ededed;
border-collapse: collapse;
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;
color: #333333;
border: 1px solid rgba(138, 138, 138, 0.09);
text-align: left;
}
.classorder table ._color_666 {
color: #666666;
}
.classorder table tr._color_666 th {
padding: 9px 15px;
}
.classorder table th {
background-color: #ededed;
height: 34px;
text-indent: 15px;
}
.classorder table td {
background-color: #ffffff;
padding: 9px 15px;
color: #333333;
}
.classorder table ._color_666 {
color: #666666;
}
.classorder table tr._color_666 th {
padding: 9px 15px;
}
.classorder .enrollTotalSearchTable {
width: 100%;
font-size: 14px;
color: #333;
border-bottom: 1px solid #cccccc;
border-right: 1px solid #cccccc;
border-collapse: collapse;
}
.classorder .enrollTotalSearchTable tr {}
.classorder .enrollTotalSearchTable tr th {
background: #dddee0;
height: 30px;
font-size: 12px;
text-align: left;
}
.classorder .enrollTotalSearchTable tr {
background: #fff;
text-align: left;
}
.classorder .enrollTotalSearchTable tbody tr:last-child {
border-bottom: 2px solid #ddd;
}
.classorder .enrollTotalSearchTable tr:first-child td:first-child {
border-bottom: 2px solid #ddd;
}
.classorder .enrollTotalSearchTable tr td {
height: 46px;
padding: 10px;
}
.classorder .enrollTotalSearchTable tr td>img {
width: 32px;
height: 32px;
border-radius: 16px;
vertical-align: middle;
margin-right: 5px;
}
.classorder .enrollTotalSearchTable tr td p {
line-height: 20px;
}
.classorder .remarks {
font-size: 14px;
color: #2d2d2d;
}
.classorder .remarks-b {
height: 34px;
background: #f0f5fb;
margin-top: 10px;
padding: 15px;
font-size: 12px;
color: #999999;
position: relative;
overflow: hidden;
display: -webkit-box;
line-height: 20px;
-webkit-line-clamp: 4;
-webkit-box-orient: vertical;
}
.classorder .remarks-b-b {
text-align: right;
position: absolute;
right: 0px;
bottom: 0px;
}
.classorder .on-left {
margin-right: 5px;
}
.classorder .finance {
padding: 1px 10px;
align-items: center;
justify-content: center;
border-radius: 4px;
margin: 5px 3px 3px 0;
}
.classorder .order_OfferId {
font-size: 18px;
color: #2961fe;
margin-bottom: 10px;
font-weight: bold;
text-decoration: underline;
cursor: pointer;
}
.takeContract {
cursor: pointer;
color: rgb(41, 97, 254);
}
.Contract_Table {
width: 100%;
border-collapse: collapse;
}
.Contract_Table th,
.Contract_Table td {
padding: 5px;
color: #000;
text-align: center;
}
.table-body {
overflow-x: hidden;
overflow-y: auto;
}
.classorder .redstyle {
color: var(--q-color-negative);
}
.order_OferTitle {
font-size: 14px;
color: #333333;
margin-bottom: 10px;
}
.tatusText.grey {
color: grey;
}
.tatusText.success {
color: #21BA45;
}
.tatusText.error {
color: #F2C037;
}
.tatusText.Black {
color: Black;
}
.ToBeReceived.red {
color: #fd397a;
}
.ToBeReceived.blue {
color: #409eff;
}
.documents-text {
display: flex;
justify-content: space-between;
}
.documents-left {
display: flex;
flex-direction: row;
flex-wrap: wrap;
margin: 2px 0;
}
.documents-left span {
margin-right: 10px;
border-radius: 3px;
padding: 2px 6px;
}
.documents-left span:hover {
cursor: pointer;
}
.documents-left span.one {
background-color: rgba(41, 97, 254, 0.2);
color: rgb(41, 97, 254);
}
.documents-left span.two {
background-color: rgba(242, 140, 29, 0.2);
color: rgb(242, 140, 29);
}
.documents-left span.three {
background-color: rgba(63, 196, 255, 0.2);
color: rgb(63, 196, 255);
}
.documents-left.num span {
background-color: rgba(41, 97, 254, 0);
color: rgb(41, 97, 254);
padding: 0;
}
.documents-right {
margin-right: 20px;
position: relative;
}
.OrderId-text {
font-size: 19px;
/* text-decoration:underline; */
font-weight: bold;
color: #2961fe;
margin-bottom: 10px;
cursor: pointer;
}
.CreateByName-text {
margin-bottom: 10px;
}
.colorblue {
color: #2961fe;
}
.enedit-box {
display: flex;
align-items: center;
}
.select-right {
margin-left: 5px;
}
.Credentials {
color: #2961FE;
}
.TicketVoucher-box {
display: flex;
}
.TicketVoucher-box span {
flex-shrink: 0;
}
.TicketVoucher-box i {
margin-left: 5px;
}
.agreement-IncomeMoney-box{
position: relative;
}
.agreement-IncomeMoney-pop{
position: absolute;
top: -20px;
left: -270px;
z-index: 1;
background: #fff;
padding: 10px 19px 10px 19px;
Box-shadow:5px 5px 10px 5px #ccc;
}
.agreement-Cancel{
text-align: right;
color: #409eff;
}
.agreement-Cancel span:first-child{
color: #999999;
margin-right: 20px;
}
.agreement-Cancel span:hover{
cursor: pointer;
}
.float-flag-shape{
position: absolute;
top:20px;
border: 1px solid #fff;
height: 0;
width: 0;
border-top: 6px solid transparent;
border-left: 10px solid #fff;
border-bottom: 3px solid transparent;
right:-11px;
}
.el-checkbox-group,.el-radio-group{
display: flex !important;
margin-bottom: 10px !important;
}
.font-color-link{
cursor: pointer;
}
.OrderType-text{
font-size: 11px;
font-weight: 100;
margin-left: 5px;
border-radius: 3px;
display: inline-block;
padding: 0 1px;
}
.OrderType-text.one{
color: rgb(41, 97, 254);
background-color: rgba(41, 97, 254,.2);
}
.OrderType-text.two{
color: rgb(242, 140, 29);
background-color: rgba(242, 140, 29,.2);
}
.OrderType-text.three{
color: rgb(63, 196, 255);
background-color: rgba(63, 196, 255,.2);
}
.OrderType-text.four{
color: rgb(255,111,0);
background-color: rgba(255,111,0,.2);
}
.OrderType-text.five{
color: rgb(197,225,165);
background-color: rgba(97,225,165,.2);
}
li { li {
list-style-type: none; list-style-type: none;
} }
......
src/components/guestManagement/Agreement.vue
View file @ fa99aa85
...@@ -70,6 +70,7 @@ ...@@ -70,6 +70,7 @@
.Credentials { .Credentials {
color: #2961FE; color: #2961FE;
cursor: pointer;
} }
.agreement-IncomeMoney-box{ .agreement-IncomeMoney-box{
/* position: relative; */ /* position: relative; */
...@@ -115,6 +116,37 @@ ...@@ -115,6 +116,37 @@
/deep/.el-table .cell.el-tooltip{ /deep/.el-table .cell.el-tooltip{
overflow: hidden !important; overflow: hidden !important;
} }
.OrderType-text{
font-size: 11px;
font-weight: 100;
margin-left: 5px;
border-radius: 3px;
display: inline-block;
padding: 0 1px;
}
.OrderType-text-box .OrderType-text:nth-child(2){
margin-left: 0;
}
.OrderType-text.one{
color: rgb(41, 97, 254);
background-color: rgba(41, 97, 254,.2);
}
.OrderType-text.two{
color: rgb(242, 140, 29);
background-color: rgba(242, 140, 29,.2);
}
.OrderType-text.three{
color: rgb(63, 196, 255);
background-color: rgba(63, 196, 255,.2);
}
.OrderType-text.four{
color: rgb(255,111,0);
background-color: rgba(255,111,0,.2);
}
.OrderType-text.five{
color: rgb(197,225,165);
background-color: rgba(97,225,165,.2);
}
</style> </style>
<template> <template>
<div class="Business"> <div class="Business">
...@@ -158,11 +190,15 @@ ...@@ -158,11 +190,15 @@
row-class-name="font-size-12"> row-class-name="font-size-12">
<el-table-column <el-table-column
fixed fixed
label="订单号" label="订单号" width="110">
show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.OrderId}} <div class="OrderType-text-box">
<!-- <p v-for="(item,index) in scope.row.MultipleChoiceList">{{item.Name}}</p> --> <p>{{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':''))))"
v-for="(items,index) in scope.row.MultipleChoiceList">{{items.Name}}</span>
</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column fixed label="业务员" show-overflow-tooltip :width="120"> <el-table-column fixed label="业务员" show-overflow-tooltip :width="120">
......
src/components/guestManagement/ticketOrder.vue
View file @ fa99aa85
...@@ -1379,23 +1379,23 @@ ...@@ -1379,23 +1379,23 @@
}, 50); }, 50);
this.form.GuestId = this.GuestId this.form.GuestId = this.GuestId
if (this.name == "编辑机票订单") { if (this.name == "编辑机票订单") {
this.checkList = this.obj.OrderType.split(',') this.checkList = this.obj.OrderType!=null&&this.obj.OrderType.split(',')
if (this.obj.OrderType.indexOf(1) != -1) { if (this.obj.OrderType&&this.obj.OrderType.indexOf(1) != -1) {
this.AirTicketsShow = false this.AirTicketsShow = false
} else { } else {
this.AirTicketsShow = true this.AirTicketsShow = true
} }
if (this.obj.OrderType.indexOf(2) != -1) { if (this.obj.OrderType&&this.obj.OrderType.indexOf(2) != -1) {
this.visaShow = false this.visaShow = false
} else { } else {
this.visaShow = true this.visaShow = true
} }
if (this.obj.OrderType.indexOf(3) != -1) { if (this.obj.OrderType&&this.obj.OrderType.indexOf(3) != -1) {
this.groundShow = false this.groundShow = false
} else { } else {
this.groundShow = true this.groundShow = true
} }
if (this.obj.OrderType.indexOf(4) != -1) { if (this.obj.OrderType&&this.obj.OrderType.indexOf(4) != -1) {
this.comboShow = false this.comboShow = false
} else { } else {
this.comboShow = true this.comboShow = true
...@@ -1786,7 +1786,8 @@ ...@@ -1786,7 +1786,8 @@
this.BillMaking.vorcherInos=[] this.BillMaking.vorcherInos=[]
this.form.Voucher.forEach(item=>{ this.form.Voucher.forEach(item=>{
let Content ={ let Content ={
Content:item Content:item,
type: 3
} }
this.BillMaking.vorcherInos.push(Content) this.BillMaking.vorcherInos.push(Content)
}) })
...@@ -1806,7 +1807,8 @@ ...@@ -1806,7 +1807,8 @@
// }); // });
this.Voucher.push(data) this.Voucher.push(data)
let Content ={ let Content ={
Content:data Content:data,
type:3
} }
this.BillMaking.vorcherInos.push(Content) this.BillMaking.vorcherInos.push(Content)
this.form.Voucher.push(url); this.form.Voucher.push(url);
...@@ -2044,7 +2046,7 @@ ...@@ -2044,7 +2046,7 @@
this.$message.warning('请选择汇款时间'); this.$message.warning('请选择汇款时间');
return return
} }
if(!this.BillMaking.TradeDate){ if(!this.BillMaking.AccountNumber){
this.$message.warning('请输入流水号'); this.$message.warning('请输入流水号');
return return
} }
......
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