Skip to content

S
SuperMan
Commit c167fbe1 authored by 王悦's avatar 王悦
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents e249be9a e4842613
Show whitespace changes
Inline Side-by-side
Showing with 513 additions and 121 deletions
src/assets/css/cssReset.css
View file @ c167fbe1
...@@ -103,6 +103,7 @@ input:-webkit-autofill{-webkit-box-shadow: 0 0 0px 1000px white inset;} ...@@ -103,6 +103,7 @@ input:-webkit-autofill{-webkit-box-shadow: 0 0 0px 1000px white inset;}
.w220{width: 220px!important;} .w220{width: 220px!important;}
.w230{width: 230px!important;} .w230{width: 230px!important;}
.w240{width: 240px!important;} .w240{width: 240px!important;}
.w250{width: 250px!important;}
.w260{width: 260px!important;} .w260{width: 260px!important;}
.w272{width: 272px!important;} .w272{width: 272px!important;}
.w275{width: 275px!important;} .w275{width: 275px!important;}
......
src/components/BusExport.vue
View file @ c167fbe1
...@@ -147,6 +147,7 @@ ...@@ -147,6 +147,7 @@
MakeEndDate:'', MakeEndDate:'',
CurrType:'', CurrType:'',
CurrName:'', CurrName:'',
ClientId:''
}, },
Year:'', Year:'',
Month:'', Month:'',
...@@ -160,7 +161,7 @@ ...@@ -160,7 +161,7 @@
this.msg.MakeStartDate = this.$route.query.MakeStartDate; this.msg.MakeStartDate = this.$route.query.MakeStartDate;
this.msg.MakeEndDate = this.$route.query.MakeEndDate; this.msg.MakeEndDate = this.$route.query.MakeEndDate;
this.msg.CurrType = this.$route.query.CurrType; this.msg.CurrType = this.$route.query.CurrType;
this.msg.ClientId=this.$route.query.ClientId;
this.Year = this.msg.Month.split('-')[0]; this.Year = this.msg.Month.split('-')[0];
this.Month = this.msg.Month.split('-')[1]; this.Month = this.msg.Month.split('-')[1];
......
src/components/FinancialModule/addCapitalAllocation.vue
View file @ c167fbe1
...@@ -29,6 +29,107 @@ ...@@ -29,6 +29,107 @@
background-color: transparent !important; background-color: transparent !important;
padding: 0 2px !important; padding: 0 2px !important;
} }
.page_addCapitalAllocation ._conten ._lable{
display: inline-block;
width: 90px;
text-align: right;
}
.page_addCapitalAllocation ._conten ul li._inList{
border: 1px solid #c94052;
padding: 10px 0;
position: relative;
}
.page_addCapitalAllocation ._conten ul li._inList>p{
border-bottom: 1px dotted #c94052;
padding-bottom: 10px;
margin-bottom: 10px;
padding-left: 10px;
font-size: 18px;
}
.page_addCapitalAllocation ._conten ul li._inList>div{
padding: 5px 0;
}
.page_addCapitalAllocation ._conten ul li._inList ._add_btn{
text-align: right;
height: 35px;
line-height: 35px;
position: absolute;
right: 22px;
bottom: 10px;
}
.page_addCapitalAllocation ._conten ul li._inList ._add_btn span{
cursor: pointer;
}
.page_addCapitalAllocation ._conten ul li._inList textarea{
border: none;
border-bottom: 1px solid #666666;
min-height: 300px;
}
.page_addCapitalAllocation ._conten ul li._inList ._uoload{
padding-left: 10px;
}
.page_addCapitalAllocation ._addUpload_box{
display: block;
margin: 15px;
}
.page_addCapitalAllocation ._addUpload_box img{
width: 100%;
}
.page_addCapitalAllocation ._addUpload_box>div{
float: left;
width:138px;
height:92px;
border:1px dashed rgba(210,210,210,1);
border-radius:2px;
cursor: pointer;
margin-bottom: 10px;
padding: 5px;
margin-right: 10px;
position: relative;
}
.page_addCapitalAllocation ._addUpload_box>div:hover{
background-color: #f5f5f5;
}
.page_addCapitalAllocation ._addFile_name{
padding-left: 15px;
max-width: 450px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.page_addCapitalAllocation ._addUpload_box .icon-guanbi1 {
font-size: 12px;
color: white;
display: inline-block;
margin-left: 15px;
position: absolute;
right: -6px;
top: -9px;
background-color: #f56c6c;
border-radius: 50%;
height: 20px;
width: 20px;
text-align: center;
line-height: 20px;
}
.page_addCapitalAllocation ._addUpload_box .icon-guanbi1:hover {
font-size: 12px;
color: #c94052;
}
.page_addCapitalAllocation ._addUpload_box .icon-excel,.page_addCapitalAllocation ._addUpload_box .icon-pdf {
text-align: center;
font-size: 38px;
color: green;
line-height: 75px;
}
.page_addCapitalAllocation ._pic_upload .el-upload-dragger {
font-size: 28px;
color: #8c939d;
width: 126px;
height: 80px;
line-height: 41px;
text-align: center;
}
</style> </style>
<template> <template>
<div class="page_addCapitalAllocation"> <div class="page_addCapitalAllocation">
...@@ -37,31 +138,104 @@ ...@@ -37,31 +138,104 @@
<p><span>资金调拨单</span></p> <p><span>资金调拨单</span></p>
</div> </div>
<div class="_conten"> <div class="_conten">
<ul> <ul v-if="inList.length">
<li> <li v-for="(item, index) in inList" class="_inList">
<p>收款对象</p>
<div> <div>
<span>收款账户：</span> <span class="_lable">收款方式：</span>
<el-select filterable v-model='BankList.Type' placeholder="" @change="getAccountList(BankList.Type)" class="w100 _border_b_1"> <el-select filterable v-model='item.mode' @change="FinancialInstitutions_post_GetAccountList(item.mode, item.Type)" class="w100 _border_b_1">
<el-option v-for='item in AccList' <el-option v-for='item in AccList'
:label='item.Name' :label='item.Name'
:value='item.ID' :value='item.ID'
:key='item.ID'> :key='item.ID'>
</el-option> </el-option>
</el-select> </el-select>
<el-select filterable v-model='BankList.AccountId' placeholder="" @change="getAccName(BankList.AccountId)" class="w100 _border_b_1"> <span class="_lable">账户类型：</span>
<el-option v-for='item in accountList' <el-select filterable v-model='item.Type' @change="FinancialInstitutions_post_GetAccountList(item.mode, item.Type)" class="w100 _border_b_1">
<el-option v-for='item in shouAccList'
:label='item.Name' :label='item.Name'
:value='item.ID' :value='item.ID'
:key='item.ID'> :key='item.ID'>
</el-option> </el-option>
</el-select> </el-select>
<span class="_lable">到款账户：</span>
<el-select filterable v-model='item.AccountId' @change="getAccInfo(index, item.AccountId)" class="w250 _border_b_1">
<el-option v-for='item in shouAccNumList'
:label='item.allName'
:value='item.ID'
:key='item.ID'>
</el-option>
</el-select>
</div>
<div>
<span class="_lable">收款金额：</span>
<el-input v-model='item.OriginalMoney' class="w100 _border_b_1"></el-input>
<span class="_lable">汇率：</span>
<el-input v-model='item.Rate' class="w100 _border_b_1"></el-input>
<span class="_lable">本位金额：</span>
<el-input v-model='item.Money' class="w100 _border_b_1"></el-input>
</div>
<div>
<span class="_lable">调拨日期：</span>
<el-date-picker clearable class="w100 _border_b_1"
v-model="item.AllotDate"
prefix-icon='1'
type="date"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd">
</el-date-picker>
<span class="_lable">备注：</span>
<el-input v-model="item.Description" type="textarea" class="w300 _border_b_1"></el-input>
<div class="_add_btn">
<span @click="initMsg(1)">添加</span>
<span @click="deleteItem(1, index)">删除</span>
<span @click="clearItem(1, index)">清空</span>
</div>
</div>
<div class="_uoload">
<p>上传附件<span class="_addUpload_tips">（单个附件大小不得超过10M）</span></p>
<div class="_addUpload_box clearfix" >
<template v-for="(file,fIndex) in item.VorcherInos">
<div v-if="file.Type==3">
<div style="width:100%;height:100%;overflow: hidden;">
<img :src="file.Url?file.Url:file.Content" @click="showUpLoadFile(file)">
</div>
<span class="iconfont icon-guanbi1" @click="deleteUploadFile(1, index, fIndex)"></span>
</div>
<div v-if="file.Type==1">
<div class="iconfont " :class="file.Content.substring(file.Content.lastIndexOf('.')+1, file.Content.length).toUpperCase()=='PDF'? 'icon-pdf' : 'icon-excel'" @click="showUpLoadFile(file)">
</div>
<span class="iconfont icon-guanbi1" @click="deleteUploadFile(1, index, fIndex)"></span>
</div>
<div v-if="file.Type==2">
<div class="iconfont icon-excel" @click="showUpLoadFile(file)">
</div>
<span class="iconfont icon-guanbi1" @click="deleteUploadFile(1, index, fIndex)"></span>
</div>
</template>
<div class="_pic_upload" @click="inUploadIndex = index,inUploadTrue = true">
<el-upload
drag
:http-request="uploadFileBtn"
:multiple="true" :show-file-list="false" action="">
<i class="el-icon-plus avatar-uploader-icon"></i>
<div class="el-upload__text">点击/拖拽上传</div>
</el-upload>
</div>
</div>
</div> </div>
</li> </li>
</ul> </ul>
</div> </div>
<viewer :images="images" :options='imageOptions' @inited="inited" class="viewer" ref="viewer">
<img v-for="src in images" :src="src" :key="src">
</viewer>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
data(){ data(){
return { return {
...@@ -77,9 +251,91 @@ export default { ...@@ -77,9 +251,91 @@ export default {
emList: [], emList: [],
BankList: [] BankList: []
}, },
BankList: { queryAccMsg: {
pageIndex: 1,
pageSize: 999,
ID: 0,
BackId: 0,
TypeId: 0,
BankType: 0,
Alias: ''
},
AccList: [],
accountList: [],
shouAccList: [],
shouAccNumList: [],
loading: false,
bankType: '',
inList: [],
outList: [],
inUploadIndex: 0,
inUploadTrue: false,
imageOptions:{
navbar:false,
title:false
},
images: [],
}
},
created(){
this.initMsg()
},
methods:{
clearItem: function (type, index) {
if (type===1) {
this.inList[index].ID = 0
this.inList[index].Type = ''
this.inList[index].mode = ''
this.inList[index].AccountId = ''
this.inList[index].OriginalMoney = 0
this.inList[index].Rate = 0
this.inList[index].Money = 0
this.inList[index].CurrencyId = ''
this.inList[index].Description = ''
this.inList[index].AllotDate = ''
this.inList[index].AllotType = 1
this.inList[index].Sort = ''
this.inList[index].allName = ''
this.inList[index].VorcherInos = []
}else if(type===2) {
this.outList[index].ID = 0
this.outList[index].Type = ''
this.outList[index].mode = ''
this.outList[index].AccountId = ''
this.outList[index].OriginalMoney = 0
this.outList[index].Rate = 0
this.outList[index].Money = 0
this.outList[index].CurrencyId = ''
this.outList[index].Description = ''
this.outList[index].AllotDate = ''
this.outList[index].AllotType = 2
this.outList[index].Sort = ''
this.outList[index].allName = ''
this.outList[index].VorcherInos = []
}
this.$forceUpdate()
},
deleteItem: function (type, index) {
if (type===1) {
if (this.inList.length===1) {
return this.$message.error('不能删除了！');
} else {
this.inList.splice(index, 1)
}
} else if (type===2){
if (this.outList.length===1) {
return this.$message.error('不能删除了！');
} else {
this.outList.splice(index, 1)
}
}
this.$forceUpdate()
},
initInList: function () {
this.inList.push({
ID: 0, ID: 0,
Type: '', Type: '',
mode: '',
AccountId: '', AccountId: '',
OriginalMoney: 0, OriginalMoney: 0,
Rate: 0, Rate: 0,
...@@ -87,77 +343,168 @@ export default { ...@@ -87,77 +343,168 @@ export default {
CurrencyId: '', CurrencyId: '',
Description: '', Description: '',
AllotDate: '', AllotDate: '',
AllotType: '', AllotType: 1,
Sort: '', Sort: '',
VorcherInos: [ allName: '',
{ VorcherInos: []
})
},
initOnList: function () {
this.outList.push({
ID: 0, ID: 0,
Type: 0, Type: '',
Content: 0 mode: '',
} AccountId: '',
] OriginalMoney: 0,
Rate: 0,
Money: 0,
CurrencyId: '',
Description: '',
AllotDate: '',
AllotType: 2,
Sort: '',
allName: '',
VorcherInos: []
})
}, },
AccList: [], initMsg: function (t) {
accountList: [], if(!t){
loading: false, this.initInList()
bankType: '' this.initOnList()
} else if (t===1) {
this.initInList()
} else if (t===2) {
this.initOnList()
} }
this.$forceUpdate()
}, },
create(){ GetBranchAccountList: function () { //收款方式
this.apipost('Financial_post_GetBranchAccountList', {}, res=>{
if(res.data.resultCode==1){
let List = res.data.data;
this.AccList = List;
}else{
this.$message.error(res.data.message);
}
},err=>{})
}, },
methods:{ AccountType_post_GetList: function (){ //获取收款方式类型下拉
AccountType_post_GetList: function () { //获取账户类型下拉 this.apipost('AccountType_post_GetList', {}, res=>{
this.apipost('AccountType_post_GetList',this.queryAccMsg,res=>{
if(res.data.resultCode==1){ if(res.data.resultCode==1){
let AccList = res.data.data; let List = res.data.data;
this.AccList = AccList; this.shouAccList = List;
}else{ }else{
this.$message.error(res.data.message); this.$message.error(res.data.message);
} }
},err=>{}) },err=>{})
}, },
getAccountList(i){ //获取账户类型对应下的账户列表 FinancialInstitutions_post_GetAccountList: function (Type, id) {
this.BankList.AccountId = ''; if (!id) return
this.AccountNumber = ''; this.queryAccMsg.TypeId = id
this.apipost('FinancialInstitutions_post_GetALLAccountList',{TypeId:i}, res => { this.queryAccMsg.BankType = Type
if(res.data.resultCode == 1) { this.apipost('FinancialInstitutions_post_GetAccountList', this.queryAccMsg, res=>{
let data = res.data.data; if(res.data.resultCode==1){
data.forEach(x=>{ let List = res.data.data.pageData;
List.forEach(x => {
x.allName = x.BackNo+"("+x.Alias+")"; x.allName = x.BackNo+"("+x.Alias+")";
x.Name = x.Alias; });
this.shouAccNumList = List
}else{
this.$message.error(res.data.message);
}
},err=>{})
},
getAccInfo: function (i, id) {
this.shouAccNumList.forEach(x => {
if (x.ID === id) {
console.log(x)
this.inList[i].Rate = x.Rate
this.inList[i].AccountId = x.ID
this.inList[i].CurrencyId = x.CurrencyId
}
})
},
uploadFileBtn: function (file) { //上传
if(file.file.size > 1024 * 1024 * 10) {
this.$message.warning('文件大小不能超过10M！')
return
}
// 1 文档 2 数据 3 图片
let typeArr=[
{stringArr:'GIF|JPG|JPEG|PNG|BMP',type:3},
{stringArr:'DOCX|DOC|XLSX|XLS|PPT|PPTX|PDF',type:1},
]
let ft=file.file.name.substring(file.file.name.lastIndexOf('.')+1,file.file.name.length).toUpperCase();
let fileTypeNumber = 2;
let typeOk = false;
typeArr.forEach(x=>{
if(x.stringArr.indexOf(ft)!='-1')
{
fileTypeNumber=x.type
typeOk = true;
}
})
if (!typeOk) return this.$message.error('请上传图片、word、excel类型的文件！');
let newArr = [];
newArr.push(file.file)
let path = "/Upload/Temporary/"
this.$message.info('上传中...')
this.uploadFile(path, newArr, x => {
console.log(x.res.requestUrls[0])
let fileSize = file.file.size<1024? file.file.size:(file.file.size / 1024).toFixed(0);
if (this.inUploadTrue) {
this.inList[this.inUploadIndex].VorcherInos.push({
Content: x.name,
ID:0,
Type:fileTypeNumber,
Url:x.res.requestUrls[0].split("?")[0],
}) })
this.accountList = data; } else {
// if(this.$route.query.edit){ this.outList[this.inUploadIndex].VorcherInos.push({
// this.getAccName(this.msg.BankList[0].AccountId) Content: x.name,
// } ID:0,
} Type:fileTypeNumber,
}, err => {}) Url:x.res.requestUrls[0].split("?")[0],
},
getAccName: function (i,o) { // 根据选择账户获取账户名
this.accountList.forEach(x=>{
if(x.ID == i){
this.AccountNumber = x.allName;
this.msg.BankList[0].CurrencyId = x.CurrencyId;
this.msg.BankList[0].Type = x.BankType;
this.detailList.currenName = x.CurrencyName;
this.detailList.CurrencyId = x.CurrencyId;
if(this.edit==false||o){
this.detailList.Rate =x.Rate
}
this.msg.detailList.forEach((y,i)=>{
y.CurrencyId = x.CurrencyId;
y.currenName = x.CurrencyName;
if(this.edit==false||o){
y.Rate =x.Rate;
}
this.Calculation(2,i+1);
}) })
} }
this.$message.success('上传成功');
});
},
deleteUploadFile: function (type, i , ind) { // 删除上传文件
if (type===1) {
this.inList[i].VorcherInos.splice(ind, 1)
} else {
this.outList[i].VorcherInos.splice(ind, 1)
}
},
showUpLoadFile(i){ // 预览上传文件
if(i.Type==3){
this.picIsShow= true;
let isExsit=false
this.images.forEach(x=>{
if(x==i.Url)
isExsit=true
}) })
if(!isExsit) {
this.images.push(i.Url)
} else {
this.$viewer.view(this.images.indexOf(i.Url))
}
this.$viewer.show()
}else{
if(i.Content.substring(i.Content.lastIndexOf('.')+1,i.Content.length).toUpperCase()=='PDF'){
this.previewPDF(i.Url)
}else{
window.open("https://view.officeapps.live.com/op/view.aspx?src="+i.Url)
}
}
},
inited (viewer){
this.$viewer = viewer
}, },
}, },
mounted(){ mounted(){
this.GetBranchAccountList()
this.AccountType_post_GetList() this.AccountType_post_GetList()
} }
} }
......
src/components/Login.vue
View file @ c167fbe1
...@@ -338,7 +338,7 @@ export default { ...@@ -338,7 +338,7 @@ export default {
); );
}, },
getCode() { getCode() {
var phoneReg = /(^1[3|4|5|7|8]\d{9}$)|(^09\d{8}$)/; var phoneReg = /(^1[3|4|5|7|8|9]\d{9}$)|(^09\d{8}$)/;
//电话 //电话
var phone = this.mobileNumber.replace(/^\s+|\s+$/gm, ""); var phone = this.mobileNumber.replace(/^\s+|\s+$/gm, "");
if (!phoneReg.test(phone)) { if (!phoneReg.test(phone)) {
......
src/components/SalesModule/groupTourOrder.vue
View file @ c167fbe1
...@@ -1425,8 +1425,8 @@ ...@@ -1425,8 +1425,8 @@
<p style="max-width: 160px;display: block;" class="over_ellipsis" :title="item.ltName">{{item.ltName}}</p> <p style="max-width: 160px;display: block;" class="over_ellipsis" :title="item.ltName">{{item.ltName}}</p>
</td> </td>
<td> <td>
<el-popover style='padding: 0;' width="470" trigger="click"> <!-- <el-popover style='padding: 0;' width="470" trigger="click"> -->
<div class="personNolayer"> <!-- <div class="personNolayer">
<p> <p>
<span>成人：{{item.manNum}}人</span> <span>成人：{{item.manNum}}人</span>
<span>儿童：{{item.chirdNum}}人</span> <span>儿童：{{item.chirdNum}}人</span>
...@@ -1453,14 +1453,14 @@ ...@@ -1453,14 +1453,14 @@
<td colspan="5" align="center">暂无数据</td> <td colspan="5" align="center">暂无数据</td>
</tr> </tr>
</table> </table>
</div> </div> -->
<span v-if='item.guestNumStatus==1' style="color:#1AA86B;" class="personNo" slot="reference" <span v-if='item.guestNumStatus==1' style="color:#1AA86B;" class="personNo" slot="reference"
@click="getMembersDetail(item)">{{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}}</span> @click="getMembersDetail(item)">{{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}}</span>
<span v-if='item.guestNumStatus==2' style="color:#E95252;" class="personNo" slot="reference" <span v-if='item.guestNumStatus==2' style="color:#E95252;" class="personNo" slot="reference"
@click="getMembersDetail(item)">{{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}}</span> @click="getMembersDetail(item)">{{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}}</span>
<span v-if='item.guestNumStatus==3' style="color:#666;" class="personNo" slot="reference" <span v-if='item.guestNumStatus==3' style="color:#666;" class="personNo" slot="reference"
@click="getMembersDetail(item)">{{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}}</span> @click="getMembersDetail(item)">{{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}}</span>
</el-popover> <!-- </el-popover> -->
</td> </td>
<td style="color:#FF9C00">{{item.tC_Price}}</td> <td style="color:#FF9C00">{{item.tC_Price}}</td>
<td style="color:#FF9C00">{{item.unit_Price}}</td> <td style="color:#FF9C00">{{item.unit_Price}}</td>
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ c167fbe1
...@@ -1447,8 +1447,8 @@ ...@@ -1447,8 +1447,8 @@
<p class="fz12">{{item.contactMobile}}</p> --> <p class="fz12">{{item.contactMobile}}</p> -->
</td> </td>
<td> <td>
<el-popover style='padding: 0;' width="470" trigger="click" > <!-- <el-popover style='padding: 0;' width="470" trigger="click" > -->
<div class="personNolayer"> <!-- <div class="personNolayer">
<p> <p>
<span>成人：{{item.manNum}}人</span> <span>成人：{{item.manNum}}人</span>
<span>儿童：{{item.chirdNum}}人</span> <span>儿童：{{item.chirdNum}}人</span>
...@@ -1475,11 +1475,11 @@ ...@@ -1475,11 +1475,11 @@
<td colspan="5" align="center">暂无数据</td> <td colspan="5" align="center">暂无数据</td>
</tr> </tr>
</table> </table>
</div> </div> -->
<span v-if='item.guestNumStatus==1' style="color:#1AA86B;" class="personNo" slot="reference" @click="getMembersDetail(item)">{{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}}</span> <span v-if='item.guestNumStatus==1' style="color:#1AA86B;" class="personNo" slot="reference" @click="getMembersDetail(item)">{{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}}</span>
<span v-if='item.guestNumStatus==2' style="color:#E95252;" class="personNo" slot="reference" @click="getMembersDetail(item)">{{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}}</span> <span v-if='item.guestNumStatus==2' style="color:#E95252;" class="personNo" slot="reference" @click="getMembersDetail(item)">{{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}}</span>
<span v-if='item.guestNumStatus==3' style="color:#666;" class="personNo" slot="reference" @click="getMembersDetail(item)">{{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}}</span> <span v-if='item.guestNumStatus==3' style="color:#666;" class="personNo" slot="reference" @click="getMembersDetail(item)">{{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}}</span>
</el-popover> <!-- </el-popover> -->
</td> </td>
<td style="color:#FF9C00"> <td style="color:#FF9C00">
<span>{{item.tC_Price}}</span> <span>{{item.tC_Price}}</span>
...@@ -1624,7 +1624,9 @@ ...@@ -1624,7 +1624,9 @@
<tr> <tr>
<td colspan="4" class="groupTourOrder_remarks" style="height: 40px;"> <td colspan="4" class="groupTourOrder_remarks" style="height: 40px;">
<div> <div>
<div><span>备注：</span><p><span v-if='item.clientSource==1&&item.brandName!=""'>{{item.brandName}}订单 {{item.platformOrder}};</span>{{item.remarks}}</p></div> <div><span>备注：</span><p>
<span v-if="item.tsId>0">投诉单号：<a href="javascript:void(0);" @click="goUrlTS('ComplaintsDetail',item.tsId,item.orderId,'投诉详情')">{{item.tsId}}</a> ;</span>
<span v-if='item.clientSource==1&&item.brandName!=""'>{{item.brandName}}订单 {{item.platformOrder}};</span>{{item.remarks}}</p></div>
<div> <div>
<!-- <span>{{item.remarksName}}&ensp;{{item.rematksTime}}</span> --> <!-- <span>{{item.remarksName}}&ensp;{{item.rematksTime}}</span> -->
<el-popover width="600" placement="bottom-end" trigger="click"> <el-popover width="600" placement="bottom-end" trigger="click">
...@@ -1734,8 +1736,8 @@ ...@@ -1734,8 +1736,8 @@
<p v-if='item.isOwn==2&&userId!=1&&userId!=5&&positionId!=168'>*****</p> <p v-if='item.isOwn==2&&userId!=1&&userId!=5&&positionId!=168'>*****</p>
</td> </td>
<td> <td>
<el-popover style='padding: 0;' width="470" trigger="click" > <!-- <el-popover style='padding: 0;' width="470" trigger="click" > -->
<div class="personNolayer"> <!-- <div class="personNolayer">
<p> <p>
<span>成人：{{item.manNum}}人</span> <span>成人：{{item.manNum}}人</span>
<span>儿童：{{item.chirdNum}}人</span> <span>儿童：{{item.chirdNum}}人</span>
...@@ -1762,11 +1764,11 @@ ...@@ -1762,11 +1764,11 @@
<td colspan="5" align="center">暂无数据</td> <td colspan="5" align="center">暂无数据</td>
</tr> </tr>
</table> </table>
</div> </div> -->
<span v-if='item.guestNumStatus==1' style="color:#1AA86B;" class="personNo" slot="reference" @click="getMembersDetail(item)">{{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}}</span> <span v-if='item.guestNumStatus==1' style="color:#1AA86B;" class="personNo" slot="reference" @click="getMembersDetail(item)">{{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}}</span>
<span v-if='item.guestNumStatus==2' style="color:#E95252;" class="personNo" slot="reference" @click="getMembersDetail(item)">{{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}}</span> <span v-if='item.guestNumStatus==2' style="color:#E95252;" class="personNo" slot="reference" @click="getMembersDetail(item)">{{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}}</span>
<span v-if='item.guestNumStatus==3' style="color:#666;" class="personNo" slot="reference" @click="getMembersDetail(item)">{{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}}</span> <span v-if='item.guestNumStatus==3' style="color:#666;" class="personNo" slot="reference" @click="getMembersDetail(item)">{{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}}</span>
</el-popover> <!-- </el-popover> -->
</td> </td>
<td style="color:#FF9C00"> <td style="color:#FF9C00">
<span>{{item.tC_Price}}</span> <span>{{item.tC_Price}}</span>
...@@ -2314,6 +2316,18 @@ export default { ...@@ -2314,6 +2316,18 @@ export default {
} }
}, },
methods: { methods: {
//跳转
goUrlTS (path, id, orderId, title) {
this.$router.push({
name: path,
query: {
'id': id,
'orderId': orderId,
blank: 'y',
tab: title
}
})
},
//是否可以修改成交单价 //是否可以修改成交单价
canEditUnitPrice() { canEditUnitPrice() {
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
......
src/components/SalesModule/productQuery.vue
View file @ c167fbe1
...@@ -289,7 +289,7 @@ ...@@ -289,7 +289,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="单地接人数" prop="AirticketNum"> <el-form-item label="单地接人数" prop="AirticketNum" v-show="addMsg.GroupType !== '1'">
<el-input v-model='addMsg.AirticketNum' @keyup.native="checkInteger(addMsg,'AirticketNum')" @input='getNumber();getTotalPrice();getHouseNo();autoRemarks("AirticketNum","单地接数量")'></el-input> <el-input v-model='addMsg.AirticketNum' @keyup.native="checkInteger(addMsg,'AirticketNum')" @input='getNumber();getTotalPrice();getHouseNo();autoRemarks("AirticketNum","单地接数量")'></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -1110,6 +1110,11 @@ ...@@ -1110,6 +1110,11 @@
this.getNumber(); this.getNumber();
this.getHouseNo(); this.getHouseNo();
this.getTotalPrice() this.getTotalPrice()
} else if (val === '1') {
this.addMsg.AirticketNum = 0
this.getNumber();
this.getHouseNo();
this.getTotalPrice()
} }
}, },
downloadFile: function (item) { downloadFile: function (item) {
......
src/components/ShoppingStore/ShoppingStore.vue
View file @ c167fbe1
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
} }
.shoppingStore .resourceList { .shoppingStore .resourceList {
width: 215px; width: 215px;
height: 288px; height: 230px;
background-color: #fff; background-color: #fff;
border: 1px solid #ededed; border: 1px solid #ededed;
border-radius: 4px; border-radius: 4px;
...@@ -434,10 +434,9 @@ ...@@ -434,10 +434,9 @@
<div class="hotelResource clearfix" v-loading="loading" :class="{'divTop':isShow,'fillTop':fillShow}"> <div class="hotelResource clearfix" v-loading="loading" :class="{'divTop':isShow,'fillTop':fillShow}">
<div class="resourceList" v-for="item in dataInfo" :key="item.subCode"> <div class="resourceList" v-for="item in dataInfo" :key="item.subCode">
<div class="reTopInfo"> <div class="reTopInfo">
<img v-if="item.PicPath!=''" :src="'https://reborndev.oss-cn-hangzhou.aliyuncs.com'+item.PicPath" :onerror='defaultImg' /> <img v-if="item.PicPath!=''" :src="'https://reborndev.oss-cn-hangzhou.aliyuncs.com'+item.PicPath" :onerror='defaultImg' />
<img v-else src="../../assets/img/shoppingstore.jpg" :onerror='defaultImg' /> <img v-else src="../../assets/img/shoppingstore.jpg" :onerror='defaultImg' />
<div class="profitList"> <div class="profitList" style="display:none">
<div class="profOne">一<span class="cumlaProfit">累计利润</span>一</div> <div class="profOne">一<span class="cumlaProfit">累计利润</span>一</div>
<div>￥{{item.TotalProfit}}</div> <div>￥{{item.TotalProfit}}</div>
</div> </div>
...@@ -453,8 +452,8 @@ ...@@ -453,8 +452,8 @@
No.{{item.Sort}} No.{{item.Sort}}
</div> </div>
</div> </div>
<div class="AccumuTrading">累计交易</div> <div class="AccumuTrading" style="display:none">累计交易</div>
<div class="amountOf">￥{{item.TotalPrice}}</div> <div class="amountOf" style="display:none">￥{{item.TotalPrice}}</div>
<div class="PhoneNum"> <div class="PhoneNum">
<i class="iconfont icon-img_dianhua"></i>{{item.Tel}} <i class="iconfont icon-img_dianhua"></i>{{item.Tel}}
</div> </div>
...@@ -477,7 +476,6 @@ ...@@ -477,7 +476,6 @@
<input type="button" class="hollowFixedBtn" @click="isShow=false,resetForm('addMsg')" value="取消" /> <input type="button" class="hollowFixedBtn" @click="isShow=false,resetForm('addMsg')" value="取消" />
</el-col> </el-col>
</el-row> </el-row>
<!-- <div class="combottomTitle">{{titleInfo}}</div> -->
<el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="100px"> <el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="100px">
<ul class="changeMsg"> <ul class="changeMsg">
<li> <li>
...@@ -575,15 +573,10 @@ ...@@ -575,15 +573,10 @@
</div> </div>
</div> </div>
</el-form> </el-form>
<!-- <div class="btmBtn">
<div style="float:right;">
<input type="button" class="hollowFixedBtn" @click="isShow=false,resetForm('addMsg')" value="取消"/>
<input type="button" class="normalBtn" @click="submitForm('addMsg')" value="保存"/>
</div>
</div> -->
</div> </div>
<div class="btmAddStore" :class="{'fillShow':fillShow}"> <div class="btmAddStore" :class="{'fillShow':fillShow}">
<div class="btmTitle">导入营销数据<span class="litTip">(红色边框代表未匹配到的数据)</span></div> <div class="btmTitle">导入营销数据<span class="litTip">(红色边框代表未匹配到的数据)</span></div>
<div style="height:250px;overflow-y: auto;">
<table class="impoTable" style="border-spacing: 0px 1px;"> <table class="impoTable" style="border-spacing: 0px 1px;">
<thead> <thead>
<tr> <tr>
...@@ -633,6 +626,7 @@ ...@@ -633,6 +626,7 @@
</tr> </tr>
</thead> </thead>
</table> </table>
</div>
<div class="btmBtn impotBtn"> <div class="btmBtn impotBtn">
<input type="button" class="normalBtn" @click="importInfo" value="确认导入" /> <input type="button" class="normalBtn" @click="importInfo" value="确认导入" />
<input type="button" class="hollowFixedBtn" @click="hideFill" value="取消" /> <input type="button" class="hollowFixedBtn" @click="hideFill" value="取消" />
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ c167fbe1
...@@ -1404,13 +1404,14 @@ ...@@ -1404,13 +1404,14 @@
<p class="fz12 over_ellipsis" style="width: 90%;">领队控位</p> <p class="fz12 over_ellipsis" style="width: 90%;">领队控位</p>
</td> </td>
<td> <td>
<el-popover style='padding: 0;' width="470" trigger="click"> <!-- <el-popover style='padding: 0;' width="470" trigger="click"> -->
<div class="personNolayer"> <!-- <div class="personNolayer">
<p> <p>
<span>成人：{{item.ManNum}}人</span> <span>成人：{{item.ManNum}}人</span>
<span>儿童：{{item.ChirdNum}}人</span> <span>儿童：{{item.ChirdNum}}人</span>
<span>老人：{{item.OldPeopleNum}}人</span> <span>老人：{{item.OldPeopleNum}}人</span>
<span>婴儿：{{item.BabyNum}}人</span> <span>婴儿：{{item.BabyNum}}人</span>
<span>单地接：{{item.AirticketNum}}人</span>
</p> </p>
<table border="0" cellspacing="1" cellpadding="1"> <table border="0" cellspacing="1" cellpadding="1">
<tr> <tr>
...@@ -1431,11 +1432,11 @@ ...@@ -1431,11 +1432,11 @@
<td colspan="5" align="center">暂无数据</td> <td colspan="5" align="center">暂无数据</td>
</tr> </tr>
</table> </table>
</div> </div> -->
<span v-if='item.GuestNumStatus==1' style="color:#1AA86B; " class="personNo nowrap" slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span> <span v-if='item.GuestNumStatus==1' style="color:#1AA86B; " class="personNo nowrap" slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span>
<span v-if='item.GuestNumStatus==2' style="color:#E95252; " class="personNo nowrap" slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span> <span v-if='item.GuestNumStatus==2' style="color:#E95252; " class="personNo nowrap" slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span>
<span v-if='item.GuestNumStatus==3' style="color:#666; " class="personNo nowrap" slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span> <span v-if='item.GuestNumStatus==3' style="color:#666; " class="personNo nowrap" slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span>
</el-popover> <!-- </el-popover> -->
</td> </td>
<td>{{item.TC_Price}}</td> <td>{{item.TC_Price}}</td>
<td>{{item.Unit_Price}}</td> <td>{{item.Unit_Price}}</td>
...@@ -1585,13 +1586,14 @@ ...@@ -1585,13 +1586,14 @@
<p v-if="childItem.IsOwn==2&&userId!=1&&userId!=5">*****</p> <p v-if="childItem.IsOwn==2&&userId!=1&&userId!=5">*****</p>
</td> </td>
<td> <td>
<el-popover style='padding: 0;' width="470" trigger="click"> <!-- <el-popover style='padding: 0;' width="470" trigger="click" > -->
<div class="personNolayer"> <!-- <div class="personNolayer">
<p> <p>
<span>成人：{{childItem.ManNum}}人</span> <span>成人：{{childItem.ManNum}}人</span>
<span>儿童：{{childItem.ChirdNum}}人</span> <span>儿童：{{childItem.ChirdNum}}人</span>
<span>老人：{{childItem.OldPeopleNum}}人</span> <span>老人：{{childItem.OldPeopleNum}}人</span>
<span>婴儿：{{childItem.BabyNum}}人</span> <span>婴儿：{{childItem.BabyNum}}人</span>
<span>单地接：{{childItem.AirticketNum}}人</span>
</p> </p>
<table border="0" cellspacing="1" cellpadding="1"> <table border="0" cellspacing="1" cellpadding="1">
<tr> <tr>
...@@ -1612,11 +1614,11 @@ ...@@ -1612,11 +1614,11 @@
<td colspan="5" align="center">暂无数据</td> <td colspan="5" align="center">暂无数据</td>
</tr> </tr>
</table> </table>
</div> </div> -->
<span v-if='childItem.GuestNumStatus==1' style="color:#1AA86B; " class="personNo nowrap" slot="reference">{{childItem.GuestNum}}/{{childItem.YSeatNum>0? childItem.YSeatNum+'Y ':''}}{{childItem.ESeatNum>0? childItem.ESeatNum+'E ':''}}{{childItem.FSeatNum>0? childItem.FSeatNum+'F ':''}}</span> <span v-if='childItem.GuestNumStatus==1' style="color:#1AA86B; " class="personNo nowrap" slot="reference">{{childItem.GuestNum}}/{{childItem.YSeatNum>0? childItem.YSeatNum+'Y ':''}}{{childItem.ESeatNum>0? childItem.ESeatNum+'E ':''}}{{childItem.FSeatNum>0? childItem.FSeatNum+'F ':''}}</span>
<span v-if='childItem.GuestNumStatus==2' style="color:#E95252;" class="personNo nowrap" slot="reference">{{childItem.GuestNum}}/{{childItem.YSeatNum>0? childItem.YSeatNum+'Y ':''}}{{childItem.ESeatNum>0? childItem.ESeatNum+'E ':''}}{{childItem.FSeatNum>0? childItem.FSeatNum+'F ':''}}</span> <span v-if='childItem.GuestNumStatus==2' style="color:#E95252;" class="personNo nowrap" slot="reference">{{childItem.GuestNum}}/{{childItem.YSeatNum>0? childItem.YSeatNum+'Y ':''}}{{childItem.ESeatNum>0? childItem.ESeatNum+'E ':''}}{{childItem.FSeatNum>0? childItem.FSeatNum+'F ':''}}</span>
<span v-if='childItem.GuestNumStatus==3' style="color:#666; " class="personNo nowrap" slot="reference">{{childItem.GuestNum}}/{{childItem.YSeatNum>0? childItem.YSeatNum+'Y ':''}}{{childItem.ESeatNum>0? childItem.ESeatNum+'E ':''}}{{childItem.FSeatNum>0? childItem.FSeatNum+'F ':''}}</span> <span v-if='childItem.GuestNumStatus==3' style="color:#666; " class="personNo nowrap" slot="reference">{{childItem.GuestNum}}/{{childItem.YSeatNum>0? childItem.YSeatNum+'Y ':''}}{{childItem.ESeatNum>0? childItem.ESeatNum+'E ':''}}{{childItem.FSeatNum>0? childItem.FSeatNum+'F ':''}}</span>
</el-popover> <!-- </el-popover> -->
</td> </td>
<td class="nowrap">{{childItem.TC_Price}}</td> <td class="nowrap">{{childItem.TC_Price}}</td>
<td>{{childItem.Unit_Price}}</td> <td>{{childItem.Unit_Price}}</td>
...@@ -1723,6 +1725,7 @@ ...@@ -1723,6 +1725,7 @@
<div class="clearfix RL-MARK"> <div class="clearfix RL-MARK">
<span class="RL-remarkTitle">备注:</span> <span class="RL-remarkTitle">备注:</span>
<p class="RL-redType RL-remarkCon"> <p class="RL-redType RL-remarkCon">
<span v-if="childItem.TsId>0">投诉单号：<a href="javascript:void(0);" @click="goUrlTS('ComplaintsDetail',childItem.TsId,childItem.OrderId,'投诉详情')">{{childItem.TsId}}</a> ;</span>
<span v-if='childItem.ClientSource==1&&childItem.BrandName!=""'>{{childItem.BrandName}}订单 <span v-if='childItem.ClientSource==1&&childItem.BrandName!=""'>{{childItem.BrandName}}订单
{{childItem.PlatformOrder}};</span> {{childItem.PlatformOrder}};</span>
{{childItem.Remarks}} {{childItem.Remarks}}
...@@ -1804,13 +1807,14 @@ ...@@ -1804,13 +1807,14 @@
<p v-if="item.IsOwn==2&&userId!=1&&userId!=5">*****</p> <p v-if="item.IsOwn==2&&userId!=1&&userId!=5">*****</p>
</td> </td>
<td> <td>
<el-popover style='padding: 0;' width="470" trigger="click"> <!-- <el-popover style='padding: 0;' width="470" trigger="click"> -->
<div class="personNolayer"> <!-- <div class="personNolayer">
<p> <p>
<span>成人：{{item.ManNum}}人</span> <span>成人：{{item.ManNum}}人</span>
<span>儿童：{{item.ChirdNum}}人</span> <span>儿童：{{item.ChirdNum}}人</span>
<span>老人：{{item.OldPeopleNum}}人</span> <span>老人：{{item.OldPeopleNum}}人</span>
<span>婴儿：{{item.BabyNum}}人</span> <span>婴儿：{{item.BabyNum}}人</span>
<span>单地接：{{item.AirticketNum}}人</span>
</p> </p>
<table border="0" cellspacing="1" cellpadding="1"> <table border="0" cellspacing="1" cellpadding="1">
<tr> <tr>
...@@ -1831,11 +1835,11 @@ ...@@ -1831,11 +1835,11 @@
<td colspan="5" align="center">暂无数据</td> <td colspan="5" align="center">暂无数据</td>
</tr> </tr>
</table> </table>
</div> </div> -->
<span v-if='item.GuestNumStatus==1' style="color:#1AA86B;" class="personNo" slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span> <span v-if='item.GuestNumStatus==1' style="color:#1AA86B;" class="personNo" slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span>
<span v-if='item.GuestNumStatus==2' style="color:#E95252;" class="personNo" slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span> <span v-if='item.GuestNumStatus==2' style="color:#E95252;" class="personNo" slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span>
<span v-if='item.GuestNumStatus==3' style="color:#666;" class="personNo" slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span> <span v-if='item.GuestNumStatus==3' style="color:#666;" class="personNo" slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span>
</el-popover> <!-- </el-popover> -->
</td> </td>
<td>{{item.TC_Price}}</td> <td>{{item.TC_Price}}</td>
<td>{{item.Unit_Price}}</td> <td>{{item.Unit_Price}}</td>
...@@ -2498,6 +2502,18 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue"; ...@@ -2498,6 +2502,18 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
updateSalesMan:updateSalesMan updateSalesMan:updateSalesMan
}, },
methods: { methods: {
//跳转
goUrlTS (path, id, orderId, title) {
this.$router.push({
name: path,
query: {
'id': id,
'orderId': orderId,
blank: 'y',
tab: title
}
})
},
maxCommissionMinusRate: function () { maxCommissionMinusRate: function () {
this.TCMsg.CommissionMinusRate = this.TCMsg.CommissionMinusRate.replace(/[^\.\d]/g,''); this.TCMsg.CommissionMinusRate = this.TCMsg.CommissionMinusRate.replace(/[^\.\d]/g,'');
this.TCMsg.CommissionMinusRate = this.TCMsg.CommissionMinusRate.replace('.',''); this.TCMsg.CommissionMinusRate = this.TCMsg.CommissionMinusRate.replace('.','');
......
src/components/busManagement/BusApportionManagement.vue
View file @ c167fbe1
...@@ -298,6 +298,16 @@ ...@@ -298,6 +298,16 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="客户名称" class='multiple_input countryList'>
<el-select filterable v-model='exportInfo.ClientId' placeholder="请选择客户名称" class="w200 _border_b_1">
<el-option :value="0" label="不限"></el-option>
<el-option v-for='item in ClientAccountList'
:label='item.Name'
:value='item.ID'
:key='item.ID'>
</el-option>
</el-select>
</el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<button class="normalBtn" type="primary" @click="goToExport('BusExport')">{{$t('pub.saveBtn')}}</button> &nbsp; <button class="normalBtn" type="primary" @click="goToExport('BusExport')">{{$t('pub.saveBtn')}}</button> &nbsp;
...@@ -388,7 +398,8 @@ export default { ...@@ -388,7 +398,8 @@ export default {
DCDate:'', DCDate:'',
StartGroupDate:'', StartGroupDate:'',
EndGroupDate:'', EndGroupDate:'',
CurrType:3 CurrType:3,
ClientId:0
}, },
pickerBeginDateBefore: { pickerBeginDateBefore: {
disabledDate: time => { disabledDate: time => {
...@@ -818,6 +829,7 @@ export default { ...@@ -818,6 +829,7 @@ export default {
MakeStartDate:this.exportInfo.StartGroupDate, MakeStartDate:this.exportInfo.StartGroupDate,
MakeEndDate:this.exportInfo.EndGroupDate, MakeEndDate:this.exportInfo.EndGroupDate,
CurrType:this.exportInfo.CurrType, CurrType:this.exportInfo.CurrType,
ClientId:this.exportInfo.ClientId
} }
}); });
window.open(routeData.href, "_blank"); window.open(routeData.href, "_blank");
......
src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue
View file @ c167fbe1
...@@ -579,7 +579,6 @@ ...@@ -579,7 +579,6 @@
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
var tempData = res.data.data; var tempData = res.data.data;
console.log('tempData',tempData)
if (tempData.Feature != null) { if (tempData.Feature != null) {
this.FeatureData.ID = tempData.Feature.ID; this.FeatureData.ID = tempData.Feature.ID;
this.FeatureData.ConfigId = tempData.Feature.ConfigId; this.FeatureData.ConfigId = tempData.Feature.ConfigId;
......
src/components/newTravelmanager/TravelGroupControl/TravelTemp/travelFeature3.vue
View file @ c167fbe1
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<!--<div id='newFeatureBox' v-if="!Refresh" v-loading="RenderingOk">--> <!--<div id='newFeatureBox' v-if="!Refresh" v-loading="RenderingOk">-->
<div id='newFeatureBox' v-if="!Refresh"> <div id='newFeatureBox' v-if="!Refresh">
<!-- 酒店 --> <!-- 酒店 -->
<div class="travle_page" v-for="(item, index) in hotelObj.pageList" :key="'hotel'+index " v-if="item === 0"> <div class="travle_page" v-for="(item, index) in hotelObj.pageList" :key="'hotel'+index " v-if="hotelObj.list.length>0">
<!-- 酒店1 --> <!-- 酒店1 -->
<div class="travel_hotel_1" v-if="item === 0 && hotelObj.list!=null && hotelObj.list.length>0"> <div class="travel_hotel_1" v-if="item === 0 && hotelObj.list!=null && hotelObj.list.length>0">
<div class="hotel_1_header"> <div class="hotel_1_header">
...@@ -1354,7 +1354,8 @@ ...@@ -1354,7 +1354,8 @@
init: function () { //初始化 init: function () { //初始化
let dataList = JSON.parse(JSON.stringify(this.FeatureData)); let dataList = JSON.parse(JSON.stringify(this.FeatureData));
let deleteDataList = JSON.parse(JSON.stringify(this.FeatureData.FeatureHtmlJsonDelete)); let deleteDataList = JSON.parse(JSON.stringify(this.FeatureData.FeatureHtmlJsonDelete));
this.deleteArray = deleteDataList==="" ? this.deleteArray : deleteDataList; this.deleteArray = !deleteDataList ? [] : deleteDataList;
console.log("this.deleteArray", this.deleteArray)
console.log("dataList",dataList,!this.$route.query.configId,dataList.switch4or5) console.log("dataList",dataList,!this.$route.query.configId,dataList.switch4or5)
// console.log("this.$route.query.configId && this.FeatureData.FeatureType<4",this.$route.query.configId && this.FeatureData.FeatureType<4) || (this.$route.query.configId && this.FeatureData.FeatureType<4) // console.log("this.$route.query.configId && this.FeatureData.FeatureType<4",this.$route.query.configId && this.FeatureData.FeatureType<4) || (this.$route.query.configId && this.FeatureData.FeatureType<4)
if (!this.$route.query.configId || (this.$route.query.configId && dataList.switch4or5) || (this.$route.query.configId && this.FeatureData.lastFeatureType<4)){ if (!this.$route.query.configId || (this.$route.query.configId && dataList.switch4or5) || (this.$route.query.configId && this.FeatureData.lastFeatureType<4)){
...@@ -1841,6 +1842,7 @@ ...@@ -1841,6 +1842,7 @@
}, },
// 版块删除 // 版块删除
bolckToDelete: function (name, index1, index2) { bolckToDelete: function (name, index1, index2) {
console.log(name, index1)
let blockList = []; let blockList = [];
if (name === 'hotel') { if (name === 'hotel') {
blockList = this.hotelObj.list blockList = this.hotelObj.list
...@@ -1849,6 +1851,7 @@ ...@@ -1849,6 +1851,7 @@
} else if (name === 'restaurant') { } else if (name === 'restaurant') {
blockList = this.restaurantObj.list blockList = this.restaurantObj.list
} }
console.log(blockList)
this.imgTopReset(name, index1, index2); this.imgTopReset(name, index1, index2);
this.deleteArray.push(blockList[index1]); this.deleteArray.push(blockList[index1]);
console.log("删除",blockList[index1]) console.log("删除",blockList[index1])
......
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