Skip to content

S
SuperMan
Commit 52ae88c4 authored by youjie's avatar youjie
Browse files
Options

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

parents 7a76265a 0e9004ff
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1418 additions and 1260 deletions
src/components/SupplierIndex.vue
View file @ 52ae88c4
This diff is collapsed.
src/components/TravelContractConfirm.vue
View file @ 52ae88c4
......@@ -1140,7 +1140,7 @@
</template>
5
<template
v-if="CtObj.ContractTicketAndHotel && (CtObj.ContractTicketAndHotel.ContractHotels ||CtObj.ContractTicketAndHotel.ContractTickets)">
v-if="CtObj.ContractTicketAndHotel && ((CtObj.ContractTicketAndHotel.ContractHotels&&CtObj.ContractTicketAndHotel.ContractHotels.length>0) ||(CtObj.ContractTicketAndHotel.ContractTickets&&CtObj.ContractTicketAndHotel.ContractTickets.length>0))">
<img
src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAMAAAAMs7fIAAAAflBMVEUAAAAAAACwsLC5ubm5ubm5ubm4uLizs7O1tbWmpqa5ubm5ubm3t7evr6////+5ubnt7e3y8vLq6ur6+vr09PTo6Oj4+Pjv7++8vLxYWFicnJxxcXFgYGDi4uLb29vBwcHExMS7u7uUlJSKiorg4ODT09PJycmjo6OCgoJpaWms464fAAAADnRSTlMACQ/7atLJvWBWCdW/WGJ0ck0AAACVSURBVBjTbc5HFoMwDEVRJ/QUWRiM40IJpO5/g5FNm+QOdI7e6LN/4oSvktiHvEdY4eBTKmCnzlQiqGbG2QruJ8Y4NMGgrWzgdvSlDr6uq+ullB7Xhu5WRlN+XLsXpSY96VGRpSA+rNYvJFvBp7O4lQhQCGHewgt7LhKElF0nCYiUNl/7FlZtnzNSZBGfRVnBgsOOvh9/9xAo+8NxzQAAAABJRU5ErkJggg=="
style="margin-bottom: -4px;width:3rem;" />
......@@ -1150,9 +1150,7 @@
src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAMAAAAMs7fIAAAAdVBMVEUAAAAAAACwsLDNzc3Q0ND///+5ubn///+5ubm8vLzz8/Pt7e3r6+vo6Ojv7+/6+vr4+PjS0tKbm5vk5OTf39/b29vCwsKJiYni4uLa2tqsrKx3d3e2trawsLCpqamkpKSSkpLExMSfn5+Li4uEhIR9fX0mJiaMZFtDAAAAB3RSTlMAEh3+/YUS7eKGqgAAAJ1JREFUGNNtzzcWwjAQRVHANkqjnJxt4v6XiMRBiILXza3+HP7UtQSXSNsl0YGhEru0SQigmiBJMJJghZSScisROWdRzoxKKWy0QuSUhfIxLizcjKNFKJ0fZtos/RGxPqOjXxFC4ClOCwjxEdaP983P8epZkWE3lrF1b6o0AwA4reG9h3AEnHvPUwjy5jb0qNQHnX9vcK3pDrljLV0vwMkLmE4T88cAAAAASUVORK5CYII="
style="margin-bottom: -4px;width:3rem;" />
</template>
6 <img
src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAMAAAAMs7fIAAAAflBMVEUAAAAAAACwsLC5ubm5ubm5ubm4uLizs7O1tbWmpqa5ubm5ubm3t7evr6////+5ubnt7e3y8vLq6ur6+vr09PTo6Oj4+Pjv7++8vLxYWFicnJxxcXFgYGDi4uLb29vBwcHExMS7u7uUlJSKiorg4ODT09PJycmjo6OCgoJpaWms464fAAAADnRSTlMACQ/7atLJvWBWCdW/WGJ0ck0AAACVSURBVBjTbc5HFoMwDEVRJ/QUWRiM40IJpO5/g5FNm+QOdI7e6LN/4oSvktiHvEdY4eBTKmCnzlQiqGbG2QruJ8Y4NMGgrWzgdvSlDr6uq+ullB7Xhu5WRlN+XLsXpSY96VGRpSA+rNYvJFvBp7O4lQhQCGHewgt7LhKElF0nCYiUNl/7FlZtnzNSZBGfRVnBgsOOvh9/9xAo+8NxzQAAAABJRU5ErkJggg=="
style="margin-bottom: -4px;width:3rem;" />等共计
等共计<span>&nbsp;<font>{{getTotalNum(getCount())}}</font></span>&nbsp;项服务。</p>
</el-col>
</el-row>
......@@ -1243,7 +1241,7 @@
</template>
5
<template
v-if="CtObj.ContractTicketAndHotel && (CtObj.ContractTicketAndHotel.ContractHotels ||CtObj.ContractTicketAndHotel.ContractTickets)">
v-if="CtObj.ContractTicketAndHotel && ((CtObj.ContractTicketAndHotel.ContractHotels&&CtObj.ContractTicketAndHotel.ContractHotels.length>0) ||(CtObj.ContractTicketAndHotel.ContractTickets&&CtObj.ContractTicketAndHotel.ContractTickets.length>0))">
<img
src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAMAAAAMs7fIAAAAflBMVEUAAAAAAACwsLC5ubm5ubm5ubm4uLizs7O1tbWmpqa5ubm5ubm3t7evr6////+5ubnt7e3y8vLq6ur6+vr09PTo6Oj4+Pjv7++8vLxYWFicnJxxcXFgYGDi4uLb29vBwcHExMS7u7uUlJSKiorg4ODT09PJycmjo6OCgoJpaWms464fAAAADnRSTlMACQ/7atLJvWBWCdW/WGJ0ck0AAACVSURBVBjTbc5HFoMwDEVRJ/QUWRiM40IJpO5/g5FNm+QOdI7e6LN/4oSvktiHvEdY4eBTKmCnzlQiqGbG2QruJ8Y4NMGgrWzgdvSlDr6uq+ullB7Xhu5WRlN+XLsXpSY96VGRpSA+rNYvJFvBp7O4lQhQCGHewgt7LhKElF0nCYiUNl/7FlZtnzNSZBGfRVnBgsOOvh9/9xAo+8NxzQAAAABJRU5ErkJggg=="
style="margin-bottom: -4px;width:3rem;" />
......@@ -1253,9 +1251,7 @@
src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAMAAAAMs7fIAAAAdVBMVEUAAAAAAACwsLDNzc3Q0ND///+5ubn///+5ubm8vLzz8/Pt7e3r6+vo6Ojv7+/6+vr4+PjS0tKbm5vk5OTf39/b29vCwsKJiYni4uLa2tqsrKx3d3e2trawsLCpqamkpKSSkpLExMSfn5+Li4uEhIR9fX0mJiaMZFtDAAAAB3RSTlMAEh3+/YUS7eKGqgAAAJ1JREFUGNNtzzcWwjAQRVHANkqjnJxt4v6XiMRBiILXza3+HP7UtQSXSNsl0YGhEru0SQigmiBJMJJghZSScisROWdRzoxKKWy0QuSUhfIxLizcjKNFKJ0fZtos/RGxPqOjXxFC4ClOCwjxEdaP983P8epZkWE3lrF1b6o0AwA4reG9h3AEnHvPUwjy5jb0qNQHnX9vcK3pDrljLV0vwMkLmE4T88cAAAAASUVORK5CYII="
style="margin-bottom: -4px;width:3rem;" />
</template>
6 <img
src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAMAAAAMs7fIAAAAflBMVEUAAAAAAACwsLC5ubm5ubm5ubm4uLizs7O1tbWmpqa5ubm5ubm3t7evr6////+5ubnt7e3y8vLq6ur6+vr09PTo6Oj4+Pjv7++8vLxYWFicnJxxcXFgYGDi4uLb29vBwcHExMS7u7uUlJSKiorg4ODT09PJycmjo6OCgoJpaWms464fAAAADnRSTlMACQ/7atLJvWBWCdW/WGJ0ck0AAACVSURBVBjTbc5HFoMwDEVRJ/QUWRiM40IJpO5/g5FNm+QOdI7e6LN/4oSvktiHvEdY4eBTKmCnzlQiqGbG2QruJ8Y4NMGgrWzgdvSlDr6uq+ullB7Xhu5WRlN+XLsXpSY96VGRpSA+rNYvJFvBp7O4lQhQCGHewgt7LhKElF0nCYiUNl/7FlZtnzNSZBGfRVnBgsOOvh9/9xAo+8NxzQAAAABJRU5ErkJggg=="
style="margin-bottom: -4px;width:3rem;" />等共计
等共计<span>&nbsp;<font>{{getTotalNum(getCount())}}</font></span>&nbsp;项服务。</p>
<p>费用总额（小写）人民币<span>{{CtObj.C_TotalPrice}}</span>元&nbsp;&nbsp;（大写）人民币<span>
<font>{{number_chinese(CtObj.C_TotalPrice)}}</font>
......@@ -3720,7 +3716,7 @@
},
methods: {
getCount() {
var serviceCount = 1;
var serviceCount = 0;
if (this.CtObj.ContractTicketList != null && this.CtObj.ContractTicketList.length > 0) {
serviceCount++;
}
......
src/components/TravelContractView.vue
View file @ 52ae88c4
......@@ -822,7 +822,7 @@
</template>
5
<template
v-if="CtObj.ContractTicketAndHotel && (CtObj.ContractTicketAndHotel.ContractHotels ||CtObj.ContractTicketAndHotel.ContractTickets)">
v-if="CtObj.ContractTicketAndHotel && ((CtObj.ContractTicketAndHotel.ContractHotels&&CtObj.ContractTicketAndHotel.ContractHotels.length>0) ||(CtObj.ContractTicketAndHotel.ContractTickets&&CtObj.ContractTicketAndHotel.ContractTickets.length>0))">
<img
src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAMAAAAMs7fIAAAAflBMVEUAAAAAAACwsLC5ubm5ubm5ubm4uLizs7O1tbWmpqa5ubm5ubm3t7evr6////+5ubnt7e3y8vLq6ur6+vr09PTo6Oj4+Pjv7++8vLxYWFicnJxxcXFgYGDi4uLb29vBwcHExMS7u7uUlJSKiorg4ODT09PJycmjo6OCgoJpaWms464fAAAADnRSTlMACQ/7atLJvWBWCdW/WGJ0ck0AAACVSURBVBjTbc5HFoMwDEVRJ/QUWRiM40IJpO5/g5FNm+QOdI7e6LN/4oSvktiHvEdY4eBTKmCnzlQiqGbG2QruJ8Y4NMGgrWzgdvSlDr6uq+ullB7Xhu5WRlN+XLsXpSY96VGRpSA+rNYvJFvBp7O4lQhQCGHewgt7LhKElF0nCYiUNl/7FlZtnzNSZBGfRVnBgsOOvh9/9xAo+8NxzQAAAABJRU5ErkJggg=="
style="margin-bottom: -4px;width:17px;heigth:17px" />
......@@ -832,9 +832,6 @@
src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAMAAAAMs7fIAAAAdVBMVEUAAAAAAACwsLDNzc3Q0ND///+5ubn///+5ubm8vLzz8/Pt7e3r6+vo6Ojv7+/6+vr4+PjS0tKbm5vk5OTf39/b29vCwsKJiYni4uLa2tqsrKx3d3e2trawsLCpqamkpKSSkpLExMSfn5+Li4uEhIR9fX0mJiaMZFtDAAAAB3RSTlMAEh3+/YUS7eKGqgAAAJ1JREFUGNNtzzcWwjAQRVHANkqjnJxt4v6XiMRBiILXza3+HP7UtQSXSNsl0YGhEru0SQigmiBJMJJghZSScisROWdRzoxKKWy0QuSUhfIxLizcjKNFKJ0fZtos/RGxPqOjXxFC4ClOCwjxEdaP983P8epZkWE3lrF1b6o0AwA4reG9h3AEnHvPUwjy5jb0qNQHnX9vcK3pDrljLV0vwMkLmE4T88cAAAAASUVORK5CYII="
style="margin-bottom: -4px;width:17px;heigth:17px" />
</template>
6 <img
src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAMAAAAMs7fIAAAAflBMVEUAAAAAAACwsLC5ubm5ubm5ubm4uLizs7O1tbWmpqa5ubm5ubm3t7evr6////+5ubnt7e3y8vLq6ur6+vr09PTo6Oj4+Pjv7++8vLxYWFicnJxxcXFgYGDi4uLb29vBwcHExMS7u7uUlJSKiorg4ODT09PJycmjo6OCgoJpaWms464fAAAADnRSTlMACQ/7atLJvWBWCdW/WGJ0ck0AAACVSURBVBjTbc5HFoMwDEVRJ/QUWRiM40IJpO5/g5FNm+QOdI7e6LN/4oSvktiHvEdY4eBTKmCnzlQiqGbG2QruJ8Y4NMGgrWzgdvSlDr6uq+ullB7Xhu5WRlN+XLsXpSY96VGRpSA+rNYvJFvBp7O4lQhQCGHewgt7LhKElF0nCYiUNl/7FlZtnzNSZBGfRVnBgsOOvh9/9xAo+8NxzQAAAABJRU5ErkJggg=="
style="margin-bottom: -4px;width:17px;heigth:17px" />等共计
等共计<span>&nbsp;<font>{{getTotalNum(getCount())}}</font></span>&nbsp;项服务。</p>
<p>费用总额（小写）人民币<span>{{CtObj.C_TotalPrice}}</span>元&nbsp;&nbsp;（大写）人民币<span>
<font>{{number_chinese(CtObj.C_TotalPrice)}}</font>
......@@ -2186,7 +2183,7 @@
},
methods: {
getCount() {
var serviceCount = 1;
var serviceCount = 0;
if (this.CtObj.ContractTicketList != null && this.CtObj.ContractTicketList.length > 0) {
serviceCount++;
}
......
src/components/TravelManager/TravelList/TeamBalancePayment.vue
View file @ 52ae88c4
......@@ -512,7 +512,7 @@
<div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">收入
<template v-if="DataList&&DataList.TeamBalance&&DataList.TeamBalance.TCNUM">
{{DataList.TeamBalance.TCNUM}} ({{TCID}})
{{DataList.TeamBalance.TCNUM}} ({{TCID}}) {{DataList.TeamBalance.OutBranchName}}
</template>
</div>
<div v-if="IsHaveAuth" style="padding: 5px 0 0 0;">
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 52ae88c4
......@@ -598,7 +598,6 @@
<span>{{$t('Airticket.Air_StartTime')}}</span>
<span class="go_date">{{item.StartDate}}</span>
</p>
<p class="travelnowrap flex" v-if="item.OfferShouPeiFee>0">
<span>手配费</span>
<span class="go_date">
......@@ -777,36 +776,40 @@
<span slot="reference" class="price">{{$t('Operation.Op_priceDetail')}}</span>
</el-popover>
</p>
<p style="color:red;margin:20px 0 10px 0;font-size:12px;">
<p style="color:red;margin:10px 0 10px 0;font-size:12px;">
{{$t('op.TodayClicks')}}：{{item.TodayClickCount}}
</p>
<p style="color:red;font-size:12px;">
{{$t('op.TotalClicks')}}：{{item.TotalClickCount}}
</p>
<p class="color:red;margin:20px 0 10px 0;font-size:12px;" v-if="item.OfferUrlExtArray&&item.OfferUrlExtArray.length>0">
<p v-if="item.OfferUrlExtArray&&item.OfferUrlExtArray.length>0" style="margin-top:5px;font-size:13px;">
<span>报价单</span>
<span class="go_date">
<template v-for="(subItem,subIndex) in item.OfferUrlExtArray">
<a :key="subIndex" style="margin-left:20px;color:blue;cursor:pointer;" :href="subItem.Url"
v-if="subItem.Url" target="_blank" :download="subItem.Name">{{subItem.Name}}</a>
<span> <template v-for="(subItem,subIndex) in item.OfferUrlExtArray">
<el-tooltip :key="subIndex" class="item" effect="dark" content="点击下载报价单" placement="top">
<a :key="subIndex+10000" style="color:blue;cursor:pointer;text-decoration:underline;"
:href="subItem.Url" v-if="subItem.Url" target="_blank"
:download="subItem.Name">{{subItem.Name}}</a>
</el-tooltip>
<template v-if="item.OfferUrlExtArray.length>1 && subIndex<item.OfferUrlExtArray.length">
<br :key="subIndex+1000" />
</template>
</template>
</span>
</p>
<p class="color:red;margin:20px 0 10px 0;font-size:12px;" v-else-if="item.PriceOfferUrl&&item.PriceOfferUrl!=''">
<p v-else-if="item.PriceOfferUrl&&item.PriceOfferUrl!=''" style="margin-top:5px;font-size:13px;">
<span>报价单</span>
<span class="go_date">
<a style="margin-left:20px;color:blue;cursor:pointer;" :href="item.PriceOfferUrl"
v-if="item.PriceOfferUrl" target="_blank">下载报价单</a>
<span>
<el-tooltip class="item" effect="dark" content="点击下载报价单" placement="top">
<a :href="item.PriceOfferUrl" style="color:blue;cursor:pointer;text-decoration:underline;"
v-if="item.PriceOfferUrl" target="_blank">下载报价单</a>
</el-tooltip>
</span>
</p>
<p class="travelnowrap" v-if="item.Config_OfferId&&item.Config_OfferId>0">
<p v-if="item.Config_OfferId&&item.Config_OfferId>0" style="margin-top:5px;font-size:13px;">
<span style="cursor:pointer;text-decoration:underline;color:blue;"
@click="showDialog(item.ID, item.Config_OfferId)">报价详情</span>
</p>
<p v-if="item.Config_OfferId==0">
<p v-if="item.Config_OfferId==0" style="margin-top:5px;font-size:13px;">
<span style="cursor:pointer;text-decoration:underline;color:red;"
@click="NewCopyPriceSheet(item,0)">新增报价单</span>
<span style="cursor:pointer;text-decoration:underline;color:red;"
......@@ -1537,6 +1540,7 @@
},
},
methods: {
//复制、新增报价单
NewCopyPriceSheet(item, type) {
if (type) {
this.CopyConfigOffer(item)
......@@ -1545,51 +1549,47 @@
}
},
//跳转到报价单
gotoOffer(item, type) {
let name = 'QuotationNewPrice'
gotoOffer(item) {
let query = {
offerid: item.Config_OfferId,
TCID: item.TCID,
blank: 'y',
tab: '报价单'
}
if (type) { //新增报价单
query.TeamType = item.TeamType;
query.TCID = item.TCID;
query.LineID = item.LineID;
query.ltID = item.ltID;
query.DayNum = item.DayNum;
query.OutDateTime = item.StartCityTime;
query.OutBranchId = item.OutBranchId;
query.ForbidChange = true;
query.Title = item.Title;
this.$router.push({
path: name,
query
});
} else {
this.$router.push({
path: name,
query
});
}
this.$router.push({
path: 'QuotationNewPrice',
query
});
},
// 复制报价单
CopyConfigOffer(item) {
this.queryCommonData.loading = true;
let msg = {
ID: item.ID,
TCID: item.TCID,
}
this.apipost(
var that = this;
that.apipost(
"travel_post_CopyConfigOffer", msg,
res => {
that.queryCommonData.loading = false;
if (res.data.resultCode == 1) {
this.Success(res.data.message)
var tipMsg = "复制成功!查看报价单!"
that.getControlList();
this.Confirm(tipMsg, function () {
if (res.data.data && res.data.data > 0) {
let query = {
offerid: res.data.data,
blank: 'y',
tab: '报价单'
}
//跳转到新报价单页面
that.OpenNewPage('/QuotationNewPrice', query)
}
})
} else {
this.Error(res.data.message);
that.Error(res.data.message);
}
},
err => {}
);
});
},
//跳转到用款计划
GoToleaderReimbursement(item) {
......
src/components/TravelManager/TravelList/oneDayTrip.vue
View file @ 52ae88c4
......@@ -413,7 +413,7 @@
<span class="TC_xiajia" v-if="item.TCState==2">{{$t('visa.v_yxiajia')}}</span>
<span class="TC_xiajia quxiao" v-if="item.TCState==4">{{$t('hotel.hotel_HasBeenCancelled')}}</span>
<span class="TC_xiajia daiwanshan"
v-if="item.Config_OfferId>0&&item.Config_OfferStatus&&item.TCState==1">
v-if="item.Config_OfferId>0&&item.Config_OfferStatus&&item.TCState==1">
{{item.Config_OfferStatus}}
</span>
</div>
......@@ -454,29 +454,7 @@
<a style="corsor:pointer;"
:href="domainManager().ViittoFileUrl+item.WordPath">{{$t('visa.v_salecompany')}}下载WORD行程</a>
</p>
<p class="travelnowrap flex" v-if="item.OfferUrlExtArray&&item.OfferUrlExtArray.length>0">
<span>报价单</span>
<span class="go_date">
<template v-for="(subItem,subIndex) in item.OfferUrlExtArray">
<a :key="subIndex" style="margin-left:20px;color:blue;cursor:pointer;" :href="subItem.Url"
v-if="subItem.Url" target="_blank" :download="subItem.Name">{{subItem.Name}}</a>
<template v-if="item.OfferUrlExtArray.length>1 && subIndex<item.OfferUrlExtArray.length">
<br :key="subIndex+1000" />
</template>
</template>
</span>
</p>
<p class="travelnowrap flex" v-else-if="item.PriceOfferUrl&&item.PriceOfferUrl!=''">
<span>报价单</span>
<span class="go_date">
<a style="margin-left:20px;color:blue;cursor:pointer;" :href="item.PriceOfferUrl"
v-if="item.PriceOfferUrl" target="_blank">下载报价单</a>
</span>
</p>
<p class="travelnowrap" v-if="item.Config_OfferId">
<span style="cursor:pointer;text-decoration:underline;color:blue;"
@click="showDialog(item.ID, item.Config_OfferId)">报价详情</span>
</p>
</div>
</div>
<div class="el-col" style="width:190px;">
......@@ -578,6 +556,39 @@
<span slot="reference" class="price">{{$t('Operation.Op_priceDetail')}}</span>
</el-popover>
</p>
<p v-if="item.OfferUrlExtArray&&item.OfferUrlExtArray.length>0" style="margin-top:5px;">
<span>报价单</span>
<span> <template v-for="(subItem,subIndex) in item.OfferUrlExtArray">
<el-tooltip :key="subIndex" class="item" effect="dark" content="点击下载报价单" placement="top">
<a :key="subIndex+10000" style="color:blue;cursor:pointer;text-decoration:underline;"
:href="subItem.Url" v-if="subItem.Url" target="_blank"
:download="subItem.Name">{{subItem.Name}}</a>
</el-tooltip>
<template v-if="item.OfferUrlExtArray.length>1 && subIndex<item.OfferUrlExtArray.length">
<br :key="subIndex+1000" />
</template>
</template>
</span>
</p>
<p v-else-if="item.PriceOfferUrl&&item.PriceOfferUrl!=''" style="margin-top:5px;">
<span>报价单</span>
<span>
<el-tooltip class="item" effect="dark" content="点击下载报价单" placement="top">
<a :href="item.PriceOfferUrl" style="color:blue;cursor:pointer;text-decoration:underline;"
v-if="item.PriceOfferUrl" target="_blank">下载报价单</a>
</el-tooltip>
</span>
</p>
<p v-if="item.Config_OfferId&&item.Config_OfferId>0" style="margin-top:5px;">
<span style="cursor:pointer;text-decoration:underline;color:blue;"
@click="showDialog(item.ID, item.Config_OfferId)">报价详情</span>
</p>
<p v-if="item.Config_OfferId==0" style="margin-top:5px;">
<span style="cursor:pointer;text-decoration:underline;color:red;"
@click="NewCopyPriceSheet(item,0)">新增报价单</span>
<span style="cursor:pointer;text-decoration:underline;color:red;"
@click="NewCopyPriceSheet(item,1)">复制报价单</span>
</p>
</div>
</div>
<div class="el-col" style="width:150px;">
......@@ -591,7 +602,6 @@
<p>
<span>{{$t('visa.v_yibaoru')}}</span>
<i>
{{item.OrderGuestNum}}
<span class="TCL-redType" v-if="item.OrderLeaderGuestNum>=1">+{{item.OrderLeaderGuestNum}}</span>人
</i>
......@@ -691,14 +701,6 @@
<el-dropdown-item>
<div @click='GoToleaderReimbursement(item)' style="color:red">地接成本支出 </div>
</el-dropdown-item>
<template v-if="item.Config_OfferId==0&&item.TCState==1">
<el-dropdown-item>
<div @click="NewCopyPriceSheet(item,0)">新增报价单 </div>
</el-dropdown-item>
<el-dropdown-item>
<div @click="NewCopyPriceSheet(item,1)">复制报价单 </div>
</el-dropdown-item>
</template>
</el-dropdown-menu>
</el-dropdown>
</div>
......@@ -994,61 +996,56 @@
}
},
methods: {
NewCopyPriceSheet(item,type){
if(type){
//复制、新增报价单
NewCopyPriceSheet(item, type) {
if (type) {
this.CopyConfigOffer(item)
}else{
this.gotoOffer(item,1)
} else {
this.gotoOffer(item, 1)
}
},
//跳转到报价单
gotoOffer(item,type) {
let name = 'QuotationNewPrice'
gotoOffer(item) {
let query = {
offerid: item.Config_OfferId,
TCID: item.TCID,
blank: 'y',
tab: '报价单'
}
if(type){//新增报价单
query.TeamType = 2
query.configld = item.ID
query.TCID = item.TCID
query.LineID = item.LineID
query.LineName = item.LineName
query.ltID = item.ltID
query.LtName = item.LtName
query.DayNum = item.DayNum
query.OutDateTime = item.StartCityTime
query.OutBranchId = item.OutBranchId
query.ForbidChange = true
this.$router.push({
path: name,
query
});
}else{
this.$router.push({
path: name,
query
});
}
this.$router.push({
path: 'QuotationNewPrice',
query
});
},
// 复制报价单
CopyConfigOffer(item){
CopyConfigOffer(item) {
this.queryCommonData.loading = true;
let msg = {
ID: item.ID,
TCID: item.TCID,
}
this.apipost(
var that = this;
that.apipost(
"travel_post_CopyConfigOffer", msg,
res => {
that.queryCommonData.loading = false;
if (res.data.resultCode == 1) {
this.Success(res.data.message)
var tipMsg = "复制成功!查看报价单!"
that.getControlList();
this.Confirm(tipMsg, function () {
if (res.data.data && res.data.data > 0) {
let query = {
offerid: res.data.data,
blank: 'y',
tab: '报价单'
}
//跳转到新报价单页面
that.OpenNewPage('/QuotationNewPrice', query)
}
})
} else {
this.Error(res.data.message);
that.Error(res.data.message);
}
},
err => {}
);
});
},
//跳转到用款计划
GoToleaderReimbursement(item) {
......@@ -1534,7 +1531,7 @@
})
},
//开团或修改
goToOpenTravel(path, configId, tcid,item) {
goToOpenTravel(path, configId, tcid, item) {
if (configId > 0) {
this.$store.commit('pageConditionUpdate', this.queryMsg)
this.$router.push({
......@@ -1555,7 +1552,7 @@
}
},
//当团修改
goTonowTeam(path, configId, tcid, TCNUM,item) {
goTonowTeam(path, configId, tcid, TCNUM, item) {
if (configId > 0) {
this.$store.commit('pageConditionUpdate', this.queryMsg)
this.$router.push({
......
src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue
View file @ 52ae88c4
......@@ -309,7 +309,12 @@
{{OtherPrice.AirTicketMoeny}}
</el-form-item>
</td>
<td>
<td colspan="2">
<el-form-item label="中段机票">
{{OtherPrice.InlandAirTicketMoney}}
</el-form-item>
</td>
<td colspan="2">
<el-form-item label="税金">
{{teamPrice.TaxPrice}}
</el-form-item>
......@@ -319,30 +324,35 @@
{{teamPrice.UnionPrice}}
</el-form-item>
</td>
<td colspan="5" rowspan="2">
小计(机票+中段机票+税金+联运+领队导游分摊+过夜+签证+保险):
<br />{{getCostTotalMoney()}}
</td>
</tr>
<tr>
<td colspan="2">
<el-form-item label="领队导游分摊">
{{OtherPrice.AirTicketShareMoney}}
</el-form-item>
</td>
<td colspan="2">
<el-form-item label="过夜">
{{teamPrice.NightPrice}}
</el-form-item>
</td>
<td>
<td colspan="2">
<el-form-item label="签证">
{{teamPrice.VisaPrice}}
</el-form-item>
</td>
<td>
<td colspan="2">
<el-form-item label="保险">
{{OtherPrice.SafeMoney}}
</el-form-item>
</td>
<td colspan="2">
<el-form-item label="领队导游分摊">
{{OtherPrice.AirTicketShareMoney}}
</el-form-item>
</td>
<td colspan="2">
小计(机票+税金+联运+过夜+签证+保险+领队导游分摊):
<br />{{getCostTotalMoney()}}
</td>
</tr>
<tr>
<td colspan="13"></td>
</tr>
<tr>
<td colspan="2">
......@@ -410,14 +420,18 @@
地接成本<br />(人民币)
</td>
<td colspan="2">
成本<br />[地接成本(人民币)+机票+税金+联运+过夜+签证+保险]
成本<br />[地接成本(人民币)+其它成本(人民币)小计]
</td>
<td colspan="2">
销售价格
<td>
同业销售价格
<br />(人民币)
</td>
<td>
直客销售价格
<br />(人民币)
</td>
<td>
<template v-if="postConfig.LineId==14">
<template v-if="postConfig.LineId==14||postConfig.LineId==118">
销售价格
<br />(日币)
</template>
......@@ -445,7 +459,7 @@
{{getLocalJpyTotalMoney(subItem.PeopleNumber)}}
</td>
<td colspan="2">
<template v-if="postConfig.LineId==14">
<template v-if="postConfig.LineId==14||postConfig.LineId==118">
{{getLocalTotalMoney(subItem.PeopleNumber)}}
</template>
<template v-else-if="postConfig.LineId==168">
......@@ -458,11 +472,14 @@
<td colspan="2">
{{subItem.TotalMoney}}
</td>
<td colspan="2">
<td>
{{subItem.SalePrice}}
</td>
<td>
<template v-if="postConfig.LineId==14">
{{subItem.B2CSalePrice}}
</td>
<td>
<template v-if="postConfig.LineId==14||postConfig.LineId==118">
{{subItem.JPYSalePrice}}
</template>
</td>
......@@ -483,7 +500,7 @@
v-if="postConfig.ManagerAduitDate&&postConfig.ManagerAduitDate!=''&&postConfig.ManagerAduitName&&postConfig.ManagerAduitName!=''">
<p> {{postConfig.ManagerAduitName}}：{{postConfig.ManagerAduitDate}}
<template v-if="postConfig.ManagerAduitStatus==1">
<span style="color:#69D5A;">通过</span>
<span style="color:blue;">通过</span>
</template>
<template v-if="postConfig.ManagerAduitStatus==2">
<span style="color:red;">驳回</span>
......@@ -496,7 +513,7 @@
<p>
{{postConfig.AuditByName}}：{{postConfig.AuditDate}}
<template v-if="postConfig.TravelState==3">
<span style="color:#69D5A;"> 通过</span>
<span style="color:blue;"> 通过</span>
</template>
<template v-if="postConfig.TravelState==4">
<span style="color:red;"> 驳回</span>
......@@ -651,14 +668,15 @@
},
//其它成本价格
getCostTotalMoney() {
//机票+税金+联运+过夜+保险+领队导游分摊
//机票+中段机票+税金+领队导游分摊+联运+过夜+保险
let totalMoney = this.getConvertMoney(this.OtherPrice.AirTicketMoeny) +
this.getConvertMoney(this.OtherPrice.InlandAirTicketMoney) +
this.getConvertMoney(this.teamPrice.TaxPrice) +
this.getConvertMoney(this.teamPrice.UnionPrice) +
this.getConvertMoney(this.OtherPrice.AirTicketShareMoney) +
this.getConvertMoney(this.teamPrice.NightPrice) +
this.getConvertMoney(this.teamPrice.VisaPrice) +
this.getConvertMoney(this.OtherPrice.SafeMoney) +
this.getConvertMoney(this.OtherPrice.AirTicketShareMoney)
this.getConvertMoney(this.OtherPrice.SafeMoney)
return totalMoney;
},
//获取汇率
......
src/components/TravelManager/TravelNewQuotation/CostNewPriceCC.vue
View file @ 52ae88c4
......@@ -216,7 +216,12 @@
{{OtherPrice.AirTicketMoeny}}
</el-form-item>
</td>
<td>
<td colspan="2">
<el-form-item label="中段机票">
{{OtherPrice.InlandAirTicketMoney}}
</el-form-item>
</td>
<td colspan="2">
<el-form-item label="税金">
{{teamPrice.TaxPrice}}
</el-form-item>
......@@ -226,29 +231,35 @@
{{teamPrice.UnionPrice}}
</el-form-item>
</td>
<td colspan="5" rowspan="2">
小计(机票+中段机票+税金+联运+领队导游分摊+过夜+签证+保险):
<br />{{getCostTotalMoney()}}
</td>
</tr>
<tr>
<td colspan="2">
<el-form-item label="领队导游分摊">
{{OtherPrice.AirTicketShareMoney}}
</el-form-item>
</td>
<td colspan="2">
<el-form-item label="过夜">
{{teamPrice.NightPrice}}
</el-form-item>
</td>
<td>
<td colspan="2">
<el-form-item label="签证">
{{teamPrice.VisaPrice}}
</el-form-item>
</td>
<td>
<td colspan="2">
<el-form-item label="保险">
{{OtherPrice.SafeMoney}}
</el-form-item>
</td>
<td colspan="2">
<el-form-item label="领队导游分摊">
{{OtherPrice.AirTicketShareMoney}}
</el-form-item>
</td>
<td colspan="2">
小计(机票+税金+联运+过夜+签证+保险+领队导游分摊):{{getCostTotalMoney()}}
</td>
</tr>
<tr>
<td colspan="13"></td>
</tr>
<tr>
<td colspan="2">
......@@ -316,14 +327,18 @@
地接成本<br />(人民币)
</td>
<td colspan="2">
成本<br />[地接成本(人民币)+机票+税金+联运+过夜+签证+保险]
成本<br />[地接成本(人民币)+其它成本(人民币)小计]
</td>
<td colspan="2">
销售价格
<td>
同业销售价格
<br />(人民币)
</td>
<td>
直客销售价格
<br />(人民币)
</td>
<td>
<template v-if="postConfig.LineId==14">
<template v-if="postConfig.LineId==14||postConfig.LineId==118">
销售价格
<br />(日币)
</template>
......@@ -351,7 +366,7 @@
{{getLocalJpyTotalMoney(subItem.PeopleNumber)}}
</td>
<td colspan="2">
<template v-if="postConfig.LineId==14">
<template v-if="postConfig.LineId==14||postConfig.LineId==118">
{{getLocalTotalMoney(subItem.PeopleNumber)}}
</template>
<template v-else-if="postConfig.LineId==168">
......@@ -364,11 +379,14 @@
<td colspan="2">
{{subItem.TotalMoney}}
</td>
<td colspan="2">
<td>
{{subItem.SalePrice}}
</td>
<td>
<template v-if="postConfig.LineId==14">
{{subItem.B2CSalePrice}}
</td>
<td>
<template v-if="postConfig.LineId==14||postConfig.LineId==118">
{{subItem.JPYSalePrice}}
</template>
</td>
......@@ -388,7 +406,7 @@
v-if="postConfig.ManagerAduitDate&&postConfig.ManagerAduitDate!=''&&postConfig.ManagerAduitName&&postConfig.ManagerAduitName!=''">
{{postConfig.ManagerAduitName}}：{{postConfig.ManagerAduitDate}} <template
v-if="postConfig.ManagerAduitStatus==1">
<span style="color:#69D5A;"> 通过</span>
<span style="color:blue;"> 通过</span>
</template>
<template v-if="postConfig.ManagerAduitStatus==2">
<span style="color:red;"> 驳回</span>
......@@ -398,7 +416,7 @@
<template v-if="postConfig.AuditDate&&postConfig.AuditDate!=''">
<br />
{{postConfig.AuditByName}}：{{postConfig.AuditDate}} <template v-if="postConfig.TravelState==3">
<span style="color:#69D5A;"> 通过</span>
<span style="color:blue;"> 通过</span>
</template>
<template v-if="postConfig.TravelState==4">
<span style="color:red;"> 驳回</span>
......@@ -500,14 +518,15 @@
},
//其它成本价格
getCostTotalMoney() {
//机票+税金+联运+过夜+保险+领队导游分摊
//机票+中段机票+税金+领队导游分摊+联运+过夜+保险
let totalMoney = this.getConvertMoney(this.OtherPrice.AirTicketMoeny) +
this.getConvertMoney(this.OtherPrice.InlandAirTicketMoney) +
this.getConvertMoney(this.teamPrice.TaxPrice) +
this.getConvertMoney(this.teamPrice.UnionPrice) +
this.getConvertMoney(this.OtherPrice.AirTicketShareMoney) +
this.getConvertMoney(this.teamPrice.NightPrice) +
this.getConvertMoney(this.teamPrice.VisaPrice) +
this.getConvertMoney(this.OtherPrice.SafeMoney) +
this.getConvertMoney(this.OtherPrice.AirTicketShareMoney)
this.getConvertMoney(this.OtherPrice.SafeMoney)
return totalMoney;
},
//获取汇率
......
src/components/TravelManager/TravelNewQuotation/CostNewPriceForm.vue
View file @ 52ae88c4
......@@ -303,12 +303,18 @@
</tr>
<tr>
<td colspan="2">
<el-form-item label="机票">
<el-form-item label="机票" label-position="right">
<el-input type="text" v-model='OtherPrice.AirTicketMoeny' class="w100"
@keyup.native="checkPrice(OtherPrice,'AirTicketMoeny'),getchange()"></el-input>
</el-form-item>
</td>
<td>
<td colspan="2">
<el-form-item label="中段机票">
<el-input type="text" v-model='OtherPrice.InlandAirTicketMoney' class="w100"
@keyup.native="checkPrice(OtherPrice,'InlandAirTicketMoney'),getchange()"></el-input>
</el-form-item>
</td>
<td colspan="2">
<el-form-item label="税金">
<el-input type="text" v-model='teamPrice.TaxPrice' class="w100"
@keyup.native="checkPrice(teamPrice,'TaxPrice'),getchange()"></el-input>
......@@ -320,34 +326,39 @@
@keyup.native="checkPrice(teamPrice,'UnionPrice'),getchange()"></el-input>
</el-form-item>
</td>
<td colspan="5" rowspan="2">
小计(机票+中段机票+税金+联运+领队导游分摊+过夜+签证+保险):
<br /> {{getCostTotalMoney()}}
</td>
</tr>
<tr>
<td colspan="2">
<el-form-item label="领队导游分摊">
<el-input type='text' class="w100" v-model="OtherPrice.AirTicketShareMoney"
@keyup.native="checkPrice(OtherPrice,'AirTicketShareMoney'),getchange()"></el-input>
</el-form-item>
</td>
<td colspan="2">
<el-form-item label="过夜">
<el-input type="text" v-model='teamPrice.NightPrice' class="w100"
@keyup.native="checkPrice(teamPrice,'NightPrice'),getchange()"></el-input>
</el-form-item>
</td>
<td>
<td colspan="2">
<el-form-item label="签证">
<el-input type="text" v-model='teamPrice.VisaPrice' class="w100"
@keyup.native="checkPrice(teamPrice,'VisaPrice'),getchange()"></el-input>
</el-form-item>
</td>
<td colspan="2">
<el-form-item label="领队导游分摊">
<el-input type='text' class="w100" v-model="OtherPrice.AirTicketShareMoney"
@keyup.native="checkPrice(OtherPrice,'AirTicketShareMoney'),getchange()"></el-input>
</el-form-item>
</td>
<td>
<el-form-item label="保险">
<el-input type='text' class="w60" v-model="OtherPrice.SafeMoney"
<el-input type='text' class="w100" v-model="OtherPrice.SafeMoney"
@keyup.native="checkPrice(OtherPrice,'SafeMoney'),getchange()"></el-input>
</el-form-item>
</td>
<td colspan="2">
小计(机票+税金+联运+过夜+签证+保险+领队导游分摊):
<br /> {{getCostTotalMoney()}}
</td>
</tr>
<tr>
<td colspan="13"></td>
</tr>
<tr>
<td colspan="2">
......@@ -429,14 +440,18 @@
地接成本<br />(人民币)
</td>
<td colspan="2">
成本<br />[地接成本(人民币)+机票+税金+联运+过夜+签证+保险+领队导游分摊]
成本<br />[地接成本(人民币)+其它成本(人民币)小计]
</td>
<td colspan="2">
销售价格
<td>
同业销售价格
<br />(人民币)
</td>
<td>
直客销售价格
<br />(人民币)
</td>
<td>
<template v-if="postConfig.LineId==14">
<template v-if="postConfig.LineId==14||postConfig.LineId==118">
销售价格
<br />(日币)
</template>
......@@ -464,7 +479,7 @@
{{getLocalJpyTotalMoney(subItem.PeopleNumber)}}
</td>
<td>
<template v-if="postConfig.LineId==14">
<template v-if="postConfig.LineId==14||postConfig.LineId==118">
{{getLocalTotalMoney(subItem.PeopleNumber)}}
</template>
<template v-else-if="postConfig.LineId==168">
......@@ -479,13 +494,18 @@
<td colspan="2">
{{subItem.TotalMoney}}
</td>
<td colspan="2">
<td>
<el-input type='text' class="w70" v-model="subItem.SalePrice"
@keyup.native="checkPrice(subItem,'SalePrice')" maxlength="8"></el-input>
</td>
<td>
<el-input v-if="postConfig.LineId==14" type='text' class="w70" v-model="subItem.JPYSalePrice"
@keyup.native="checkPrice(subItem,'JPYSalePrice')" maxlength="8"></el-input>
<el-input type='text' class="w70" v-model="subItem.B2CSalePrice"
@keyup.native="checkPrice(subItem,'B2CSalePrice')" maxlength="8"></el-input>
</td>
<td>
<el-input v-if="postConfig.LineId==14||postConfig.LineId==118" type='text' class="w70"
v-model="subItem.JPYSalePrice" @keyup.native="checkPrice(subItem,'JPYSalePrice')" maxlength="8">
</el-input>
</td>
<td colspan="2">
<el-input type="textarea" v-model="subItem.CostRemark"></el-input>
......@@ -708,14 +728,15 @@
},
//其它成本价格
getCostTotalMoney() {
//机票+税金+联运+过夜+保险+领队导游分摊
//机票+中段机票+税金+领队导游分摊+联运+过夜+保险
let totalMoney = this.getConvertMoney(this.OtherPrice.AirTicketMoeny) +
this.getConvertMoney(this.OtherPrice.InlandAirTicketMoney) +
this.getConvertMoney(this.teamPrice.TaxPrice) +
this.getConvertMoney(this.teamPrice.UnionPrice) +
this.getConvertMoney(this.OtherPrice.AirTicketShareMoney) +
this.getConvertMoney(this.teamPrice.NightPrice) +
this.getConvertMoney(this.teamPrice.VisaPrice) +
this.getConvertMoney(this.OtherPrice.SafeMoney) +
this.getConvertMoney(this.OtherPrice.AirTicketShareMoney)
this.getConvertMoney(this.OtherPrice.SafeMoney)
return totalMoney;
},
//获取币种对应 的人数报价
......
src/components/TravelManager/TravelNewQuotation/QuotationAduit.vue
View file @ 52ae88c4
......@@ -198,7 +198,6 @@
"travel_get_GetMyTravelInfo_V4",
msg,
res => {
console.log("travel_get_GetMyTravelInfo_V4", res.data);
this.loading = false;
if (res.data.resultCode == 1) {
var tempData = res.data.data;
......
src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue
View file @ 52ae88c4
......@@ -226,7 +226,11 @@
}
let msg = {
offerId: offerId,
TCID: 0,
};
if (this.$route.query.TCID && this.$route.query.TCID > 0) {
msg.TCID = this.$route.query.TCID
}
this.loading = true;
this.apipost(
"travel_get_GetMyTravelInfo_V4",
......@@ -275,6 +279,7 @@
if (tempData.OutBranchName && tempData.OutBranchName != '') {
this.postData.OutBranchId = Number(tempData.OutBranchId);
}
this.postData.TeamType=tempData.TeamType;
this.postData.OfferPayType = tempData.OfferPayType;
this.postData.SaleOfferPayType = tempData.SaleOfferPayType;
this.postData.TravelState = tempData.TravelState;
......@@ -294,35 +299,15 @@
},
},
created() {
this.postData.OfferId = this.$route.query.offerid > 0 ? this.$route.query.offerid : 0;
this.getPostData();
//从团控列表跳转信息
if (this.$route.query.TeamType && this.$route.query.TeamType >= 0) {
this.postData.TeamType = Number(this.$route.query.TeamType);
if (this.$route.query.offerid && this.$route.query.offerid > 0) {
this.postData.OfferId = this.$route.query.offerid;
}
//从团控列表跳转信息
if (this.$route.query.TCID && this.$route.query.TCID > 0) {
this.postData.TCID = this.$route.query.TCID
}
if (this.$route.query.LineID && this.$route.query.LineID > 0) {
this.postData.LineId = Number(this.$route.query.LineID);
}
if (this.$route.query.ltID && this.$route.query.ltID > 0) {
this.postData.LineteamId = Number(this.$route.query.ltID);
}
if (this.$route.query.DayNum && this.$route.query.DayNum > 0) {
this.postData.DayNum = this.$route.query.DayNum;
}
if (this.$route.query.OutDateTime && this.$route.query.OutDateTime != '') {
this.postData.OutDateTime = this.$route.query.OutDateTime;
}
if (this.$route.query.OutBranchId && this.$route.query.OutBranchId != '') {
this.postData.OutBranchId = Number(this.$route.query.OutBranchId);
}
if (this.$route.query.Title && this.$route.query.Title != '') {
this.postData.Title = this.$route.query.Title;
}
this.getPostData();
//团控列表跳转参数结束
console.log("this.post", this.postData);
},
components: {
DirectNewQuotation: DirectNewQuotation
......
src/components/TravelManager/TravelNewQuotation/priceDialog.vue
View file @ 52ae88c4
......@@ -261,13 +261,11 @@
},
methods: {
getPostData() {
let configId = this.ConfigId;
let offerId = 0;
if (this.OfferId) {
offerId = this.OfferId;
}
let msg = {
ID: configId,
offerId: offerId
};
this.loading = true;
......
src/components/dmc/manager/GroundSupplier/index.vue
View file @ 52ae88c4
......@@ -47,12 +47,12 @@
maxlength="-1"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<!-- <el-col :span="4">
<el-form-item label="财务信息：">
<el-input placeholder="" v-model="msg.FinanceMan"
maxlength="-1"></el-input>
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="4">
<el-form-item label="分类：">
<el-select filterable v-model='msg.GroundingType' class="">
......@@ -89,9 +89,9 @@
<el-table-column prop="LinkMan" label="供应商联系人"></el-table-column>
<el-table-column prop="LinkTel" label="供应商电话"></el-table-column>
<el-table-column prop="LinkDuties" label="供应商职务"></el-table-column>
<el-table-column prop="FinanceMan" label="财务联系人"></el-table-column>
<!-- <el-table-column prop="FinanceMan" label="财务联系人"></el-table-column>
<el-table-column prop="FinanceTel" label="财务电话"></el-table-column>
<el-table-column prop="FinanceDuties" label="财务职务"></el-table-column>
<el-table-column prop="FinanceDuties" label="财务职务"></el-table-column> -->
<el-table-column prop="" label="合同">
<template slot-scope="scope">
<div v-if="verificationFile(scope.row.ContractUrl,3)" class="img-box">
......@@ -195,8 +195,9 @@
</el-form-item>
</div>
<div class="msgbox">
<el-form-item label="供应商分类" prop="GroundingType">
<el-select filterable v-model='form.GroundingType' style="width: 100%;">
<el-form-item label="供应商分类" prop="GroundingTypeInfo">
<el-select filterable v-model='form.GroundingTypeInfo' multiple
collapse-tags style="width: 100%;">
<el-option v-for="item in sortList" :key="item.ID" :value="item.ID" :label="item.Name">
</el-option>
</el-select>
......@@ -206,10 +207,16 @@
<el-form-item label="供应商名称" prop="Name">
<el-input v-model="form.Name" clearable></el-input>
</el-form-item>
</div>
</div>
<div class="msgbox">
<el-form-item label="供应商地址" prop="Address">
<el-input v-model="form.Address" clearable></el-input>
<el-form-item label="到期时间" prop="ContractEndTime">
<el-date-picker
v-model="form.ContractEndTime"
type="date"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
placeholder="选择合同到期时间">
</el-date-picker>
</el-form-item>
</div>
<div class="msgbox">
......@@ -228,18 +235,8 @@
</el-form-item>
</div>
<div class="msgbox">
<el-form-item label="财务联系人" prop="FinanceMan">
<el-input v-model="form.FinanceMan" clearable></el-input>
</el-form-item>
</div>
<div class="msgbox">
<el-form-item label="财务电话" prop="FinanceTel">
<el-input v-model="form.FinanceTel" clearable></el-input>
</el-form-item>
</div>
<div class="msgbox">
<el-form-item label="财务职务" prop="FinanceDuties">
<el-input v-model="form.FinanceDuties" clearable></el-input>
<el-form-item label="供应商地址" prop="Address">
<el-input v-model="form.Address" clearable></el-input>
</el-form-item>
</div>
<div class="msgbox">
......@@ -271,17 +268,7 @@
</div>
</el-form-item>
</div>
<div class="msgbox">
<el-form-item label="到期时间" prop="ContractEndTime">
<el-date-picker
v-model="form.ContractEndTime"
type="date"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
placeholder="选择合同到期时间">
</el-date-picker>
</el-form-item>
</div>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="resetForm('form'),showVisible = false">取 消</el-button>
......@@ -317,8 +304,7 @@
pageIndex: 1,
pageSize: 10,
Name: '',
FinanceMan: '',
GroundingType:'0',
GroundingType:'',
LineInfo: '',
LineId: '0'
},
......@@ -333,25 +319,18 @@
LinkMan: '',
LinkTel: '',
LinkDuties: '',
FinanceMan: '',
FinanceTel: '',
FinanceDuties: '',
GroundingType: '',
ContractUrl: '',
LineInfo: '',
LineId: [],
GroundingTypeInfo:[],
ContractEndTime: ''
},
rules:{
Name: [{ required: true, message: '请输入供应商名称', trigger: "blur"}],
Address: [{ required: true, message: '请输入供应商地址', trigger: "blur"}],
LinkMan: [{ required: true, message: '请输入供应商联系人', trigger: "blur"}],
LinkTel: [{ required: true, message: '请输入供应商电话', trigger: "blur"}],
LinkDuties: [{ required: true, message: '请输入供应商职务', trigger: "blur"}],
FinanceMan: [{ required: true, message: '请输入财务联系人', trigger: "blur"}],
FinanceTel: [{ required: true, message: '请输入财务电话', trigger: "blur"}],
FinanceDuties: [{ required: true, message: '请输入财务职务', trigger: "blur"}],
GroundingType: [{ required: true, message: '请选择供应商类型', trigger: "change"}],
GroundingTypeInfo: [{ required: true, message: '请选择供应商类型', trigger: "change"}],
LineId: [{ required: true, message: '请选择路线', trigger: "change"}],
ContractUrl: [{ required: true, message: '请上传合同', trigger: "buttom"}],
ContractEndTime: [{ required: true, message: '请选择合同到期时间', trigger: "change"}],
......@@ -390,6 +369,7 @@
if (res.data.resultCode == 1) {
this.form = res.data.data
this.form.LineId = res.data.data.LineInfo.split(',').map(x=>{ return Number(x) })
this.form.GroundingTypeInfo = res.data.data.GroundingType.split(',').map(x=>{ return Number(x) })
} else {
this.Error(res.data.message)
}
......@@ -415,6 +395,7 @@
// }
this.form = JSON.parse(JSON.stringify(row))
this.$set(this.form, 'LineId', row.LineInfo.split(',').map(x=>{ return Number(x) }))
this.$set(this.form, 'GroundingTypeInfo', row.GroundingType.split(',').map(x=>{ return Number(x) }))
}
this.showVisible = true
},
......@@ -483,6 +464,7 @@
this.$refs[formName].validate((valid) => {
if (valid) {
this.form.LineInfo = this.form.LineId.join(',')
this.form.GroundingType = this.form.GroundingTypeInfo.join(',')
this.submitLoading = true
this.apipost(
'travel_get_SetGroundingSupplier', this.form,
......@@ -511,13 +493,11 @@
LinkMan: '',
LinkTel: '',
LinkDuties: '',
FinanceMan: '',
FinanceTel: '',
FinanceDuties: '',
GroundingType: '',
ContractUrl: '',
LineInfo: '',
LineId: [],
GroundingTypeInfo:[],
ContractEndTime: ''
}
this.$refs[formName].resetFields();
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice2.vue
View file @ 52ae88c4
......@@ -398,12 +398,12 @@
<li class="liList" v-for="(dayobject,index) in days" :key="index+1000">
<span v-if="dayobject.checkState==$calendarUtils.checkState.noChecked"
class="other-month">{{dayobject.day.getDate()}}</span>
<!--@click="clickedDay(dayobject)"-->
<!---->
<span v-if="dayobject.checkState==$calendarUtils.checkState.checked"
class="checked1" >{{dayobject.day.getDate()}}</span>
<!--@click="clickedDay(dayobject)"-->
class="checked1" @click="clickedDay(dayobject)">{{dayobject.day.getDate()}}</span>
<!---->
<span
v-else-if="dayobject.checkState==$calendarUtils.checkState.hasValue" >{{dayobject.day.getDate()}}</span>
v-else-if="dayobject.checkState==$calendarUtils.checkState.hasValue" @click="clickedDay(dayobject)">{{dayobject.day.getDate()}}</span>
</li>
</ul>
</div>
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice3.vue
View file @ 52ae88c4
......@@ -384,12 +384,12 @@
<li class="liList" v-for="(dayobject,index) in days" :key="index+1000">
<span v-if="dayobject.checkState==$calendarUtils.checkState.noChecked"
class="other-month">{{dayobject.day.getDate()}}</span>
<!--@click="clickedDay(dayobject)"-->
<!---->
<span v-if="dayobject.checkState==$calendarUtils.checkState.checked"
class="checked1" >{{dayobject.day.getDate()}}</span>
<!--@click="clickedDay(dayobject)"-->
class="checked1" @click="clickedDay(dayobject)">{{dayobject.day.getDate()}}</span>
<!---->
<span
v-else-if="dayobject.checkState==$calendarUtils.checkState.hasValue" >{{dayobject.day.getDate()}}</span>
v-else-if="dayobject.checkState==$calendarUtils.checkState.hasValue" @click="clickedDay(dayobject)">{{dayobject.day.getDate()}}</span>
</li>
</ul>
</div>
......
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