Skip to content

S
SuperMan
Commit 706d6edb authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

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

parents 7de01a2a eb8de9b7
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1304 additions and 750 deletions
src/components/Hotel/roomReservationsDetails.vue
View file @ 706d6edb
......@@ -204,9 +204,19 @@
<el-option label='签单' :value='2'></el-option>
<el-option label='实物抵扣' :value='5'></el-option>
<el-option label='预付' :value='4'></el-option>
<el-option label='公司合团支付' :value='6'></el-option>
</el-select>
</td>
</tr>
<tr v-show="subItem.PayStyle==6">
<td colspan="2" style="height:5px;"></td>
</tr>
<tr v-show="subItem.PayStyle==6">
<td width="70" style="text-align:right;">付款团号：</td>
<td>
<el-input class='w135' v-model='subItem.PayTypeTCNUM'></el-input>
</td>
</tr>
<tr>
<td colspan="2" style="height:5px;"></td>
</tr>
......@@ -230,7 +240,7 @@
<!-- 操作 -->
<td v-if="childIndex==0" :rowspan="5">
<!--v-if="subItem.OPState!=1"-->
<template >
<template>
<el-tooltip class="item" effect="dark" content="保存" placement="top-start">
<el-button icon="iconfont icon-baocun1" @click="SaveSingle(subItem)" type="primary"></el-button>
</el-tooltip>
......@@ -307,8 +317,8 @@
subItem.HotelId = 0;
subItem.HotelName = "";
subItem.OrderID = 0;
subItem.OrderDetailsList.forEach(childItem=>{
childItem.OrderDetailsId=0;
subItem.OrderDetailsList.forEach(childItem => {
childItem.OrderDetailsId = 0;
});
item.HotelOrderList.push(subItem);
},
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ 706d6edb
......@@ -37,8 +37,8 @@
<th width="100">车配号</th>
<th width="100">车辆号</th>
<th width="60">用车方式</th>
<!-- <th width="60">车费</th>
<th width="120">车费付款方式</th> -->
<th width="60">车费</th>
<th width="120">车费付款方式</th>
<th width="80">高速公路费</th>
<th width="120">高速费用付款方式</th>
<th width="60">停车费</th>
......@@ -58,29 +58,35 @@
<span v-if='index!=0&&index!=list.BusList.length-1'>{{item.AirportPickUpStr}}</span>
<span v-if='index==list.BusList.length-1'>送机</span>
</td>
<!-- <td>
{{ item.PayType === 1 ? moneyFormat(item.CostPrice) : 0}}
<td>
{{item.CostPrice >= 0 && item.CostPrice !== null && item.PayType > 0 ? (item.PayType === 1 ? moneyFormat(item.CostPrice) : 0) : ''}}
</td>
<td>
<span v-if="item.PayType === 1">现付</span>
<span v-else-if="item.PayType === 2">公司结算</span>
<span v-else-if="item.PayType === 3">预付</span>
<span v-else>暂无</span>
</td> -->
<span v-else-if="item.PayType ===6">合团公司支付</span>
<span v-else></span>
</br>
<span v-show="item.PayType==6">付款团号：{{item.PayTypeTCNUM}}</span>
</td>
<td>
{{item.HighSpeedPayType === 1 ? moneyFormat(item.HighSpeedPrice) : 0}}
{{item.HighSpeedPrice >= 0 && item.HighSpeedPrice !== null && item.HighSpeedPayType > 0 ? (item.HighSpeedPayType === 1 ? moneyFormat(item.HighSpeedPrice) : 0) : ''}}
</td>
<td>
<span v-if="item.HighSpeedPayType === 1">现付</span>
<span v-else-if="item.HighSpeedPayType === 2">公司结算</span>
<span v-else-if="item.HighSpeedPayType === 3">预付</span>
<span v-else>暂无</span>
<span v-else-if="item.HighSpeedPayType ===6">合团公司支付</span>
<span v-else></span>
</br>
<span v-show="item.HighSpeedPayType==6">付款团号：{{item.PayTypeTCNUM}}</span>
</td>
<td>
{{moneyFormat(item.StopPrice)}}
{{item.StopPrice >= 0 && item.StopPrice !== null && item.PayType > 0 ? (item.PayType === 1 ? moneyFormat(item.StopPrice) : 0): ''}}
</td>
<td>
{{moneyFormat((item.PayType === 1 ? Number(item.CostPrice) : 0)+Number(item.StopPrice))}}
{{Number(moneyFormat((item.PayType === 1 ? Number(item.CostPrice) : 0) + (item.PayType === 1 ? Number(item.StopPrice) : 0) + (item.HighSpeedPayType === 1 ? Number(item.HighSpeedPrice) : 0))) <= 0 ? '' : moneyFormat((item.PayType === 1 ? Number(item.CostPrice) : 0) + (item.PayType === 1 ? Number(item.StopPrice) : 0) + (item.HighSpeedPayType === 1 ? Number(item.HighSpeedPrice) : 0))}}
</td>
<td v-if='index==0' :rowspan='list.BusList.length'>
{{busTotalPrice(list.BusList)}}
......@@ -98,7 +104,7 @@
</tr>
<tr v-if="TotalNav.reimburseTotalPrice">
<td>总金额</td>
<td colspan="13">
<td colspan="14">
{{moneyFormat(TotalNav.reimburseTotalPrice.SelfPayingExpendTotalPrice)}}
</td>
<!-- <td>签单/预付/抵扣总金额</td>
......@@ -162,7 +168,7 @@
<td>
<p class="cursorpointer text-decoration"
@click="goHotelDetail(subItem.TCID, subItem.NewCombinationNum, subItem.TCNUM, 'roomReservationsDetails')">
{{moneyFormat(childItem.UnitPrice)}}
{{subItem.PayStyle === 1 ? moneyFormat(childItem.UnitPrice) : 0}}
</p>
</td>
<td>
......@@ -179,7 +185,10 @@
<span v-else-if="subItem.PayStyle === 2">签单</span>
<span v-else-if="subItem.PayStyle === 4">预付</span>
<span v-else-if="subItem.PayStyle === 5">实物抵扣</span>
<span v-else>暂无</span>
<span v-else-if="subItem.PayStyle === 6">公司合团支付</span>
<span v-else></span>
</br>
<span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
</td>
<td v-if="childIndex==0" :rowspan="5">
{{subItem.Remarks}}
......@@ -234,7 +243,7 @@
<td>
<p class="cursorpointer text-decoration"
@click="goHotelDetail(subItem.TCID, subItem.NewCombinationNum, subItem.TCNUM, 'bookDinnerStatisticsDetails')">
{{moneyFormat(childItem.PeoplePrice)}}
{{subItem.PayStyle === 1 ? moneyFormat(childItem.PeoplePrice) : 0}}
</p>
</td>
<td>
......@@ -250,7 +259,10 @@
<span v-if="subItem.PayStyle === 1">现付</span>
<span v-else-if="subItem.PayStyle === 2">公司结算</span>
<span v-else-if="subItem.PayStyle === 3">预付</span>
<span v-else>暂无</span>
<span v-else-if="subItem.PayStyle === 6">公司合团支付</span>
<span v-else></span>
</br>
<span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
</td>
<td v-if="childIndex==0" :rowspan="3">
{{item.Remarks}}
......@@ -307,7 +319,7 @@
<td>
<p class="cursorpointer text-decoration"
@click="goHotelDetail(subItem.TCID, subItem.NewCombinationNum, subItem.TCNUM, 'admissionStatisticsDetails')">
{{moneyFormat(childItem.PeoplePrice)}}
{{subItem.PayStyle === 1 ? moneyFormat(childItem.PeoplePrice) : 0}}
</p>
</td>
<td>
......@@ -323,7 +335,10 @@
<span v-if="subItem.PayStyle === 1">现付</span>
<span v-else-if="subItem.PayStyle === 2">公司结算</span>
<span v-else-if="subItem.PayStyle === 3">预付</span>
<span v-else>暂无</span>
<span v-else-if="subItem.PayStyle === 6">公司合团支付</span>
<span v-else></span>
</br>
<span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
</td>
<td v-if="childIndex==0" :rowspan="3">
{{item.Remarks}}
......@@ -653,7 +668,7 @@
if (str == '2')
return '儿童'
if (str == '3')
return '婴儿'
return '小人'
},
UseDinnerTypeToWord(str) {
if (str == 1)
......
src/components/Login.vue
View file @ 706d6edb
......@@ -317,16 +317,10 @@ export default {
if (previousPathInfo) {
let path = previousPathInfo.path.indexOf('login') === -1 ? previousPathInfo.path : 'index'
let query = previousPathInfo.query ? previousPathInfo.query : {}
if (path!== 'index') {
this.$router.push({ path: "/"+ path, query: query });
} else {
this.$router.push({ path: "/index" });
}
}else {
this.$router.push({ path: "/index" });
}
//登录成功后跳转页面
// this.$notify.success({
// title:'提示',
......
src/components/ShoppingStore/ShoppingStore.vue
View file @ 706d6edb
......@@ -509,11 +509,44 @@
<button class="normalBtn" type="button" @click="showDiv">{{$t('pub.addBtn')}}</button>
<button class="normalBtn importBtn" type="button" @click="outerVisible=true">导入营销数据</button>
<a class="hollowFixedBtn downBtn" :href="downList">下载模板</a>
<button class="hollowFixedBtn" type="button" style="display:none;"
@click="DownLoadShop()">导出</button>
</li>
</ul>
</div>
<!--不要删除-->
<div style="display:none">
<table>
<tr>
<td>
进店时间:
</td>
<td>
<el-date-picker class="w150" type="date" value-format="yyyy-MM-dd" placeholder=""
v-model="DownLoadmsg.EnterTime"></el-date-picker>
</td>
<td>
创建时间:
</td>
<td>
<el-date-picker class="w150" type="date" value-format="yyyy-MM-dd" placeholder=""
v-model="DownLoadmsg.CreateDate">
</el-date-picker>
</td>
<td>
购物店:
</td>
<td>
<el-select multiple="" class="w150" v-model='DownLoadmsg.ShopIds' filterable placeholder="请选择购物店">
<el-option v-for='item in getShop' :key="item.ID" :label="item.Name" :value="item.ID">
</el-option>
</el-select>
</td>
<td>
<button class="hollowFixedBtn" type="button" @click="DownLoadShop()">导出</button>
</td>
</tr>
</table>
</div>
<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="reTopInfo">
......@@ -804,6 +837,17 @@
QDistrict: "",
Name: ""
},
//文件下载参数
DownLoadmsg: {
//创建日期
CreateDate: "",
//进店时间
EnterTime: "",
//操作人
CreateBy: 0,
//购物店Ids
ShopIds: ""
},
addMsg: {
ID: "0",
Name: "",
......@@ -852,12 +896,9 @@
//下载Excel
DownLoadShop() {
this.loading = true;
let qMsg = {
queryMsg: this.msg,
uid: this.getLocalStorage().EmployeeId
};
this.DownLoadmsg.CreateBy = this.getLocalStorage().EmployeeId;
let fileName = "购物店单据导出" + this.$commonUtils.getCurrentDate() + ".xls";
this.GetLocalFile("shop_get_downloadShopFinaceList", qMsg, fileName,
this.GetLocalFile("shop_get_downloadShopFinaceList", this.DownLoadmsg, fileName,
res => {
this.loading = false;
});
......
src/components/TravelManager/TravelList/RegistrationStatistics.vue
View file @ 706d6edb
......@@ -157,9 +157,10 @@
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading='queryCommonData.loading'>
<tr>
<th width="50">{{$t('active.ad_xuhao')}}</th>
<th width="80">{{$t('Operation.Op_chutuan')}}</th>
<th width='200'>{{$t('Operation.Op_TeamName')}}</th>
<th width="60">{{$t('Operation.Op_chutuan')}}</th>
<th width='120'>{{$t('Operation.Op_TeamName')}}</th>
<th width="80">{{$t('fnc.tuanqi')}}</th>
<th width="130">团期编号</th>
<th width="80">{{$t('Operation.Op_jinchudian')}}</th>
<th width="100">{{$t('Operation.Op_ArriveTime')}}</th>
<th width="50">{{$t('Operation.Op_price')}}</th>
......@@ -180,22 +181,23 @@
'Rs_Start10':item.StartCityNum==10,'Rs_Start11':item.StartCityNum==11,'Rs_Start12':item.StartCityNum==12,'Rs_Start13':item.StartCityNum==13}">
{{item.StartCityName}}</td>
<td>{{item.LtName}}</td>
<td>{{item.StartDateStr}}</td>
<td>{{item.StartDateStr}} {{item.AlCode}}</td>
<td><span title="点击跳转到团控列表" :class="item.TCID>0?'RS_RedType PingFangSC Order_RS':'Order_RS'" @click="goUrl('TravelControlList',item.TCNUM,'团控列表')">{{item.TCID}}</span></td>
<td>{{item.InOut}}</td>
<td>{{item.InOutTime}}</td>
<td>{{item.B2CMemberPrice}}</td>
<td>{{item.TotalSeat}}</td>
<td>
<span class="Order_RS" :class="{'RS_RedType':item.OrderTotalNum>0}"
<span title="点击跳转到报名清单" class="Order_RS" :class="{'RS_RedType':item.OrderTotalNum>0}"
@click="goUrl('RegistrationList',item.TCID,'设置领队')">{{item.OrderTotalNum-item.OrderLeaderGuestNum}}<span
v-if="item.OrderLeaderGuestNum>0">+{{item.OrderLeaderGuestNum}}</span></span>
</td>
<td><span class="Order_RS" @click="goUrl('RegistrationList',item.TCID,'设置领队')">{{item.OrderPaymentNum}}</span>
</td>
<td><span :class="item.LeaderName!=''&&item.LeaderName!=null?'PingFangSC Order_RS':'Order_RS'"
<td><span title="点击跳转到报名清单" :class="item.LeaderName!=''&&item.LeaderName!=null?'PingFangSC Order_RS':'Order_RS'"
@click="goUrl('RegistrationList',item.TCID,'报名清单')">{{item.LeaderName!=""&&item.LeaderName!=null ?item.LeaderName:"设置领队"}}</span>
</td>
<td><span :class="item.GuideName!=''&&item.GuideName!=null?'RS_RedType PingFangSC Order_RS':'Order_RS'"
<td><span title="点击跳转到设置导游页面" :class="item.GuideName!=''&&item.GuideName!=null?'RS_RedType PingFangSC Order_RS':'Order_RS'"
@click="goUrl('leaderArrangement',item.TCID,'设置导游')">{{item.GuideName!=""&&item.GuideName!=null?item.GuideName:"设置导游"}}</span>
</td>
<td><span class="RS_Nameover">{{item.OPRemark}}</span></td>
......@@ -349,11 +351,14 @@
},
DownLoadFile() {
this.Info("正在下载文件...")
this.queryCommonData.loading=true;
this.GetLocalFile(
"travel_get_DownTravelPriceOrderStatistics",
this.queryMsg,
"报名统计.xls"
);
"报名统计.xls",
res => {
this.queryCommonData.loading = false;
});
},
goUrl(path, id, NameStr) {
if (id > 0) {
......
src/components/TravelManager/TravelList/TeamBalancePayment.vue
View file @ 706d6edb
......@@ -102,10 +102,6 @@
color: #4d7afd;
}
.Team_Incontent {
margin-left: 35px;
}
.Team_firstTitle span {
margin-right: 10px;
text-align: center;
......@@ -114,7 +110,6 @@
}
.Team_Incontent span {
margin-left: 20px;
font-size: 14px;
font-family: 'PingFangSC-Fine';
}
......@@ -174,9 +169,9 @@
</span>团费收入
</div>
<div class="Team_Incontent">
<div>应收<span>￥{{DataList.TeamBalance.ShouldReceive}}</span></div>
<div>实收<span class="Team_Coins">￥{{DataList.TeamBalance.ActualReceive}}</span></div>
<div>待收<span class="Team_Coins">￥{{DataList.TeamBalance.WaitRecive}}</span></div>
<div>应收：<span>￥{{DataList.TeamBalance.ShouldReceive}}</span></div>
<div>实收：<span class="Team_Coins">￥{{DataList.TeamBalance.ActualReceive}}</span></div>
<div>待收：<span class="Team_Coins">￥{{DataList.TeamBalance.WaitRecive}}</span></div>
<div>
注：应收=订单应收总额，实收=订单实收总额
</div>
......@@ -191,9 +186,9 @@
</span>其他收入
</div>
<div class="Team_Incontent">
<div>应收<span>￥{{moneyFormat(moneyAll.otheryTotalyf)}}</span></div>
<div>实收<span class="Team_Coins">￥{{moneyFormat(moneyAll.otheryTotalsf)}}</span></div>
<div>待收<span class="Team_Coins">￥{{moneyFormat(moneyAll.otheryTotalyf-moneyAll.otheryTotalsf)}}</span></div>
<div>应收：<span>￥{{moneyFormat(moneyAll.otheryTotalyf)}}</span></div>
<div>实收：<span class="Team_Coins">￥{{moneyFormat(moneyAll.otheryTotalsf)}}</span></div>
<div>待收：<span class="Team_Coins">￥{{moneyFormat(moneyAll.otheryTotalyf-moneyAll.otheryTotalsf)}}</span></div>
<!--<div>
注：应收=订单应收总额，实收=订单实收总额
</div>-->
......@@ -208,9 +203,9 @@
</span>支出
</div>
<div class="Team_Incontent">
<div>应付<span>￥{{DataList.TeamBalance.ShouldPay}}</span></div>
<div>实付<span class="Team_Coins">￥{{DataList.TeamBalance.ActualPay}}</span></div>
<div>待付<span class="Team_Coins">￥{{DataList.TeamBalance.WaitPay}}</span></div>
<div>应付：<span>￥{{DataList.TeamBalance.ShouldPay}}</span></div>
<div>实付：<span class="Team_Coins">￥{{DataList.TeamBalance.ActualPay}}</span></div>
<div>待付：<span class="Team_Coins">￥{{DataList.TeamBalance.WaitPay}}</span></div>
<div>
注：成本单据总额(包含退款)+提成-小费收入-地接收入
</div>
......@@ -225,8 +220,8 @@
</span>利润
</div>
<div class="Team_Incontent">
<div>实际利润<span>￥{{DataList.TeamBalance.ExpectedProfit}}</span></div>
<div>当前利润<span class="Team_Coins">￥{{DataList.TeamBalance.ActualProfit}}</span></div>
<div>实际利润：<span>￥{{DataList.TeamBalance.ExpectedProfit}}</span></div>
<div>当前利润：<span class="Team_Coins">￥{{DataList.TeamBalance.ActualProfit}}</span></div>
<div>
注：实收-(应付/实付)+佣金收入+自费收入-联运成本
</div>
......@@ -240,16 +235,16 @@
<i class="iconfont icon-qian"></i>
</span>其他
</div>
<div class="Team_Incontent" style="height:80px;overflow:auto;">
<div>提成：</div>
<div class="Team_Incontent" style="height:50px;overflow:auto;margin-bottom:10px;">
<div>
<div>提&nbsp;&nbsp;&nbsp;成</div>
<div style="margin-bottom:6px;">
<template v-for="subItem in DataList.ExpectedCutList">
<div style="margin-bottom:10px;">{{subItem.BranchName}} ￥{{subItem.expectedCut}} </div>
<div style="margin-bottom:5px;">{{subItem.BranchName}} ￥{{subItem.expectedCut}} </div>
</template>
</div>
</div>
<div>联运成本<span>￥{{DataList.LYCB}}</span></div>
<div>联运成本：<span>￥{{DataList.LYCB}}</span></div>
</div>
<div class="Team_firstTitle">
<span class="Team_comCoinType Team_lirun">
......@@ -257,7 +252,7 @@
</span>优惠
</div>
<div class="Team_Incontent">
<div>金&nbsp;&nbsp;&nbsp;额<span>￥{{DataList.TeamBalance.DiscountMoney}}</span></div>
<div>金额：<span>￥{{DataList.TeamBalance.DiscountMoney}}</span></div>
</div>
</div>
</el-col>
......
src/components/activity/CommodityActive.vue 0 → 100644
View file @ 706d6edb
<style>
.height_auto.el-select .el-input {
height: auto;
}
.CommodityType ._addUpload_box {
display: block;
margin: 10px 0 0;
}
.CommodityType ._addUpload_box img {
height: 15px;
display: block;
margin-right: 25px;
}
.CommodityType ._addUpload_box > div.el-upload {
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;
}
.CommodityType ._addUpload_box .icon-guanbi1 {
font-size: 12px;
color: white;
display: inline-block;
margin-left: 15px;
position: absolute;
left: 9px;
top: -5px;
background-color: #f56c6c;
border-radius: 50%;
height: 15px;
width: 15px;
text-align: center;
line-height: 15px;
}
.CommodityType ._addUpload_box > div:hover {
background-color: #f5f5f5;
}
.CommodityType .el-upload-dragger {
font-size: 28px;
color: #8c939d;
width: 126px;
height: 80px;
line-height: 41px;
text-align: center;
}
.CommodityType .bg_color_delete{
background-color: #ee4454;
border-color: #ee4454;
}
</style>
<template>
<div class="flexOne CommodityType">
<div class="query-box">
<ul class>
<li>
<input type="button" @click="getList" class="hollowFixedBtn" value="查询">
<input
type="button"
@click="outerVisible = true,dialogTitle='新增商品活动', addMsg.reqType = 'add',resetInfo()"
class="normalBtn"
:value="$t('pub.addBtn')"
>
</li>
</ul>
</div>
<div class="clearfix"></div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
<tr>
<th width="120px">活动编号</th>
<th>活动名称</th>
<th>活动图片</th>
<th>活动描述</th>
<th>创建时间</th>
<th>操作</th>
</tr>
<tr v-for="item in dataList">
<td>{{item.id}}</td>
<td>{{item.name}}</td>
<td>
<img :src="item.images" alt>
</td>
<td>{{item.descrip}}</td>
<td>{{item.createTime.replace('T', ' ')}}</td>
<td>
<el-tooltip
class="item"
effect="dark"
:content="$t('active.ld_editInfo')"
placement="top"
>
<el-button
type="primary"
icon="el-icon-edit"
circle
@click="outerVisible=true,dialogTitle='修改商品活动',updateData(item)"
></el-button>
</el-tooltip>
<!-- <el-tooltip class="item" effect="dark" content="删除" placement="top">
<el-button type="primary" class="bg_color_delete" icon="el-icon-delete" circle @click="Delete(item)"></el-button>
</el-tooltip> -->
</td>
</tr>
</table>
<div class="noDataNotice" v-if="dataList.length<1">
<i class="iconfont icon-kong"></i>
<p>{{$t("active.ld_noData")}}</p>
</div>
<el-dialog
custom-class="w400"
:title="dialogTitle"
:visible.sync="outerVisible"
center
:before-close="closeChangeMachie"
>
<el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="130px">
<el-form-item label="商品活动名称" prop="name">
<el-input v-model="addMsg.name" class="w217"/>
</el-form-item>
<el-form-item label="活动介绍" prop="descrip">
<el-input type="textarea" v-model="addMsg.descrip" class="w217"></el-input>
</el-form-item>
<el-form-item label="商品活动图标">
<div class="_addUpload_box">
<div class="_pic_upload">
<template v-if="addMsg.images!==''">
<div>
<div
style="width:100%;height:100%;overflow: hidden;display: flex;align-items: center;"
>
<img :src="addMsg.images">
<span
style="font-size:12px; color:#666666;cursor: pointer;line-height: 20px;"
@click="addMsg.images=''"
>重新上传</span>
</div>
</div>
</template>
<el-upload
v-else
drag
:http-request="uploadFileBtn"
:multiple="false"
:show-file-list="false"
action
>
<i class="el-icon-plus avatar-uploader-icon"></i>
<div class="el-upload__text">{{$t("active.ld_djscwj")}}</div>
</el-upload>
</div>
</div>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<button
class="hollowFixedBtn"
@click="outerVisible = false, resetForm('addMsg')"
>{{$t('pub.cancelBtn')}}</button> &nbsp;
<button class="normalBtn" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button>
</div>
</el-dialog>
</div>
</template>
<script>
export default {
data() {
return {
//请求
msg: {
state: -1,
name: ""
},
addMsg: {
descrip: "",
name: "",
images: "",
id: 0
},
rules: {
name: [
{ required: true, message: "请输入名称", trigger: "blur" }
],
descrip: [
{ required: true, message: "请输入描述", trigger: "blur" }
]
},
loading: false,
outerVisible: false,
dialogTitle: "",
dataList: [],
awardRelationList: [],
jurisdictionsList: []
};
},
mounted() {
this.getList();
},
filters: {},
methods: {
// 删除
Delete(item) {
this.$confirm("是否删除"+ item.name+"? 删除后不可恢复", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
this.apiJavaPost(
"/api/IntegralManager/goodsTypeManager",
{ reqType: 'delete', id: item.id },
res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message);
this.getList();
} else {
this.Error(res.data.message);
}
},
err => {}
);
})
.catch(() => {});
},
//上传图片
uploadFileBtn(file) {
//上传
if (file.file.size > 1024 * 1024 * 10) {
this.$message.warning(this.$t("tips.wjdxbncgsz"));
return;
}
// 1 文档 2 数据 3 图片
let typeArr = [{ stringArr: "GIF|JPG|JPEG|PNG|BMP", type: 3 }];
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(this.$t("tips.qsctpian"));
let newArr = [];
newArr.push(file.file);
let path = "/Upload/activity/";
this.$message.info(this.$t("tips.shangchuanzhong"));
this.UploadSelfFileT(path, newArr, x => {
let fileSize =
file.file.size < 1024
? file.file.size
: (file.file.size / 1024).toFixed(0);
this.addMsg.images = this.domainManager().ViittoFileUrl + x.data.FilePath;
this.$message.success(this.$t("tips.scchenggong"));
this.$forceUpdate();
});
},
//获取数据
getList() {
this.loading = true;
this.apiJavaPost(
"/api/IntegralManager/getGoodsSeries",
{},
res => {
this.loading = false;
console.log(res);
if (res.data.resultCode === 1) {
this.dataList = res.data.data;
console.log(this.dataList, "datalist");
} else {
this.Error(res.data.message);
}
},
null
);
},
//提交
submitForm(addMsg) {
//提交创建、修改表单
this.$refs[addMsg].validate(valid => {
if (valid) {
this.addAward();
} else {
return false;
}
});
},
//提交添加
addAward() {
if (this.addMsg.images === "") return this.Error("请上传图片");
this.apiJavaPost(
"/api/IntegralManager/AddGoodsSeries",
this.addMsg,
res => {
if (res.data.resultCode === 1) {
this.Success(res.data.message);
this.outerVisible = false;
this.getList();
} else {
this.Error(res.data.message);
}
},
null
);
},
//修改信息
updateData(item) {
this.outerVisible = true;
this.addMsg.id = item.id;
this.addMsg.name = item.name;
this.addMsg.descrip = item.descrip;
this.addMsg.images = item.images;
},
//重置信息
resetInfo() {
var newMsg = {
name: "",
descrip: '',
images: "",
id: 0
};
this.addMsg = newMsg;
},
closeChangeMachie(done) {
//弹出框关闭初始化弹框内表单
done();
this.resetForm("addMsg");
},
resetForm(formName) {
this.$refs[formName].resetFields();
}
}
};
</script>
\ No newline at end of file
src/components/activity/CommodityType.vue
View file @ 706d6edb
......@@ -199,8 +199,6 @@ export default {
outerVisible: false,
dialogTitle: "",
dataList: [],
awardRelationList: [],
jurisdictionsList: []
};
},
mounted() {
......@@ -268,6 +266,7 @@ export default {
this.$forceUpdate();
});
},
//获取数据
getList() {
this.loading = true;
......@@ -300,7 +299,7 @@ export default {
},
//提交添加
addAward() {
if (this.addMsg.icon === "") return this.Error("请上传icon");
if (this.addMsg.icon === "") return this.Error("请上传图片");
this.apiJavaPost(
"/api/IntegralManager/goodsTypeManager",
this.addMsg,
......
src/components/activity/IntegralMall.vue
View file @ 706d6edb
......@@ -35,10 +35,10 @@
</li>
<li>
<span>
<em>热门商品</em>
<em>商品活动</em>
<el-select filterable v-model="msg.ishot">
<el-option label="热门" value="Y"></el-option>
<el-option label="非热门" value="N"></el-option>
<el-option label="不限" value=""></el-option>
<el-option v-for="item in GoodsSeriesList" :label="item.name" :value="item.id" :key="item.id"></el-option>
</el-select>
</span>
</li>
......@@ -59,7 +59,7 @@
<th>市场价</th>
<th>限购数</th>
<th>配送说明</th>
<th>是否热门</th>
<th>所属活动</th>
<th>商品状态</th>
<th>操作</th>
</tr>
......@@ -71,7 +71,7 @@
<td>{{item.marketPrice}}</td>
<td>{{item.quota === 0 ? '不限购' : `限购${item.quota}次`}}</td>
<td>{{item.logistic}}</td>
<td>{{item.ishot === 'Y' ? '热门' : '非热门'}}</td>
<td>{{getHotName(item.ishot)}}</td>
<td>{{item.state === 1 ? '上架' : item.state === 0 ? '下架' : '删除'}}</td>
<td>
<el-tooltip class="item" effect="dark" :content="$t('active.ld_editInfo')" placement="top">
......@@ -102,21 +102,47 @@ export default {
state: 1,
name: '',
type: '',
ishot: 'Y'
ishot: ''
},
loading:false,
dataList:[],
GoodsTypeList: [],
GoodsSeriesList: [],
};
},
mounted() {
this.getList();
this.getGoodsTypeManager();
this.getGoodsSeries();
},
filters: {
},
methods: {
getHotName: function (id) {
for(let i = 0; i < this.GoodsSeriesList.length; i++ ) {
if (this.GoodsSeriesList[i].id === id) {
return this.GoodsSeriesList[i].name
}
}
return '无'
},
getGoodsSeries() {
this.loading = true;
this.apiJavaPost(
"/api/IntegralManager/getGoodsSeries",
{},
res => {
this.loading = false;
if (res.data.resultCode === 1) {
this.GoodsSeriesList = res.data.data;
} else {
this.Error(res.data.message);
}
},
null
);
},
addIntegralMall: function( path, obj, tab){
localStorage.editIntegralMall = JSON.stringify(obj);
this.$router.push({ name: path,query:{blank: 'y', tab: tab} })
......
src/components/activity/addIntegralMall.vue
View file @ 706d6edb
......@@ -250,10 +250,10 @@
<el-form-item label="包装说明">
<el-input v-model="addMsg.packing" class="w217"/>
</el-form-item>
<el-form-item label="是否热门">
<el-form-item label="商品所属活动">
<el-select filterable v-model="addMsg.ishot">
<el-option label="热门" value="Y" :key="1"></el-option>
<el-option label="非热门" value="N" :key="0"></el-option>
<el-option label="无" :value="0" :key="0"></el-option>
<el-option v-for="item in GoodsSeriesList" :label="item.name" :value="item.id" :key="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="配送说明">
......@@ -408,7 +408,7 @@ export default {
logistic: "",
state: 1,
quota: 0,
ishot: "Y",
ishot: 0,
descripImg: '',
},
MenberList: [],
......@@ -442,10 +442,27 @@ export default {
},
images: [],
defaultImg: 'this.src="' + require("../../assets/img/bg_z1@2x.png") + '"',
apiUrl: 'addGoodsInfo'
apiUrl: 'addGoodsInfo',
GoodsSeriesList: [],
};
},
methods: {
getGoodsSeries() {
this.loading = true;
this.apiJavaPost(
"/api/IntegralManager/getGoodsSeries",
{},
res => {
this.loading = false;
if (res.data.resultCode === 1) {
this.GoodsSeriesList = res.data.data;
} else {
this.Error(res.data.message);
}
},
null
);
},
goIntegralMall: function(path) {
this.$router.push({ name: path });
},
......@@ -608,6 +625,7 @@ export default {
}
this.getMenberList();
this.getGoodsTypeManager();
this.getGoodsSeries();
}
};
</script>
src/components/administrative/ExaminationStatistics.vue
View file @ 706d6edb
......@@ -505,11 +505,17 @@ export default {
value: `2019${o}`,
})
}
this.msg.Periods=dt.getFullYear()+(dt.getMonth()>9?dt.getMonth():"0"+dt.getMonth())
// this.msg.Periods=dt.getFullYear()+(dt.getMonth()>9?dt.getMonth():"0"+dt.getMonth())
this.getList();
this.getCompanyList();
},
created(){
let date=new Date;
let year=date.getFullYear();
let month=date.getMonth()+1;
month =(month<10 ? "0"+month:month);
let mydate = (year.toString()+month.toString());
this.msg.Periods = mydate;
Vue.component('commission-table-operation',{
template:`<div style='width:80px;height:40px;background:#fff;text-align:center;position: relative;left:-5px;padding-top: 6px;padding-top:6px;'><el-button type="primary" size='mini' icon="el-icon-view" circle @click="see(rowData,index)"></el-button></div>`,
props:{
......
src/components/busManagement/BusInfo.vue
View file @ 706d6edb
......@@ -265,16 +265,22 @@
</el-select>
</template>
</el-table-column>
<el-table-column label="付款方式" min-width="150">
<el-table-column label="付款方式" min-width="150" >
<template slot-scope="scope">
<el-select class='sel' v-model='scope.row.PayType' :placeholder="$t('pub.pleaseSel')">
<el-option label='请选择' :value='0'></el-option>
<el-option label='现付' :value='1'></el-option>
<el-option label='公司结算' :value='2'></el-option>
<el-option label='预付' :value='3'></el-option>
<el-option label='合团公司支付' :value='6'></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column label="合团支付团号" min-width="150" >
<template slot-scope="scope">
<el-input class='w120' type="text" v-model='scope.row.PayTypeTCNUM' v-show="scope.row.PayType==6"></el-input>
</template>
</el-table-column>
<el-table-column label="定团号" min-width="230">
<template slot-scope="scope">
<div :class="{'BusTyleFirst':scope.$index==0}">
......@@ -318,6 +324,7 @@
<el-option label='现付' :value='1'></el-option>
<el-option label='公司结算' :value='2'></el-option>
<el-option label='预付' :value='3'></el-option>
<el-option label='合团公司支付' :value='6'></el-option>
</el-select>
</div>
</template>
......@@ -527,9 +534,16 @@
tempHighSpeedFee += parseFloat(busTypeObj.AllDayHighSpeedFee);
}
});
if(obj.HighSpeedPrice==0)
{
obj.HighSpeedPrice = tempHighSpeedFee;
}
if(obj.CostPrice==0)
{
obj.CostPrice = tempCostFee;
}
}
}else{
obj.PayType=null;
}
......@@ -717,8 +731,6 @@
newPlanData.PayType = oldPlanData.PayType;
newPlanData.BookGroup = oldPlanData.BookGroup;
newPlanData.HighSpeedPayType = oldPlanData.HighSpeedPayType;
// newPlanData.HighSpeedPrice = oldPlanData.HighSpeedPrice;
// newPlanData.CostPrice = oldPlanData.CostPrice;
}
},
mounted() {
......
src/components/dmc/manager/dmcTotalTable.vue
View file @ 706d6edb
......@@ -263,7 +263,7 @@
<span style="color: #4BCA81;" v-if="item.ResultReport.HotelResult==1">√</span>
<span class="colorE95252" v-else>{{item.ResultReport.HotelResult=='-1'?"x":"O"}}</span>
</div>
<p v-if="item.LineId==14 && item.CommonReport.PriceHotelResult && item.CommonReport.PriceHotelResult.length>0" style="display:none;">
<p v-if="item.LineId==14 && item.CommonReport.PriceHotelResult && item.CommonReport.PriceHotelResult.length>0" >
<el-popover width="600" trigger="click" popper-class="TC_HotelPop">
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="singeRowTable">
<tr>
......
src/components/sale/sale.vue
View file @ 706d6edb
This diff is collapsed.
src/router/config.js
View file @ 706d6edb
......@@ -3362,6 +3362,14 @@ export default {
title: '新增商品'
}
},
{
path: '/CommodityActive',
name: 'CommodityActive',
component: resolve => require(['@/components/activity/CommodityActive'], resolve),
meta: {
title: '商品活动'
}
},
]
},
{
......
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