Skip to content

S
SuperMan
Commit 6f561e29 authored by youjie's avatar youjie
Browse files
Options

no message

parent e14c9660
Show whitespace changes
Inline Side-by-side
Showing with 69 additions and 50 deletions
src/components/FinancialModule/BasicDocuments.vue
View file @ 6f561e29
......@@ -420,14 +420,16 @@
<p class="illustrate-left">附加说明：<span class="fr" v-if="GetDetail.ComplainID > 0"
@click="goUrl('ComplaintsDetail', GetDetail.ComplainID,GetDetail.OrderID)"> <span style="color:#000">投诉单号：</span>
<span class="cursorpointer text-decoration">{{GetDetail.ComplainID}}</span></span>
<span v-if="(GetDetail.TemplateId==28 || GetDetail.TemplateId==30) && GetDetail.OtherType!=63 &&
GetDetail.OtherType!=64"
@click="Gourl(GetDetail)" style="cursor: pointer;float: right;color: #000;font-size: 14px;
<!-- (GetDetail.TemplateId==28 || GetDetail.TemplateId==30) && GetDetail.OtherType!=63 &&
GetDetail.OtherType!=64 -->
<span v-if="GetDetail.OtherType==48"
@click="GoOPurl('OPsalesCommissiondetails',GetDetail)" style="cursor: pointer;float: right;color: #000;font-size: 14px;
text-decoration: underline;">
提成详情</span>
<span v-if="(GetDetail.TemplateId==29 || GetDetail.TemplateId==31) && OPState && GetDetail.OtherType!=63 && GetDetail.OtherType!=64"
@click="GoOPurl(GetDetail)" style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">
提成详情</span>
国内提成详情</span>
<!-- (GetDetail.TemplateId==29 || GetDetail.TemplateId==31) && OPState && GetDetail.OtherType!=63 && GetDetail.OtherType!=64 -->
<span v-if="GetDetail.OtherType==73"
@click="GoOPurl('OpComPersonDetails',GetDetail)" style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">
出境提成详情</span>
<span v-if="CostTypeState" @click="GourlCostType('VisitRecord',1)" style="margin:0 10px;cursor: pointer;float: right;
color: #000;font-size: 14px;text-decoration: underline;">
拜访记录</span>
......@@ -1970,9 +1972,9 @@ export default {
},
GoOPurl(GetDetail){
GoOPurl(path,GetDetail){
this.$router.push({
name: 'OPsalesCommissiondetails',
name: path,
query: {
PeriodId: GetDetail.ReFinanceId,
OutBranchId: String(GetDetail.RB_Branch_Id),
......@@ -2012,6 +2014,22 @@ export default {
tab: "台湾销售提成详情"
}
});
}else if(GetDetail.OtherType==48){
this.$router.push({
name: 'OPsalesCommissiondetails',
query: {
id: id,
blank: "y"
}
});
}else if(GetDetail.OtherType==73){
this.$router.push({
name: 'OpComPersonDetails',
query: {
id: id,
blank: "y"
}
});
}else if(GetDetail.OtherType==70){//跳转台湾提成的三级详情
let urlName
if(GetDetail.ReFinanceId2==1){
......
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ 6f561e29
......@@ -844,15 +844,16 @@
@click="goassets(GetDetail.ReFinanceId,GetDetail.OtherType)"> 电商出库单:{{GetDetail.ReFinanceId}}</span>
<span class="fr" style="text-decoration: underline;cursor: pointer;" v-if="GetDetail.OtherType==17"
@click="lookbreakage(GetDetail.ReFinanceId)"> 报损/报溢单:{{GetDetail.ReFinanceId}}</span>
<!-- (GetDetail.TemplateId==28 || GetDetail.TemplateId==30) && GetDetail.OtherType!=63 && GetDetail.OtherType!=64 -->
<span
v-if="(GetDetail.TemplateId==28 || GetDetail.TemplateId==30) && GetDetail.OtherType!=63 && GetDetail.OtherType!=64"
@click="Gourl('OPsalesCommissiondetails',GetDetail)"
style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">提成详情</span>
v-if="GetDetail.OtherType==48"
@click="GoOPurl('OPsalesCommissiondetails',GetDetail)"
style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">国内提成详情</span>
<!-- (GetDetail.TemplateId==29 || GetDetail.TemplateId==31) && OPState && GetDetail.OtherType!=63 && GetDetail.OtherType!=64 -->
<span
v-if="(GetDetail.TemplateId==29 || GetDetail.TemplateId==31) && OPState
&& GetDetail.OtherType!=63 && GetDetail.OtherType!=64"
v-if="GetDetail.OtherType==73"
@click="GoOPurl('OpComPersonDetails',GetDetail)"
style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">提成详情</span>
style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">出境提成详情</span>
<span v-if="CostTypeState" @click="GourlCostType('VisitRecord',1)"
style="margin:0 10px;cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">拜访记录</span>
<span v-if="CostTypeState" @click="GourlCostType('yingyanMap',2)"
......@@ -1788,6 +1789,24 @@
tab: "台湾销售提成详情"
}
});
}else if(GetDetail.OtherType==48){
this.$router.push({
name: 'OPsalesCommissiondetails',
query: {
PeriodId: GetDetail.ReFinanceId,
OutBranchId: GetDetail.RB_Branch_Id,
blank: "y"
}
});
}else if(GetDetail.OtherType==73){
this.$router.push({
name: 'OpComPersonDetails',
query: {
PeriodId: GetDetail.ReFinanceId,
OutBranchId: GetDetail.RB_Branch_Id,
blank: "y"
}
});
} else if (GetDetail.OtherType == 70) { //跳转台湾提成的三级详情
let urlName
if (GetDetail.ReFinanceId2 == 1) {
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ 6f561e29
......@@ -286,15 +286,10 @@
</td>
<td v-if="childIndex==0" :rowspan="6" style="text-align:left; ">
<template v-if="subItem.HotelName!=subItem.NewHotelName && subItem.NewHotelName!=''">
<el-tooltip class="item" effect="dark" :content="subItem.HotelName" placement="bottom">
<span style="text-decoration:line-through">{{subItem.HotelName.substring(0,10)}}</span>
</el-tooltip>
{{subItem.HotelName}}
</template>
<template v-else>
<el-tooltip class="item" effect="dark" :content="subItem.HotelName" placement="bottom">
<span style="text-decoration:line-through">{{subItem.HotelName.substring(0,10)}}</span>
</el-tooltip>
{{subItem.HotelName}}
</template>
</td>
<td v-if="childIndex==0" :rowspan="6" style="text-align:left; ">
......@@ -302,10 +297,7 @@
style="text-decoration: underline; cursor: pointer;color:red">查看手配书</a>
</td>
<td v-if="childIndex==0" :rowspan="6" style="text-align:left;color:red; ">
<el-tooltip v-if="subItem.HotelName!=subItem.NewHotelName" class="item" effect="dark" :content="subItem.NewHotelName" placement="bottom">
<span style="text-decoration:line-through">{{""+subItem.NewHotelName.substring(0,10)}}</span>
</el-tooltip>
<!-- {{subItem.HotelName!=subItem.NewHotelName?""+subItem.NewHotelName:""}} -->
{{subItem.HotelName!=subItem.NewHotelName?""+subItem.NewHotelName:""}}
</td>
<td v-if="childIndex==0" :rowspan="6">
{{subItem.HouseStatistics.NeedBed}}/{{subItem.HouseStatistics.NoNeedBed}}
......@@ -571,14 +563,10 @@
</td>
<td style="text-align:left; ">
<template v-if="subItem.HotelName!=subItem.NewHotelName && subItem.NewHotelName!=''">
<el-tooltip class="item" effect="dark" :content="subItem.HotelName" placement="bottom">
<span style="text-decoration:line-through">{{subItem.HotelName.substring(0,10)}}</span>
</el-tooltip>
{{subItem.HotelName}}
</template>
<template v-else>
<el-tooltip class="item" effect="dark" :content="subItem.HotelName" placement="bottom">
<span style="text-decoration:line-through">{{subItem.HotelName.substring(0,10)}}</span>
</el-tooltip>
{{subItem.HotelName}}
</template>
</td>
<td style="text-align:left; ">
......@@ -586,10 +574,7 @@
style="text-decoration: underline; cursor: pointer;color:red">查看手配书</a>
</td>
<td style="text-align:left;color:red; ">
<el-tooltip v-if="subItem.HotelName!=subItem.NewHotelName" class="item" effect="dark" :content="subItem.NewHotelName" placement="bottom">
<span style="text-decoration:line-through">{{""+subItem.NewHotelName.substring(0,10)}}</span>
</el-tooltip>
<!-- {{subItem.HotelName!=subItem.NewHotelName?""+subItem.NewHotelName:""}} -->
{{subItem.HotelName!=subItem.NewHotelName?""+subItem.NewHotelName:""}}
</td>
<td >
{{subItem.HouseStatistics.NeedBed}}/{{subItem.HouseStatistics.NoNeedBed}}
......@@ -725,10 +710,7 @@
</td>
<td >
<span>
<el-tooltip class="item" effect="dark" :content="subItem.SupplierName" placement="bottom">
<span style="text-decoration:line-through">{{subItem.SupplierName.substring(0,5)}}</span>
</el-tooltip>
<!-- {{subItem.SupplierName}} -->
{{subItem.SupplierName}}
<br />
<template v-if="subItem.SupplierPayType !== 0">
<span v-if="subItem.SupplierPayType == 1"> 现付 </span>
......
src/components/SalesVisa/ModifyVisaProduct.vue
View file @ 6f561e29
......@@ -444,7 +444,8 @@
value-format="yyyy-MM-dd"
>
</el-date-picker>
<span style="color: red;font-size: 12px;">*：结束日期请设置为月20日左右， 防止销售月底报名次月无法提成帐未平；</span>
</br>
<span style="color: red;font-size: 12px;">*结束日期请设置为月20日左右， 防止销售月底报名次月无法提成帐未平。</span>
</el-form-item>
<el-form-item label="热门签证" prop="HotVisa">
<el-select v-model="addMsg.HotVisa">
......@@ -994,13 +995,7 @@ getCompanyList() {
this.PriceDates=[]
},
SaveVisaProduct(formName) {
let SendVisaDate = moment(new Date()).format("YYYY-MM")+'-25'
this.addMsg.SendVisaDate = moment(this.PriceDates[1]).format("YYYY-MM-DD")
console.log(this.addMsg.SendVisaDate,this.addMsg.SendVisaDate<SendVisaDate,'---')
if(this.addMsg.SendVisaDate<SendVisaDate){
this.getBeforeDate(0,new Date().Format("yyyy-MM-dd"))
}
return
this.$refs[formName].validate(valid => {
if (valid) {
......@@ -1028,6 +1023,11 @@ getCompanyList() {
this.addMsg.SendVisaDate = moment(this.PriceDates[1]).format(
"YYYY-MM-DD"
);
let SendVisaDate = moment(new Date()).format("YYYY-MM")+'-25'
if(this.addMsg.SendVisaDate>SendVisaDate){
this.Error(`价格有效结束日期请选择${SendVisaDate}之前日期！`);
return;
}
this.apipost(
"dmc_post_visa_SetVisaProduct_V1",
this.addMsg,
......
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