Skip to content

S
SuperMan
Commit 51f9080a authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

update

parent e27ebfc4
Hide whitespace changes
Inline Side-by-side
Showing with 94 additions and 45 deletions
src/assets/common/lang/jp.js
View file @ 51f9080a
......@@ -2459,3 +2459,28 @@ export const sm={
laoron:'老人',
nianlingType:'年齢タイプ',
}
export const op={
Onedaytour:'一日観光',
feizhicai:'非直采',
zhicai:'直采',
notxiaobaotuan:'は小包団を許可しません。',
rentoufy:'人头返用',
b2bxianlubjt:'B2B線の背景図は、',
b2bxianlucbct:'B2B線側辺長図',
appubiao:'アプリアイコン',
fuzop:'はOPを担当します',
qingtxldm:'回線コードを記入してください。',
qingsrzqdzm:'正しい文字を入力してください。',
qingtxzdje:'最低金額を記入してください。',
qingtxljc:'回線略称を記入してください。',
qingxzxlfx:'回線の方向を選択してください',
sfshanchucxl:'はこの路線を削除しますか？',
qtxxianlumc:'回線名を記入してください。',
qxzsuosxl:'所属線を選んでください',
qtxmddmc:'目的地名を記入してください。',
}
\ No newline at end of file
src/assets/common/lang/zh-tw.js
View file @ 51f9080a
......@@ -1806,7 +1806,7 @@ export const salesModule={
TotalVisit:'累計拜訪',
OntheBlackList:'已加入黑名單',
storeName:'門店名稱',
HouseNumber:'請輸入，精准到門牌號碼',
HouseNumber:'請輸入,精准到門牌號碼',
Belongbrand:'所屬品牌',
premises:'經營場所',
CustomerSource:'客戶來源',
......@@ -1874,7 +1874,7 @@ export const salesModule={
HistoryTask:'查看歷史任務',
MyTasks:'我發佈的任務',
AddTasks:'新增任務',
ClickAddTasks:'點擊右上方“+”按鈕，新增一個任務吧',
ClickAddTasks:'點擊右上方“+”按鈕,新增一個任務吧',
TodayTask:'今日任務動態',
NoActive:'大家好像都還沒有行動起來哦',
Contribution:'貢獻',
......@@ -1884,10 +1884,10 @@ export const salesModule={
ZB:'占比',
NoConfiguration:'您還沒有配寘',
ClickToEdit:'請點擊卡片中的編輯按鈕“',
LJPZ:'立即配寘，否則無法評分',
LJPZ:'立即配寘,否則無法評分',
reMindNow:'當前還剩餘',
ZBFP:'的占比沒有分配，',
ZBFPYX:'占比分配不全會影響銷售的綜合能力評估，',
ZBFP:'的占比沒有分配,',
ZBFPYX:'占比分配不全會影響銷售的綜合能力評估,',
CXFP:'重新分配',
NLPG:'能力評定修改',
NLMC:'能力名稱',
......@@ -1984,9 +1984,9 @@ export const salesModule={
StartLY:'出發聯運價',
BackLY:'返回聯運價',
UpTeamPrice:'高於本團單價',
Notice1:'注：如果超出本團的最低讓價，差價將由你來承擔',
Notice1:'注：如果超出本團的最低讓價,差價將由你來承擔',
Notice2:'注：最多少價',
Notice3:'元，如需少價更多請聯系上級首長',
Notice3:'元,如需少價更多請聯系上級首長',
SingleNum:'單地接人數',
AdultNum:'成人人數',
NoSupplier:'本團不支持兒童出遊',
......@@ -2104,7 +2104,7 @@ export const salesModule={
SSJE:'收損金額',
BabyPrice:'嬰兒價',
UpdateRoom:'修改房型',
OPjinzhi:' OP已禁止修改訂單資訊，請聯系OP修改備註',
OPjinzhi:' OP已禁止修改訂單資訊,請聯系OP修改備註',
AdultPeople:'稽核人',
ApplyStatus:'付款狀態',
DSDJ:'待收定金',
......@@ -2130,7 +2130,7 @@ export const salesModule={
LossReceipt:'設為收損單',
ApplyInvoice:'申請發票',
ApplyPhoto:'申請照片',
OrderSured:'訂單已確認，取消請聯系OP',
OrderSured:'訂單已確認,取消請聯系OP',
LookTourse:'查看旅客調查',
Zhao:'照',
NoPhoto:'照片一人',
......@@ -2427,6 +2427,30 @@ export const sm={
haizi:'孩子',
laoren:'老人',
nianlingType:'年齡類型',
}
export const op={
Onedaytour:'一日遊',
feizhicai:'非直采',
zhicai:'直采',
notxiaobaotuan:'不允許小包團',
rentoufy:'人頭返傭',
b2bxianlubjt:'B2B線路背景圖',
b2bxianlucbct:'B2B線路側邊長圖',
apptubiao:'App圖標',
fuzeop:'負責OP',
qingtxxldm:'請填寫線路程式碼',
qingsrzqdzm:'請輸入正確的字母',
qingtxzdje:'請填寫最低金額',
qingtxxljc:'請填線路簡稱',
qingxzxlfx:'請選擇線路方向',
sfshanchucxl:'是否删除此線路？',
qtxxianlumc:'請填寫線路名',
qxzsuosxl:'請選擇所屬線路',
qtxmddmc:'請填寫目的地名稱',
}
import invoicesManager from './zhTW/invoicesManager'
......
src/components/systemManagement/destinationManagement.vue
View file @ 51f9080a
......@@ -41,7 +41,7 @@
<li>
<label>{{$t('system.query_lineName')}}</label>
<el-select v-model="msg.LineID" filterable :placeholder="$t('system.ph_choice')" class="w210">
<el-option label='不限' :value='defaultSelectValue'></el-option>
<el-option :label="$t('pub.unlimitedSel')" :value='defaultSelectValue'></el-option>
<el-option v-for='item in lineList' :key="item.LineID" :label="item.LineName" :value="item.LineID">
</el-option>
</el-select>
......@@ -51,8 +51,8 @@
<el-input v-model="msg.PlaceName" :placeholder="$t('system.ph_in')" @keyup.native.enter="getList" class="w210"></el-input>
</li>
<li>
<input type="button" class="hollowFixedBtn" value="查询" @click="resetPageIndex(),getList()" />
<input type="button" class="normalBtn" value="添加" @click="outerVisible=true,dialogTitle='新增'" />
<input type="button" class="hollowFixedBtn" :value="$t('pub.saveBtn')" @click="resetPageIndex(),getList()" />
<input type="button" class="normalBtn" :value="$t('fnc.tianjia')" @click="outerVisible=true,dialogTitle='新增'" />
</li>
</ul>
</div>
......@@ -69,7 +69,7 @@
<td>{{item.LineName}}</td>
<td>{{item.PlaceName}}</td>
<td>{{item.CountryName}}</td>
<td>{{item.IsShow==0?'不显示':'显示'}}</td>
<td>{{item.IsShow==0? $t('MarketingActi.notShow'):$t('system.table_isShows')}}</td>
<td style="position: relative;">
<el-row>
<el-tooltip class="item" effect="dark" :content="$t('system.table_edit')" placement="top-start">
......@@ -158,28 +158,28 @@ export default {
LineName: [
{
required: true,
message: "请填写线路名",
message: this.$t('op.qtxxianlumc'),
trigger: "blur"
}
],
LineID: [
{
required: true,
message: "请选择所属线路",
message: this.$t('op.qxzsuosxl'),
trigger: "change"
}
],
PlaceName: [
{
required: true,
message: "请填写目的地名称",
message: this.$t('op.qtxmddmc'),
trigger: "blur"
}
],
countryString: [
{
required: true,
message: "请选择国家",
message: this.$t('visaT.qxzguojia'),
trigger: "change"
}
]
......@@ -296,15 +296,15 @@ export default {
},
deletelist(index) {
//删除
this.$confirm("是否删除?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
this.$confirm(this.$t('tips.shifoushanchu'), this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'),
type: "warning"
})
.then(() => {
this.$message({
type: "success",
message: "删除成功!"
message: this.$t('tips.shanchuchenggong')
});
this.deleteLine(index);
})
......
src/components/systemManagement/lineManagement.vue
View file @ 51f9080a
......@@ -389,10 +389,10 @@
</el-col>
<el-col :span="2">
<div class="_LowDisMoney">
<div v-if="item.lineDirection==1">入境</div>
<div v-else-if="item.lineDirection==2">出境</div>
<div v-else-if="item.lineDirection==3">一日游</div>
<div>线路方向</div>
<div v-if="item.lineDirection==1">{{$t('Operation.Op_theEntry')}}</div>
<div v-else-if="item.lineDirection==2">{{$t('Operation.Op_leaveCountry')}}</div>
<div v-else-if="item.lineDirection==3">{{$t('op.Onedaytour')}}</div>
<div>{{$t('Operation.Op_LineDirection')}}</div>
</div>
</el-col>
<el-col :span="3">
......@@ -444,10 +444,10 @@
</div>
</el-col>
<el-col :span="2">
<div class="Linezhicai" :class="{'redType':item.isDirect=='0'}">{{item.isDirect=="0"?'非直采':'直采'}}</div>
<div class="Linezhicai" :class="{'redType':item.isShow=='0'}">{{item.isShow=="0"?'不显示':'显示'}}</div>
<div class="Linezhicai" :class="{'redType':item.isDirect=='0'}">{{item.isDirect=="0"?$t('op.feizhicai'):$t('op.zhicai')}}</div>
<div class="Linezhicai" :class="{'redType':item.isShow=='0'}">{{item.isShow=="0"?$t('MarketingActi.notShow'):$t('system.table_isShows')}}</div>
<div class="Linezhicai" :class="{'redType':item.is_PacketGroup=='0'}">
{{item.is_PacketGroup =="0"?'不允许小包团':'允许小包团'}}</div>
{{item.is_PacketGroup =="0"?$t('op.notxiaobaotuan'):$t('Operation.Op_AllowSmallGroup')}}</div>
</el-col>
<el-col :span="2">
<div>
......@@ -541,22 +541,22 @@
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="线路方向" prop="LineDirection">
<el-form-item :label="$t('Operation.Op_LineDirection')" prop="LineDirection">
<el-select v-model="addMsg.LineDirection" :placeholder="$t('pub.pleaseSel')">
<el-option label='入境' :value='1'></el-option>
<el-option label='出境' :value='2'></el-option>
<el-option label='一日游' :value='3'></el-option>
<el-option :label="$t('Operation.Op_theEntry')" :value='1'></el-option>
<el-option :label="$t('Operation.Op_leaveCountry')" :value='2'></el-option>
<el-option :label="$t('op.Onedaytour')" :value='3'></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="人头返佣">
<el-form-item :label="$t('op.rentoufy')">
<el-input v-model="addMsg.RebateMoney" maxlength="10" @keyup.native="checkPrice(addMsg,'RebateMoney')">
</el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="B2B线路背景图">
<el-form-item :label="$t('op.b2bxianlubjt')">
<div class="TFimgList">
<img v-if="!addMsg.BackgroundImage" src="../../assets/img/bg_c3@3x.png">
<img v-else :src='addMsg.BackgroundImage'>
......@@ -574,7 +574,7 @@
</el-col>
<el-col :span="5">
<el-form-item label="B2B线路侧边长图">
<el-form-item :label="$t('op.b2bxianlucbct')">
<div class="TFimgList" style="width:90px">
<img v-if="!addMsg.BroadsideImage" src="../../assets/img/bg_c3@3x.png">
<img v-else :src='addMsg.BroadsideImage'>
......@@ -592,7 +592,7 @@
</el-col>
<el-col :span="5">
<el-form-item label="App图标">
<el-form-item :label="$t('op.apptubiao')">
<div class="TFimgList" style="width:50px;height:50px">
<img v-if="!addMsg.AppLineIcon" src="../../assets/img/bg_c3@3x.png">
<img v-else :src='addMsg.AppLineIcon'>
......@@ -656,7 +656,7 @@
</td>
</tr>
<tr>
<td class="LM_Back" @click="closeOpTion()">负责OP</td>
<td class="LM_Back" @click="closeOpTion()">{{$t('op.fuzeop')}}</td>
<td v-for="item in getCompanyList" @click="closeOpTion()" :key="item.subCode">
<span class="joinDepart" v-if="!item.seletOpShow">{{item.joinEmployee | getJoinEmpName}}</span>
<el-select v-model="item.selectOpIdArr" multiple class='w160 multiple_input' filterable
......@@ -738,32 +738,32 @@
//表单必填验证
lineName: [{
required: true,
message: "请输入线路名",
message: this.$t('system.ph_lineName'),
trigger: "blur"
}],
lineCode: [{
required: true,
message: "请填写线路代码",
message: this.$t('op.qingtxxldm'),
trigger: "blur"
},
{
pattern: /^[a-zA-Z]/,
message: "请输入正确的字母"
message: this.$t('op.qingsrzqdzm')
}
],
lowDeposit: [{
required: true,
message: "请填写最低金额",
message: this.$t('op.qingtxzdje'),
trigger: "blur"
}],
lineShortName: [{
required: true,
message: "请填线路简称",
message: this.$t('op.qingtxxljc'),
trigger: "change"
}],
LineDirection: [{
required: true,
message: "请选择线路方向",
message: this.$t('op.qingxzxlfx'),
trigger: "change"
}]
}
......@@ -915,7 +915,7 @@
},
deletelist(lineID) {
var that = this;
this.Confirm("是否删除此线路?", function () {
this.Confirm(that.$t('op.sfshanchucxl'), function () {
let msg = {
ID: lineID
};
......@@ -924,7 +924,7 @@
msg,
res => {
if (res.data.resultCode == 1) {
that.Success("删除成功");
that.Success(res.data.message);
that.getList();
}
},
......
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