Skip to content

C
confucius
Commit 2de57df0 authored by 黄奎's avatar 黄奎
Browse files
Options

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

parents 40839c21 e1912f25
Expand all Show whitespace changes
Inline Side-by-side
Showing with 13250 additions and 12 deletions
src/App.vue
View file @ 2de57df0
...@@ -12,7 +12,7 @@ export default { ...@@ -12,7 +12,7 @@ export default {
<style> <style>
@import url('~assets/css/font.css'); @import url('~assets/css/font.css');
@import url('//at.alicdn.com/t/font_2077629_xjjeh93ylwf.css'); @import url('//at.alicdn.com/t/font_2077629_vhc2pmigytp.css');
html, html,
body, body,
......
src/components/system/menu-form.vue
View file @ 2de57df0
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<div class="row wrap"> <div class="row wrap">
<q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.MenuName" ref="MenuName" <q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.MenuName" ref="MenuName"
class="col-6 q-pr-lg q-pb-lg" label="菜单名称" :rules="[val => !!val || '请填写菜单名称']" /> class="col-6 q-pr-lg q-pb-lg" label="菜单名称" :rules="[val => !!val || '请填写菜单名称']" />
<q-input filled stack-label maxlength="50" :dense="false" v-model="objOption.MenuUrl" ref="MenuUrl" <q-input filled stack-label maxlength="100" :dense="false" v-model="objOption.MenuUrl" ref="MenuUrl"
class="col-6 q-pr-lg q-pb-lg" label="菜单地址" /> class="col-6 q-pr-lg q-pb-lg" label="菜单地址" />
<q-select class="col-6 q-pb-lg" v-model="objOption.MenuType" :options="MenuTypeOpts" emit-value map-options <q-select class="col-6 q-pb-lg" v-model="objOption.MenuType" :options="MenuTypeOpts" emit-value map-options
label="菜单类型" @input="queryMenuList()" /> label="菜单类型" @input="queryMenuList()" />
......
src/pages/financial/accDetail/CashReport.vue
View file @ 2de57df0
...@@ -55,13 +55,13 @@ ...@@ -55,13 +55,13 @@
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<ul class="clearfix"> <ul class="clearfix" style="position: absolute;right: 20px;top: 20px;">
<li class="hight_query"> <div>
<span> <span>
</span> </span>
<button class="hollowFixedBtn" @click="getList()">{{$t('pub.searchBtn')}}</button> <button class="hollowFixedBtn" @click="getList()">{{$t('pub.searchBtn')}}</button>
<button class="normalBtn" @click="method5()">导出</button> <button class="normalBtn" @click="method5()">导出</button>
</li> </div>
</ul> </ul>
</div> </div>
<div class="_fnDm_content" v-loading='loading'> <div class="_fnDm_content" v-loading='loading'>
......
src/pages/financial/accDetail/TransferReport.vue
View file @ 2de57df0
...@@ -46,13 +46,13 @@ ...@@ -46,13 +46,13 @@
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<ul class="clearfix"> <ul class="clearfix" style="position: absolute;right: 20px;top: 20px;">
<li class="hight_query"> <div class="hight_query">
<span> <span>
</span> </span>
<button class="hollowFixedBtn" @click="getList()">{{$t('pub.searchBtn')}}</button> <button class="hollowFixedBtn" @click="getList()">{{$t('pub.searchBtn')}}</button>
<button class="normalBtn" @click="method5()">{{$t('visa.v_daochu')}}</button> <button class="normalBtn" @click="method5()">{{$t('visa.v_daochu')}}</button>
</li> </div>
</ul> </ul>
</div> </div>
<div class="_fnDm_content" v-loading='loading'> <div class="_fnDm_content" v-loading='loading'>
......
src/pages/financial/addFinancialProcess.vue
View file @ 2de57df0
...@@ -1182,6 +1182,7 @@ ...@@ -1182,6 +1182,7 @@
DepartmentName: data.PostName, DepartmentName: data.PostName,
Id: data.PostId Id: data.PostId
}) })
console.log(this.showRole,'showRolessssss');
} else { } else {
if (this.roleSetCheckedKeys.length == 1) { if (this.roleSetCheckedKeys.length == 1) {
this.roleSetCheckedKeys.push(data.PostId) this.roleSetCheckedKeys.push(data.PostId)
...@@ -1218,6 +1219,7 @@ ...@@ -1218,6 +1219,7 @@
AuditList.AuditWay = 1; AuditList.AuditWay = 1;
AuditList.AuditUserList = [{ AuditList.AuditUserList = [{
EmployeeId: '', EmployeeId: '',
EmployeeIdName:'',
Sort: '' Sort: ''
}]; }];
AuditList.Sort = this.myAuditList.length + 1; AuditList.Sort = this.myAuditList.length + 1;
......
src/pages/financial/components/BillModule.vue 0 → 100644
View file @ 2de57df0
This diff is collapsed.
src/pages/financial/components/FlowChartModule.vue
View file @ 2de57df0
<style scoped>
._bg_blue{background-color: #297BEF}
._bg_org{background-color: #F16C3C !important}
._bg_gre{background-color: #32B37C}
._bg_greS{background-color:#1C9A65}
._bg_gray{background-color: #666666}
._array{display: inline-block;background-color: #999999}
._array_h{width: 35px;height: 3px;}
._array_h_left{top: 14px;left: -40px;position: absolute;}
._array_h_right{top: 14px;right: -40px;position: absolute;}
._array_w{width: 3px;height: 35px;}
.tri_left{width: 0;height:0;border-top:6px solid transparent;border-bottom:6px solid transparent;border-left: 6px solid #999999;}
.tri_down{width: 0;height:0;border-left:6px solid transparent;border-right: 6px solid transparent;border-top: 6px solid #999999; }
.tri_right{width: 0;height:0;border-top:6px solid transparent;border-bottom: 6px solid transparent;border-right: 6px solid #999999;}
._tag{display: inline-block;border-radius: 4px;padding: 2px 4px;margin-bottom: 4px;font-size: 12px}
._inlineblock_cen{display: inline-block;text-align: center}
._text_right{text-align: right;padding-right: 50px}
._tp_b{padding: 0 20px}
.height40{height: 40px;}
._feiyong{padding: 10px;flex-wrap: wrap;/*justify-content: space-between;*/display: flex;}
._feiyong>span{display: inline-block;padding: 4px 20px;color: white;font-size: 14px;border-radius: 4px;margin:0 10px 10px 0;}
._log_t_s{font-size: 12px;color: #666666}
.el-popover{text-align: inherit}
._dtel{padding-top: 10px;}
._no_liucheng{padding: 20px;text-align: center}
._liu_block{display: inline-block;width:auto;margin-bottom: 20px;position: relative;}
.icon-xiaotuziCduan_,.icon-xiaotuziCduan_2{position: absolute;right: -10px;top: -10px;color: #999999;}
._array_h_left .icon-xiaotuziCduan_2{position: absolute;left: -10px;top: -10px;right: initial;}
.text_l{text-align: left;margin-right: 50px}
.text_r{text-align: right;margin-left: 50px}
._miaoshu{display: inline-block;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;padding:6px 15px;border-radius:4px;background-color: #297BEF;color:white;font-size: 14px;min-width: 120px; text-align: center;max-width: 130px;}
._last_ml0{margin-right: 0}
._last_mr0{margin-left: 0}
._array_h_dbox{position:absolute;top: 14px;right: -5px;}
._array_h_dbox_l{right: inherit;left: -40px}
._array_h_down{width: 35px;height: 3px;position: absolute;background-color: #999999}
._array_h_down_{width: 3px;height: 20px;position: absolute;background-color: #999999}
._array_h_down_l{left: 35px}
.icon-xiaotuziCduan_1{position: absolute;left: 29px;top: 10px;color: #999999;}
.xiaotuziCduan_1_l{left: inherit;right: -9px;}
</style>
<template>
<div class="clearfix" v-if="dataList">
<template v-for="(lc,li) in dataList.AuditList">
<div class="_liu_block clearfix" :class="[Math.floor((li+1)%3==0?li:(li+1)/3)%2==0?'fl text_l ':'fr text_r ']">
<span class="_array _array_h" :class="(li+1)%3!=0&&Math.floor((li+1)%3==0?li:(li+1)/3)%2!=0?'_array_h_left ':''" v-if="(li+1)%3!=0&&Math.floor((li+1)%3==0?li:(li+1)/3)%2!=0&&li!=dataList.AuditList.length-1"><span class="iconfont icon-xiaotuziCduan_2"></span></span>
<el-tooltip class="dataList" effect="dark" :content="lc.contentTips" placement="top">
<span :class="lc.AuditType==3?'_bg_org':'_bg_blue'" class="_miaoshu ">{{lc.AuditDescription}} <span v-if="lc.AuditWay!=1">({{lc.AuditWay=="2"?$t('fnc.huiqian'):$t('fnc.huoqian')}})</span></span>
</el-tooltip>
<span v-if="(li+1)%3!=0&&Math.floor((li+1)%3==0?li:(li+1)/3)%2==0&&li!=dataList.AuditList.length-1" :class="(li+1)%3!=0&&Math.floor((li+1)%3==0?li:(li+1)/3)%2==0?'_array_h_right ':''" class="_array _array_h"><span class="iconfont icon-xiaotuziCduan_"></span></span>
<div class="_array_h_dbox" v-if="li!=dataList.AuditList.length-1" :class="Math.floor((li+1)%3==0?li:(li+1)/3)%2==0?'':'_array_h_dbox_l'">
<span v-if="(li+1)%3==0" class="_array_h_down"></span>
<span v-if="(li+1)%3==0" class="_array_h_down_" :class="Math.floor((li+1)%3==0?li:(li+1)/3)%2==0?'_array_h_down_l':''"></span>
<span v-if="(li+1)%3==0" class="iconfont icon-xiaotuziCduan_1" :class="Math.floor((li+1)%3==0?li:(li+1)/3)%2==0?'':'xiaotuziCduan_1_l'"></span>
</div>
</div>
</template>
</div>
</template>
<script>
export default {
props:["data"],
data(){
return{
dataList:{},
}
},methods:{
},mounted(){
},watch: {
data: {
handler: function(val, oldVal) {
this.dataList = val
},
deep: true
}
},created(){
this.dataList = this.data;
}
}
</script>
src/pages/financial/components/GZBillModule.vue 0 → 100644
View file @ 2de57df0
This diff is collapsed.
src/pages/financial/components/MergeBillModule.vue 0 → 100644
View file @ 2de57df0
This diff is collapsed.
src/pages/financial/components/ReceivablesModule.vue 0 → 100644
View file @ 2de57df0
This diff is collapsed.
src/pages/financial/components/TicketingModule.vue 0 → 100644
View file @ 2de57df0
<style>
.m_TicketingModule{
border: 1px solid #DDDDDD;
border-bottom: none;
}
.m_TicketingModule ._tit{
padding-left: 10px;
font-size: 14px;
color: #000;
padding: 8px 15px;
background-color: white;
display: flex;
justify-content: space-between;
}
.m_TicketingModule ._text{
border-left: 3px solid #e95252;
padding-left: 10px;
}
.m_TicketingModule ._tit ._btn{
font-size: 12px;
color: #333333;
cursor: pointer;
}
.m_TicketingModule ._tit ._btn:hover{
color: #E95252;
}
.m_TicketingModule ._tit ._btn .iconfont{
font-size: 12px;
display: inline-block;
margin-left: 10px;
}
.m_TicketingModule ._rotate{
transform:rotate(180deg);
}
.m_TicketingModule .singeRowTable{
color:#333333
}
.m_TicketingModule ._padding_20_15{
padding: 20px 15px;
background-color: white;
}
</style>
<template>
<div class="m_TicketingModule">
<div class="_tit">
<span class="_text">国内票务订单信息</span>
<div>
<span class="_btn" v-if="tableShow" @click="tableShow=false">收起 <i class="iconfont icon-gengduo _rotate"></i> </span>
<span class="_btn" v-else @click="tableShow=true">展开 <i class="iconfont icon-gengduo"></i> </span>
</div>
</div>
<div v-show="tableShow" class="_padding_20_15">
<table class="singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0">
<tr>
<th width='200px'>期数/订单号</th>
<th>人数</th>
<th>总价</th>
<th>成本</th>
<th>利润</th>
<th>客户名称</th>
<th width='200px'>行程时间</th>
<!-- <th>航段</th> -->
</tr>
<tr v-for="(item,index) in dataList" :key="index">
<td>{{item.Term}}-{{item.OrderID}}</td>
<td>{{item.Number}}人</td>
<td>¥{{item.TotalPrice}}</td>
<td>¥{{item.TotalCost}}</td>
<td>￥{{item.Profit}}</td>
<td>{{item.ClientName}}</td>
<td>{{item.TravelTime}}</td>
<!-- <td>{{dataList.Leg}}</td> -->
</tr>
</table>
</div>
</div>
</template>
<script>
export default {
props:["FrID","id"],
data(){
return{
tableShow:false,
dataList:[],
}
},watch:{
},created(){
},mounted(){
// let FrID = this.$route.query.FrID;
this.getDate(this.FrID);
},methods:{
getDate(FrID){
let msg = {
FrID:FrID,
}
this.apipost('Domestic_Ticket_post_GetByBillAndIDList',msg,r=>{
if(r.data.resultCode==1){
let data = r.data.data;
this.dataList = data;
}
},null)
}
}
}
</script>
src/pages/financial/components/addFinancialDocuments2.vue 0 → 100644
View file @ 2de57df0
This diff is collapsed.
src/pages/financial/components/addReceivablesDocuments2.vue 0 → 100644
View file @ 2de57df0
This diff is collapsed.
src/pages/financial/financalDocument/CapitalAllocation.vue 0 → 100644
View file @ 2de57df0
This diff is collapsed.
src/pages/financial/financalDocument/FinancialDocuments.vue 0 → 100644
View file @ 2de57df0
This diff is collapsed.
src/pages/financial/financalDocument/RecPayQuery.vue 0 → 100644
View file @ 2de57df0
This diff is collapsed.
src/pages/financial/financalDocument/WorkEntrustmentMy.vue 0 → 100644
View file @ 2de57df0
This diff is collapsed.
src/pages/financial/financalDocument/addCapitalAllocation.vue 0 → 100644
View file @ 2de57df0
This diff is collapsed.
src/pages/financial/financalDocument/invoicesManager.vue 0 → 100644
View file @ 2de57df0
This diff is collapsed.
src/pages/financial/financalDocument/refundQuery.vue 0 → 100644
View file @ 2de57df0
<style>
@import "../css/cssReset.css";
</style>
<template>
<div class='flexOne'>
<div class="query-box">
<ul>
<li>
<span>
<em>订单号</em>
<el-input type="text" v-model="msg.OrderId" :placeholder="$t('pub.pleaseImport')"></el-input>
</span>
</li>
<li>
<span>
<em>订单来源</em>
<el-select v-model="msg.OrderSource" filterable clearable>
<el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
<el-option v-for="item in orderList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select>
</span>
</li>
<li>
<span><em>商务订单</em>
<el-input type="text" v-model="msg.Pay_Order" :placeholder="$t('pub.pleaseImport')"></el-input>
</span>
</li>
<li>
<span><em>平台订单</em>
<el-input type="text" v-model="msg.Trade_Order" :placeholder="$t('pub.pleaseImport')"></el-input>
</span>
</li>
<li>
<span>
<em>支付方式</em>
<el-select v-model="msg.Pay_Way" filterable clearable>
<el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
<el-option label="微信" :value="1"></el-option>
<el-option label="QQ" :value="2"></el-option>
<el-option label="支付宝" :value="3"></el-option>
<el-option label="银联" :value="4"></el-option>
</el-select>
</span>
</li>
<li>
<span><em>商户号</em>
<el-input type="text" v-model="msg.Mch_Id" :placeholder="$t('pub.pleaseImport')"></el-input>
</span>
</li>
<li>
<span>
<em>类型</em>
<el-select v-model="msg.Type" filterable clearable>
<el-option label="收款" :value="1"></el-option>
<el-option label="退款" :value="2"></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>退款状态</em>
<el-select v-model="msg.RefundStatus" filterable clearable>
<el-option label="不限" :value="0"></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>
<span>
<em>财务单据</em>
<el-input type="text" v-model="msg.FinanceId" @keyup.native="checkInteger(msg,'FinanceId')" :placeholder="$t('pub.pleaseImport')"></el-input>
</span>
</li>
<li>
<span>
<em>日期</em>
<el-date-picker type="date" v-model="msg.StartTime"
:picker-options="pickerBeginDateBefore" value-format="yyyy-MM-dd" placeholder></el-date-picker>
<el-date-picker type="date" v-model="msg.EndTime"
:picker-options="pickerBeginDateAfter" value-format="yyyy-MM-dd" placeholder></el-date-picker>
</span>
</li>
<li>
<span>
<em>退款日期</em>
<el-date-picker type="date" v-model="msg.RefundStartTime"
:picker-options="pickerBeginDateBefore" value-format="yyyy-MM-dd" placeholder></el-date-picker> -
<el-date-picker type="date" v-model="msg.RefundEndTime"
:picker-options="pickerBeginDateAfter" value-format="yyyy-MM-dd" placeholder></el-date-picker>
</span>
</li>
<li>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="handleCurrentChange(),getList()" />
</li>
</ul>
</div>
<div class="cm_content">
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
<tr>
<th width="250">平台单号</th>
<th width="100">金额</th>
<th>支付方式</th>
<th>支付日期</th>
<th>状态</th>
<th>退款金额</th>
</tr>
<tr v-for="item in dataList">
<td>{{item.Trade_Order}}</td>
<td>{{item.Money}}</td>
<td>{{item.PayWayName}}</td>
<td>{{item.Pay_Date}}</td>
<td>{{item.PayStatus}}</td>
<td>{{item.RefundMoney}}</td>
</tr>
</table>
<div class="noDataNotice" v-if="dataList.length<1">
<i class="iconfont icon-kong"></i>
<p>{{$t("active.ld_noData")}}</p>
</div>
</div>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.currentPage" :page-size="msg.pageSize"
layout="total,prev, pager, next, jumper" :total="msg.total"></el-pagination>
</div>
</template>
<script>
export default {
data(){
return{
msg:{
pageIndex:1,
pageSize:10,
OrderId:'',
OrderSource:0,
Pay_Order:'',
Trade_Order:'',
Pay_Way:0,
Mch_Id:'',
StartTime:'',
EndTime:'',
RefundStartTime:'',
RefundEndTime:'',
Type:2,
RefundStatus:0,
FinanceId:'',
currentPage:1,
total: 0,
},
loading:false,
orderList:[],
dataList:[],
pickerBeginDateBefore: {
disabledDate: time => {
let endTime = new Date(this.msg.EndTime)
return endTime.getTime() < time.getTime()
}
},
pickerBeginDateAfter: {
disabledDate: time => {
let startTime = new Date(this.msg.StartTime)
return startTime.getTime() >= time.getTime()
}
}
}
},
methods:{
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
getList(){ //获取列表
this.loading =true;
this.apipost('OnlinePay_get_GetOrderPayMoneyInfo',this.msg,res=>{
this.loading = false;
if(res.data.resultCode==1){
this.dataList = res.data.data.pageData;
this.msg.total = res.data.data.count;
}else{
this.Error(res.data.message);
}
},err=>{})
},
//订单来源
getOrderlist() {
this.apipost(
"order_post_GetOrderSource", {},
res => {
if (res.data.resultCode == 1) {
this.orderList = res.data.data;
}
},null);
},
},
mounted(){
this.getOrderlist();
this.getList();
}
}
</script>
src/router/routes.js
View file @ 2de57df0
This diff is collapsed.
src/utils/erpindex.js
View file @ 2de57df0
This diff is collapsed.
src/utils/msgBus.js 0 → 100644
View file @ 2de57df0
import Vue from 'vue'
export default new Vue;
\ No newline at end of file
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