Skip to content

S
SuperMan
Commit e4763f5e authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

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

parents a0b38842 654bcd6c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2629 additions and 1655 deletions
src/components/FinancialModule/addFinancialDocuments.vue
View file @ e4763f5e
......@@ -890,9 +890,34 @@ export default {
if(this.orderObj){
this.msg.VisaIds = this.orderObj.VisaIds?this.orderObj.VisaIds:'';
}
// 2019-12-3 18:29:31 新增费用类型判断
let riqi = false
this.msg.detailList.forEach(x=>{
if (!riqi && (x.CostTypeName == '房费' || x.CostTypeName == '差旅费' || x.CostTypeName == '签证费' || x.CostTypeName.indexOf('机票') !== -1)){
riqi = true
}
delete x.rate;
});
if (riqi) {
var today = new Date();
var year = today.getFullYear();
var month = today.getMonth();
var date = today.getDate();
var weeks = ["日","一","二","三","四","五","六"]
var temp = new Date(year,month,date+3)
var today = Date.parse(new Date())
var PayDate = this.msg.PayDate
var startTime = Date.parse(temp);
var endTime = Date.parse(PayDate);
if (endTime > startTime) {
this.$message.error('房费、差旅费、签证费、机票相关费用类型单据的预付款日期最多推后3天！');
return
}
// else if (endTime < today) {
// this.$message.error('房费、差旅费、签证费、机票相关费用类型单据的预付款日期最多推后3天！');
// return
// }
}
//旅客名单数据组装
if(!this.$route.query.edit){
this.msg.Type = this.$route.query.Type
......
src/components/SalesModule/MyCustomer.vue
View file @ e4763f5e
......@@ -321,8 +321,7 @@
}
.MycustomerTable th,.MycustomerTable td{
text-align: left;
text-indent: 25px;
padding-left:25px
}
.MyCustomerDetailbottomLayer{overflow: auto; position:absolute;height:200px;
z-index:50;bottom:0;left: 0;border-top:1px solid #d1d1d1;background-color:#FFFFFF;padding: 20px 20px 0;width: 100%;}
......@@ -352,7 +351,17 @@
height: 148px;
display: block;
}
.yichangde{
display: inline-block;
border-radius: 50%;
color: red;
border: 1px solid red;
font-size: 12px;
width: 18px;
height: 18px;
text-align: center;
cursor:pointer;
}
</style>
<template>
<div class="page_MyCustomer MyCustomerDiv">
......@@ -394,7 +403,7 @@
<tr>
<th>姓名</th>
<th>联系电话</th>
<th>联系地址</th>
<th>门店名称</th>
<th>近期约访</th>
<th>最近拜访</th>
<th>累计拜访</th>
......@@ -407,7 +416,24 @@
</tr>
<tr v-for="(item,i) in dataList" :key="i">
<td>{{item.contact}}</td>
<td>
<span>{{item.contact}}</span>
<el-popover width="280" popper-class="pd20" trigger="click">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr class="_color_666">
<th>异常名称</th>
<th>创建人</th>
<th>创建时间</th>
</tr>
<tr v-for="(unionItem,x) in CustomerException">
<td>{{unionItem.ExceptionName}}</td>
<td>{{unionItem.CreateByName}}</td>
<td>{{unionItem.CreateTimestr}}</td>
</tr>
</table>
<span v-show="item.exceptionCount > 0" slot="reference" class="yichangde" @click="yichangde(item)">异</span>
</el-popover>
</td>
<td>{{item.contactNumber}}</td>
<td>{{item.customerName}}</td>
<td>
......@@ -611,6 +637,19 @@
<el-input class='w200' v-model='updateMsg.Contact'></el-input>
</el-form-item>
</el-col>
<el-col :span="6" v-if="updateMsg.customerExceptionList.length > 0">
<el-form-item label="解决异常">
<el-select class='w200' filterable multiple
clearable
collapse-tags v-model='updateMsg.CustomerExceptionIds'>
<el-option v-for='item in updateMsg.customerExceptionList'
:label='item.exceptionName'
:value='item.exceptionId'
:key='item.exceptionId'>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
</el-col>
</el-row>
......@@ -842,7 +881,9 @@
District:0,
HousePhotos:[],
BusinessCardPhotos:[],
Images:[],
Images:[],
customerExceptionList: [],
CustomerExceptionIds: [],
},
cityList:[],
regionList:[],
......@@ -850,10 +891,18 @@
ImagesNew:'',
BusinessCardPhotosNew:'',
HousePhotosNew:'',
CustomerException: [],
JYExceptionList: [],
}
},
methods: {
yichangde(obj){
this.apipost("app_get_GetCustomerException", {customerId: obj.customerId},res => {
if (res.data.resultCode == 1) {
this.CustomerException = res.data.data
}
})
},
EditMsg(item){
this.addLayer1=true;
this.id=item.customerId;
......@@ -957,14 +1006,16 @@
// }
// this.contact=res.data.data.contact
this.updateMsg.CustomerName=x.customerName
this.updateMsg.Contact=x.ContactName
this.updateMsg.Contact=x.contactName
this.updateMsg.CustomerId=x.customerId
this.updateMsg.Address=x.address
this.updateMsg.Address=x.address.split(',')[1]
this.updateMsg.Province=x.province
this.getCityNew()
this.updateMsg.City=x.city
this.getRegionNew()
this.updateMsg.District=x.district
this.updateMsg.customerExceptionList=x.customerExceptionList
this.updateMsg.CustomerExceptionIds = []
this.updateMsg.District=x.district
if(x.businessCardPhotos&&x.businessCardPhotos.length>0)
{
this.BusinessCardPhotos=x.businessCardPhotos[0]
......
src/components/SalesModule/VisitRecord.vue
View file @ e4763f5e
......@@ -165,7 +165,7 @@ export default {
let start_time=timestamp.getTime()/1000
let end_time=start_time+86400
let url='?ak=ZzGBZF6L0sgFDLlDohyvYhCnWy4dwksX&service_id=203768&entity_name='+this.account+'&start_time='+start_time+'&end_time='+end_time+'&is_processed=1&process_option=need_denoise=1,need_vacuate=1,need_mapmatch=1';
let url='?ak=L5Qw0GlbbCIMwgR4Uug3ogM40Imkd3CV&service_id=203768&entity_name='+this.account+'&start_time='+start_time+'&end_time='+end_time+'&is_processed=1&process_option=need_denoise=1,need_vacuate=1,need_mapmatch=1';
this.$http.get('https://bird.ioliu.cn/v1?url=http://yingyan.baidu.com/api/v3/track/gettrack'+url).then(res=>{
let xy=res.data.points
this.Point=[]
......
src/components/SalesModule/customerTransfer.vue
View file @ e4763f5e
......@@ -60,6 +60,16 @@
</el-select>
</li>
<li>
<span>
<em>是否异常</em>
</span>
<el-select filterable class='multiple_input' v-model='msg.ExceptionCount ' :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
<el-option label="是" :value="1"></el-option>
<el-option label="否" :value="2"></el-option>
</el-select>
</li>
<li>
<span class="fl mt10">
<em>{{$t('admin.admin_Department')}}</em>
......@@ -187,6 +197,21 @@
>
{{item.CustomerName}}<i class="iconfont icon-shimingrenzheng" :class="{'_class_b': item.RealNameAuthentication===1}"></i>
</label>
<el-popover width="280" popper-class="pd20" trigger="click">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr class="_color_666">
<th>异常名称</th>
<th>创建人</th>
<th>创建时间</th>
</tr>
<tr v-for="(unionItem,x) in CustomerException">
<td>{{unionItem.ExceptionName}}</td>
<td>{{unionItem.CreateByName}}</td>
<td>{{unionItem.CreateTimestr}}</td>
</tr>
</table>
<span v-if="item.ExceptionCount > 0" slot="reference" class="yichangde" @click="yichangde(item)">异</span>
</el-popover>
</td>
<td>{{item.Contact}}</td>
<td>
......@@ -528,6 +553,7 @@ export default {
children: node.ChildList
};
},
CustomerException: [],
datainfo:{},
CustomerBrandList:[],
DepartmentId: null,
......@@ -546,6 +572,7 @@ export default {
jySort: 'desc',
rtsSort: '',
orderBy: 'TradeMoney desc',
ExceptionCount: 0,
},
RecipientMsg: {
CustomerIdArr: [],
......@@ -736,6 +763,13 @@ export default {
this.$message.info("已取消删除！");
});
},
yichangde(obj){
this.apipost("app_get_GetCustomerException", {customerId: obj.CustomerIdS},res => {
if (res.data.resultCode == 1) {
this.CustomerException = res.data.data
}
})
},
saveVisa() {
// 保存
if (this.addMsg.District == "") {
......@@ -1425,4 +1459,15 @@ export default {
.customerTransfer .el-button-group{
padding-top: 10px;
}
.yichangde{
display: inline-block;
border-radius: 50%;
color: red;
border: 1px solid red;
font-size: 12px;
width: 18px;
height: 18px;
text-align: center;
cursor:pointer;
}
</style>
src/components/SalesModule/yingyanMap.vue
View file @ e4763f5e
This diff is collapsed.
src/components/Ticketing/TicketManager.vue
View file @ e4763f5e
......@@ -3874,6 +3874,10 @@ export default {
this.outerVisible = false;
this.getList();
}
else
{
this.Error(res.message);
}
},
//下载模板文件
getDownList() {
......
src/components/dmc/manager/dmcTotalTable.vue
View file @ e4763f5e
......@@ -502,7 +502,7 @@
<td colspan="23" style="text-align: left!important;padding:0 20px;">
<div class="link">
<p @click="getJourney(item)" style="padding-top:4px;">{{item.Title}}</p>
<div v-if="outItem.PriceCommonList[index].DMCNum && outItem.PriceCommonList[index].DMCNum!=''"
<div
class="colorE95252" style="padding-top:5px;padding-bottom:4px;font-size:13px;">{{$t('op.DJBZTH')}}：<span style="font-weight:bold">{{outItem.PriceCommonList[index].DMCNum}}</span>
</div>
<div v-show="outItem.PriceCommonList[index].OPInnerRemark!=''" class="colorE95252"
......
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