Skip to content

S
SuperMan
Commit 7ec3981f authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

config.js 冲突

parents d8c58cf5 32dbe2d3
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 669 additions and 582 deletions
src/assets/common/lang/jp.js
View file @ 7ec3981f
This diff is collapsed.
src/assets/common/lang/zh-tw.js
View file @ 7ec3981f
......@@ -1536,6 +1536,31 @@ export const rule = {
qsrzjine: '請輸入總金額',
qxzrzshijian: '請選擇入職時間！',
qsrzqdqq: '請輸入正確的qq！',
EnterContratPerson:'請輸入連絡人',
EnterCustomer:'請輸入客戶名',
EnterPNum:'請輸入聯繫電話',
EnterRightNum:'請輸入正確的電話',
ChoiceBrand:'請選擇所屬品牌',
ChoiceJob:'請選擇職務',
ChoiceJYCS:'請選擇經營場所',
ChoiceCusFrom:'請選擇經客戶來源',
EnterCusName:'請輸入客戶名',
EnterBrandName:'請輸入品牌名稱',
ChoiceVDate:'請選擇拜訪日期',
ChoiceVTime:'請選擇拜訪時間',
ChoiceLC:'請選擇所屬流程',
EnterCusName:'請輸入客戶名稱',
EnterCusAds:'請輸入客戶地址',
EnterTaskName:'請輸入任務名稱',
ChoiceTaskType:'請選擇任務類型',
EnterNum:'請輸入數量',
OnlyInter:'只能輸入正整數',
ChoiceRQFW:'請選擇時間範圍',
EnterMark:'請輸入備註',
OnlyNumber:'只能輸入數位',
EnterPnum:'請輸入人數',
EnterRJRQ:'請輸入入境日期',
EnterCJRQ:'請輸入出境日期',
}
export const adm={
......@@ -1806,7 +1831,7 @@ export const salesModule={
TotalVisit:'累計拜訪',
OntheBlackList:'已加入黑名單',
storeName:'門店名稱',
HouseNumber:'請輸入，精准到門牌號碼',
HouseNumber:'請輸入,精准到門牌號碼',
Belongbrand:'所屬品牌',
premises:'經營場所',
CustomerSource:'客戶來源',
......@@ -1874,7 +1899,7 @@ export const salesModule={
HistoryTask:'查看歷史任務',
MyTasks:'我發佈的任務',
AddTasks:'新增任務',
ClickAddTasks:'點擊右上方“+”按鈕，新增一個任務吧',
ClickAddTasks:'點擊右上方“+”按鈕,新增一個任務吧',
TodayTask:'今日任務動態',
NoActive:'大家好像都還沒有行動起來哦',
Contribution:'貢獻',
......@@ -1884,10 +1909,10 @@ export const salesModule={
ZB:'占比',
NoConfiguration:'您還沒有配寘',
ClickToEdit:'請點擊卡片中的編輯按鈕“',
LJPZ:'立即配寘，否則無法評分',
LJPZ:'立即配寘,否則無法評分',
reMindNow:'當前還剩餘',
ZBFP:'的占比沒有分配，',
ZBFPYX:'占比分配不全會影響銷售的綜合能力評估，',
ZBFP:'的占比沒有分配,',
ZBFPYX:'占比分配不全會影響銷售的綜合能力評估,',
CXFP:'重新分配',
NLPG:'能力評定修改',
NLMC:'能力名稱',
......@@ -1984,9 +2009,9 @@ export const salesModule={
StartLY:'出發聯運價',
BackLY:'返回聯運價',
UpTeamPrice:'高於本團單價',
Notice1:'注：如果超出本團的最低讓價，差價將由你來承擔',
Notice1:'注：如果超出本團的最低讓價,差價將由你來承擔',
Notice2:'注：最多少價',
Notice3:'元，如需少價更多請聯系上級首長',
Notice3:'元,如需少價更多請聯系上級首長',
SingleNum:'單地接人數',
AdultNum:'成人人數',
NoSupplier:'本團不支持兒童出遊',
......@@ -2104,7 +2129,7 @@ export const salesModule={
SSJE:'收損金額',
BabyPrice:'嬰兒價',
UpdateRoom:'修改房型',
OPjinzhi:' OP已禁止修改訂單資訊，請聯系OP修改備註',
OPjinzhi:' OP已禁止修改訂單資訊,請聯系OP修改備註',
AdultPeople:'稽核人',
ApplyStatus:'付款狀態',
DSDJ:'待收定金',
......@@ -2130,7 +2155,7 @@ export const salesModule={
LossReceipt:'設為收損單',
ApplyInvoice:'申請發票',
ApplyPhoto:'申請照片',
OrderSured:'訂單已確認，取消請聯系OP',
OrderSured:'訂單已確認,取消請聯系OP',
LookTourse:'查看旅客調查',
Zhao:'照',
NoPhoto:'照片一人',
......@@ -2427,6 +2452,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/assets/common/lang/zh.js
View file @ 7ec3981f
......@@ -820,7 +820,7 @@ export const fnc = {
khuren: '开户人：',
ptAcc: '平台账户：',
suoshugs: '所属公司：',
ptsyongfei: '平台使用费：',
ptsffangshi: '平台使用费：',
ptsffangshi: '平台收费方式：',
abfenbi: '按百分比',
anrentou: '按人头',
......@@ -1258,7 +1258,7 @@ export const tips = {
tips: '提示',
shifoudui: '是否对',
zhshanchu: '账户进行销户操作？销户后不可恢复！',
cancleDelete: '已取消删除',
cancleDelete: '已取消删除！',
saveYes: '保存成功！',
sxhuilv: '以下汇率系统将每隔30分钟实时更新一次',
yssdliucheng: '注：以上费用类型将会被执行你设定的流程',
......@@ -1546,7 +1546,31 @@ export const rule = {
qxzrzshijian: '请选择入职时间!',
qsrzqdqq: '请输入正确的qq!',
EnterContratPerson:'请输入联系人',
EnterCustomer:'请输入客户名',
EnterPNum:'请输入联系电话',
EnterRightNum:'请输入正确的电话',
ChoiceBrand:'请选择所属品牌',
ChoiceJob:'请选择职务',
ChoiceJYCS:'请选择经营场所',
ChoiceCusFrom:'请选择经客户来源',
EnterCusName:'请输入客户名',
EnterBrandName:'请输入品牌名称',
ChoiceVDate:'请选择拜访日期',
ChoiceVTime:'请选择拜访时间',
ChoiceLC:'请选择所属流程',
EnterCusName:'请输入客户名称',
EnterCusAds:'请输入客户地址',
EnterTaskName:'请输入任务名称',
ChoiceTaskType:'请选择任务类型',
EnterNum:'请输入数量',
OnlyInter:'只能输入正整数',
ChoiceRQFW:'请选择时间范围',
EnterMark:'请输入备注',
OnlyNumber:'只能输入数字',
EnterPnum:'请输入人数',
EnterRJRQ:'请输入入境日期',
EnterCJRQ:'请输入出境日期',
}
export const adm={
......@@ -1779,6 +1803,7 @@ export const MarketingActi={
commTypename:'商品类型名称',
typeNum:'类型编号',
notShow:'不显示',
commName:'商品名称',
commType:'商品类型',
commActivity:'商品活动',
......@@ -2189,7 +2214,6 @@ export const salesModule={
BigBag:'大红包',
}
export const sm={
Personalrank:"个人排行榜",
derprank:"部门排行榜",
......@@ -2262,11 +2286,8 @@ export const sm={
songji:"送机",
bantian:"半天",
buyongche:"不用车",
qingxuanzchufacity:"请选择出发城市",
qingxuanzjiaotongType:"请选择交通类型",
qingxuanzchufacity:"请选择出发城市",
qingxuanzchufacity:"请选择出发城市",
qingxuanzchufacity:"请选择出发城市",
qsrjiaotonginfo:"请输入交通信息",
qxztime:"请选择时间",
scenChoosse:"景点选择",
......@@ -2448,6 +2469,30 @@ export const sm={
laoren:'老人',
nianlingType:'年龄类型',
}
//OP操作
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:'请填写目的地名称',
XilieName:'系列名',
StaffName:'员工名称',
BL:'比例',
}
import invoicesManager from './zhCN/invoicesManager'
import Ground from './zhCN/Ground'
......
src/components/Buying/AdManageList.vue
View file @ 7ec3981f
......@@ -27,7 +27,8 @@
</el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top">
<el-button type="danger" size="mini" class="iconfont icon-quxiao1" @click="removeAdManage(item.Id)"></el-button>
<el-button type="danger" size="mini" class="iconfont icon-quxiao1" @click="removeAdManage(item.Id)">
</el-button>
</el-tooltip>
</el-button-group>
</td>
......@@ -40,9 +41,6 @@
</div>
</template>
<script>
import {
get
} from 'http';
export default {
data() {
return {
......@@ -62,7 +60,6 @@
this.getList();
},
filters: {},
methods: {
//获取数据
getList() {
......@@ -111,7 +108,24 @@
}
}, null);
},
}
},
//上传图片
UploadImage(file) {
let newArr = [];
newArr.push(file.file);
let fileName = file.file.name;
var path = "/Upload/Temporary/";
this.UploadSelfFileT(path, newArr, x => {
//统一图片处理
if (this.DiningImageArray.length === 5) {
return this.$message.error('最多上传5张图片')
}
var obj = {}
var str = x.data.FilePath;
var imgUrl = this.domainManager().ViittoFileUrl + x.data.FilePath;
this.DiningImageArray.push(imgUrl);
});
},
};
</script>
src/components/Buying/GuestAccountList.vue
View file @ 7ec3981f
<style>
.height_auto.el-select .el-input{
height: auto
}
</style>
<template>
<div class="flexOne">
<div class="query-box">
<ul class="user_time_picker">
<li>
<span>
<em>{{$t('MarketingActi.commName')}}</em>
<el-input v-model="msg.name" @keyup.enter.native="getList"></el-input>
</span>
</li>
<li>
<span>
<em>商品类型</em>
<el-select filterable v-model="msg.SellType">
<el-option :label="$t('pub.unlimitedSel')" :value="0" key="0"></el-option>
<el-option v-for="item in CommodityTypeList" :label="item.Name" :value="item.Id" :key="item.Id"></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>商品分类</em>
<el-select filterable v-model="msg.CategoryId">
<el-option :label="$t('pub.unlimitedSel')" :value="-1"></el-option>
<el-option v-for="item in GoodsTypeList" :label="item.Name" :value="item.Id" :key="item.Id"></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>{{$t('admin.admin_status')}}</em>
<el-select filterable v-model="msg.Status">
<el-option :label="$t('pub.unlimitedSel')" :value="-1"></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="4"></el-option>
</el-select>
</span>
</li>
<li>
<input type="button" @click="getList" class="hollowFixedBtn" :value="$t('pub.searchBtn')">
<input type="button" @click="addIntegralMall('BuyingAdd')" 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='80'>{{$t('MarketingActi.commNum')}}</th>
<th>{{$t('MarketingActi.commName')}}</th>
<th>分类名称</th>
<th>类型名称</th>
<th>成本价</th>
<th>销售价</th>
<th>领队返佣</th>
<th>公司返佣</th>
<th>同行返佣</th>
<th>微途返佣</th>
<th>姓名</th>
<th>账户</th>
<th>手机号码</th>
<th>护照</th>
<th>性别</th>
<th>状态</th>
<th>创建时间</th>
<th>{{$t('system.table_operation')}}</th>
</tr>
<tr v-for="item in dataList">
<td>{{item.Id}}</td>
<td>{{item.Name}}</td>
<td>{{item.CategoryName}}</td>
<td>{{item.SellTypeName}}</td>
<td>{{item.CostPrice}}</td>
<td>{{item.SellPrice}}</td>
<td>{{item.LeaderRebate}}</td>
<td>{{item.CompanyRebate}}</td>
<td>{{item.ClientRebate}}</td>
<td>{{item.WeiTuRebate}}</td>
<td>
<td>{{item.AccountName}}</td>
<td>{{item.LoginAccount}}</td>
<td>{{item.MobilePhone}}</td>
<td>{{item.PassportNo}}</td>
<td>{{item.SexStr}}</td>
<td>{{item.AccountStatusStr}}</td>
<td>{{item.CreateTimeStr}}</td>
<td>
<el-button-group>
<el-tooltip class="item" effect="dark" :content="$t('active.ld_editInfo')" placement="top">
<el-button type="primary" size="mini" icon="el-icon-edit" @click="addIntegralMall('BuyingAdd', item.Id, '修改商品')"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="上架" placement="top">
<el-button type="success" size="mini" class="iconfont icon-shangjia1"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="下架" placement="top">
<el-button type="warning" size="mini" class="iconfont icon-xiajia1"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="取消" placement="top">
<el-button type="danger" size="mini" class="iconfont icon-quxiao1"></el-button>
</el-tooltip>
<template v-if="item.AccountStatus==0">
<el-tooltip class="item" effect="dark" content="禁用" placement="top">
<el-button type="primary" size="mini" icon="el-icon-edit" @click="SetAccountStatus(item.Id,1)">
</el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top">
<el-button type="danger" size="mini" class="iconfont icon-quxiao1" @click="SetAccountStatus(item.Id,2)">
</el-button>
</el-tooltip>
</template>
<template v-else>
<el-tooltip class="item" effect="dark" content="启用" placement="top">
<el-button type="primary" size="mini" icon="el-icon-edit" @click="SetAccountStatus(item.Id,0)">
</el-button>
</el-tooltip>
</template>
</el-button-group>
</td>
</td>
</tr>
<tfoot>
<tr>
<td colspan="8">
<el-pagination background @current-change="handleCurrentChange" layout="total,prev, pager, next, jumper"
:page-size="msg.pageSize" :total="msg.total">
</el-pagination>
</td>
</tr>
</tfoot>
</table>
<el-pagination background @current-change="handleCurrentChange" layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=total>
</el-pagination>
<div class="noDataNotice" v-if="dataList.length<1">
<i class="iconfont icon-kong"></i>
<p>{{$t("active.ld_noData")}}</p>
</div>
</div>
</div>
</template>
<script>
export default {
data() {
return {
//请求
msg: {
pageSize: 15,
pageIndex: 1,
SellType: 0,
Name: '',
CategoryId: -1,
Status: -1
},
loading:false,
dataList:[],
GoodsTypeList: [],
total:0,
CommodityTypeList: [],
};
},
mounted() {
this.getList();
this.getCommodityTypeList();
this.getGoodsTypeManager();
},
filters: {
},
methods: {
handleCurrentChange(val){
this.msg.pageIndex=val;
this.getList();
},
addIntegralMall: function( path, proId, tab){
this.$router.push({ name: path,query:{blank: 'y', proId: proId, tab: tab} })
},
getGoodsTypeManager() {
this.apipost("Shop_post_GetCommodityCategoryList",{Name: "", ParentId: 0},res => {
if (res.data.resultCode === 1) {
this.GoodsTypeList = res.data.data;
} else {
this.Error(res.data.message);
}
export default {
data() {
return {
//查询参数
msg: {
pageIndex: 1,
pageSize: 10,
total: 0,
},
null
);
loading: false,
dataList: [],
//账户修改
editMsg: {
Id: 0,
AccountStatus: 0,
}
};
},
mounted() {
this.getList();
},
getCommodityTypeList() {
this.apipost(
"Shop_post_GetCommodityTypeList",
{},
res => {
filters: {},
methods: {
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
//获取数据
getList() {
this.loading = true;
this.apipost("ShopGuest_get_GetGuestAccountPageListService", this.msg, res => {
this.loading = false;
if (res.data.resultCode === 1) {
this.CommodityTypeList = res.data.data;
this.dataList = res.data.data.pageData;
this.msg.total = res.data.data.count;
} else {
this.Error(res.data.message);
}
},
null
);
},
//获取数据
getList() {
this.loading = true;
this.apipost("Shop_post_GetPageList", this.msg, res => {
this.loading = false;
if (res.data.resultCode === 1) {
this.dataList = res.data.data.pageData;
this.total= res.data.data.count;
} else {
this.Error(res.data.message)
}, null);
},
//修改账户类型
SetAccountStatus(Id, AccountStatus) {
this.editMsg.Id = Id;
this.editMsg.AccountStatus = AccountStatus;
var tipStr = "";
if (AccountStatus == 0) {
tipStr = "启用";
} else if (AccountStatus == 1) {
tipStr = "禁用";
} else if (AccountStatus == 2) {
tipStr = "删除";
}
}, null);
},
}
};
</script>
\ No newline at end of file
var that = this;
this.Confirm("是否[" + tipStr + "]此账户?", function () {
that.apipost("ShopGuest_post_SetGuestAccountStatusService", that.editMsg, res => {
if (res.data.resultCode === 1) {
that.editMsg.Id = 0;
that.editMsg.AccountStatus = 0;
that.getList();
} else {
that.Error(res.data.message);
}
}, null);
});
}
}
};
</script>
src/components/FinancialModule/AirTicketApp.vue
View file @ 7ec3981f
......@@ -15,22 +15,22 @@
</tr>
</table>
<el-dialog
title="修改"
:title="$t('system.table_edit')"
:visible.sync="dialogVisible"
width="300px">
<div>
<el-form ref="form" :model="changeMsg" label-width="80px">
<el-form-item label="公司">
<el-form-item :label="$t('system.table_company')">
<span>{{changeMsg.BranchName}}</span>
</el-form-item>
<el-form-item label="比例" prop="LossRatio">
<el-form-item :label="$t('op.BL')" prop="LossRatio">
<el-input @keyup.native="checkInteger(changeMsg,'LossRatio')" v-model="changeMsg.Ratio"></el-input>
</el-form-item>
</el-form>
</div>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="dialogVisible = false">取 消</el-button>
<el-button type="danger" size="small" @click="Ok">确 定</el-button>
<el-button size="small" @click="dialogVisible = false">{{$t('pub.cancelBtn')}}</el-button>
<el-button type="danger" size="small" @click="Ok">{{$t('pub.sureBtn')}}</el-button>
</span>
</el-dialog>
</div>
......
src/components/FinancialModule/WireControl.vue
View file @ 7ec3981f
......@@ -31,7 +31,7 @@
<ul class="user_time_picker">
<li>
<span>
<em>员工</em>
<em>{{$t('system.table_staffs')}}</em>
<el-select
filterable
v-model="msg.Employee_id"
......@@ -43,7 +43,7 @@
</li>
<li>
<span>
<em>线路</em>
<em>{{$t('advmanager.v_line')}}</em>
<el-select filterable v-model="msg.Line_id">
<el-option :label="$t('system.ph_buxian')" :value="0"></el-option>
<el-option v-for="item in newLineList" :label="item.LineName" :value="item.LineID" :key="item.LineID"></el-option>
......@@ -71,13 +71,13 @@
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
<tr>
<th>编号</th>
<th>员工名称</th>
<th>公司名称</th>
<th width="300">线路名称</th>
<th width="300">系列名称</th>
<th>操作人</th>
<th>操作时间</th>
<th>{{$t('hotel.hotel_SerialNumber')}}</th>
<th>{{$t('op.StaffName')}}</th>
<th>{{$t('admin.admin_company')}}</th>
<th width="300">{{$t('system.query_lineName')}}</th>
<th width="300">{{$t('active.ad_xlmc')}}</th>
<th>{{$t('admin.admin_czPerson')}}</th>
<th>{{$t('hotel.table_operattime')}}</th>
<th>{{$t('system.table_operation')}}</th>
</tr>
<tr v-for="(item,index) in DataList">
......@@ -91,7 +91,7 @@
<td>{{item.UpdateDate}}</td>
<td class="text_al_left">
<!-- <el-button-group> -->
<el-tooltip class="item" effect="dark" content="编辑" placement="top">
<el-tooltip class="item" effect="dark" :content="$t('pub.edit')" placement="top">
<el-button
type="primary"
icon="el-icon-edit"
......@@ -99,7 +99,7 @@
@click="Edit(item)"
></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top">
<el-tooltip class="item" effect="dark" :content="$t('system.ph_shanchu')" placement="top">
<el-button
type="danger"
icon="el-icon-delete"
......@@ -143,7 +143,7 @@
</el-form-item>
</td>
<td>
<el-form-item label="员工" prop="Employee_id">
<el-form-item :label="$t('system.table_staffs')" prop="Employee_id">
<el-select
filterable style="width:100%;"
v-model="addMsg.Employee_id"
......
src/components/PersonalInfoSet.vue
View file @ 7ec3981f
......@@ -728,39 +728,39 @@
<div class="Shouji_Conteng">
<el-form :model="passWordMsg" ref="passWordMsg" label-position="right" :rules="rules2" label-width="100px">
<el-form-item v-if="sureOldPwd" label="旧密码" prop="OldPwd" style="margin-bottom:30px;">
<el-input type="password" class="w400" v-model="passWordMsg.OldPwd">
<el-input type="password" class="w400" v-model="passWordMsg.OldPwd" maxlength="15">
<i slot="suffix" title="显示密码" @click="changePassOld('show')" style="cursor:pointer;"
class="el-input__icon iconfont icon-yincang"></i>
</el-input>
</el-form-item>
<el-form-item v-else label="旧密码" prop="OldPwd" style="margin-bottom:30px;">
<el-input type="text" class="w400" v-model="passWordMsg.OldPwd">
<el-input type="text" class="w400" v-model="passWordMsg.OldPwd" maxlength="15">
<i slot="suffix" title="隐藏密码" @click="changePassOld('hide')" style="cursor:pointer;"
class="el-input__icon iconfont icon-xianshi"></i>
</el-input>
</el-form-item>
<el-form-item v-if="visible" label="新密码" style="margin-bottom:30px;" prop="Pwd">
<el-input type="password" class="w400" v-model="passWordMsg.Pwd" maxlength="6" placeholder="请输入新密码">
<el-input type="password" class="w400" v-model="passWordMsg.Pwd" maxlength="15" placeholder="请输入新密码">
<i slot="suffix" title="显示密码" @click="changePass('show')" style="cursor:pointer;"
class="el-input__icon iconfont icon-yincang"></i>
</el-input>
</el-form-item>
<el-form-item v-else label="新密码" style="margin-bottom:30px;" prop="Pwd">
<el-input type="text" class="w400" v-model="passWordMsg.Pwd" maxlength="6" placeholder="请输入新密码">
<el-input type="text" class="w400" v-model="passWordMsg.Pwd" maxlength="15" placeholder="请输入新密码">
<i slot="suffix" title="隐藏密码" @click="changePass('hide')" style="cursor:pointer;"
class="el-input__icon iconfont icon-xianshi"></i>
</el-input>
</el-form-item>
<el-form-item v-if="SureVisible" label="确认密码" style="margin-bottom:30px;" prop="surePassword">
<el-input type="password" class="w400" v-model="passWordMsg.surePassword" maxlength="6" placeholder="请输入新密码">
<el-input type="password" class="w400" v-model="passWordMsg.surePassword" maxlength="15" placeholder="请输入新密码">
<i slot="suffix" title="显示密码" @click="changePass2('show')" style="cursor:pointer;"
class="el-input__icon iconfont icon-yincang"></i>
</el-input>
</el-form-item>
<el-form-item v-else label="确认密码" style="margin-bottom:30px;" prop="surePassword">
<el-input type="text" class="w400" v-model="passWordMsg.surePassword" maxlength="6" placeholder="请输入新密码">
<el-input type="text" class="w400" v-model="passWordMsg.surePassword" maxlength="15" placeholder="请输入新密码">
<i slot="suffix" title="隐藏密码" @click="changePass2('hide')" style="cursor:pointer;"
class="el-input__icon iconfont icon-xianshi"></i>
</el-input>
......
src/components/SalesModule/CustomerCertification.vue
View file @ 7ec3981f
......@@ -146,7 +146,7 @@
<th width="10%">{{$t('salesModule.storeName')}}</th>
<th width="10%">{{$t('hotel.suplier_contact')}}</th>
<th width="10%">{{$t('hotel.table_tel')}}</th>
<th width="10%">{{$t('MarketingActi.TransactionMon')}}</th>
<th width="10%">{{$t('salesModule.TransactionMon')}}</th>
<th width="10%">{{$t('admin.admin_address')}}</th>
<th width="10%">{{$t('salesModule.belongUnion')}}</th>
<th width="10%">{{$t('salesModule.ApplyTime')}}</th>
......
src/components/SalesModule/MyCustomer.vue
View file @ 7ec3981f
......@@ -388,19 +388,19 @@ export default {
}
},
rules:{
contact:[{required: true, message: "请输入联系人", trigger: "blur"}],
customerName:[{required: true, message: "请输入客户名", trigger: "blur"}],
contact:[{required: true, message:this.$t('rule.EnterContratPerson'), trigger: "blur"}],
customerName:[{required: true, message:this.$t('rule.EnterCustomer'), trigger: "blur"}],
contactNumber:[
{required: true, message: "请输入联系电话", trigger: "blur"},
{ pattern: /^1[123457890]\d{9}$/, message: "请输入正确的电话" }
{required: true, message:this.$t('rule.EnterPNum'), trigger: "blur"},
{ pattern: /^1[123457890]\d{9}$/, message:this.$t('rule.EnterRightNum') }
],
brandIds:[{required: true, message: "请选择所属品牌", trigger: "change"}],
Duty:[{required: true, message: "请选择职务", trigger: "change"}],
remark:[{required: false, message: "请选择职务", trigger: "change"}],
Premises:[{required: true, message: "请选择经营场所", trigger: "change"}],
CustomerSourceType:[{required: true, message: "请选择经客户来源", trigger: "change"}],
customerName:[{required: true, message: "请输入客户名", trigger: "blur"}],
address:[{required: true, message: "请输入地址", trigger: "blur"}],
brandIds:[{required: true, message:this.$t('rule.ChoiceBrand'), trigger: "change"}],
Duty:[{required: true, message:this.$t('rule.ChoiceJob'), trigger: "change"}],
remark:[{required: false, message: this.$t('rule.ChoiceJob'), trigger: "change"}],
Premises:[{required: true, message:this.$t('rule.ChoiceJYCS'), trigger: "change"}],
CustomerSourceType:[{required: true, message:this.$t('rule.ChoiceCusFrom'), trigger: "change"}],
customerName:[{required: true, message:this.$t('rule.EnterCusName'), trigger: "blur"}],
address:[{required: true, message:this.$t('visaT.qsradder'), trigger: "blur"}],
},
dataList:[],
CustomerBrandList:[],
......@@ -421,19 +421,19 @@ export default {
}
},methods:{
deleteCustomer(obj){
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.apipost('app_customer_Remove',{ID:obj.customerId},res=>{
if(res.data.resultCode==1){
this.$message.success('删除成功！');
this.Success(res.data.message);
this.getList()
}
},err=>{})
}).catch(() => {
this.$message.info('已取消删除！');
this.Error('已取消删除！');
});
},
uploadImg(file) {
......
src/components/SalesModule/SalesAssessment.vue
View file @ 7ec3981f
......@@ -67,12 +67,12 @@
},
rules:{
RequireScore:[
{ required: true, message: '请输入', trigger: 'blur' },
{pattern: /^\d*$/, message: '只能输入数字' }
{ required: true, message:this.$t('pub.pleaseImport'), trigger: 'blur' },
{pattern: /^\d*$/, message:this.$t('rule.OnlyNumber')}
],
Ratio:[
{ required: true, message: '请输入', trigger: 'blur' },
{pattern: /^\d*$/, message: '只能输入数字' }
{ required: true, message:this.$t('pub.pleaseImport'), trigger: 'blur' },
{pattern: /^\d*$/, message:this.$t('rule.OnlyNumber')}
]
},
dataList:[]
......
src/components/SalesModule/VisitPlan.vue
View file @ 7ec3981f
......@@ -675,19 +675,19 @@ export default {
}
},
rules:{
customerInfoId:[{required: true, message: "请选择客户", trigger: "change"}],
newVisitDay:[{required: true, message: "请选择拜访日期", trigger: "change"}],
newVisitTime:[{required: true, message: "请选择拜访时间", trigger: "change"}],
SalesProcess:[{required: true, message: "请选择所属流程", trigger: "change"}],
customerName:[{required: true, message: "请输入客户名称", trigger: "blur"}],
contact:[{required: true, message: "请输入联系人", trigger: "blur"}],
contactNumber:[{required: true, message: "请输入联系电话", trigger: "blur"}],
address:[{required: true, message: "请输入客户地址", trigger: "blur"}],
brandIds:[{required: true, message: "请选择所属品牌", trigger: "change"}],
Duty:[{required: true, message: "请选择职务", trigger: "change"}],
remark:[{required: false, message: "请选择职务", trigger: "change"}],
Premises:[{required: true, message: "请选择经营场所", trigger: "change"}],
CustomerSourceType:[{required: true, message: "请选择经客户来源", trigger: "change"}],
customerInfoId:[{required: true, message:this.$t('rule.qxzkhmingcheng'), trigger: "change"}],
newVisitDay:[{required: true, message:this.$t('rule.ChoiceVDate'), trigger: "change"}],
newVisitTime:[{required: true, message:this.$t('rule.ChoiceVTime'), trigger: "change"}],
SalesProcess:[{required: true, message:this.$t('rule.ChoiceLC'), trigger: "change"}],
customerName:[{required: true, message:this.$t('rule.EnterCusName'), trigger: "blur"}],
contact:[{required: true, message:this.$t('rule.EnterContratPerson'), trigger: "blur"}],
contactNumber:[{required: true, message:this.$t('rule.EnterPNum'), trigger: "blur"}],
address:[{required: true, message:this.$t('rule.EnterCusAds'), trigger: "blur"}],
brandIds:[{required: true, message:this.$t('rule.ChoiceBrand'), trigger: "change"}],
Duty:[{required: true, message:this.$t('rule.ChoiceJob'), trigger: "change"}],
remark:[{required: false, message:this.$t('rule.ChoiceJob'), trigger: "change"}],
Premises:[{required: true, message:this.$t('rule.ChoiceJYCS'), trigger: "change"}],
CustomerSourceType:[{required: true, message:this.$t('rule.ChoiceCusFrom'), trigger: "change"}],
},
pickerOptions0: {
disabledDate(time) {
......@@ -949,9 +949,9 @@ export default {
},err=>{})
},
deleteItem(obj,date){
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.apipost('app_today_visit_RemoveCustomerVisit', {
......@@ -966,7 +966,7 @@ export default {
}
}, err => {})
}).catch(() => {
this.$message.info('取消删除');
this.$message.info(this.$t('tips.cancleDelete'));
});
},
goUrl(path,time) {
......
src/components/SalesModule/branding.vue
View file @ 7ec3981f
......@@ -90,7 +90,7 @@ export default {
},
editOk: function() {
if (this.editData.Name === "") {
this.$message.error("请输入品牌名称");
this.$message.error(this.$t('rule.EnterBrandName'));
} else {
this.apipost(
"customer_post_Set",
......@@ -109,9 +109,9 @@ export default {
}
},
delBtn: function(key) {
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.apipost(
......@@ -129,7 +129,7 @@ export default {
);
})
.catch(() => {
this.$message.info("已取消删除！");
this.$message.info(this.$t('tips.cancleDelete'));
});
},
getList: function() {
......
src/components/SalesModule/publicCustomer.vue
View file @ 7ec3981f
......@@ -58,8 +58,8 @@
<th width="20%">{{$t('admin.admin_address')}}</th>
<th width="10%">{{$t('salesModule.belongUnion')}}</th>
<th width="10%">{{$t('salesModule.Laiyuan')}}</th>
<th width="8%">{{$t('MarketingActi.VisitCount')}}</th>
<th width="10%">{{$t('MarketingActi.TransactionMon')}}</th>
<th width="8%">{{$t('salesModule.VisitCount')}}</th>
<th width="10%">{{$t('salesModule.TransactionMon')}}</th>
<th width="10%">{{$t('active.cl_addPp')}}</th>
<th width="5%">{{$t('hotel.table_operat')}}</th>
</tr>
......
src/components/SalesModule/saleTaskManagement.vue
View file @ 7ec3981f
......@@ -12,7 +12,7 @@
<el-input type="text" :disabled='isAllocatingTask' v-model='addTaskMsg.TaskName' :placeholder="$t('visaT.Pleasefillin')"></el-input>
</el-form-item>
<el-form-item class='w300' :label="$t('salesModule.TaskType')" prop="TaskType">
<el-select placeholder="请选项" :disabled='isDisabled||isAllocatingTask' v-model='addTaskMsg.TaskType'>
<el-select :placeholder="$t('pub.pleaseSel')" :disabled='isDisabled||isAllocatingTask' v-model='addTaskMsg.TaskType'>
<el-option v-for='item in taskTypeList'
:label='item.Name'
:value='item.Id'
......@@ -128,7 +128,7 @@
</div>
</div>
<p style="text-align: right; width: 100%; clear: both;">
<input type="button" class="hollowFixedBtn" value="取消" @click="clearMsg"/>
<input type="button" class="hollowFixedBtn" :value="$t('pub.cancelBtn')" @click="clearMsg"/>
<input v-if='!isAllocatingTask' type="button" class="normalBtn" :value="$t('pub.saveBtn')" @click="submitForm('addTaskMsg')"/>
<input v-if='isAllocatingTask' type="button" class="normalBtn" :value="$t('pub.saveBtn')" @click="saveAllocatingTask"/>
</p>
......@@ -355,20 +355,20 @@
},
rules:{
TaskName:[
{ required: true, message: '请输入任务名称', trigger: 'blur' }
{ required: true, message:this.$t('rule.EnterTaskName'), trigger: 'blur' }
],
TaskType:[
{ required: true, message: '请选择任务类型', trigger: 'change' }
{ required: true, message:this.$t('rule.ChoiceTaskType'), trigger: 'change' }
],
TaskNum:[
{ required: true, message: '请输入数量', trigger: 'blur' },
{ pattern: /^[1-9]\d*$/, message: "只能输入正整数" }
{ required: true, message:this.$t('rule.EnterNum'), trigger: 'blur' },
{ pattern: /^[1-9]\d*$/, message:this.$t('rule.OnlyInter') }
],
taskTime:[
{ required: true, message: '请选择时间范围', trigger: 'change' }
{ required: true, message:this.$t('rule.ChoiceRQFW'), trigger: 'change' }
],
Remarks:[
{ required: false, message: '请输入备注', trigger: 'blur' }
{ required: false, message:this.$t('rule.EnterMark'), trigger: 'blur' }
],
},
......
src/components/SalesModule/workTotal.vue
View file @ 7ec3981f
......@@ -40,7 +40,7 @@
<th width="15%">{{$t('salesModule.Personnel')}}</th>
<th width="15%">{{$t('salesModule.Visital')}}</th>
<th width="15%">{{$t('salesModule.laxin')}}</th>
<th width="15%">{{$t('MarketingActi.ShouKe')}}</th>
<th width="15%">{{$t('salesModule.ShouKe')}}</th>
<th width="10%">{{$t('fnc.shoukuan')}}</th>
<th width="10%">{{$t('salesModule.MakeInquiry')}}</th>
<th width="10%">{{$t('salesModule.Complaints')}}</th>
......
src/components/SalesVisa/VisaProductAddOrder.vue
View file @ 7ec3981f
......@@ -112,7 +112,7 @@
</td>
</tr>
<tr v-show="dataList.length==0">
<td v-show="dataList.length==0" colspan="6" align="center">{{$t('system.content_noData')}}</td>
<td v-show="dataList.length==0" colspan="7" align="center">{{$t('system.content_noData')}}</td>
</tr>
</table>
......@@ -299,10 +299,10 @@ export default {
ClientType: '1'
},
rules:{
PeopleNum:[{required: true, message: "请输入人数", trigger: "blur"}],
PeopleNum:[{required: true, message:this.$t('rule.EnterPnum'), trigger: "blur"}],
// DepartDate:[{required: true, message: "请输入出发日期", trigger: "blur"}],
EnterCountryTime:[{required: true, message: "请输入入境日期", trigger: "blur"}],
LeaveCountryTime:[{required: true, message: "请输入出境日期", trigger: "blur"}]
EnterCountryTime:[{required: true, message:this.$t('rule.EnterRJRQ'), trigger: "blur"}],
LeaveCountryTime:[{required: true, message:this.$t('rule.EnterCJRQ'), trigger: "blur"}]
},
VisaApplyForTypeEnum:[],
JapanAirportList:[],
......@@ -423,9 +423,9 @@ export default {
}
},
deleteCustomer(obj){
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.apipost('app_customer_Remove',{ID:obj.customerId},res=>{
......@@ -435,7 +435,7 @@ export default {
}
},err=>{})
}).catch(() => {
this.$message.info('已取消删除！');
this.$message.info(this.$t('tips.cancleDelete'));
});
},
getList(){ // 获取列表数据
......
src/components/TravelManager/TravelList/todayOrderTotal.vue
View file @ 7ec3981f
......@@ -57,7 +57,7 @@
<span>
<em>{{$t('hotel.order_Number')}}</em>
</span>
<el-input class="w135" v-model="msg.tempOrderId"></el-input>
<el-input class="w135" v-model="msg.tempOrderId" @keyup.native="checkInteger(msg,'tempOrderId')" ></el-input>
</li>
<li>
<span>
......
src/components/index.vue
View file @ 7ec3981f
......@@ -230,7 +230,7 @@
<el-dropdown-menu class="changelanguage" slot="dropdown">
<el-dropdown-item @click.native="ChangeLan('Japanese')">日语 <i v-if="language=='Japanese'" class="iconfont icon-duigou"></i></el-dropdown-item>
<el-dropdown-item @click.native="ChangeLan('zh-CN')">简体中文 <i v-if="language=='zh-CN'" class="iconfont icon-duigou"></i></el-dropdown-item>
<el-dropdown-item @click.native="ChangeLan('zh-TW')">繁体中文 <i v-if="language=='zh-TW'" class="iconfont"></i></el-dropdown-item>
<el-dropdown-item @click.native="ChangeLan('zh-TW')">繁体中文 <i v-if="language=='zh-TW'" class="iconfont icon-duigou"></i></el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</li>
......
src/components/systemManagement/destinationManagement.vue
View file @ 7ec3981f
......@@ -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.searchBtn')" @click="resetPageIndex(),getList()" />
<input type="button" class="normalBtn" :value="$t('pub.addBtn')" @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/lineBackgroundMusic.vue
View file @ 7ec3981f
......@@ -86,8 +86,8 @@
</span>
</li>
<li>
<input type="button" class="hollowFixedBtn" @click="resetPageIndex(),initTableInfo()" value="查询" />
<input type="button" class="normalBtn" @click="clearInfo(),outerVisible=true,dialogTitle='新增背景音乐'" value="新增" />
<input type="button" class="hollowFixedBtn" @click="resetPageIndex(),initTableInfo()" :value="$t('pub.searchBtn')" />
<input type="button" class="normalBtn" @click="clearInfo(),outerVisible=true,dialogTitle='新增背景音乐'" :value="$t('pub.addBtn')"/>
</li>
</ul>
</div>
......@@ -115,32 +115,32 @@
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" layout="total,prev, pager, next, jumper"
:page-size=msg.pageSize :total=total>
</el-pagination>
<el-dialog center custom-class='insideDialog' width="100" title="提示信息" :visible.sync="innerVisible" append-to-body>
<el-dialog center custom-class='insideDialog' width="100" :title="$t('pub.hintMsg')" :visible.sync="innerVisible" append-to-body>
{{this.insideDialogTxt}}
<div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" type="primary" @click="innerVisible=false">取消</button>
<button class="normalBtn" @click="delInfo()">确定</button>
<button class="hollowFixedBtn" type="primary" @click="innerVisible=false">{{$t('pub.cancelBtn')}}</button>
<button class="normalBtn" @click="delInfo()">{{$t('pub.sureBtn')}}</button>
</div>
</el-dialog>
<el-dialog custom-class='w500' :title="dialogTitle" :visible.sync="outerVisible" center>
<el-form :model="addMsg" ref="addMsg" label-width="120px">
<el-form-item label="线路">
<el-select filterable clearable v-model='addMsg.lineID' placeholder="不限">
<el-option label='不限' value='0'></el-option>
<el-form-item :label="$t('advmanager.v_line')">
<el-select filterable clearable v-model='addMsg.lineID' :placeholder="$t('pub.unlimitedSel')">
<el-option :label="$t('pub.unlimitedSel')" value='0'></el-option>
<el-option v-for='item in lineList' :label='item.LineName' :value='item.LineID' :key='item.LineID'>
</el-option>
</el-select>
<div class="re-upload">
<el-upload class="upload-demo" :action="AllUrl" :show-file-list="false" name="importfile" :onError="uploadError"
:onSuccess="uploadSuccess" :beforeUpload="beforeAvatarUpload" multiple>
<el-button size="small" type="primary">点击上传</el-button>
<el-button size="small" type="primary">{{$t('tips.dianjishanhcuan')}}</el-button>
</el-upload>
</div>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<button class="normalBtn" type="primary" @click="submitForm('addMsg')">保存</button> &nbsp;
<button class="hollowFixedBtn" @click="outerVisible = false">取消</button>
<button class="normalBtn" type="primary" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button> &nbsp;
<button class="hollowFixedBtn" @click="outerVisible = false">{{$t('pub.cancelBtn')}}</button>
</div>
</el-dialog>
</div>
......
src/components/systemManagement/lineManagement.vue
View file @ 7ec3981f
......@@ -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('visa.v_chujing')}}</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();
}
},
......
src/components/systemManagement/seriesManagement.vue
View file @ 7ec3981f
......@@ -77,7 +77,7 @@
<li>
<label class="">{{$t('system.table_ssLine')}}</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>
......@@ -90,12 +90,12 @@
</el-select>
</li>
<li>
<label class="">系列名</label>
<label class="">{{$t('op.XilieName')}}</label>
<el-input type="text" v-model="msg.LtName" :placeholder="$t('system.ph_LtName')" @keyup.native.enter="getList" maxlength="20" 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.searchBtn')" @click="resetPageIndex(),getList()" />
<input type="button" class="normalBtn" :value="$t('pub.addBtn')" @click="outerVisible=true,dialogTitle='新增团名资料'" />
</li>
</ul>
</div>
......@@ -103,8 +103,8 @@
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<th width="">{{$t('system.table_ssLine')}}</th>
<th>目的地</th>
<th>系列名</th>
<th>{{$t('system.query_dest')}}</th>
<th>{{$t('op.XilieName')}}</th>
<th>{{$t('system.table_isShow')}}</th>
<th width="200">{{$t('system.table_operation')}}</th>
</tr>
......@@ -121,7 +121,7 @@
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start">
<el-button type="danger" icon="el-icon-delete" circle @click="deletelist(index)"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="设置" placement="top-start">
<el-tooltip class="item" effect="dark" :content="$t('leader.leader_Set')" placement="top-start">
<el-button type="info" icon="el-icon-setting" @click="goUrl('seriesSetList',item.LtID)" circle></el-button>
</el-tooltip>
</el-row>
......@@ -140,14 +140,14 @@
<el-form-item :label="$t('system.table_ssLine')" prop="LineID">
<el-select v-model="addMsg.LineID" filterable :placeholder="$t('system.ph_choice')" @change="getDestinationList(1)"
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>
</el-form-item>
<el-form-item :label="$t('system.query_dest')" prop="placeID">
<el-select v-model="addMsg.placeID" 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 destinationList' :key="item.PlaceID" :label="item.PlaceName" :value="item.PlaceID">
</el-option>
</el-select>
......@@ -158,7 +158,7 @@
{{$t('system.table_codeTips')}}
</div>
</el-form-item>
<el-form-item label="系列名" prop="LtName">
<el-form-item :label="$t('op.XilieName')" prop="LtName">
<el-input type="text" v-model="addMsg.LtName" :placeholder="$t('system.ph_LtName')" maxlength="20" class="w210"></el-input>
</el-form-item>
<el-form-item :label="$t('system.table_isSaleInNET')" class="seriesMg_tips_f">
......@@ -175,8 +175,8 @@
</div>
</el-form>
<div slot="footer" class="dialog-footer">
<button class="normalBtn" type="primary" @click="submitForm('addMsg')">保存</button> &nbsp;
<button class="hollowFixedBtn" @click="outerVisible = false,resetForm('addMsg')">取消</button>
<button class="normalBtn" type="primary" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button> &nbsp;
<button class="hollowFixedBtn" @click="outerVisible = false,resetForm('addMsg')">{{$t('pub.cancelBtn')}}</button>
</div>
</el-dialog>
</div>
......
src/components/systemManagement/transportCostsManagement.vue
View file @ 7ec3981f
......@@ -18,36 +18,36 @@
<li>
<span>
<em>{{$t('system.query_lineName')}}</em>
<el-select filterable v-model='msg.lineID' placeholder="不限">
<el-option label='不限' value='0'></el-option>
<el-select filterable v-model='msg.lineID' :placeholder="$t('pub.unlimitedSel')">
<el-option :label="$t('pub.unlimitedSel')" value='0'></el-option>
<el-option v-for='item in lineList' :label='item.LineName' :value='item.LineID' :key='item.LineID'>
</el-option>
</el-select>
</span>
</li>
<li>
<input type="button" class="hollowFixedBtn" @click="resetPageIndex(),initTableInfo()" value="查询" />
<input type="button" class="normalBtn" @click="clearInfo(),outerVisible=true,dialogTitle='新增联运成本'" value="新增" />
<input type="button" class="hollowFixedBtn" @click="resetPageIndex(),initTableInfo()" :value="$t('pub.searchBtn')" />
<input type="button" class="normalBtn" @click="clearInfo(),outerVisible=true,dialogTitle='新增联运成本'" :value="$t('pub.addBtn')"/>
</li>
</ul>
</div>
<div class="commonContent" v-loading="loading">
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<th rowspan="2" class="TCMRightborder">线路</th>
<th colspan="4" class="TCMRightbottom">成都机位出发</th>
<th colspan="4" class="TCMRightbottom">当地机位出发</th>
<th rowspan="2" class="TCMRightleft">操作</th>
<th rowspan="2" class="TCMRightborder">{{$t('advmanager.v_line')}}</th>
<th colspan="4" class="TCMRightbottom">{{$t('Operation.Op_Cdreservation')}}</th>
<th colspan="4" class="TCMRightbottom">{{$t('Operation.Op_localrevervation')}}</th>
<th rowspan="2" class="TCMRightleft">{{$t('system.table_operation')}}</th>
</tr>
<tr>
<th>总公司价格</th>
<th>分公司价格</th>
<th>代销商价格</th>
<th class="TCMRightborder">当团利润归属</th>
<th>总公司价格</th>
<th>分公司价格</th>
<th>代销商价格</th>
<th>当团利润归属</th>
<th>{{$t('Operation.Op_headOfficePrice')}}</th>
<th>{{$t('Operation.Op_branchPrice')}}</th>
<th>{{$t('Operation.Op_affiliate')}}</th>
<th class="TCMRightborder">{{$t('Operation.Op_profitsBelong')}}</th>
<th>{{$t('Operation.Op_headOfficePrice')}}</th>
<th>{{$t('Operation.Op_branchPrice')}}</th>
<th>{{$t('Operation.Op_affiliate')}}</th>
<th>{{$t('Operation.Op_profitsBelong')}}</th>
</tr>
<tr v-for="item in tableInfo" :key="item.subCode">
<td>{{item.LineName}}</td>
......@@ -60,11 +60,11 @@
<td>{{item.LocalAffiliatePrice}}</td>
<td>{{item.LocalProfitAffiliation==0?'当地公司':'总公司'}}</td>
<td>
<el-tooltip class="item" effect="dark" content="修改" placement="top-start">
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start">
<el-button type="primary" @click="updateInfo(item.ID),outerVisible=true,dialogTitle='修改联运成本'" icon="el-icon-edit"
circle></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top-start">
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start">
<el-button type="danger" icon="el-icon-delete" @click="isdelete(item.ID)" circle></el-button>
</el-tooltip>
</td>
......@@ -76,38 +76,38 @@
</div>
<el-dialog custom-class='addCompany' :title="dialogTitle" :visible.sync="outerVisible" center :before-close="closeChangeMachie">
<el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="150px">
<el-form-item label="线路" prop="lineID">
<el-select filterable clearable v-model='addMsg.lineID' placeholder="不限" class="w210">
<el-form-item :label="$t('advmanager.v_line')" prop="lineID">
<el-select filterable clearable v-model='addMsg.lineID' :placeholder="$t('system.ph_choice')" class="w210">
<el-option v-for='item in lineList' :label='item.LineName' :value='item.LineID' :key='item.LineID'>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="总公司价格" prop="HeadofficePrice">
<el-form-item :label="$t('Operation.Op_headOfficePrice')" prop="HeadofficePrice">
<el-input type="text" v-model="addMsg.HeadofficePrice" class="w210" @keyup.native="checkPrice(addMsg,'HeadofficePrice')"></el-input>
</el-form-item>
<el-form-item label="分公司价格" prop="BranchofficePrice">
<el-form-item :label="$t('Operation.Op_branchPrice')" prop="BranchofficePrice">
<el-input type="text" v-model="addMsg.BranchofficePrice" class="w210" @keyup.native="checkPrice(addMsg,'BranchofficePrice')"></el-input>
</el-form-item>
<el-form-item label="代销商价格" prop="AffiliatePrice">
<el-form-item :label="$t('Operation.Op_affiliate')" prop="AffiliatePrice">
<el-input type="text" v-model="addMsg.AffiliatePrice" class="w210" @keyup.native="checkPrice(addMsg,'AffiliatePrice')"></el-input>
</el-form-item>
<el-form-item label="当团利润归属" prop="ProfitAffiliation">
<el-select filterable clearable v-model='addMsg.ProfitAffiliation' placeholder="不限" class="w210">
<el-form-item :label="$t('Operation.Op_profitsBelong')" prop="ProfitAffiliation">
<el-select filterable clearable v-model='addMsg.ProfitAffiliation' :placeholder="$t('pub.unlimitedSel')" class="w210">
<el-option v-for='item in profitBelong' :label='item.label' :value='item.value' :key='item.value'>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="当地总公司价格" prop="LocalHeadofficePrice">
<el-form-item :label="$t('Operation.Op_localzongprice')" prop="LocalHeadofficePrice">
<el-input type="text" v-model="addMsg.LocalHeadofficePrice" class="w210" @keyup.native="checkPrice(addMsg,'LocalHeadofficePrice')"></el-input>
</el-form-item>
<el-form-item label="当地分公司价格" prop="LocalBranchofficePrice">
<el-form-item :label="$t('Operation.Op_localBranchPrice')" prop="LocalBranchofficePrice">
<el-input type="text" v-model="addMsg.LocalBranchofficePrice" class="w210" @keyup.native="checkPrice(addMsg,'LocalBranchofficePrice')"></el-input>
</el-form-item>
<el-form-item label="当地代销商价格" prop="LocalAffiliatePrice">
<el-form-item :label="$t('Operation.Op_localdaiPrice')" prop="LocalAffiliatePrice">
<el-input type="text" v-model="addMsg.LocalAffiliatePrice" class="w210" @keyup.native="checkPrice(addMsg,'LocalAffiliatePrice')"></el-input>
</el-form-item>
<el-form-item label="当地当团利润归属" prop="LocalProfitAffiliation">
<el-select filterable clearable v-model='addMsg.LocalProfitAffiliation' placeholder="不限" class="w210">
<el-form-item :label="$t('Operation.Op_localDangPrice')" prop="LocalProfitAffiliation">
<el-select filterable clearable v-model='addMsg.LocalProfitAffiliation' :placeholder="$t('pub.unlimitedSel')" class="w210">
<el-option v-for='item in profitBelong' :label='item.label' :value='item.value' :key='item.value'>
</el-option>
</el-select>
......@@ -116,8 +116,8 @@
</el-form>
<div slot="footer" class="dialog-footer">
<button class="normalBtn" type="primary" @click="submitForm('addMsg')">保存</button> &nbsp;
<button class="hollowFixedBtn" @click="resetForm('addMsg'),outerVisible = false">取消</button>
<button class="normalBtn" type="primary" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button> &nbsp;
<button class="hollowFixedBtn" @click="resetForm('addMsg'),outerVisible = false">{{$t('pub.cancelBtn')}}</button>
</div>
</el-dialog>
......
src/router/config.js
View file @ 7ec3981f
......@@ -3981,6 +3981,21 @@ export default {
meta: {
title: '商品价格'
}
},{
path: '/AdManageList',
name: 'AdManageList',
component: resolve => require(['@/components/Buying/AdManageList'], resolve),
meta: {
title: '首页广告管理'
}
},
{
path: '/GuestAccountList',
name: 'GuestAccountList',
component: resolve => require(['@/components/Buying/GuestAccountList'], resolve),
meta: {
title: '账户管理'
}
},
{
path: '/IntegralMall',
......
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