Skip to content

S
SuperMan
Commit 18c07a9d authored by 黄奎's avatar 黄奎
Browse files
Options

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

parents d7114241 61c6db1f
Hide whitespace changes
Inline Side-by-side
Showing with 100 additions and 77 deletions
src/assets/common/lang/zh.js
View file @ 18c07a9d
......@@ -2214,7 +2214,6 @@ export const salesModule={
BigBag:'大红包',
}
export const sm={
Personalrank:"个人排行榜",
derprank:"部门排行榜",
......@@ -2470,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/FinancialModule/AirTicketApp.vue
View file @ 18c07a9d
......@@ -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 @ 18c07a9d
......@@ -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/SalesVisa/VisaProductAddOrder.vue
View file @ 18c07a9d
......@@ -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>
......
src/components/systemManagement/destinationManagement.vue
View file @ 18c07a9d
......@@ -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="$t('pub.saveBtn')" @click="resetPageIndex(),getList()" />
<input type="button" class="normalBtn" :value="$t('fnc.tianjia')" @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>
......
src/components/systemManagement/lineBackgroundMusic.vue
View file @ 18c07a9d
......@@ -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 @ 18c07a9d
......@@ -389,7 +389,7 @@
</el-col>
<el-col :span="2">
<div class="_LowDisMoney">
<div v-if="item.lineDirection==1">{{$t('Operation.Op_theEntry')}}</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>
......
src/components/systemManagement/seriesManagement.vue
View file @ 18c07a9d
......@@ -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 @ 18c07a9d
......@@ -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>
......
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