Skip to content

S
SuperMan
Commit 20719f0a authored by zhengke's avatar zhengke
Browse files
Options

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

parents 219fd9ef 4e94ccbf
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 681 additions and 48 deletions
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ 20719f0a
......@@ -397,6 +397,7 @@
<span v-if="(GetDetail.TemplateId==29 || GetDetail.TemplateId==31) && OPState" @click="GoOPurl(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>
<span v-if="CostTypeState" @click="GourlCostType('yingyanMap',2)" style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">鹰眼轨迹</span>
<span v-if="OtherType!=''" @click="GourlHotelZr" style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">酒店折让</span>
</p>
<table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;margin-top:15px;" width="100%" v-if="GetDetail.TCIDAndTCNUMList.length>0">
<tr v-for="(o,ox) in GetDetail.TCIDAndTCNUMList" class="_fujiashuoming_tr">
......@@ -926,6 +927,7 @@ export default {
showModel: false,
CostTypeState:false,
huijiShow:false,
OtherType:'',
}
},components:{
'my-FlowChartModule': myFlowChartModule,
......@@ -952,7 +954,19 @@ export default {
if(ActionMenuCode.indexOf('F_Update_KJCostType')!=-1){
this.huijiShow=true;
}
this.OtherType=this.$route.query.OtherType?this.$route.query.OtherType:'';
},methods:{
GourlHotelZr(){
this.$router.push({
name: 'HotelDiscount',
query: {
FinanceId:this.ID,
blank: "y",
tab: "酒店折让"
}
});
},
GourlCostType(path,num){
this.$router.push({
name: path,
......
src/components/Hotel/HotelDiscount.vue 0 → 100644
View file @ 20719f0a
This diff is collapsed.
src/components/Hotel/HotelProductManage2.vue
View file @ 20719f0a
......@@ -110,6 +110,7 @@
<div class="hotelProductManage2_edit2_header">
<div>{{$t('restaurant.res_bidManage')}}</div>
<div>
<input type="button" value="酒店折让" @click="goHotelDiscount('HotelDiscount')" class="hollowbtn" />
<input type="button" :value="$t('ground.piliangshanchu')" @click="delete2Reset()" class="hollowbtn" />
<input type="button" :value="$t('ground.chongzhi')" @click="edit2Reset()" class="hollowFixedBtn" />
<input type="button" :value="$t('pub.saveBtn')" @click="edit2Save()" class="normalBtn" />
......@@ -890,6 +891,16 @@
}
},
methods: {
goHotelDiscount(path) {
this.$router.push({
name: path,
query: {
blank: "y",
NewHotelID:this.hotelId,
}
});
},
//库存类型
stockColor: function (item, item2, childItem) {
if (item.date === item2.month && item2.hasOwnProperty('data')) {
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ 20719f0a
......@@ -114,8 +114,15 @@
{{item.AirportPickUpStr}}
<template v-if="item.AirportPickUp==15 && item.MergeList && item.MergeList.length>0"
v-for="(subItem,subIndex) in item.MergeList">
<div :key="subIndex" style="color:blue;white-space:nowrap;">
套车团号：{{subItem.MTCNUM}}({{subItem.MTCID}})
<div :key="subIndex" style="color:blue;white-space:nowrap;cursor:pointer;text-decoration:underline;" @click="GoToLeader(subItem)">
套车团号：{{subItem.MTCNUM}}({{subItem.MTCID}})
</div>
</template>
<template v-if="item.MergePlanList && item.MergePlanList.length>0"
v-for="(subItem,subIndex) in item.MergePlanList">
<div :key="subIndex" style="color:blue;white-space:nowrap;cursor:pointer;text-decoration:underline;" @click="GoToLeader(subItem)">
被套车团号：{{subItem.MTCNUM}}({{subItem.TCIDs}})
</div>
</template>
</td>
......@@ -859,6 +866,20 @@
commonHotelInfo
},
methods: {
GoToLeader(obj) {
this.$router.push({
name: 'leaderReimbursement',
query: {
"id": obj.TCIDs,
NewCombinationNum: obj.DMCNum,
isUpdate: true,
OutBranchId: 0,
blank: 'y',
tab: '用款计划',
lineId: 0
}
})
},
// 20190815 新增领款单据重新生成自动带上计算后的金额
goFncEditUrl(url, crId, frId) {
let obj = {};
......
src/components/administrative/ContractManage.vue
View file @ 20719f0a
......@@ -3,32 +3,35 @@
background-color: #fff !important;
color: #e95252 !important;
border-color: #e95252 !important;
}
}
.ContractManage .query-box .el-button--primary:focus,
.query-box .el-button--primary:hover {
.ContractManage .query-box .el-button--primary:focus,
.query-box .el-button--primary:hover {
background-color: #fff !important;
color: #e95252 !important;
border-color: #e95252 !important;
}
}
.ContractManage .query-box .el-button {
.ContractManage .query-box .el-button {
border-radius: 16px;
height: 30px;
position: relative;
top:5px;
}
top: 5px;
}
.ContractManage .query-box .el-button i {
.ContractManage .query-box .el-button i {
color: #e95252;
}
.ContractManage .query-box .el-button span {
}
.ContractManage .query-box .el-button span {
position: relative;
top: -3px;
}
.ContractManage .el-button+.el-button{
margin-left:0!important;
}
}
.ContractManage .el-button+.el-button {
margin-left: 0 !important;
}
</style>
<template>
......@@ -108,15 +111,15 @@
getList();
resetPageIndex();
" />
<el-dropdown @command="getImport">
<el-button type="primary" @click="goContract('onedayTripContract', 0, '一日游合同')" > 一日游合同
<i class="el-icon-arrow-down el-icon--right"></i>
</el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="1">境内旅游合同</el-dropdown-item>
<el-dropdown-item command="2">单项委托合同</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<el-dropdown @command="getImport">
<el-button type="primary" @click="goContract('onedayTripContract', 0, '一日游合同')"> 一日游合同
<i class="el-icon-arrow-down el-icon--right"></i>
</el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="1">境内旅游合同</el-dropdown-item>
<el-dropdown-item command="2">单项委托合同</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</li>
</ul>
</div>
......@@ -133,6 +136,7 @@
<th width="100">合同状态</th>
<th width="100">创建人</th>
<th width="120">创建时间</th>
<th width="120">是否盖章</th>
<th width="130">操作</th>
</tr>
<tr v-for="(item, index) in dataList" :key="index">
......@@ -150,7 +154,11 @@
</template>
</td>
<td>{{ item.T_ContractNum }}</td>
<td>{{ item.Tourists_Name }}</td>
<td style="text-align:left">
<span v-if="item.Tourists_Sign&&item.Tourists_Sign!=''" style="color:green;">【已签字】</span>
<span v-else style="color:red;">【未签字】</span>
{{ item.Tourists_Name }}
</td>
<td>{{ item.TravelAgency_Name }}</td>
<td>{{ item.TravelAgency_DealMan }}</td>
<td>{{ item.C_TCNUM }}</td>
......@@ -158,8 +166,11 @@
<td>{{ item.StatusStr }}</td>
<td>{{ item.CreateByName }}</td>
<td>{{ item.CreateTimeStr }}</td>
<td> <span v-if="item.IsTravelAgencySignature==0">未盖章</span>
<span v-if="item.IsTravelAgencySignature==1" style="color:green;">已盖章</span></td>
<td>
<el-tooltip class="item" effect="dark" content="修改" placement="top-start" v-if="item.Status==0||item.Status==3">
<el-tooltip class="item" effect="dark" content="修改" placement="top-start"
v-if="item.Status==0||item.Status==3">
<template v-if="item.CType == 3">
<el-button type="primary" icon="el-icon-edit" circle
@click="goContract('onedayTripContract', item.ID, '一日游合同')"></el-button>
......@@ -186,14 +197,16 @@
<el-button type="info" icon="el-icon-upload2" circle @click="SubmitContract(item)"></el-button>
</el-tooltip>
<el-tooltip class="item" v-if="item.Status==2" effect="dark" content="复制链接发送给客户">
<el-button type="info" icon="iconfont icon-copy-l" circle @click="CopyUrl(item)" style="padding:4px;background-color:#9266f9;border-color:#9266f9;"></el-button>
<el-button type="info" icon="iconfont icon-copy-l" circle @click="CopyUrl(item)"
style="padding:4px;background-color:#9266f9;border-color:#9266f9;"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="取消" placement="top-start" v-if="item.Status==0">
<el-button type="danger" icon="el-icon-close" circle @click="DeleteContract(item)"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="查看" placement="top-start">
<el-button type="danger" icon="iconfont icon-chakan" circle @click="ViewContract(item)" style="padding:4px;"></el-button>
<el-button type="danger" icon="iconfont icon-chakan" circle @click="ViewContract(item)"
style="padding:4px;"></el-button>
</el-tooltip>
</td>
</tr>
......@@ -291,23 +304,23 @@
});
},
//复制URL
CopyUrl(item){
CopyUrl(item) {
var oInput = document.createElement('input');
oInput.value = item.Url;
document.body.appendChild(oInput);
oInput.select(); // 选择对象
document.execCommand("Copy"); // 执行浏览器复制命令
oInput.className = 'oInput';
oInput.style.display='none';
this.Info("复制成功!");
oInput.style.display = 'none';
this.Info("复制成功!");
},
//跳转
getImport(command) {
if(command==1){
this.goContract('DomesticTravelcontract', 0, '境内旅游合同');
}else if(command==2){
this.goContract('SingleContract', 0, '单项委托合同');
}
if (command == 1) {
this.goContract('DomesticTravelcontract', 0, '境内旅游合同');
} else if (command == 2) {
this.goContract('SingleContract', 0, '单项委托合同');
}
},
//下载合同
......@@ -376,15 +389,14 @@
this.loading = false;
if (res.data.resultCode == 1) {
this.dataList = res.data.data.pageData;
this.dataList.forEach(x=>{
let Url="";
if(this.isOnline()){
Url= window.location.hostname+'/#/TravelContractConfirm?ContractId='+x.ID;
}
else{
Url= window.location.hostname+":8080/"+'#/TravelContractConfirm?ContractId='+x.ID;
}
x.Url=Url;
this.dataList.forEach(x => {
let Url = "";
if (this.isOnline()) {
Url = window.location.hostname + '/#/TravelContractConfirm?ContractId=' + x.ID;
} else {
Url = window.location.hostname + ":8080/" + '#/TravelContractConfirm?ContractId=' + x.ID;
}
x.Url = Url;
})
this.total = res.data.data.count;
} else {
......@@ -402,8 +414,7 @@
this.msg.pageIndex = val;
this.getList();
},
ViewContract(item)
{
ViewContract(item) {
this.$router.push({
name: "TravelContractView",
query: {
......
src/router/config.js
View file @ 20719f0a
......@@ -818,6 +818,14 @@ export default {
title: '酒店产品管理2'
},
},
{
path: '/HotelDiscount', //酒店折让
name: 'HotelDiscount',
component: resolve => require(['@/components/Hotel/HotelDiscount'], resolve),
meta: {
title: '酒店折让'
},
},
{
path: '/HotelProductEdit', //酒店产品编辑
name: 'HotelProductEdit',
......
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