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
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 @@ ...@@ -51,8 +51,8 @@
<div class="query-box"> <div class="query-box">
<ul> <ul>
<li> <li>
<input type="button" class="normalBtn" value="新增" @click="goURL('addCapitalAllocation')"/> <input type="button" class="normalBtn" :value="$t('pub.addBtn')" @click="goURL('addCapitalAllocation')"/>
<input type="button" class="hollowFixedBtn" value="查询" @click="getList()"/> <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/>
</li> </li>
</ul> </ul>
</div> </div>
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
<el-col :span="4"> <el-col :span="4">
<el-form-item label="公司"> <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-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' <el-option v-for='item in CompanyList'
:label='item.BName' :label='item.BName'
:value='item.Id' :value='item.Id'
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
<el-col :span="4"> <el-col :span="4">
<el-form-item label="部门"> <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-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' <el-option v-for='item in DepartmentList'
:label='item.DepartmentName' :label='item.DepartmentName'
:value='item.DepartmentID' :value='item.DepartmentID'
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
<el-col :span="4"> <el-col :span="4">
<el-form-item label="制单人"> <el-form-item label="制单人">
<el-select filterable v-model='msg.UpdateBy'> <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' <el-option v-for='item in EmployeeList'
:label='item.EmName' :label='item.EmName'
:value='item.EmployeeId' :value='item.EmployeeId'
...@@ -113,9 +113,9 @@ ...@@ -113,9 +113,9 @@
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="4"> <el-col :span="4">
<el-form-item label="状态"> <el-form-item :label="$t('admin.admin_status')">
<el-select v-model="msg.Status" filterable> <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' <el-option v-for='item in StatusList'
:label='item.Name' :label='item.Name'
:value='item.ID' :value='item.ID'
...@@ -148,8 +148,8 @@ ...@@ -148,8 +148,8 @@
<th>创建时间</th> <th>创建时间</th>
<th>创建人</th> <th>创建人</th>
<!-- <th>备注</th> --> <!-- <th>备注</th> -->
<th>状态</th> <th>{{$t('admin.admin_status')}}</th>
<th>操作</th> <th>{{$t('system.table_operation')}}</th>
</tr> </tr>
<tr v-for="(item, index) in dataList"> <tr v-for="(item, index) in dataList">
<td>{{item.FrID}}</td> <td>{{item.FrID}}</td>
......
src/components/FinancialModule/CashierWork.vue
View file @ d159e8c8
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<div class="query-box"> <div class="query-box">
<ul> <ul>
<li> <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"> <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="transitionShow" class="iconfont icon-biaoge" @click="switchMethod(1)"></i>
<i v-if="transitionShow2" class="iconfont icon-icon-ssan" @click="switchMethod(2)"></i> <i v-if="transitionShow2" class="iconfont icon-icon-ssan" @click="switchMethod(2)"></i>
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<th>授权账户</th> <th>授权账户</th>
<th>已处理单据</th> <th>已处理单据</th>
<th>待处理单据</th> <th>待处理单据</th>
<th>操作</th> <th>{{$t('system.table_operation')}}</th>
</tr> </tr>
<tr v-for="(item,index) in dataList" :key="index"> <tr v-for="(item,index) in dataList" :key="index">
<td>{{item.Name}}</td> <td>{{item.Name}}</td>
......
src/components/FinancialModule/FinancialDocuments.vue
View file @ d159e8c8
...@@ -530,17 +530,17 @@ ...@@ -530,17 +530,17 @@
<table border="0" cellspacing="0" cellpadding="0" class="singeRowTable"> <table border="0" cellspacing="0" cellpadding="0" class="singeRowTable">
<tr class="_t_head"> <tr class="_t_head">
<th v-if="checkboxShow"><input type="checkbox" v-model="isCkedAll" @click='checkedAll()'></th> <th v-if="checkboxShow"><input type="checkbox" v-model="isCkedAll" @click='checkedAll()'></th>
<th>所属公司</th> <th width="90">所属公司</th>
<th>单号</th> <th>单号</th>
<th>单据类型</th> <th width="90">单据类型</th>
<th>关联信息</th> <th>关联信息</th>
<th>费用类型</th> <th>费用类型</th>
<th>交易方式</th> <th>交易方式</th>
<th>金额</th> <th>金额</th>
<th>{{msg.Type==1?'收款':'付款'}}对象</th> <th>{{msg.Type==1?'收款':'付款'}}对象</th>
<th>制单人员</th> <th width="90">制单人员</th>
<th>当前状态</th> <th>当前状态</th>
<th>操作</th> <th>{{$t('system.table_operation')}}</th>
</tr> </tr>
<tr class="_item_list" v-for="(item,index) in DataList"> <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> <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 @@ ...@@ -2,70 +2,15 @@
<template> <template>
<div class="flexOne page_PlatformAccount"> <div class="flexOne page_PlatformAccount">
<div class="query-box"> <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> <ul>
<li> <li>
<!-- <input
type="button"
class="hollowFixedBtn"
value="查询"
@click="resetPageIndex(),getList()"
>-->
<input <input
type="button" type="button"
class="normalBtn" class="normalBtn"
value="新增" value="新增"
@click="addShow=true,text='新增',ed=false" @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> </li>
</ul> </ul>
</div> </div>
...@@ -752,7 +697,7 @@ export default { ...@@ -752,7 +697,7 @@ export default {
let allName = { let allName = {
field: "allName", field: "allName",
title: "所属公司", title: "所属公司",
width: 40, width: 80,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "left",
isResize: true, isResize: true,
...@@ -889,10 +834,10 @@ export default { ...@@ -889,10 +834,10 @@ export default {
}, },
}; };
let opera = { let opera = {
title: "操作", title: this.$t('system.table_operation'),
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "left",
width: 80, width: 120,
isResize: false, isResize: false,
componentName:'table-operation' componentName:'table-operation'
}; };
......
src/components/FinancialModule/ReceivingOfficer.vue
View file @ d159e8c8
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<div class="query-box"> <div class="query-box">
<ul> <ul>
<li> <li>
<button class="normalBtn" @click="addShow=true,text='新增'">新增</button> <button class="normalBtn" @click="addShow=true,text='新增'">{{$t('pub.addBtn')}}</button>
</li> </li>
</ul> </ul>
</div> </div>
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<th>所属公司</th> <th>所属公司</th>
<th>业务人员</th> <th>业务人员</th>
<th>负责方向</th> <th>负责方向</th>
<th>操作</th> <th>{{$t('system.table_operation')}}</th>
</tr> </tr>
<tr v-for="(item,index) in dataList" :key="index"> <tr v-for="(item,index) in dataList" :key="index">
<td>{{item.Name}}</td> <td>{{item.Name}}</td>
...@@ -75,12 +75,12 @@ ...@@ -75,12 +75,12 @@
<el-form class=" clearfix" :model="addMsg" ref="addMsg" :rules="rules" label-width="100px"> <el-form class=" clearfix" :model="addMsg" ref="addMsg" :rules="rules" label-width="100px">
<el-row> <el-row>
<el-col :span="4"> <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-input v-model="addMsg.Name"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="所属公司"> <el-form-item :label="$t('system.query_company')">
<el-select filterable v-model='addMsg.BranchId' > <el-select filterable v-model='addMsg.BranchId' >
<el-option v-for='item in CompanyList' <el-option v-for='item in CompanyList'
:label='item.BName' :label='item.BName'
...@@ -91,14 +91,14 @@ ...@@ -91,14 +91,14 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="业务人员：" prop="listArr"> <el-form-item label="业务人员" prop="listArr">
<el-select <el-select
v-model="addMsg.listArr" v-model="addMsg.listArr"
filterable filterable
remote remote
multiple multiple
reserve-keyword reserve-keyword
placeholder="请输入" :placeholder="$t('pub.pleaseImport')"
:remote-method="remoteMethod" :remote-method="remoteMethod"
@change="$forceUpdate()" @change="$forceUpdate()"
@remove-tag="removeTag" @remove-tag="removeTag"
......
src/components/FinancialModule/accDetail/CashAccDetail.vue
View file @ d159e8c8
...@@ -104,8 +104,8 @@ ...@@ -104,8 +104,8 @@
<ul> <ul>
<li> <li>
<input type="button" class="hollowFixedBtn" value="合并单据" @click="addChuNaFun"/> <input type="button" class="hollowFixedBtn" value="合并单据" @click="addChuNaFun"/>
<input type="button" class="hollowFixedBtn" value="查询" @click="getList()"/> <input type="button" class="hollowFixedBtn" :value="$t('pub.saveBtn')" @click="getList()"/>
<input type="button" class="normalBtn" value="导出" @click=""/> <input type="button" class="normalBtn" :value="$t('visa.v_daochu')" />
</li> </li>
</ul> </ul>
</div> </div>
......
src/components/FinancialModule/accDetail/CompanyAccDetail.vue
View file @ d159e8c8
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
<el-col :span="4" :gutter="35"> <el-col :span="4" :gutter="35">
<el-form-item label="单据状态"> <el-form-item label="单据状态">
<el-select filterable v-model='msg.Status' > <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='1'></el-option>
<el-option label='通过' :value='2'></el-option> <el-option label='通过' :value='2'></el-option>
<el-option label='驳回' :value='3'></el-option> <el-option label='驳回' :value='3'></el-option>
...@@ -98,15 +98,15 @@ ...@@ -98,15 +98,15 @@
<ul> <ul>
<li> <li>
<input type="button" class="hollowFixedBtn" value="合并单据" @click="addChuNaFun"/> <input type="button" class="hollowFixedBtn" value="合并单据" @click="addChuNaFun"/>
<input type="button" class="hollowFixedBtn" value="查询" @click="getList()"/> <input type="button" class="hollowFixedBtn" :value="$t('pub.saveBtn')" @click="getList()"/>
<input type="button" class="normalBtn" value="导出" @click=""/></li> <input type="button" class="normalBtn" :value="$t('visa.v_daochu')" @click=""/></li>
</ul> </ul>
</div> </div>
<div class="cm_content"> <div class="cm_content">
<table class="po_content singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0" v-loading="loading"> <table class="po_content singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0" v-loading="loading">
<tr> <tr>
<th></th> <th></th>
<th>所属公司</th> <th>{{$t('system.query_company')}}</th>
<th>单号</th> <th>单号</th>
<th>摘要</th> <th>摘要</th>
<th>汇款人/付款对象</th> <th>汇款人/付款对象</th>
......
src/components/FinancialModule/accountingWork.vue
View file @ d159e8c8
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<div class="query-box"> <div class="query-box">
<ul> <ul>
<li> <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"> <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="transitionShow" class="iconfont icon-biaoge" @click="switchMethod(1)"></i>
<i v-if="transitionShow2" class="iconfont icon-icon-ssan" @click="switchMethod(2)"></i> <i v-if="transitionShow2" class="iconfont icon-icon-ssan" @click="switchMethod(2)"></i>
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<th>所属公司</th> <th>所属公司</th>
<th>业务人员</th> <th>业务人员</th>
<th>负责方向</th> <th>负责方向</th>
<th>操作</th> <th>{{$t('system.table_operation')}}</th>
</tr> </tr>
<tr v-for="(item,index) in dataList" :key="index"> <tr v-for="(item,index) in dataList" :key="index">
<td>{{item.Name}}</td> <td>{{item.Name}}</td>
......
src/components/FinancialModule/sellCommissionRules.vue
View file @ d159e8c8
...@@ -173,7 +173,7 @@ ...@@ -173,7 +173,7 @@
<th>终止人数</th> <th>终止人数</th>
<th>基础比列</th> <th>基础比列</th>
<th>额外奖励</th> <th>额外奖励</th>
<th>操作</th> <th>{{$t('system.table_operation')}}</th>
</thead> </thead>
<tbody> <tbody>
<tr v-for="(item, index) in addMsg.RuleClassList" :key="index"> <tr v-for="(item, index) in addMsg.RuleClassList" :key="index">
...@@ -247,8 +247,8 @@ ...@@ -247,8 +247,8 @@
</el-form> </el-form>
</div> </div>
<div class="btm-opera-btn"> <div class="btm-opera-btn">
<input type="button" class="normalBtn" value="保存" @click="save"> <input type="button" class="normalBtn" :value="$t('pub.saveBtn')" @click="save">
<input type="button" class="cancelBtn" value="取消" @click="changeShow(0)"> <input type="button" class="cancelBtn" :value="$t('pub.cancelBtn')" @click="changeShow(0)">
</div> </div>
</div> </div>
</div> </div>
...@@ -555,10 +555,10 @@ export default { ...@@ -555,10 +555,10 @@ export default {
} }
}; };
let opera = { let opera = {
title: "操作", title: this.$t('system.table_operation'),
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "left",
width: 80, width: 150,
isResize: false, isResize: false,
componentName: "table-operation" componentName: "table-operation"
}; };
......
src/components/SalesModule/enrollTotalTwo.vue
View file @ d159e8c8
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
</span> </span>
</li> </li>
<li> <li>
<input type="button" class="hollowFixedBtn" value="查询" @click="getList();resetPageIndex()" /> <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList();resetPageIndex()" />
</li> </li>
</ul> </ul>
</div> </div>
...@@ -205,10 +205,10 @@ ...@@ -205,10 +205,10 @@
<tr> <tr>
<th width="120">单号&团号</th> <th width="120">单号&团号</th>
<th width="90">客户信息</th> <th width="90">客户信息</th>
<th width="70">类型</th> <th width="70">{{$t('admin.admin_type')}}</th>
<th width="180">系列&线路</th> <th width="180">系列&线路</th>
<!-- <th width="190" style="display:none;">日期</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> <th width="80">成交单价</th>
<th width="80">应收总额</th> <th width="80">应收总额</th>
...@@ -219,10 +219,10 @@ ...@@ -219,10 +219,10 @@
<th width="80">平台税金</th> <th width="80">平台税金</th>
<th width="80">在途</th> <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>
<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> </tr>
<tbody v-for="(item,index) in list" :key="index"> <tbody v-for="(item,index) in list" :key="index">
<tr> <tr>
...@@ -290,7 +290,7 @@ ...@@ -290,7 +290,7 @@
<td>{{item2.acessDate}}</td> <td>{{item2.acessDate}}</td>
</tr> </tr>
<tr v-if='item.couponAllotList.length==0'> <tr v-if='item.couponAllotList.length==0'>
<td colspan="6" align="center">暂无数据</td> <td colspan="6" align="center">{{$t('system.content_noData')}}</td>
</tr> </tr>
</table> </table>
</div> </div>
...@@ -321,7 +321,7 @@ ...@@ -321,7 +321,7 @@
<span>{{item2.remarks}}</span> <span>{{item2.remarks}}</span>
<span>{{item2.createByName}} <span style="color: #666666;">{{item2.createDate}}</span></span> <span>{{item2.createByName}} <span style="color: #666666;">{{item2.createDate}}</span></span>
</p> </p>
<span v-if="item.remarksList.length === 0">暂无数据</span> <span v-if="item.remarksList.length === 0">{{$t('system.content_noData')}}</span>
</div> </div>
<el-button slot="reference" icon="iconfont icon-gengduo" style="padding:0px;border:none;background-color:transparent;" <el-button slot="reference" icon="iconfont icon-gengduo" style="padding:0px;border:none;background-color:transparent;"
class="groupTourOrder_remarks_btn"></el-button> class="groupTourOrder_remarks_btn"></el-button>
...@@ -339,7 +339,7 @@ ...@@ -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===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 v-else-if="item2.colorState===4" class="groupTourOrder_tickets_black" @click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')">{{item2.frID}}</span>
</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> </div>
<div> <div>
...@@ -351,7 +351,7 @@ ...@@ -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===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 v-else-if="item2.colorState===4" class="groupTourOrder_tickets_black" @click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')">{{item2.frID}}</span>
</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> </div>
</td> </td>
......
src/components/busManagement/BusInfo.vue
View file @ d159e8c8
...@@ -75,14 +75,10 @@ ...@@ -75,14 +75,10 @@
background-color: #e4e7ed; background-color: #e4e7ed;
color: #c0c4cc; color: #c0c4cc;
} }
.busInfoDetailsDiv span{ .busInfoP{
display:inline-block; display:inline-block;
margin-right: 20px;
} }
.busInfoDetailsDiv p{ .busInfoP :hover {
display:inline-block;
}
.busInfoDetailsDiv p:hover {
text-decoration: underline; text-decoration: underline;
cursor: pointer; cursor: pointer;
} }
...@@ -91,12 +87,27 @@ ...@@ -91,12 +87,27 @@
<template> <template>
<div class="flexOne busInfo"> <div class="flexOne busInfo">
<div class="bus_Notice">注：此处不和任何团队行程做绑定，如需下载车配表，请在车辆绑定团队以后再行下载</div> <div class="bus_Notice">注：此处不和任何团队行程做绑定，如需下载车配表，请在车辆绑定团队以后再行下载</div>
<div style="margin-bottom:20px;">{{title}}</div> <table class="singeRowTable">
<div class="busInfoDetailsDiv"> <tr>
<span>进出点：{{InOut}}</span><span>订单人数：{{RealityNum}}</span> <td colspan="6">{{title}}</td>
<span>机位总数：{{totalFlySeat}}</span><span>领队：{{LeaderName}}</span><span>导游：{{GuideName}}</span> </tr>
<span>团号：<p @click="goUrlT('TravelControlList',TCNUMS,'团控列表')">{{TCNUMS}}</p></span> <tr>
</div> <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"> <div style="width: 100%; overflow-x: auto;margin-top:20px;" class="ownScrollbarStyle">
<el-form :model="PostData" :rules="rules" ref="PostData"> <el-form :model="PostData" :rules="rules" ref="PostData">
<table class="bo_bus" cellspacing="1"> <table class="bo_bus" cellspacing="1">
......
src/components/scenicSpot/admissionStatisticsDetails.vue
View file @ d159e8c8
<template> <template>
<div> <div>
<div class="query-box" style="border-bottom: none;"> <div class="query-box" style="border-bottom: none;">
<ul> <ul>
<li> <li>
<input type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)"/> <input type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
<input type="button" class="fr normalBtn mb30" value="保存草稿" @click="saveList(0)"/> <input type="button" class="fr normalBtn mb30" value="保存草稿" @click="saveList(0)" />
</li> </li>
</ul> </ul>
</div> </div>
<div style="width: 100%; overflow-y: auto;padding-bottom: 10px; height: 100%; " class="ownScrollbarStyle"> <div style="width: 100%; overflow-y: auto;padding-bottom: 10px; height: 100%; " class="ownScrollbarStyle">
<table border="0" cellspacing="1" cellpadding="0" class="admissionStatisticsDetailsTalbe"> <table border="0" cellspacing="1" cellpadding="0" class="admissionStatisticsDetailsTalbe">
<tr> <tr>
<th width="120">公司团号</th> <th width="120">公司团号</th>
<th width="120">定团号</th> <th width="120">定团号</th>
<th width="120">游览时间</th> <th width="120">游览时间</th>
<th width="200">景点名称</th> <th width="200">景点名称</th>
<th width="100">总人数</th> <th width="100">总人数</th>
<th width="100">游客类型</th> <th width="100">游客类型</th>
<th width="80">游客人数</th> <th width="80">游客人数</th>
<th width="80">使用人数</th> <th width="80">使用人数</th>
<th width="80">免人数</th> <th width="80">免人数</th>
<th width="100">单价</th> <th width="100">单价</th>
<th width="80">金额小计</th> <th width="80">金额小计</th>
<th width="80">返佣</th> <th width="80">返佣</th>
<th width="80">总金额</th> <th width="80">总金额</th>
<th width="80">付款方式</th> <th width="80">付款方式</th>
<th width="150">联络电话</th> <th width="150">订团号</th>
<th width="300">地址</th> <th width="150">联络电话</th>
<th width="200">备注</th> <th width="300">地址</th>
</tr> <th width="200">备注</th>
<tr v-for="(item,index) in list"> </tr>
<td :rowspan="list.length" v-if="index==0"><div class="w120">{{TCNUM}}</div></td> <tr v-for="(item,index) in list">
<td :rowspan="list.length" v-if="index==0"><div class="w120">{{NewCombinationNum}}</div></td> <td :rowspan="list.length" v-if="index==0">
<td> <div class="w120">{{TCNUM}}</div>
<div class="w120"> </td>
{{item.UseTimeStr}} <td :rowspan="list.length" v-if="index==0">
</div> <div class="w120">{{NewCombinationNum}}</div>
</td> </td>
<td> <td>
<div class="w200 ScenicComDivflex" v-for="subItem in item.ScenicStatisticsList"> <div class="w120">
{{subItem.ScenicName}} {{item.UseTimeStr}}
</div> </div>
</td> </td>
<td> <td>
<div class="w100 ScenicComDiv" v-for="subItem in item.ScenicStatisticsList"> <div class="w200 ScenicComDivflex" v-for="subItem in item.ScenicStatisticsList">
{{subItem.UseAccount}} {{subItem.ScenicName}}
</div> </div>
</td> </td>
<td> <td>
<div class="w100 ScenicComDiv" v-for="subItem in item.ScenicStatisticsList"> <div class="w100 ScenicComDiv" v-for="subItem in item.ScenicStatisticsList">
<p v-for="o in subItem.TicketPriceList"> {{subItem.UseAccount}}
{{personStrToWord(o.PeopleType)}} </div>
</p> </td>
</div> <td>
</td> <div class="w100 ScenicComDiv" v-for="subItem in item.ScenicStatisticsList">
<td> <p v-for="o in subItem.TicketPriceList">
<div class="w80 ScenicComDiv" v-for="subItem in item.ScenicStatisticsList"> {{personStrToWord(o.PeopleType)}}
<p v-for="o in subItem.TicketPriceList"> </p>
{{o.PeopleNum}} </div>
</p> </td>
</div> <td>
</td> <div class="w80 ScenicComDiv" v-for="subItem in item.ScenicStatisticsList">
<td> <p v-for="o in subItem.TicketPriceList">
<div class="w80 ScenicComDiv" v-for="subItem in item.ScenicStatisticsList"> {{o.PeopleNum}}
<p v-for="o in subItem.TicketPriceList"> </p>
<el-input class='w50 tcenter' v-model='o.UsePeopleNum' type="number" @input='calculationPrice(subItem)' @keyup.native="checkInteger(o,'UsePeopleNum')"></el-input> </div>
</p> </td>
</div> <td>
</td> <div class="w80 ScenicComDiv" v-for="subItem in item.ScenicStatisticsList">
<td> <p v-for="o in subItem.TicketPriceList">
<div class="w80 ScenicComDiv" v-for="subItem in item.ScenicStatisticsList"> <el-input class='w50 tcenter' v-model='o.UsePeopleNum' type="number" @input='calculationPrice(subItem)'
<p v-for="o in subItem.TicketPriceList"> @keyup.native="checkInteger(o,'UsePeopleNum')"></el-input>
<el-input class='w50 tcenter' maxlength='2' v-model='o.Discount' type="number" @input='calculationPrice(subItem)' @keyup.native="checkInteger(o,'Discount')"></el-input> </p>
</p> </div>
</div> </td>
</td> <td>
<td> <div class="w80 ScenicComDiv" v-for="subItem in item.ScenicStatisticsList">
<div class="w100 ScenicComDiv" v-for="subItem in item.ScenicStatisticsList"> <p v-for="o in subItem.TicketPriceList">
<p v-for="o in subItem.TicketPriceList"> <el-input class='w50 tcenter' maxlength='2' v-model='o.Discount' type="number"
<span class="spanlink" v-if='o.PeoplePrice==0' @click="goUrl('ticketManagement',subItem,'门票管理')">设置</span> @input='calculationPrice(subItem)' @keyup.native="checkInteger(o,'Discount')"></el-input>
<span v-if='o.PeoplePrice!=0'>{{o.PeoplePrice}}</span> </p>
</div>
<!--<el-input class='w80 tcenter' v-model='o.PeoplePrice' @input='calculationPrice(subItem)' @keyup.native="checkInteger(o,'PeoplePrice')"></el-input>--> </td>
</p> <td>
</div> <div class="w100 ScenicComDiv" v-for="subItem in item.ScenicStatisticsList">
</td> <p v-for="o in subItem.TicketPriceList">
<td> <span class="spanlink" v-if='o.PeoplePrice==0'
<div class="w80 ScenicComDiv" v-for="subItem in item.ScenicStatisticsList"> @click="goUrl('ticketManagement',subItem,'门票管理')">设置</span>
<p v-for="o in subItem.TicketPriceList"> <span v-if='o.PeoplePrice!=0'>{{o.PeoplePrice}}</span>
{{(o.UsePeopleNum-o.Discount)*o.PeoplePrice}} </p>
</p> </div>
</div> </td>
</td> <td>
<td> <div class="w80 ScenicComDiv" v-for="subItem in item.ScenicStatisticsList">
<div class="w80 ScenicComDiv" v-for="subItem in item.ScenicStatisticsList"> <p v-for="o in subItem.TicketPriceList">
<p v-for="o in subItem.TicketPriceList"> {{(o.UsePeopleNum-o.Discount)*o.PeoplePrice}}
<span class="spanlink" v-if='o.DiscountPrice==0' @click="goUrl('scenicSpotInfoManage',subItem,'景区列表')">设置</span> </p>
<span v-if='o.DiscountPrice!=0'>{{o.DiscountPrice}}%</span> </div>
<!--<el-input class='w50 tcenter' v-model='o.DiscountPrice' @input='calculationPrice(subItem)' @keyup.native="checkInteger(o,'DiscountPrice')"></el-input>--> </td>
</p> <td>
</div> <div class="w80 ScenicComDiv" v-for="subItem in item.ScenicStatisticsList">
</td> <p v-for="o in subItem.TicketPriceList">
<td> <span class="spanlink" v-if='o.DiscountPrice==0'
<div class="w80 ScenicComDiv" v-for="subItem in item.ScenicStatisticsList"> @click="goUrl('scenicSpotInfoManage',subItem,'景区列表')">设置</span>
<!-- {{(subItem.UsePeopleNum-subItem.Discount)*subItem.PeoplePrice}} --> <span v-if='o.DiscountPrice!=0'>{{o.DiscountPrice}}%</span>
{{subItem.TotalPrice}} </p>
</div> </div>
</td> </td>
<td> <td>
<div class="w160 ScenicComDiv" v-for="subItem in item.ScenicStatisticsList"> <div class="w80 ScenicComDiv" v-for="subItem in item.ScenicStatisticsList">
<el-select class='w100 sel' v-model='subItem.PayStyle' :placeholder="$t('pub.pleaseSel')"> {{subItem.TotalPrice}}
<el-option label='请选择' value='0' ></el-option> </div>
<el-option label='现付' value='1' ></el-option> </td>
<el-option label='签单' value='2' ></el-option> <td>
<el-option label='实物抵扣' value='5' ></el-option> <div class="w160 ScenicComDiv" v-for="subItem in item.ScenicStatisticsList">
<el-option label='预付' value='4' ></el-option> <el-select class='w100 sel' v-model='subItem.PayStyle' :placeholder="$t('pub.pleaseSel')">
</el-select> <el-option label='请选择' value='0'></el-option>
</div> <el-option label='现付' value='1'></el-option>
</td> <el-option label='签单' value='2'></el-option>
<td> <el-option label='实物抵扣' value='5'></el-option>
<div class="w150 ScenicComDiv" v-for="subItem in item.ScenicStatisticsList"> <el-option label='预付' value='4'></el-option>
{{subItem.Tel}} </el-select>
</div> </div>
</td> </td>
<td> <td>
<div class="w300 ScenicComDivflex" v-for="subItem in item.ScenicStatisticsList"> <div class="w160 ScenicComDiv" v-for="subItem in item.ScenicStatisticsList">
{{subItem.Address}} <el-input class='w120' v-model='subItem.CombinationNum' type="text"></el-input>
</div> </div>
</td> </td>
<td> <td>
<div class="w200 ScenicComDivflex" v-for="subItem in item.ScenicStatisticsList"> <div class="w150 ScenicComDiv" v-for="subItem in item.ScenicStatisticsList">
<el-input type='textarea' class='w170' v-model='subItem.Remarks'></el-input> {{subItem.Tel}}
</div> </div>
</td> </td>
</tr> <td>
</table> <div class="w300 ScenicComDivflex" v-for="subItem in item.ScenicStatisticsList">
</div> {{subItem.Address}}
</div> </div>
</td>
<td>
<div class="w200 ScenicComDivflex" v-for="subItem in item.ScenicStatisticsList">
<el-input type='textarea' class='w170' v-model='subItem.Remarks'></el-input>
</div>
</td>
</tr>
</table>
</div>
</div>
</template> </template>
<script> <script>
export default { export default {
data () { data() {
return { return {
defaultSelectValue:0, defaultSelectValue: 0,
list:[], list: [],
roomList:[], roomList: [],
TCNUM:'', TCNUM: '',
flightTotal:0, flightTotal: 0,
GuestNum:0, GuestNum: 0,
NewCombinationNum:'' NewCombinationNum: ''
} }
}, },
methods: { methods: {
personStrToWord(str){ personStrToWord(str) {
if(str==1) if (str == 1)
return '大' return '大'
if(str==2) if (str == 2)
return '中' return '中'
if(str==3) if (str == 3)
return '小' return '小'
}, },
goUrl(path, obj, name) { goUrl(path, obj, name) {
this.$router.push({ this.$router.push({
path: path, path: path,
query: { query: {
id: obj.ID, id: obj.ID,
blank: "y", blank: "y",
tab: name tab: name
} }
}); });
}, },
calculationPrice(obj){ calculationPrice(obj) {
let totalPrice=0 let totalPrice = 0;
console.log(obj.TicketPriceList) obj.TicketPriceList.forEach(item => {
obj.TicketPriceList.forEach(item=>{ totalPrice += item.PeoplePrice * (item.UsePeopleNum - item.Discount) * (1 - item.DiscountPrice / 100);
totalPrice+=item.PeoplePrice*(item.UsePeopleNum-item.Discount)*(1-item.DiscountPrice/100) })
}) obj.TotalPrice = totalPrice.toFixed(2);
console.log(totalPrice); },
obj.TotalPrice=totalPrice.toFixed(2) getList() {
}, this.apipost('dmcstatistics_get_GetScenicStaticsDetail', {
getList(){ TCIDs: this.$route.query.id
this.apipost('dmcstatistics_get_GetScenicStaticsDetail',{TCIDs:this.$route.query.id},res=>{ }, res => {
if(res.data.resultCode==1){ if (res.data.resultCode == 1) {
this.list=res.data.data this.list = res.data.data;
this.list.forEach(item=>{ this.list.forEach(item => {
item.ScenicStatisticsList.forEach(x=>{ item.ScenicStatisticsList.forEach(x => {
x.PayStyle=x.PayStyle.toString() x.PayStyle = x.PayStyle.toString();
this.calculationPrice(x) this.calculationPrice(x);
}) })
}) })
}else{ } else {
this.$message.error(res.data.message) this.$message.error(res.data.message);
} }
}, err => {})
},
// this.list.forEach(item=>{ saveList(type) {
// item.DiningSummaryList.forEach(x=>{ if (type == 0) {
// x.PayStyle=x.PayStyle.toString() this.list.forEach(item => {
// x.DiningReserveType=x.DiningReserveType.toString() item.ScenicStatisticsList.forEach(insideItem => {
// this.calculationPrice(x) insideItem.OrderState = 0;
// }) })
// }) })
},err=>{}) }
}, if (type == 1) {
saveList(type){ this.list.forEach(item => {
if(type==0){ item.ScenicStatisticsList.forEach(insideItem => {
this.list.forEach(item=>{ insideItem.OrderState = 1;
item.ScenicStatisticsList.forEach(insideItem=>{ })
insideItem.OrderState=0 })
}) }
}) this.apipost('dmcstatistics_get_SetTicketOrder', this.list, res => {
} if (res.data.resultCode == 1) {
if(type==1){ this.$message.success(res.data.message);
this.list.forEach(item=>{ } else {
item.ScenicStatisticsList.forEach(insideItem=>{ this.$message.error(res.data.message);
insideItem.OrderState=1 }
}) }, err => {})
}) },
}
this.apipost('dmcstatistics_get_SetTicketOrder',this.list,res=>{
if(res.data.resultCode==1){
this.$message.success(res.data.message)
}else{
this.$message.error(res.data.message)
}
},err=>{})
},
}, },
mounted() { mounted() {
this.TCNUM=this.$route.query.TCNUM this.TCNUM = this.$route.query.TCNUM;
this.flightTotal=this.$route.query.flightTotal this.flightTotal = this.$route.query.flightTotal;
this.GuestNum=this.$route.query.GuestNum this.GuestNum = this.$route.query.GuestNum;
this.NewCombinationNum = this.$route.query.NewCombinationNum this.NewCombinationNum = this.$route.query.NewCombinationNum;
this.getList() this.getList()
}, },
} }
</script> </script>
<style> <style>
.admissionStatisticsDetailsTalbe{ background: #ccc;} .admissionStatisticsDetailsTalbe {
.admissionStatisticsDetailsTalbe tr th{background: #E6E6E6;height:40px; font-size: 12px; color: #333;} background: #ccc;
.admissionStatisticsDetailsTalbe tr{background: #fff;text-align: center; height: 40px;} }
.admissionStatisticsDetailsTalbe tr td{font-size: 12px;}
.admissionStatisticsDetailsTalbe tr td .pHouseStyle{border-bottom: 1px solid #ccc; height: 20px; line-height: 20px;} .admissionStatisticsDetailsTalbe tr th {
.admissionStatisticsDetailsTalbe tr td .pHouseStyle:last-child{border-bottom: none;} background: #E6E6E6;
.admissionStatisticsDetailsTalbe tr td .ScenicComDivflex{width:100%; height: 84px; display: flex; align-items: center; padding-left: 15px; border-bottom:1px solid #ccc;} height: 40px;
.admissionStatisticsDetailsTalbe tr td .ScenicComDivflex:last-child{border-bottom: none;} font-size: 12px;
.admissionStatisticsDetailsTalbe tr td .ScenicComDiv{width:100%; height: 84px; line-height: 84px; border-bottom:1px solid #ccc;} color: #333;
.admissionStatisticsDetailsTalbe tr td .ScenicComDiv:last-child{border-bottom: none;} }
.admissionStatisticsDetailsTalbe tr td .ScenicComDiv>p{border-bottom: 1px solid #ccc; height: 28px; line-height: 28px;}
.admissionStatisticsDetailsTalbe tr td .ScenicComDiv>p:last-child{border-bottom: none;} .admissionStatisticsDetailsTalbe tr {
.admissionStatisticsDetailsTalbe tr td input{height:20px!important; padding: 0!important; text-align: center;} background: #fff;
.admissionStatisticsDetailsTalbe tr td .sel input{ text-align: center;
height:34px!important; height: 40px;
} }
.admissionStatisticsDetailsTalbe tr td .spanlink:hover{text-decoration: underline; cursor: pointer;}
.admissionStatisticsDetailsTalbe tr td {
font-size: 12px;
}
.admissionStatisticsDetailsTalbe tr td .pHouseStyle {
border-bottom: 1px solid #ccc;
height: 20px;
line-height: 20px;
}
.admissionStatisticsDetailsTalbe tr td .pHouseStyle:last-child {
border-bottom: none;
}
.admissionStatisticsDetailsTalbe tr td .ScenicComDivflex {
width: 100%;
height: 84px;
display: flex;
align-items: center;
padding-left: 15px;
border-bottom: 1px solid #ccc;
}
.admissionStatisticsDetailsTalbe tr td .ScenicComDivflex:last-child {
border-bottom: none;
}
.admissionStatisticsDetailsTalbe tr td .ScenicComDiv {
width: 100%;
height: 84px;
line-height: 84px;
border-bottom: 1px solid #ccc;
}
.admissionStatisticsDetailsTalbe tr td .ScenicComDiv:last-child {
border-bottom: none;
}
.admissionStatisticsDetailsTalbe tr td .ScenicComDiv>p {
border-bottom: 1px solid #ccc;
height: 28px;
line-height: 28px;
}
.admissionStatisticsDetailsTalbe tr td .ScenicComDiv>p:last-child {
border-bottom: none;
}
.admissionStatisticsDetailsTalbe tr td input {
height: 20px !important;
padding: 0 !important;
text-align: center;
}
.admissionStatisticsDetailsTalbe tr td .sel input {
height: 34px !important;
}
.admissionStatisticsDetailsTalbe tr td .spanlink:hover {
text-decoration: underline;
cursor: pointer;
}
</style> </style>
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