Skip to content

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

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

parents 199f23c2 03b43a07
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 381 additions and 363 deletions
src/components/FinancialModule/CapitalAllocation.vue
View file @ d159e8c8
......@@ -51,8 +51,8 @@
<div class="query-box">
<ul>
<li>
<input type="button" class="normalBtn" value="新增" @click="goURL('addCapitalAllocation')"/>
<input type="button" class="hollowFixedBtn" value="查询" @click="getList()"/>
<input type="button" class="normalBtn" :value="$t('pub.addBtn')" @click="goURL('addCapitalAllocation')"/>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/>
</li>
</ul>
</div>
......@@ -66,7 +66,7 @@
<el-col :span="4">
<el-form-item label="公司">
<el-select v-model="msg.RB_Branch_Id" placeholder="请选择公司" @change="getDepartmentMsg.RB_Branch_Id = msg.RB_Branch_Id, getDepartment(),msg.RB_Depart_Id = -2">
<el-option :value="-1" label="不限"></el-option>
<el-option :value="-1" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in CompanyList'
:label='item.BName'
:value='item.Id'
......@@ -78,7 +78,7 @@
<el-col :span="4">
<el-form-item label="部门">
<el-select v-model="msg.RB_Depart_Id" placeholder="请选择部门" @change="employeeMsg.DepartmentId = msg.RB_Depart_Id, getEmployee(), msg.UpdateBy='-1'">
<el-option :value="-2" label="不限"></el-option>
<el-option :value="-2" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in DepartmentList'
:label='item.DepartmentName'
:value='item.DepartmentID'
......@@ -90,7 +90,7 @@
<el-col :span="4">
<el-form-item label="制单人">
<el-select filterable v-model='msg.UpdateBy'>
<el-option value="-1" label="不限"></el-option>
<el-option value="-1" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in EmployeeList'
:label='item.EmName'
:value='item.EmployeeId'
......@@ -113,9 +113,9 @@
</el-row>
<el-row :gutter="20">
<el-col :span="4">
<el-form-item label="状态">
<el-form-item :label="$t('admin.admin_status')">
<el-select v-model="msg.Status" filterable>
<el-option value="-1" label="不限"></el-option>
<el-option value="-1" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in StatusList'
:label='item.Name'
:value='item.ID'
......@@ -148,8 +148,8 @@
<th>创建时间</th>
<th>创建人</th>
<!-- <th>备注</th> -->
<th>状态</th>
<th>操作</th>
<th>{{$t('admin.admin_status')}}</th>
<th>{{$t('system.table_operation')}}</th>
</tr>
<tr v-for="(item, index) in dataList">
<td>{{item.FrID}}</td>
......
src/components/FinancialModule/CashierWork.vue
View file @ d159e8c8
......@@ -6,7 +6,7 @@
<div class="query-box">
<ul>
<li>
<button class="normalBtn" @click="addShow=true,text='新增'" >新增</button>
<button class="normalBtn" @click="addShow=true,text='新增'" >{{$t('pub.addBtn')}}</button>
<el-tooltip class="item" effect="dark" content="切换排版" placement="top-end">
<i v-if="transitionShow" class="iconfont icon-biaoge" @click="switchMethod(1)"></i>
<i v-if="transitionShow2" class="iconfont icon-icon-ssan" @click="switchMethod(2)"></i>
......@@ -24,7 +24,7 @@
<th>授权账户</th>
<th>已处理单据</th>
<th>待处理单据</th>
<th>操作</th>
<th>{{$t('system.table_operation')}}</th>
</tr>
<tr v-for="(item,index) in dataList" :key="index">
<td>{{item.Name}}</td>
......
src/components/FinancialModule/FinancialDocuments.vue
View file @ d159e8c8
......@@ -530,17 +530,17 @@
<table border="0" cellspacing="0" cellpadding="0" class="singeRowTable">
<tr class="_t_head">
<th v-if="checkboxShow"><input type="checkbox" v-model="isCkedAll" @click='checkedAll()'></th>
<th>所属公司</th>
<th width="90">所属公司</th>
<th>单号</th>
<th>单据类型</th>
<th width="90">单据类型</th>
<th>关联信息</th>
<th>费用类型</th>
<th>交易方式</th>
<th>金额</th>
<th>{{msg.Type==1?'收款':'付款'}}对象</th>
<th>制单人员</th>
<th width="90">制单人员</th>
<th>当前状态</th>
<th>操作</th>
<th>{{$t('system.table_operation')}}</th>
</tr>
<tr class="_item_list" v-for="(item,index) in DataList">
<td v-if="checkboxShow"><input type="checkbox" :value="item.FrID" v-model="checkList" @change="ckeckedOne"></td>
......
src/components/FinancialModule/PlatformAccount.vue
View file @ d159e8c8
......@@ -2,70 +2,15 @@
<template>
<div class="flexOne page_PlatformAccount">
<div class="query-box">
<!-- <el-form class="_info_box clearfix" label-width="110px">
<el-row>
<el-col :span="4" :gutter="35">
<el-form-item label="账户别名">
<el-input v-model="msg.Alias"></el-input>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="所属机构">
<el-select filterable v-model="msg.BackId">
<el-option label="不限" value="-1"></el-option>
<el-option
v-for="item in FinancialList"
v-if="item.Type == 1"
:label="item.Name"
:value="item.ID"
:key="item.ID"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="账户类型">
<el-select filterable v-model="msg.TypeId">
<el-option label="不限" value="-1"></el-option>
<el-option
v-for="item in AccountTypeList"
:label="item.Name"
:value="item.ID"
:key="item.ID"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="所属公司">
<el-select filterable v-model="msg.RB_Branch_Id">
<el-option label="不限" value="-2"></el-option>
<el-option
v-for="item in CompanyList"
:label="item.BName"
:value="item.Id"
:key="item.Id"
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>-->
<ul>
<li>
<!-- <input
type="button"
class="hollowFixedBtn"
value="查询"
@click="resetPageIndex(),getList()"
>-->
<input
type="button"
class="normalBtn"
value="新增"
@click="addShow=true,text='新增',ed=false"
>
<input type="button" class="normalBtn" @click="downMuban()" value="导出">
<input type="button" class="normalBtn" @click="downMuban()" :value="$t('visa.v_daochu')">
</li>
</ul>
</div>
......@@ -752,7 +697,7 @@ export default {
let allName = {
field: "allName",
title: "所属公司",
width: 40,
width: 80,
titleAlign: "left",
columnAlign: "left",
isResize: true,
......@@ -889,10 +834,10 @@ export default {
},
};
let opera = {
title: "操作",
title: this.$t('system.table_operation'),
titleAlign: "left",
columnAlign: "left",
width: 80,
width: 120,
isResize: false,
componentName:'table-operation'
};
......
src/components/FinancialModule/ReceivingOfficer.vue
View file @ d159e8c8
......@@ -7,7 +7,7 @@
<div class="query-box">
<ul>
<li>
<button class="normalBtn" @click="addShow=true,text='新增'">新增</button>
<button class="normalBtn" @click="addShow=true,text='新增'">{{$t('pub.addBtn')}}</button>
</li>
</ul>
</div>
......@@ -18,7 +18,7 @@
<th>所属公司</th>
<th>业务人员</th>
<th>负责方向</th>
<th>操作</th>
<th>{{$t('system.table_operation')}}</th>
</tr>
<tr v-for="(item,index) in dataList" :key="index">
<td>{{item.Name}}</td>
......@@ -75,12 +75,12 @@
<el-form class=" clearfix" :model="addMsg" ref="addMsg" :rules="rules" label-width="100px">
<el-row>
<el-col :span="4">
<el-form-item label="名称：" prop="Name">
<el-form-item :label="$t('system.query_airName')" prop="Name">
<el-input v-model="addMsg.Name"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="所属公司">
<el-form-item :label="$t('system.query_company')">
<el-select filterable v-model='addMsg.BranchId' >
<el-option v-for='item in CompanyList'
:label='item.BName'
......@@ -91,14 +91,14 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="业务人员：" prop="listArr">
<el-form-item label="业务人员" prop="listArr">
<el-select
v-model="addMsg.listArr"
filterable
remote
multiple
reserve-keyword
placeholder="请输入"
:placeholder="$t('pub.pleaseImport')"
:remote-method="remoteMethod"
@change="$forceUpdate()"
@remove-tag="removeTag"
......
src/components/FinancialModule/accDetail/CashAccDetail.vue
View file @ d159e8c8
......@@ -104,8 +104,8 @@
<ul>
<li>
<input type="button" class="hollowFixedBtn" value="合并单据" @click="addChuNaFun"/>
<input type="button" class="hollowFixedBtn" value="查询" @click="getList()"/>
<input type="button" class="normalBtn" value="导出" @click=""/>
<input type="button" class="hollowFixedBtn" :value="$t('pub.saveBtn')" @click="getList()"/>
<input type="button" class="normalBtn" :value="$t('visa.v_daochu')" />
</li>
</ul>
</div>
......
src/components/FinancialModule/accDetail/CompanyAccDetail.vue
View file @ d159e8c8
......@@ -63,7 +63,7 @@
<el-col :span="4" :gutter="35">
<el-form-item label="单据状态">
<el-select filterable v-model='msg.Status' >
<el-option label='不限' :value='-1'></el-option>
<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>
......@@ -98,15 +98,15 @@
<ul>
<li>
<input type="button" class="hollowFixedBtn" value="合并单据" @click="addChuNaFun"/>
<input type="button" class="hollowFixedBtn" value="查询" @click="getList()"/>
<input type="button" class="normalBtn" value="导出" @click=""/></li>
<input type="button" class="hollowFixedBtn" :value="$t('pub.saveBtn')" @click="getList()"/>
<input type="button" class="normalBtn" :value="$t('visa.v_daochu')" @click=""/></li>
</ul>
</div>
<div class="cm_content">
<table class="po_content singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0" v-loading="loading">
<tr>
<th></th>
<th>所属公司</th>
<th>{{$t('system.query_company')}}</th>
<th>单号</th>
<th>摘要</th>
<th>汇款人/付款对象</th>
......
src/components/FinancialModule/accountingWork.vue
View file @ d159e8c8
......@@ -7,7 +7,7 @@
<div class="query-box">
<ul>
<li>
<button class="normalBtn" @click="addShow=true,text='新增'" >新增</button>
<button class="normalBtn" @click="addShow=true,text='新增'" >{{$t('pub.addBtn')}}</button>
<el-tooltip class="item" effect="dark" content="切换排版" placement="top-end">
<i v-if="transitionShow" class="iconfont icon-biaoge" @click="switchMethod(1)"></i>
<i v-if="transitionShow2" class="iconfont icon-icon-ssan" @click="switchMethod(2)"></i>
......@@ -24,7 +24,7 @@
<th>所属公司</th>
<th>业务人员</th>
<th>负责方向</th>
<th>操作</th>
<th>{{$t('system.table_operation')}}</th>
</tr>
<tr v-for="(item,index) in dataList" :key="index">
<td>{{item.Name}}</td>
......
src/components/FinancialModule/sellCommissionRules.vue
View file @ d159e8c8
......@@ -173,7 +173,7 @@
<th>终止人数</th>
<th>基础比列</th>
<th>额外奖励</th>
<th>操作</th>
<th>{{$t('system.table_operation')}}</th>
</thead>
<tbody>
<tr v-for="(item, index) in addMsg.RuleClassList" :key="index">
......@@ -247,8 +247,8 @@
</el-form>
</div>
<div class="btm-opera-btn">
<input type="button" class="normalBtn" value="保存" @click="save">
<input type="button" class="cancelBtn" value="取消" @click="changeShow(0)">
<input type="button" class="normalBtn" :value="$t('pub.saveBtn')" @click="save">
<input type="button" class="cancelBtn" :value="$t('pub.cancelBtn')" @click="changeShow(0)">
</div>
</div>
</div>
......@@ -555,10 +555,10 @@ export default {
}
};
let opera = {
title: "操作",
title: this.$t('system.table_operation'),
titleAlign: "left",
columnAlign: "left",
width: 80,
width: 150,
isResize: false,
componentName: "table-operation"
};
......
src/components/SalesModule/enrollTotalTwo.vue
View file @ d159e8c8
......@@ -68,7 +68,7 @@
</span>
</li>
<li>
<input type="button" class="hollowFixedBtn" value="查询" @click="getList();resetPageIndex()" />
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList();resetPageIndex()" />
</li>
</ul>
</div>
......@@ -205,10 +205,10 @@
<tr>
<th width="120">单号&团号</th>
<th width="90">客户信息</th>
<th width="70">类型</th>
<th width="70">{{$t('admin.admin_type')}}</th>
<th width="180">系列&线路</th>
<!-- <th width="190" style="display:none;">日期</th> -->
<th width="50">人数</th>
<th width="70">{{$t('admin.admin_personNumber')}}</th>
<th width="80">单价</th>
<th width="80">成交单价</th>
<th width="80">应收总额</th>
......@@ -219,10 +219,10 @@
<th width="80">平台税金</th>
<th width="80">在途</th>
<th width="80">未收</th>
<th width="60">状态</th>
<th width="60">{{$t('admin.admin_status')}}</th>
</tr>
<tr>
<td v-show="list.length==0" colspan="15" align="center">暂无数据</td>
<td v-show="list.length==0" colspan="15" align="center">{{$t('system.content_noData')}}</td>
</tr>
<tbody v-for="(item,index) in list" :key="index">
<tr>
......@@ -290,7 +290,7 @@
<td>{{item2.acessDate}}</td>
</tr>
<tr v-if='item.couponAllotList.length==0'>
<td colspan="6" align="center">暂无数据</td>
<td colspan="6" align="center">{{$t('system.content_noData')}}</td>
</tr>
</table>
</div>
......@@ -321,7 +321,7 @@
<span>{{item2.remarks}}</span>
<span>{{item2.createByName}} <span style="color: #666666;">{{item2.createDate}}</span></span>
</p>
<span v-if="item.remarksList.length === 0">暂无数据</span>
<span v-if="item.remarksList.length === 0">{{$t('system.content_noData')}}</span>
</div>
<el-button slot="reference" icon="iconfont icon-gengduo" style="padding:0px;border:none;background-color:transparent;"
class="groupTourOrder_remarks_btn"></el-button>
......@@ -339,7 +339,7 @@
<span v-else-if="item2.colorState===3" class="groupTourOrder_tickets_red" @click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')">{{item2.frID}}</span>
<span v-else-if="item2.colorState===4" class="groupTourOrder_tickets_black" @click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')">{{item2.frID}}</span>
</span>
<span v-if="item.financeList.length===0" style="cursor: default;">暂无数据</span>
<span v-if="item.financeList.length===0" style="cursor: default;">{{$t('system.content_noData')}}</span>
</div>
</div>
<div>
......@@ -351,7 +351,7 @@
<span v-else-if="item2.colorState===3" class="groupTourOrder_tickets_red" @click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')">{{item2.frID}}</span>
<span v-else-if="item2.colorState===4" class="groupTourOrder_tickets_black" @click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')">{{item2.frID}}</span>
</span>
<span v-if="item.financeList.length===0" style="cursor: default;">暂无数据</span>
<span v-if="item.financeList.length===0" style="cursor: default;">{{$t('system.content_noData')}}</span>
</div>
</div>
</td>
......
src/components/busManagement/BusInfo.vue
View file @ d159e8c8
......@@ -75,14 +75,10 @@
background-color: #e4e7ed;
color: #c0c4cc;
}
.busInfoDetailsDiv span{
.busInfoP{
display:inline-block;
margin-right: 20px;
}
.busInfoDetailsDiv p{
display:inline-block;
}
.busInfoDetailsDiv p:hover {
.busInfoP :hover {
text-decoration: underline;
cursor: pointer;
}
......@@ -91,12 +87,27 @@
<template>
<div class="flexOne busInfo">
<div class="bus_Notice">注：此处不和任何团队行程做绑定，如需下载车配表，请在车辆绑定团队以后再行下载</div>
<div style="margin-bottom:20px;">{{title}}</div>
<div class="busInfoDetailsDiv">
<span>进出点：{{InOut}}</span><span>订单人数：{{RealityNum}}</span>
<span>机位总数：{{totalFlySeat}}</span><span>领队：{{LeaderName}}</span><span>导游：{{GuideName}}</span>
<span>团号：<p @click="goUrlT('TravelControlList',TCNUMS,'团控列表')">{{TCNUMS}}</p></span>
</div>
<table class="singeRowTable">
<tr>
<td colspan="6">{{title}}</td>
</tr>
<tr>
<th>进出点</th>
<th>订单人数</th>
<th>机位总数</th>
<th>领队</th>
<th>导游</th>
<th>团号</th>
</tr>
<tr>
<td>{{InOut}}</td>
<td>{{RealityNum}}</td>
<td>{{totalFlySeat}}</td>
<td>{{LeaderName}}</td>
<td>{{GuideName}}</td>
<td><p class="busInfoP" @click="goUrlT('TravelControlList',TCNUMS,'团控列表')">{{TCNUMS}}</p></td>
</tr>
</table>
<div style="width: 100%; overflow-x: auto;margin-top:20px;" class="ownScrollbarStyle">
<el-form :model="PostData" :rules="rules" ref="PostData">
<table class="bo_bus" cellspacing="1">
......
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