Skip to content

S
SuperMan
Commit 72c0f0a5 authored by zhengke's avatar zhengke
Browse files
Options

增加传入参数

parent ba4f7a22
Hide whitespace changes
Inline Side-by-side
Showing with 104 additions and 47 deletions
src/assets/common/lang/Japan/Ground.js
View file @ 72c0f0a5
......@@ -474,6 +474,21 @@ export const obj = {
shopStore:'ショッピング？ショップ',
choiceShop:'買い物店を選ぶ',
zczysx:'政策、注意事項',
dycaozuo:'ガイド操作',
dijieop:'接地OP',
jindianNum:'入店団番号',
jdrenshu:'入店人数',
yjlqqk:'コミッションの受け取り状況',
pzUpload:'証明書のアップロード',
xclq:'現場で受け取る',
gslq:'会社からもらう',
xggwud:'買い物店を改築する',
xzgwdian:'ショッピングショップを追加します',
sjkban:'データボード',
liebiao:'リスト',
anchakan:'年で見る',
anyuechakan:'月別に見る',
antianchakan:'天別に見る',
}
export default obj;
\ No newline at end of file
src/assets/common/lang/zhCN/Ground.js
View file @ 72c0f0a5
......@@ -321,7 +321,6 @@ export const obj = {
hbsj:'航班时间',
jwzs:'机位总数/(Y/E/F)',
dryxsj:'导入营销数据',
jdsj:'进店时间',
gwd:'购物店',
ljlr:'累计利润',
ljjy:'累计交易',
......@@ -460,5 +459,21 @@ export const obj = {
shopStore:'购物店',
choiceShop:'选择购物店',
zczysx:'政策，注意事项',
dycaozuo:'导游操作',
dijieop:'地接OP',
jindianNum:'进店团号',
jdrenshu:'进店人数',
yjlqqk:'佣金领取状况',
pzUpload:'凭证上传',
xclq:'现场领取',
gslq:'公司领取',
xggwud:'修改购物店',
xzgwdian:'新增购物店',
sjkban:'数据看板',
liebiao:'列表',
anchakan:'按年查看',
anyuechakan:'按月查看',
antianchakan:'按天查看',
}
export default obj;
\ No newline at end of file
src/assets/common/lang/zhTW/Ground.js
View file @ 72c0f0a5
......@@ -460,5 +460,20 @@ guideName:'導遊姓名',
shopStore:'購物店',
choiceShop:'選擇購物店',
zczysx:'政策，注意事項',
dycaozuo:'導遊操作',
dijieop:'地接OP',
jindianNum:'進店團號',
jdrenshu:'進店人數',
yjlqqk:'傭金領取狀況',
pzUpload:'憑證上傳',
xclq:'現場領取',
gslq:'公司領取',
xggwud:'修改購物店',
xzgwdian:'新增購物店',
sjkban:'數據看板',
liebiao:'清單',
anchakan:'按年查看',
anyuechakan:'按月查看',
antianchakan:'按天查看',
}
export default obj;
\ No newline at end of file
src/components/ShoppingStore/ShoppingDetails.vue
View file @ 72c0f0a5
......@@ -160,16 +160,16 @@
<div class='flexOne ShoppingDetails'>
<div class="dataIn clearfix">
<div class="storeName">{{Name}}</div>
<span class="Shop_span">日期</span>
<span class="Shop_span">{{$t('sm.Date')}}</span>
<el-date-picker class="w150" type="date" v-model="msg.StartDate" :picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd" placeholder></el-date-picker>
<el-date-picker class="w150" type="date" v-model="msg.EndDate" :picker-options="pickerBeginDateAfter"
value-format="yyyy-MM-dd" placeholder></el-date-picker>
<input type="button" class="normalBtn backBtn" @click="showStatis(1)" v-if="isShow==false" value="数据看板" style="display:none;"/>
<input type="button" class="normalBtn backBtn" @click="showStatis(2)" v-else value="列表"/>
<input type="button" class="hollowFixedBtn backBtn" @click="goUrl('ShoppingStore')" value="返回"/>
<input type="button" class="hollowFixedBtn backBtn" @click="getList()" value="查询"/>
<input type="button" class="normalBtn backBtn" @click="showStatis(1)" v-if="isShow==false" :value="$t('ground.sjkban')" style="display:none;"/>
<input type="button" class="normalBtn backBtn" @click="showStatis(2)" v-else :value="$t('ground.liebiao')"/>
<input type="button" class="hollowFixedBtn backBtn" @click="goUrl('ShoppingStore')" :value="$t('pub.returnBack')"/>
<input type="button" class="hollowFixedBtn backBtn" @click="getList()" :value="$t('pub.searchBtn')"/>
</div>
<!-- <div class="listSpan">
<span>总交易额：<label class="ShopDetail_c1 fbold">{{TotalPrice}}</label></span>
......@@ -179,14 +179,14 @@
</div> -->
<div class="mainInfo" :class="{'hidDiv':isShow}">
<div class="infoTitle">
<span>进店日期</span>
<span>关联团号</span>
<span>总交易额</span>
<span>旅行社提成</span>
<span>导游提成</span>
<span>领队提成</span>
<span>返佣余额</span>
<span>返佣总计</span>
<span>{{$t('ground.jindianriqi')}}</span>
<span>{{$t('ground.guanliantuanhao')}}</span>
<span>{{$t('ground.zongjiaoyie')}}</span>
<span>{{$t('ground.lvxingshetc')}}</span>
<span>{{$t('ground.daoyouticheng')}}</span>
<span>{{$t('ground.lingduiticheng')}}</span>
<span>{{$t('ground.fyye')}}</span>
<span>{{$t('ground.fyzj')}}</span>
</div>
<div class="listInfo" v-for="item in DataList" :key="item.subCode">
<span>{{item.StoreTime}}</span>
......@@ -216,15 +216,15 @@
<div class="statistical" :class="{'disDiv':isShow}">
<ul class="dataList">
<li :class="yearList==true?'Day_active':''" @click="getStatis(3)">
按年查看
{{$t('ground.anchakan')}}
<i></i>
</li>
<li :class="monthList==true?'Day_active':''" @click="getStatis(2)">
按月查看
{{$t('ground.anyuechakan')}}
<i></i>
</li>
<li :class="dayList==true?'Day_active':''" @click="getStatis(1)">
按天查看
{{$t('ground.antianchakan')}}
<i></i>
</li>
</ul>
......
src/components/ShoppingStore/ShoppingReimbursementDetails.vue
View file @ 72c0f0a5
......@@ -8,31 +8,33 @@
</ul>
</div>
<div style="width: 100%; overflow-x: auto;padding-bottom: 10px; ">
<table border="0" cellspacing="1" cellpadding="0" class="roomReservationsTalbe" v-loading="loading">
<table border="0" cellspacing="1" cellpadding="0" class="roomReservationsTalbe" style="width:100%" v-loading="loading">
<tr>
<th colspan="5">导游操作</th>
<th colspan="8">地接OP</th>
<th colspan="5">{{$t('ground.dycaozuo')}}</th>
<th colspan="8">{{$t('ground.dijieop')}}</th>
</tr>
<tr>
<th width="120" style="display:none;">进店团号</th>
<th width="180">店名</th>
<th width="90">公司</th>
<th width="120" style="display:none">进店时间</th>
<th width="80">进店人数</th>
<th width="100">总金额</th>
<th width="100">佣金领取状况</th>
<th width="120" style="display:none;">凭证上传</th>
<th width="100">领队佣金<br />应付</th>
<th width="100">导游佣金<br />应付</th>
<th width="100">公司佣金<br />应收</th>
<th width="100">返佣余额</th>
<th width="100">返佣总计</th>
<th width="100">汇率</th>
<th width="120">凭证上传</th>
<th width="120">备注</th>
<th width="120" style="display:none;">{{$t('ground.jindianNum')}}</th>
<th width="180">{{$t('ground.dm')}}</th>
<th width="90">{{$t('sm.company')}}</th>
<th width="120" style="display:none">{{$t('ground.jdsj')}}</th>
<th width="80">{{$t('ground.jdrs')}}</th>
<th width="100">{{$t('fnc.a_zongjine')}}</th>
<th width="100">{{$t('ground.yjlqqk')}}</th>
<th width="120" style="display:none;">{{$t('ground.pzUpload')}}</th>
<th width="100">{{$t('ground.ldyj')}}<br />{{$t('fnc.yingfu')}}</th>
<th width="100">{{$t('ground.dyyj')}}<br />{{$t('fnc.yingfu')}}</th>
<th width="100">{{$t('ground.gsyj')}}<br />{{$t('fnc.yingshou')}}</th>
<th width="100">{{$t('ground.fyye')}}</th>
<th width="100">{{$t('ground.fyzj')}}</th>
<th width="100">{{$t('hotel.hotel_CurrentRate')}}</th>
<th width="120">{{$t('ground.pzUpload')}}</th>
<th width="120">{{$t('pub.pubRemark')}}</th>
</tr>
<tr v-if="list.length==0">
<td colspan="15">暂无数据</td>
<td colspan="15" style="height:40px;text-align:center;">
{{$t('system.content_noData')}}
</td>
</tr>
<tbody v-for="(item,outindex) in list" :class="{roomReservationsSplitTrCss:outindex%2!=0}">
<tr v-for="(subItem,subIndex) in item.ShopDetailsList">
......@@ -47,7 +49,7 @@
<td class="_height_45">
<!--公司-->
{{subItem.BName}} &nbsp;
<span @click="DeleteItem(subItem)" style="color:blue;cursor:pointer;text-decoration:underline;">删除</span>
<span @click="DeleteItem(subItem)" style="color:blue;cursor:pointer;text-decoration:underline;">{{$t('system.ph_shanchu')}}</span>
</td>
<td class="more_td" v-if="subIndex==0" :rowspan="item.ShopDetailsList.length" style="display:none">
<el-input v-model="item.ShopDetailsList[0].EnterTime" placeholder="2019-01-01"
......@@ -65,8 +67,8 @@
<td class="more_td" v-if="subIndex==0" :rowspan="item.ShopDetailsList.length">
<!--CommissionStatus 佣金领取状况-->
<el-select v-model="item.ShopDetailsList[0].CommissionStatus">
<el-option label="现场领取" :value='1'></el-option>
<el-option label="公司领取" :value='2'></el-option>
<el-option :label="$t('ground.xclq')" :value='1'></el-option>
<el-option :label="$t('ground.gslq')" :value='2'></el-option>
</el-select>
</td>
<td class="more_td" @click="upIndex = outindex" v-if="subIndex==0" :rowspan="item.ShopDetailsList.length" style="display:none;">
......@@ -78,7 +80,7 @@
:src="img" style="width: 10px;height: 10px;" alt="">
<el-upload :http-request="uploadFileBtn" :multiple="true" :show-file-list="false" action="">
<i class="el-icon-plus avatar-uploader-icon" @click="UploadType=1"></i>
<div class="el-upload__text" @click="UploadType=1">点击上传</div>
<div class="el-upload__text" @click="UploadType=1">{{$t('tips.dianjishanhcuan')}}</div>
</el-upload>
<!--Credentials 凭证【导游】-->
</td>
......@@ -116,7 +118,7 @@
v-if="img !== ''" :src="img" style="width: 10px;height: 10px;" alt="">
<el-upload :http-request="uploadFileBtn" :multiple="true" :show-file-list="false" action="">
<i class="el-icon-plus avatar-uploader-icon" @click="UploadType=2"></i>
<div class="el-upload__text" @click="UploadType=2">点击上传</div>
<div class="el-upload__text" @click="UploadType=2">{{$t('tips.dianjishanhcuan')}}</div>
</el-upload>
</td>
<td v-if="subIndex==0" :rowspan="item.ShopDetailsList.length">
......
src/components/ShoppingStore/ShoppingStore.vue
View file @ 72c0f0a5
......@@ -1116,7 +1116,7 @@
};
this.imgArray = [];
this.PicPathArray = [];
this.titleInfo = "修改购物店";
this.titleInfo = this.$t('ground.xggwud');
this.apipost(
"Shopping_Post_Get",
msg,
......@@ -1150,7 +1150,7 @@
showDiv() {
this.isShow = true;
this.addMsg.ID = 0;
this.titleInfo = "新增购物店";
this.titleInfo = this.$t('ground.xzgwdian');
this.addMsg.Name = "";
this.addMsg.Type = "";
this.addMsg.Contact = "";
......
src/plug/index.js
View file @ 72c0f0a5
......@@ -111,8 +111,9 @@ export default {
//域名管理对象
Vue.prototype.domainManager = function () {
let domainUrl = '';
domainUrl = "http://192.168.2.214:8082";
domainUrl = "http://192.168.2.16:8083"; // 吴春
//domainUrl = "http://192.168.2.214:8082";
//domainUrl = "http://192.168.2.65:8025";
domainUrl = "http://192.168.2.16:8083"; // 吴春
let locationName = window.location.hostname;
let javaUrldo="";
......@@ -275,12 +276,21 @@ export default {
}
var encodeMsg = encodeURIComponent(JSON.stringify(msg)).toLowerCase();
var md5Str = md5(`cmd=${cmd}&msg=${encodeMsg}&timestamp=${timestamp}&token=${token}&key=${key}`);
let tempLanguage=0;
if(localStorage.language && localStorage.language!=''){
if(localStorage.language=="zh-TW"){
tempLanguage=1;
}else if(localStorage.language=="Japanese"){
tempLanguage=2;
}
}
var postData = {
"msg": msg,
"cmd": cmd,
"timestamp": timestamp,
"token": token,
"sign": md5Str
"sign": md5Str,
"languageId":tempLanguage
}
this.$http.post(apiurl, postData, {
headers: {
......
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