Skip to content

S
SuperMan
Commit 7306e598 authored by liudong1993's avatar liudong1993
Browse files
Options

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

parents 3ba23898 4b1f3c34
Show whitespace changes
Inline Side-by-side
Showing with 1941 additions and 37 deletions
src/components/FinancialModule/JumpReport.vue 0 → 100644
View file @ 7306e598
<style scoped>
.page_fnDm{background-color: white}
.query-box{overflow: inherit}
._nav{margin: 20px 0 0 0 ;background-color: #f5f5f5;}
._nav li{float: left;font-size: 14px;color: #666666;padding: 15px 20px;cursor: pointer;position: relative;background-color: #f1f1f1;margin-right: 5px}
._nav li._active{background-color:#FFFFFF;color: #333333 }
._nav li._active::after{content: "";width: 20px;height: 3px;background-color: #E95252;display: inline-block;position: absolute;bottom: 0;left: 38%;}
.el-range-editor.el-input__inner{border-radius: 0}
.query-box{border: none}
.hight_query{position: relative;}
.hight_query span{height: 34px;line-height: 34px;color: #E95252}
.hight_query span .icon-gengduo{font-size: 12px}
.hight_query span em{text-decoration: underline;cursor: pointer;}
.hight_query_box{position: absolute;background-color: white;z-index: 2000;right: 200px;width: 800px;}
._hqb_shadow{box-shadow:3px 2px 10px rgb(204, 203, 203);border: 1px solid #ececec;}
.query-box ul {overflow: initial;}
.hqb_t{padding: 10px 20px;font-size: 16px;background-color: #E95252;border: 1px solid #E95252;color: #fff;text-align: center;margin-bottom: 15px}
.query-box li:last-child{float: left}
.query-box>ul>li:last-child{float: right;}
.query-box .hight_query ul .el-input{width: inherit }
.hight_query_box ul li{margin-top: 0;float: left;margin-right: 15px}
.hight_query_box ul li label{font-size: 14px}
.hight_query_box .el-form{padding: 0 20px}
.hight_query_box ul li._hqb_btn{float: right;margin-right: 25px;padding-top: 5px;position: inherit}
.Receipt_box{padding: 15px;color: #c94052;width: 614px;background-color: rgba(242, 242, 242, 1);border: 1px solid rgba(228, 228, 228, 1)}
.Receipt_box.color_blur{color: #106BAF;}
.Receipt_box.color_blur .rb_stit span{display: inline-block;border-bottom: 2px solid #106BAF;padding: 0 20px}
.rb_tit{font-size: 18px;text-align: center}
.rb_stit{font-size: 14px;text-align: center}
.rb_stit span{display: inline-block;border-bottom: 2px solid #C94052;padding: 0 20px}
.rb_top_row{display: flex;justify-content: space-between;font-size: 12px;}
.rb_top_row span._r_name{color: #333333}
.rb_top_row span._r_bold{font-weight: bold}
.rb_top_row ._r_time span{color: #333333}
._r_mb5{margin-bottom: 5px;}
.Receipt_table{width: 100%;font-size: 14px;text-align: center}
.Receipt_table .th{font-weight: 200 !important}
._r_mt10{margin-top: 10px;}
._bg__{display: inline-block;padding: 2px 8px;color: white;border-radius: 4px}
._bg_red{background-color: #E95252;}
._bg_green{background-color: #2BB87C}
.text_d{text-decoration: underline;cursor: pointer;}
.PingFangSC{font-weight: bold}
.Bill_par{position: relative;}
tr th,tr td{text-align: left;padding-left: 20px;}
tr._item_list{border-bottom: 1px solid #E5E5E5;height: 78px;}
tr._item_list td{border-bottom: 1px solid #e5e5e5; padding: 10px;}
/* tr._t_head th{border-top: 1px solid #e5e5e5;} */
tr._item_list td:first-child{border-left: 1px solid #e5e5e5;}
tr._item_list td:last-child{border-right: 1px solid #e5e5e5;}
._head_img{width: 28px;height: 28px;border-radius: 50%;vertical-align:middle;}
._btn_group{font-size: 14px;}
.icon-daiqueren{color: #4BCA81}
.icon-yiqueren{color: #4BCA81}
.icon-yiquxiao{color: #959595}
.icon-shenhebohui{color: #E95252}
.icon-icon-zancun{color: #FF9C01}
.singeRowTable tr:hover{background-color: white}
._TradeWayList{padding: 5px 10px;background-color: #EEEEEE;border-radius: 4px;margin: 10px 0;width: 230px}
._bold{font-weight: bold}
._bank_name,._bank_type{display: inline-block;background-color: #333333;color: white;padding: 2px 4px;border-radius: 4px;margin-left:10px;}
._bank_name{margin-left: 10px;}
._bank_type{background-color: #2AAEF2}
._bank_type2{background-color: #FF9C01}
._font_init{color: #333333;font-size: 12px;vertical-align:top;}
.InfoChangeLog{height: auto;max-height: 220px;background-color: #FFFFFF;}
.changLogList{padding-left: 20px;max-height: 180px;overflow: auto;}
.changLogList_l{border-left: 1px solid #E9E9E9;position: relative;padding-bottom: 10px;padding-left: 20px;padding-top: 10px;}
._radius_green{background-color: #47BF8C;width: 7px;height: 7px;border-radius: 50%;display: inline-block;position: absolute;left: -4px;top: 19px;}
.changLog_time{color: #666666;font-size: 12px;display: inline-block;padding-right: 10px}
._icon_btn i{width: 30px;height: 30px;display: inline-block;color: white !important;border-radius: 50%;text-align: center;line-height: 30px;margin-right: 10px;cursor: pointer;outline: none;}
._icon_btn i.edit{background-color: #00C6FF;font-size: 16px;}
._icon_btn i.edit:hover{background-color: #59daff}
._icon_btn i.edit:active{background-color: #00b8ec}
._icon_btn i.icon-sousuo{background-color: #47BF8C;}
._icon_btn i.icon-sousuo:hover{background-color: #66bb97}
._icon_btn i.icon-sousuo:active{background-color: #35ab79}
._icon_btn i.icon-ico_commodity_defaul{background-color: #F16C3C;}
._icon_btn i.icon-ico_commodity_defaul:hover{background-color: #e87c54}
._icon_btn i.icon-ico_commodity_defaul:active{background-color: #f76630}
._icon_btn i.icon-quxiao1{background-color: #E95252;}
._icon_btn i.icon-quxiao1:hover{background-color: #ea6d6d}
._icon_btn i.icon-quxiao1:active{background-color:#e42d2d}
._icon_btn i.icon-zhuanjiao1{background-color: #E6A014;font-size: 16px;}
._icon_btn i.icon-zhuanjiao1:hover{background-color: rgb(235, 184, 84)}
._icon_btn i.icon-zhuanjiao1:active{background-color: rgb(223, 150, 6)}
._tag_span{background-color: rgba(64,158,255,.1);display: inline-block;padding: 0 5px;height: 22px;line-height: 20px;font-size: 12px;color: #409eff;border-radius: 4px;box-sizing: border-box;border: 1px solid rgba(64,158,255,.2);white-space: nowrap;margin-bottom: 4px;}
._tag_span._tag_warr{background-color: rgba(103,194,58,.1);border-color: rgba(103,194,58,.2);color: #67c23a;}
._fex_cen{display: flex;align-items: center}
._pad5{padding: 5px 10px;}
._color_gar{color: gray}
._TCIDAndTCNUMList{
display: flex;
}
</style>
<template >
<div class="page_fnDm page_RecPayQuery" @keyup.enter="resetPageIndex(),getPageList()">
<div class="query-box">
<el-form class="_info_box clearfix" label-width="110px">
<el-row style="padding:15px 20px 0 0;">
<!-- <el-col :span="4">
<el-form-item label="单号：">
<el-input placeholder="" class="" v-model="msg.FrID" @keyup.native="checkInteger(msg,'FrID')"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="团队编号：">
<el-input v-model="msg.TCID" class=""></el-input>
</el-form-item>
</el-col> -->
<el-col :span="4">
<el-form-item label="所属公司：">
<el-select filterable v-model='msg.RB_Branch_Id' @change="getDepartmentMsg.RB_Branch_Id=msg.RB_Branch_Id,msg.RB_Depart_Id='',msg.UpdateBy='',getDepartment()" class="">
<el-option :value="-1" label="不限"></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-col :span="4">
<el-form-item label="费用部门：">
<el-select filterable v-model='msg.RB_Depart_Id' @change="employeeMsg.DepartmentId=msg.RB_Depart_Id,getEmployee(),msg.UpdateBy=''" class="">
<el-option :value="0" label="不限"></el-option>
<el-option v-for='item in DepartmentList'
:label='item.DepartmentName'
:value='item.DepartmentID'
:key='item.DepartmentID'>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="制单人员：">
<el-select filterable v-model='msg.UpdateBy' class="">
<el-option :value="0" label="不限"></el-option>
<el-option v-for='item in EmployeeList'
:label='item.EmName'
:value='item.EmployeeId'
:key='item.EmployeeId'>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="单据类型：">
<el-select filterable v-model='msg.Type' class="">
<el-option key="-1" value="-1" label="不限"></el-option>
<el-option key="1" value="1" label="收入"></el-option>
<el-option key="2" value="2" label="支出"></el-option>
</el-select>
</el-form-item>
</el-col> -->
<template>
<el-col :span="4">
<el-form-item label="费用类型：">
<el-select filterable v-model='msg.CostTypeID' >
<el-option :value="0" label="不限"></el-option>
<el-option v-for="item in GetCostTypeList" :key="item.ID" :value="item.ID" :label="item.Name"></el-option>
</el-select>
</el-form-item>
</el-col>
<!-- <el-col :span="4">
<el-form-item label="账户类型：">
<el-select filterable v-model='msg.AccountType' >
<el-option value="" label="不限"></el-option>
<el-option v-for='item in AccList'
:label='item.Name'
:value='item.ID'
:key='item.ID'>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="交易方式：">
<el-select filterable v-model='msg.TradeWay' @change="getAccountList(msg.AccountType,msg.TradeWay),msg.ClientID=''" >
<el-option value="0" label="不限"></el-option>
<el-option v-for='item in BranchAccountList'
:label='item.Name'
:value='item.ID'
:key='item.ID'>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="收付款账户：">
<el-select filterable v-model='msg.BankID'>
<el-option value="" label="不限"></el-option>
<el-option v-for='item in accountList'
:label='item.Name'
:value='item.ID'
:key='item.ID'>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="排序：">
<el-select filterable v-model='msg.Sort' >
<el-option key="-1" value="-1" label="不限"></el-option>
<el-option key="0" value="0" label="团期"></el-option>
<el-option key="1" value="1" label="汇款日期"></el-option>
<el-option key="2" value="2" label="单号"></el-option>
<el-option key="3" value="3" label="交易流水号"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="模板类型：">
<el-select v-model="msg.TemplateId" filterable >
<el-option value="0" label="不限"></el-option>
<el-option v-for='item in TemplateGetList'
:label='item.Name'
:value='item.Id'
:key='item.Id'>
</el-option>
</el-select>
</el-form-item>
</el-col> -->
<el-col :span="4">
<el-form-item label="审核状态：">
<el-select filterable v-model='msg.Status' class="">
<el-option key="-1" value="-1" label="不限"></el-option>
<el-option key="0" value="0" label="暂存"></el-option>
<el-option key="1" value="1" label="审核中"></el-option>
<el-option key="2" value="2" label="通过"></el-option>
<el-option key="3" value="3" label="驳回"></el-option>
<el-option key="4" value="4" label="作废"></el-option>
<el-option key="5" value="5" label="出纳暂存"></el-option>
</el-select>
</el-form-item>
</el-col>
<!-- <el-col :span="4">
<el-form-item label="币种类型：" >
<el-select filterable v-model='msg.CurrencyId' >
<el-option key="0" value="0" label="不限"></el-option>
<el-option v-for="item in currencyTypeList" :key="item.ID" :value="item.ID" :label="item.Name"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="订单编号：">
<el-input v-model="msg.OrderID"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="金额：">
<el-input v-model="msg.sMoney" class="w64d5"></el-input>-<el-input v-model="msg.eMoney" class="w64d5"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="制单日期：">
<el-date-picker class="h34"
@change="timeAdd(1)"
v-model="productionDate"
type="daterange"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col> -->
<el-col :span="6">
<el-form-item label="交易日期：">
<el-date-picker class="h34"
v-model="transactionDate"
@change="timeAdd(3)"
type="daterange"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="发团日期：">
<el-date-picker class="h34"
v-model="missionDate"
@change="timeAdd(4)"
type="daterange"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
</template>
</el-row>
</el-form>
<ul class="clearfix">
<li class="hight_query">
<!-- <span>
<em @click.stop="heightQueryBox=!heightQueryBox">高级查询 <i class="iconfont icon-gengduo"></i></em>
</span> -->
<button class="hollowFixedBtn" @click="resetPageIndex(),getPageList()">{{$t('pub.searchBtn')}}</button>
<button class="normalBtn" @click="method5()">导出</button>
</li>
</ul>
</div>
<div class="_fnDm_content" v-loading='loading'>
<v-table
is-horizontal-resize
column-width-drag
style="width:100%"
:columns="columns"
:table-data="DataList"
:filter-method="filterMethod"
:total='total'
:pageSize='pageSize'
:pageIndex='pageIndex'
:handleCurrentChange='handleCurrentChanges'
:row-height='100'
@on-custom-comp="customCompFunc"
@sort-change="sortChange"
multiple-sort><!-- 多个排序 -->
</v-table>
</div>
</div>
</template>
<script>
import myBill from "./FinancialSubmodule/BillModule.vue";
import myrbvBill from "./FinancialSubmodule/ReceivablesModule.vue";
import myhrBill from "./FinancialSubmodule/MergeBillModule.vue";
import Vue from 'vue'
// 自定义列组件
Vue.component('table-BranchName',{ //查看操作按钮
template:`<span>{{rowData.BranchName}}</span>`,
props:{
rowData:{
type:Object
},
field:{
type:String
},
index:{
type:Number
}
},
methods:{
goUrl(path){
// let routeData = this.$router.resolve({
// name: path,
// query: {id:this.rowData.FrID}
// });
// window.open(routeData.href, "_blank");
this.$router.push({
path: '/' + path,
query: {id:this.rowData.FrID,blank:'y',tab:this.rowData.FrID+'单据详情'}
})
},
}
})
Vue.component('table-operation',{ //查看操作按钮
template:`<span>
<el-tooltip class="item" effect="dark" content="查看" placement="top">
<i style="width: 30px;
height: 30px;
display: inline-block;
color: white !important;
border-radius: 50%;
text-align: center;
line-height: 30px;
margin-right: 10px;
cursor: pointer;
background-color: #47BF8C;
outline: none;"
class="iconfont icon-sousuo" @click="goUrl('FinancialDocumentsDetail')">
</i>
</el-tooltip>
</span>`,
props:{
rowData:{
type:Object
},
field:{
type:String
},
index:{
type:Number
}
},
methods:{
goUrl(path){
// let routeData = this.$router.resolve({
// name: path,
// query: {id:this.rowData.FrID}
// });
// window.open(routeData.href, "_blank");
this.$router.push({
path: '/' + path,
query: {id:this.rowData.FrID,blank:'y',tab:this.rowData.FrID+'单据详情'}
})
},
}
})
Vue.component('table-RecPay',{ //收支样式
template:`
<span>
<span v-if="rowData.Type==2" style="display: inline-block;
padding: 2px 8px;
color: white;
background-color: #E95252;
line-height: 16px;
border-radius: 4px;">
支出
</span>
<span v-if="rowData.Type==1" style="display: inline-block;
padding: 2px 8px;
color: white;
background-color: #2BB87C;
line-height: 16px;
border-radius: 4px;">
收入
</span>
</span>`,
props:{
rowData:{
type:Object
},
field:{
type:String
},
index:{
type:Number
}
},
methods:{
}
})
Vue.component('table-BillRVB',{ //单据样式
template:`
<el-popover
popper-class="detailsIT_Journal"
placement="bottom-start"
trigger="click">
<template v-if="rowData.Type!=1&&rowData.modelShow&&(rowData.Is_Merge==0||rowData.Is_Merge==null)">
<my-Bill :ID="rowData.FrID" :width="widthSon" :color="colorSon"></my-Bill>
</template>
<template v-else-if="rowData.Type==1&&rowData.modelShow&&(rowData.Is_Merge==0||rowData.Is_Merge==null)">
<my-RVB-Bill :ID="rowData.FrID" :width="widthSon" :color="colorSon"></my-RVB-Bill>
</template>
<template v-else-if="rowData.Is_Merge==1&&rowData.modelShow">
<my-HB-Bill :ID="rowData.FrID" :width="widthSon" :color="colorSon"></my-HB-Bill>
</template>
<span slot="reference" @click="rowData.modelShow = true,conSole(rowData)" style="text-decoration: underline;cursor: pointer;font-weight: bold" >{{rowData.FrID}}</span>
</el-popover>`,
props:{
rowData:{
type:Object
},
field:{
type:String
},
index:{
type:Number
}
},components: {
"my-Bill": myBill,
"my-RVB-Bill":myrbvBill,
"my-HB-Bill":myhrBill,
},
data(){
return{
widthSon:'700px',
colorSon:"#f5f5f5",
}
},
methods:{
conSole(rowData){
console.log(rowData)
}
}
})
Vue.component('table-Info',{ //关联信息
template:`
<div>
<template v-if="rowData.TCIDAndTCNUMList.length>0">
<p class="_TCIDAndTCNUMList" style="display: flex;">
<span>团号：</span>
<template v-if="rowData.TCIDAndTCNUMList&&rowData.TCIDAndTCNUMList.length>0">
<p><span v-for="(i,ix) in rowData.TCIDAndTCNUMList">{{i.TCNUM}}（{{i.TCID}}） <span v-if="ix!=rowData.TCIDAndTCNUMList.length-1">,</br></span></span></p>
</template>
<template v-else>
<span>无</span>
</template>
</p>
<p v-if="rowData.OrderID>0 && rowData.OrderSource==8">单号：<span class="">{{rowData.OrderID}}</span></p>
</template>
<template v-else-if="rowData.OrderSource==8 && rowData.TCIDAndTCNUMList.length==0">
<p class="_TCIDAndTCNUMList">暂无团期信息</p>
</template>
<template v-else-if="rowData.OrderSource==4 && rowData.TCIDAndTCNUMList.length==0">
<p class="_TCIDAndTCNUMList" style="text-decoration: underline;cursor: pointer;" @click="goTicketPage(rowData)">机票编号：{{rowData.SourceID}}</p>
<p style="margin-top: 5px;">线路：<span>{{rowData.LineName?rowData.LineName:'机票尚未选择线路'}}</span></p>
</template>
<template v-else-if="rowData.OrderSource==9 && rowData.TCIDAndTCNUMList.length==0">
<p class="_TCIDAndTCNUMList">国内票务期数：{{rowData.Term}}</p>
</template>
<template v-else-if="rowData.OrderSource==10 && rowData.TCIDAndTCNUMList.length==0">
<p class="_TCIDAndTCNUMList">签证产品编号：{{rowData.SourceID}}</p>
</template>
<template v-else-if="rowData.OrderSource==0 || rowData.OrderSource==null">
<p class="_TCIDAndTCNUMList">{{ rowData.BranchName }}-{{rowData.DepartName}} </p>
</template>
<template v-else>
<p class="_TCIDAndTCNUMList">暂无</p>
</template>
</div>`,
props:{
rowData:{
type:Object
},
field:{
type:String
},
index:{
type:Number
}
},
methods:{
goTicketPage(data) { // 跳转机票
this.$router.push({ name: 'TicketManager',query:{id:data.SourceID,blank:'y',tab:'票务管理'} })
},
}
})
Vue.component('table-CostType',{ //费用类型
template:`
<div>
<template v-for="(s,si) in rowData.CostTypeList">
<span style="background-color: rgba(64,158,255,.1);display: inline-block;padding: 0 5px;height: 22px;line-height: 20px;font-size: 12px;color: #646464;border-radius: 4px;box-sizing: border-box;border: 1px solid rgba(64,158,255,.2);white-space: nowrap;margin-bottom: 4px;">{{s}}</span></br>
</template>
</div>`,
props:{
rowData:{
type:Object
},
field:{
type:String
},
index:{
type:Number
}
},
methods:{
}
})
Vue.component('table-TradeWay',{ //交易方式
template:`
<div>
<template v-if="rowData.TradeWayList&&rowData.TradeWayList.length>0">
<div class="_TradeWayList" v-for="(tw,twIn) in rowData.TradeWayList" style="line-height: normal !important;padding: 5px 10px;background-color: #EEEEEE;border-radius: 4px;margin: 10px 0;width:230px">
<p><span style="font-weight: bold;color:#333333">{{tw.Alias}}</span><span class="_bank_name" style="height:20px;;display: inline-block;background-color: #333333;color: white;padding: 2px 4px;border-radius: 4px;margin-left:10px;margin-letf:10px">{{rowData.TradeWayList[0].TypeName}}</span><span style="height:20px;display: inline-block;background-color: #333333;color: white;padding: 2px 4px;border-radius: 4px;margin-left:10px;" :style="{'background-color':tw.AccountType=='私'?'#2AAEF2':'#FF9C01'}">{{tw.AccountType==""?'无':tw.AccountType}}</span> </p>
<p style="color:#333333">{{tw.BankNo}}</p>
</div>
</template>
<template v-else>
<div class="_pad5">
无
</div>
</template>
</div>`,
props:{
rowData:{
type:Object
},
field:{
type:String
},
index:{
type:Number
}
},
methods:{
}
})
Vue.component('table-Money',{ //金额
template:`
<span>
<p style="line-height:20px">{{rowData.Type==1?'应收':'应付'}}：<span>{{rowData.Money}}</span></p>
<p style="line-height:20px">{{rowData.Type==1?'实收':'实付'}}：<span>{{rowData.PayMoney}}</span></p>
</span>`,
props:{
rowData:{
type:Object
},
field:{
type:String
},
index:{
type:Number
}
}
})
Vue.component('table-ClientTypeName',{ //付款对象
template:`
<span>
<span style="color: gray">{{rowData.Type==2?rowData.ClientTypeName+'：':'汇款人：'}}</span><span>{{rowData.RemitterName}}</span>
</span>
`,
props:{
rowData:{
type:Object
},
field:{
type:String
},
index:{
type:Number
}
}
})
Vue.component('table-StatusStr',{ //单据状态
template:`
<i v-if="rowData.Status==1" class="iconfont icon-daiqueren" style="color: #4BCA81"></i>
<i v-if="rowData.Status==4" class="iconfont icon-yiquxiao" style="color: #4BCA81"></i>
<i v-if="rowData.Status==2" class="iconfont icon-yiqueren" style="color: #959595"></i>
<i v-if="rowData.Status==3" class="iconfont icon-shenhebohui" style="color: #E95252"></i>
<i v-if="rowData.Status==0" class="iconfont icon-zancun" style="color: #FF9C01"></i>
<el-popover
popper-class="detailsIT_Journal"
width="250"
trigger="click">
<div style="height: auto;max-height: 220px;background-color: #FFFFFF;">
<div class="changLog">
<p class="_log_t">流程日志</p>
<ul style="padding-left: 20px;max-height: 180px;overflow: auto;" v-if="GetFinancLogList" v-loading='LogLoading'>
<li style="border-left: 1px solid #E9E9E9;position: relative;padding-bottom: 10px;padding-left: 20px;padding-top: 10px;" v-for="(log,li) in GetFinancLogList">
<span style="background-color: #47BF8C;width: 7px;height: 7px;border-radius: 50%;display: inline-block;position: absolute;left: -4px;top: 19px;"></span>
<p> <span class="_color_blue">{{log.EmName}}</span> <span class="fr changLog_time">{{log.UpdateDate}}</span> </p>
<p class="_dtel">{{log.StartValue}}</p>
</li>
</ul>
<ul v-else>
<li>暂无修改日志</li>
</ul>
</div>
</div>
<span slot="reference" class="text_d _font_init" @click="Financial_post_GetFinancLogList(rowData.FrID)">{{rowData.StatusStr}}</span>
</el-popover>
`,
props:{
rowData:{
type:Object
},
field:{
type:String
},
index:{
type:Number
}
},
data(){
return{
GetFinancLogList:[],
}
},
methods:{
Financial_post_GetFinancLogList(id){ // 获取单据日志
if(this.checkboxShow) return
this.LogLoading = true;
this.apipost('Financial_post_GetFinancLogList',{ID:id,Type:2}, res => {
if(res.data.resultCode == 1) {
let data = res.data.data;
data.forEach(x=>{
x.UpdateDate = this.$commonUtils.formatMsgTime(x.UpdateDate)
})
this.LogLoading = false;
this.GetFinancLogList = data;
}
}, err => {})
}
}
})
export default {
data(){
return{
showID:false,
active:1,
userId:0,
msg:{
pageIndex:1,
pageSize:5,
FrID:'',
sDate:'',
eDate:'',
Status:'-1',
TemplateId:'0',
RB_Branch_Id:'',
RB_Depart_Id:'',
sTradeDate:'',
eTradeDate:'',
ClientType:'',
RemitterName:'',
ClientID:'',
sMoney:'',
eMoney:'',
CurrencyId:'0',
CostTypeID:'',
Conditon:'',
TCID:'',
TradeWay:'0',
Type:'-1',
AccountType:'',
QEndDate:'',
QStartDate:'',
UpdateBy:'',
Sort:'2',
EmployeeId:'',
},
getCompanyMsg:{ // 公司
RB_Group_Id:'0',
Status:'0',
},
getDepartmentMsg:{// 部门
RB_Group_Id:'',
RB_Branch_Id:'',
Status:0,
ParentId:-1,
Tier:0,
},
employeeMsg:{ // 员工
GroupId:'',
BranchId:-1,
DepartmentId:0,
PostId:0,
IsLeave:0,
},
zhuanMsg:{
AuditEmId:null,
WorkFlowId:0,
},
DataList:[],
GetFinancLogList:[],
StatusList:[],
ClientAccountList:[],
ClientTypeList:[],
accountList:[],
BranchAccountList:[],
DepartmentList:[],
EmployeeList:[],
ConditionList:[],
CompanyList:[],
productionDate:[],
approvalDate:[],
transactionDate:[],
missionDate:[],
currencyTypeList:[],
GetCostTypeList:[],
TemplateGetList:[],
AccList:[],
checkList:[],
checkAllList:[],
dateStart:'',
dateEnd:'',
dateArr:'',
status:'1',
type:'1',
loading:false,
LogLoading:false,
isCkedAll: false,
currentPage:1,
total:0,
ChineseStr:'',
mathNumber:'',
DepartIDs:'',
loading2:false,
tableData: [],
columns: [
{field: 'BranchName', title: '所属公司', width: 80, titleAlign: 'left',columnAlign:'left',isResize:true,componentName:'table-BranchName'},
{field: 'FrID', title: '单号', width: 80, titleAlign: 'left',columnAlign:'left',isResize:true, //orderBy排序 asc 升序 desc降序
// filterMultiple: true, // 筛选项是否多选
// filters: [
// {}
// //筛选项 无筛选项 传[{}]
// ],
result:[], //筛选项默认值 单选传字符串'1' 多选数组 [1,2,2]
type:'select',// 筛选项方式 select 下拉 check 单选、多选 text搜索 datetime时间
isFrozen:true,
componentName:'table-BillRVB'
},
{field: 'custome-RecPay', title: '单据类型', width: 120, titleAlign: 'left',columnAlign:'left',isResize:true,componentName:'table-RecPay'},
{field: 'custome-Info', title: '关联信息', width: 120, titleAlign: 'left',columnAlign:'left',isResize:true,result:'',filterMultiple:false,type:'text',componentName:'table-Info'},
{field: 'dateRange', title: '费用类型', width: 120, titleAlign: 'left',columnAlign:'left',isResize:true,result:{},filterMultiple:false,type:'datetime',componentName:'table-CostType'},
{field: 'TradeWay', title: '交易方式',width: 210, titleAlign: 'left',columnAlign:'left',isResize:true,componentName:'table-TradeWay'},
{field: 'Money', title: '金额',width: 120, titleAlign: 'left',columnAlign:'left',isResize:true,componentName:'table-Money'},
{field: 'ClientTypeName', title: '付款对象',width: 180, titleAlign: 'left',columnAlign:'left',isResize:true,componentName:'table-ClientTypeName'},
{field: 'EmName', title: '制单人员',width: 120, titleAlign: 'left',columnAlign:'left',isResize:true},
{field: 'StatusStr', title: '当前状态',width: 120, titleAlign: 'left',columnAlign:'left',isResize:true},
{field: 'custome-operation', title: '操作',width: 200, titleAlign: 'left',columnAlign:'left',componentName:'table-operation',isResize:true}
],
pageSize:6,
pageIndex:1,
heightQueryBox:false
}
},created(){
if(this.$route.query.returnCode){
this.active = this.$route.query.returnCode;
this.msg.Conditon = this.$route.query.returnCode;
}
if(this.$route.query.pageIndex){
this.msg.pageIndex = this.$route.query.pageIndex;
}
if(this.$route.query.Conditon){
this.msg.Conditon = this.$route.query.Conditon;
this.active = parseInt(this.$route.query.Conditon);
}
if(this.$route.query.FrID){
this.msg.FrID = this.$route.query.FrID;
}
if(this.$route.query.Type){
this.msg.Type = this.$route.query.Type+'';
}
},components: {
"my-Bill": myBill,
"my-RVB-Bill":myrbvBill,
},mounted(){
let userInfo=this.getLocalStorage();
this.getCompanyMsg.RB_Group_Id= this.employeeMsg.GroupId = this.getDepartmentMsg.RB_Group_Id = userInfo.RB_Group_id; //集团ID
this.DepartIDs = userInfo.RB_Department_Id;
this.userId = userInfo.EmployeeId;
this.msg.EmployeeId= userInfo.EmployeeId;
this.financeinfo_post_GetList();
this.financeinfo_post_GetCostTypeList();
this.FinancialFlowTemplate_post_GetList();
this.getCompanyList();
this.Financial_post_GetConditionList();
this.getEmployee();
this.getDepartment();
this.Financial_post_GetBranchAccountList();
this.financeinfo_post_GetClientTypeList();
this.FinancialFlowTemplate_post_GetStatusList();
this.getPageList();
this.AccountType_post_GetList();
},methods:{
customCompFunc(params){
console.log(params);
},
sortChange(param){
console.log(param)
//自己写实现
//{gender:"",name:"asc"}
},
// 数据筛选
filterMethod(filters){
console.log(filters)
// let tableData = this.DataList;
// if (filters.FrID && filters.FrID.length>0){
// tableData = tableData.filter(item => filters.FrID.indexOf(item.FrID)!=-1)
// }
// if (filters.name!='' && filters.name!='-1'){
// if(!Array.isArray(filters.name))
// tableData = tableData.filter(item => filters.name==item.id);
// else
// tableData = tableData.filter(item => filters.name==item.id);
// }
// if (filters.hobby!=''){
// tableData = tableData.filter(item => item.hobby.indexOf(filters.hobby)!=-1);
// }
// if(filters.dateRange.beginDate){
// tableData = tableData.filter(item => new Date(filters.dateRange.beginDate).getTime()<=new Date(item.dateRange).getTime());
// }
// if(filters.dateRange.endDate){
// tableData = tableData.filter(item => new Date(filters.dateRange.endDate).getTime()>=new Date(item.dateRange).getTime());
// }
// this.pageIndex = 1
// this.total=tableData.length
// this.tableData = tableData.filter((item,index)=>index==0);
},
handleCurrentChanges(val){
this.pageIndex = this.msg.pageIndex = val;
this.getPageList();
},
AccountType_post_GetList(){ //获取账户类型下拉
this.apipost('AccountType_post_GetList',this.queryAccMsg,res=>{
if(res.data.resultCode==1){
this.AccList = res.data.data;
}else{
this.$message.error(res.data.message);
}
},err=>{})
},
getPageList(){ // 获取列表数据
if(!this.msg.ClientID)this.msg.ClientID=0;
if(!this.msg.ClientType)this.msg.ClientType=0;
if(!this.msg.CurrencyId)this.msg.CurrencyId=0;
if(!this.msg.CostTypeID)this.msg.CostTypeID=0;
if(!this.msg.TemplateId)this.msg.TemplateId=0;
if(!this.msg.RB_Branch_Id)this.msg.RB_Branch_Id=-1;
if(!this.msg.RB_Depart_Id)this.msg.RB_Depart_Id=0;
if(!this.msg.UpdateBy)this.msg.UpdateBy=0;
if(!this.msg.TCID)this.msg.TCID=0;
if(!this.msg.OrderID)this.msg.OrderID=0;
if(!this.msg.Status)this.msg.Status=0;
if(!this.msg.FrID)this.msg.FrID=0;
if(!this.msg.Conditon)this.msg.Conditon=1;
if(!this.msg.TradeWay)this.msg.TradeWay=0;
if(!this.msg.AccountType)this.msg.AccountType=0;
this.loading= true;
this.apipost('Financial_post_GetALLPageList',this.msg,res=>{
if(res.data.resultCode == 1) {
let data = res.data.data.pageData;
this.total = res.data.data.count;
if(this.total==0){
this.DataList=[];
}else{
data.forEach(x=>{
// this.columns[0].filters.push({label:x.FrID,value:x.FrID})
x.modelShow = false;
})
this.DataList = data;
}
this.loading=false;
}else{
this.loading= false;
this.$message.error(res.data.message);
}
this.msg.TCID= this.msg.TCID=0?this.msg.TCID:'';
this.queryInfoInit();
this.currentPage = parseInt(this.msg.pageIndex);
},err=>{})
},
method5: function() {
if(!this.msg.ClientID)this.msg.ClientID=0;
if(!this.msg.ClientType)this.msg.ClientType=0;
if(!this.msg.CurrencyId)this.msg.CurrencyId=0;
if(!this.msg.CostTypeID)this.msg.CostTypeID=0;
if(!this.msg.TemplateId)this.msg.TemplateId=0;
if(!this.msg.RB_Branch_Id)this.msg.RB_Branch_Id=-1;
if(!this.msg.RB_Depart_Id)this.msg.RB_Depart_Id=0;
if(!this.msg.UpdateBy)this.msg.UpdateBy=0;
if(!this.msg.TCID)this.msg.TCID=0;
if(!this.msg.OrderID)this.msg.OrderID=0;
if(!this.msg.Status)this.msg.Status=0;
if(!this.msg.FrID)this.msg.FrID=0;
if(!this.msg.Conditon)this.msg.Conditon=1;
if(!this.msg.TradeWay)this.msg.TradeWay=0;
if(!this.msg.AccountType)this.msg.AccountType=0;
this.GetLocalFile("Financial_post_DownInOrOut", this.msg,"收支款.xls");
} ,
financeRemove(id){//作废
this.$confirm('是否对申请单进行作废操作？作废后不可恢复！', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.deletFinance(id)
}).catch(() => {
this.$message({
type: 'info',
message: '已取消'
});
});
},
deletFinance(id){
this.apipost('Financial_post_Cancel',{ID:id},res=>{
if(res.data.resultCode == 1) {
this.$message.success(res.data.message)
}else{
this.$message.error(res.data.message)
}
this.getPageList();
},err=>{})
},
Financial_post_GetFinancLogList(id){ // 获取单据日志
this.LogLoading = true;
this.apipost('Financial_post_GetFinancLogList',{ID:id,Type:2}, res => {
if(res.data.resultCode == 1) {
let data = res.data.data;
data.forEach(x=>{
x.UpdateDate = this.$commonUtils.formatMsgTime(x.UpdateDate)
})
this.LogLoading = false;
this.GetFinancLogList = data;
}
}, err => {})
},
mathMoney(n){ // 数字转中文大写 1
this.ChineseStr = this.$commonUtils.changeMoneyToChinese(n)
},
FinancialFlowTemplate_post_GetStatusList(){ // 获取审核状态枚举
this.apipost('FinancialFlowTemplate_post_GetStatusList',{}, res => {
if(res.data.resultCode == 1) {
this.StatusList = res.data.data;
}
}, err => {})
},
financeinfo_post_GetClientTypeList(){ // 获取对象类型
this.apipost('financeinfo_post_GetClientTypeList',{}, res => {
if(res.data.resultCode == 1) {
this.ClientTypeList = res.data.data;
}
}, err => {})
},
financeinfo_post_GetClientAccountList(t){ // 获取对象类型
let msg = {
Type:t,
ObjID:0,
CardNum:''
}
this.apipost('financeinfo_post_GetClientAccountList',msg, res => {
if(res.data.resultCode == 1) {
let data = res.data.data;
let ClientAccountList = [];
data.forEach(x=>{
let obj = {
ID:x.ID,
Name:x.AccountAlias,
Nom:x.CardNum
}
ClientAccountList.push(obj)
})
this.ClientAccountList = ClientAccountList;
}
}, err => {})
},
getAccountList(i,t){ //收款账户
let accountList = []
if(t==1){ // 银行
this.apipost('bankaccount_post_GetList',{TypeId:i}, res => {
if(res.data.resultCode == 1) {
let data = res.data.data;
data.forEach(x=>{
let obj = {
ID:x.ID,
Name:x.Alias,
Nom:0,
}
accountList.push(obj)
})
this.accountList = accountList
}
}, err => {})
}
if(t==2){ //平台账户
let msg = {
BackId:0,
TypeId:i,
BranchId:-1,
Alias:''
}
this.apipost('BankAccount_post_GetPlatformList',msg, res => {
if(res.data.resultCode == 1) {
let data = res.data.data;
// console.log(data)
data.forEach(x=>{RangeIds
let obj = {
ID:x.ID,
Name:x.Alias,
Nom:x.PlatformNo
}
accountList.push(obj)
})
this.accountList = accountList
}
}, err => {})
}
if(t==3){ //现金账户
let msg = {
TypeId:i,
BranchId:-1,
Alias:''
}
this.apipost('BankAccount_post_GetCashAccountList',msg, res => {
if(res.data.resultCode == 1) {
let data = res.data.data;
// console.log(data)
data.forEach(x=>{
let obj = {
ID:x.ID,
Name:x.Alias,
Nom:0
}
accountList.push(obj)
})
this.accountList = accountList
}
}, err => {})
}
if(t==4){ //资金池账户
let msg = {
TypeId:i,
BranchId:-1,
Alias:''
}
this.apipost('BankAccount_post_GetCashPoolList',msg, res => {
if(res.data.resultCode == 1) {
let data = res.data.data;
// console.log(data)
data.forEach(x=>{
let obj = {
ID:x.ID,
Name:x.Alias,
Nom:0
}
accountList.push(obj)
})
this.accountList = accountList
}
}, err => {})
}
},
Financial_post_GetBranchAccountList(){ //获取交易方式列表
this.apipost('Financial_post_GetBranchAccountList',{}, res => {
if(res.data.resultCode == 1) {
this.BranchAccountList = res.data.data;
}
}, err => {})
},
getDepartment(){ //部门
this.apipost('admin_get_DepartmentGetList', this.getDepartmentMsg, res => {
if(res.data.resultCode == 1) {
this.DepartmentList = res.data.data;
}
}, err => {})
},
getEmployee() { //员工
this.apipost('admin_get_EmployeeGetList', this.employeeMsg, res => {
if(res.data.resultCode == 1) {
this.EmployeeList = res.data.data;
}
}, err => {})
},
getCompanyList(){ //获取公司列表
this.apipost('admin_get_BranchGetList',this.getCompanyMsg,res=>{
if(res.data.resultCode==1){
this.CompanyList=res.data.data;
}else{}
},err=>{})
},
Financial_post_GetConditionList(){ //获取财务单据枚举列表
this.apipost('Financial_post_GetConditionList',{},res=>{
if(res.data.resultCode==1){
this.ConditionList=res.data.data;
}else{}
},err=>{})
},
financeinfo_post_GetList(){ // 币种类型
this.apipost('financeinfo_post_GetList',{Name:''},res=>{
if(res.data.resultCode==1){
this.currencyTypeList = res.data.data;
}else{
}
},err=>{})
},
financeinfo_post_GetCostTypeList(){ // 费用类型
this.apipost('financeinfo_post_GetCostTypeList',{Name:'',type:0,DepartIDs:this.DepartIDs},res=>{
if(res.data.resultCode==1){
this.GetCostTypeList = res.data.data;
}else{
}
},err=>{})
},
FinancialFlowTemplate_post_GetList(){ // 单据类型
this.apipost('Financial_post_GetList',{},res=>{
// console.log(res.data.data);
if(res.data.resultCode==1){
this.TemplateGetList = res.data.data;
}else{
}
},err=>{})
},
timeAdd(t){ // 日期格式
if(t==1){ //制单日期
if(!this.productionDate){
this.msg.sDate = '';
this.msg.eDate = '';
return
}
this.msg.sDate = this.productionDate[0];
this.msg.eDate = this.productionDate[1];
}
if(t==2){ //审批日期
if(!this.approvalDate){
this.dateStart = '';
this.dateEnd = '';
return
}
this.dateStart = this.approvalDate[0];
this.dateEnd = this.approvalDate[1];
}if(t==3){ //交易日期
if(!this.transactionDate){
this.msg.sTradeDate = '';
this.msg.eTradeDate = '';
return
}
this.msg.sTradeDate = this.transactionDate[0];
this.msg.eTradeDate = this.transactionDate[1];
}
if(t==4){ //发团日期
if(!this.missionDate){
this.dateStart = '';
this.dateEnd = '';
return
}
this.msg.QStartDate = this.missionDate[0];
this.msg.QEndDate = this.missionDate[1];
}
},
queryInfoInit(){ // 初始化msg
let msg = {
pageIndex:this.msg.pageIndex,
pageSize:6,
FrID:this.msg.FrID==0?'':this.msg.FrID,
sDate:this.msg.sDate,
eDate:this.msg.sDate,
Status:this.msg.Status,
TemplateId:this.msg.TemplateId,
RB_Branch_Id:this.msg.RB_Branch_Id,
RB_Depart_Id:this.msg.RB_Depart_Id,
UpdateBy:this.msg.UpdateBy,
sTradeDate:this.msg.sTradeDate,
eTradeDate:this.msg.eTradeDate,
ClientType:this.msg.ClientType,
RemitterName:this.msg.RemitterName,
ClientID:this.msg.ClientID,
sMoney:this.msg.sMoney,
eMoney:this.msg.eMoney,
CurrencyId:this.msg.CurrencyId,
CostTypeID:this.msg.CostTypeID,
Conditon:this.msg.Conditon,
TCID:this.msg.TCID,
TradeWay:this.msg.TradeWay,
Type:this.msg.Type,
AccountType:this.msg.AccountType==0?'':this.msg.AccountType,
QEndDate:this.msg.QEndDate,
QStartDate:this.msg.QStartDate,
OrderID:this.msg.OrderID==0?'':this.msg.OrderID,
Sort:this.msg.Sort,
EmployeeId:this.msg.EmployeeId,
}
this.msg = msg;
},
handleCurrentChange(val) { //翻页
this.msg.pageIndex = val;
this.getPageList();
},
resetPageIndex(){ // 重置页码
this.msg.pageIndex=1;
this.currentPage = 1;
},
goUrl(path,id,Conditon,pageIndex){
this.$router.push({ name: path,query:{"id":id,"Conditon":Conditon,"pageIndex":pageIndex,blank:'y',tab:'单据详情'} })
},
goEit(path,type,id,edit,Conditon,pageIndex){
this.$router.push({ name: path,query:{"type":type,"FrID":id,"edit":edit,"Conditon":Conditon,"pageIndex":pageIndex} })
}
}
}
</script>
src/components/FinancialModule/addReceivablesDocuments.vue
View file @ 7306e598
......@@ -990,7 +990,7 @@ export default {
}
if (x.Type===4){
AccList.forEach(y=>{
if(y.Name === '公社资金池' || y.Name === '水口资金池' || y.Name === '橡胶资金池'){
if(y.Name === '公社资金池' || y.Name === '水口资金池' || y.Name === '橡胶资金池' || y.Name=='地接部专户'){
newAccList.push(y)
}
})
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 7306e598
......@@ -1412,35 +1412,7 @@
<p class="fz12 over_ellipsis" style="width: 90%;">领队控位</p>
</td>
<td>
<!-- <el-popover style='padding: 0;' width="470" trigger="click"> -->
<!-- <div class="personNolayer">
<p>
<span>成人：{{item.ManNum}}人</span>
<span>儿童：{{item.ChirdNum}}人</span>
<span>老人：{{item.OldPeopleNum}}人</span>
<span>婴儿：{{item.BabyNum}}人</span>
<span>单地接：{{item.AirticketNum}}人</span>
</p>
<table border="0" cellspacing="1" cellpadding="1">
<tr>
<th>姓名</th>
<th>护照</th>
<th>性别</th>
<th>年龄</th>
<th width="110">联系电话</th>
</tr>
<tr v-if='item.GuestList.length>0' v-for="(item2,index2) in item.GuestList" :key="index2">
<td>{{item2.userName}}</td>
<td>{{item2.passportNo}}</td>
<td>{{item2.sexStr}}</td>
<td>{{item2.age}}</td>
<td>{{item2.mobilePhone}}</td>
</tr>
<tr v-if='item.GuestList.length==0'>
<td colspan="5" align="center">暂无数据</td>
</tr>
</table>
</div> -->
<span v-if='item.GuestNumStatus==1' style="color:#1AA86B; " class="personNo nowrap" slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span>
<span v-if='item.GuestNumStatus==2' style="color:#E95252; " class="personNo nowrap" slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span>
<span v-if='item.GuestNumStatus==3' style="color:#666; " class="personNo nowrap" slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span>
......@@ -1514,6 +1486,7 @@
<el-tooltip effect="dark" content="更多" placement="top-start" style="float:left">
<el-popover width='100' trigger="hover">
<div class="groupTourOrder_more">
<div @click="goToPassenger(item)">旅客名单</div>
<div @click="toTrip(item)">出团通知书({{SetNoticeMsg.OutNotice==1?'OK':'暂定'}})</div>
<div v-if="userId==1" @click="getSalerInfo(item)">修改业务员</div>
<div @click='zhuanLoading = true,OPRemarkMsg.OrderId = item.OrderId'>OP备注</div>
......@@ -4001,6 +3974,23 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
tab: "团队收支明细"
}
});
},
//跳转到旅客名单
goToPassenger(item)
{
//passengerSaleList?id=11468&tcid=732&tcnum=NRT3U07190101A&isOrder=1&blank=y&tab=旅客名单
this.$router.push({
name: "passengerSaleList",
query: {
id: item.OrderId,
tcid: this.msg.TCID,
tcnum:this.ConfigData.Config.TCNUM,
isOrder:1,
blank: "y",
tab: "旅客名单"
}
});
}
},
mounted() {
......
src/components/activity/LuckyDraw.vue 0 → 100644
View file @ 7306e598
<style>
.w595{width:595px!important;}
</style>
<template>
<div class="flexOne">
<div class="query-box">
<ul class="user_time_picker">
<li>
<span>
<em>公司</em>
<el-select
filterable
v-model="msg.branchId"
>
<el-option label="不限" :value="-1"></el-option>
<el-option
v-for="item in companyList"
:label="item.BName"
:value="item.Id"
:key="item.Id"
></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>抽奖名</em>
<el-input v-model="msg.lotteryName" @keyup.enter.native="getList"></el-input>
</span>
</li>
<li>
<span>
<em>开始日期</em>
<el-date-picker type="date" v-model="msg.startDate" :picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd" placeholder></el-date-picker>
</span>
</li>
<li>
<span>
<em>结束日期</em>
<el-date-picker type="date" v-model="msg.endDate" :picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd" placeholder></el-date-picker>
</span>
</li>
<li>
<span>
<em>抽奖状态</em>
<el-select filterable v-model="msg.lotteryStatus">
<el-option label="不限" :value="0"></el-option>
<el-option label="正常" :value="1"></el-option>
<el-option label="禁用" :value="2"></el-option>
</el-select>
</span>
</li>
<li>
<input
type="button"
class="hollowFixedBtn"
value="查询"
@click="resetPageIndex(),getList()"
> &nbsp;
<input type="button" @click="outerVisible = true,dialogTitle='新增抽奖',resSetInfo()" class="normalBtn" value="新增">
</li>
</ul>
</div>
<div class="clearfix"></div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
<tr>
<th>抽奖名称</th>
<th>公司名称</th>
<th>结束日期</th>
<th>抽奖次数</th>
<th>抽奖状态</th>
<th>备注</th>
<th>操作</th>
</tr>
<tr v-for="item in dataList">
<td>{{item.lotteryName}}</td>
<td>{{item.branchName}}</td>
<td>{{item.endDate}}</td>
<td>{{item.lotteryCount}}</td>
<td>{{item.lotteryStatus==1?'正常':'禁用'}}</td>
<td>{{item.remark}}</td>
<td>
<el-tooltip class="item" effect="dark" content="修改抽奖信息" placement="top">
<el-button
type="primary"
icon="el-icon-edit"
circle
@click="outerVisible=true,dialogTitle='修改抽奖信息',updateData(item)"
></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="查看奖项" placement="top">
<el-button
type="primary"
icon="iconfont icon-chakan"
circle
@click="goUrl(item)"
></el-button>
</el-tooltip>
</td>
</tr>
</table>
<div class="noDataNotice" v-if="dataList.length<1">
<i class="iconfont icon-kong"></i>
<p>没有找到你需要的数据</p>
</div>
<el-pagination
background
@current-change="handleCurrentChange"
v-if="dataList.length>0"
:current-page.sync="currentPage"
layout="total,prev, pager, next, jumper"
:page-size="msg.pageSize"
:total="total"
></el-pagination>
<el-dialog
custom-class="w800"
:title="dialogTitle"
:visible.sync="outerVisible"
center
:before-close="closeChangeMachie"
>
<el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="100px">
<table class="layerTable layerNoIcon">
<tr>
<td>
<el-form-item label="抽奖名称" prop="lotteryName">
<el-input v-model="addMsg.lotteryName" class="w217" placeholder="抽奖名称"/>
</el-form-item>
</td>
<td>
<el-form-item label="公司" prop="branchId">
<el-select filterable class="w217" v-model="addMsg.branchId" placeholder="请选择">
<el-option
v-for="item in companyList"
:label="item.BName"
:value="item.Id"
:key="item.Id"
></el-option>
</el-select>
</el-form-item>
</td>
</tr>
<td>
<el-form-item label="抽奖次数" prop="lotteryCount">
<el-input v-model="addMsg.lotteryCount" class="w217" @keyup.native="checkInteger(addMsg,'lotteryCount')" placeholder="抽奖次数"/>
</el-form-item>
</td>
<td>
<el-form-item label="抽奖状态" prop="lotteryStatus">
<el-select filterable v-model="addMsg.lotteryStatus" class="w217">
<el-option label="正常" :value="1"></el-option>
<el-option label="禁用" :value="2"></el-option>
</el-select>
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item label="开始日期" prop="startDate" >
<el-date-picker type="datetime" v-model="addMsg.startDate"
value-format="yyyy-MM-dd HH:mm:ss" placeholder></el-date-picker>
</el-form-item>
</td>
<td>
<el-form-item label="结束日期" prop="endDate">
<el-date-picker type="datetime" v-model="addMsg.endDate"
value-format="yyyy-MM-dd HH:mm:ss" placeholder></el-date-picker></el-date-picker>
</el-form-item>
</td>
</tr>
<tr>
<td colspan="2">
<el-form-item label="备注" prop="remark">
<el-input type="textarea" v-model="addMsg.remark" class="w595"/>
</el-form-item>
</td>
</tr>
</table>
</el-form>
<div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="outerVisible = false,resetForm('addMsg'),resSetInfo()">取 消</button> &nbsp;
<button class="normalBtn" @click="submitForm('addMsg')">保存</button>
</div>
</el-dialog>
</div>
</template>
<script>
export default {
data() {
return {
//请求
msg: {
pageIndex: 1,
pageSize: 15,
lotteryName: '',
branchId: -1,
groupId : -1,
startDate: '',
endDate: '',
lotteryStatus: 0,
},
addMsg:{
id:0,
lotteryName:'',
remark:'',
startDate:'',
endDate:'',
lotteryCount:'',
groupId:0,
branchId:'',
lotteryStatus:1,
lotteryPlatform:1
},
rules:{
branchId: [{ required: true, message: "请选择公司", trigger: "change" }],
lotteryName: [{ required: true, message: "请输入抽奖名称", trigger: "blur" }],
lotteryCount: [{ required: true, message: "请输入抽奖次数", trigger: "blur" }],
startDate: [{ required: true, message: "请选择开始日期", trigger: "blur" }],
endDate: [{ required: true, message: "请选择结束日期", trigger: "blur" }],
},
loading:false,
currentPage: 1,
total:0,
dataList:[],
outerVisible: false,
dialogTitle:'',
pickerBeginDateBefore: {
disabledDate: time => {
let endTime = new Date(this.msg.endDate)
return endTime.getTime() < time.getTime()
}
},
pickerBeginDateAfter: {
disabledDate: time => {
let startTime = new Date(this.msg.startDate)
return startTime.getTime() >= time.getTime()
}
},
//公司数组
companyList:[],
//线路
LineList:[],
};
},
mounted() {
this.getCompany();
this.getLineList();
this.getList();
},
filters: {
},
methods: {
//重置id
resSetInfo(){
var newMsg = {
id:0,
lotteryName:'',
remark:'',
startDate:'',
endDate:'',
lotteryCount:'',
groupId:0,
branchId:'',
lotteryStatus:1,
lotteryPlatform:1
}
this.addMsg= newMsg;
},
//获取公司下拉
getCompany() {
let userInfo = this.getLocalStorage()
var RB_Group_id = userInfo.RB_Group_id
let msg = {
Status: 0,
is_show: 0,
RB_Group_Id: RB_Group_id
}
this.apipost(
'admin_get_BranchGetList',
msg,
res => {
if (res.data.resultCode == 1) {
this.companyList = res.data.data
}else{
this.Error(res.data.message);
}
},
err => {}
)
},
//获取线路列表
getLineList() {
this.apipost('line_post_GetList', {}, res => {
if (res.data.resultCode == 1) {
this.LineList = res.data.data
}
})
},
//获取数据
getList() {
this.loading = true;
let userInfo = this.getLocalStorage()
this.msg.groupId = userInfo.RB_Group_id
this.apiJavaPost("/api/sell/lottery/getLotteryList", this.msg, res => {
if (res.data.resultCode === 1) {
this.currentPage = res.data.data.pageCount;
this.total = res.data.data.count;
this.dataList = res.data.data.pageData;
} else {
this.Error(res.data.message)
}
this.loading = false
}, null);
},
//新增抽奖
addDraw(){
this.loading = true;
let userInfo = this.getLocalStorage();
this.addMsg.groupId = userInfo.RB_Group_id;
this.apiJavaPost("/api/sell/lottery/setLottery", this.addMsg, res => {
if (res.data.resultCode === 1) {
this.outerVisible = false;
this.resetForm("addMsg");
this.Success(res.data.message);
this.getList();
} else {
this.Error(res.data.message)
}
}, null);
},
//修改抽奖信息
updateData(item){
this.addMsg.id = item.id;
this.addMsg.lotteryName = item.lotteryName;
this.addMsg.remark = item.remark;
this.addMsg.startDate = item.startDate;
this.addMsg.endDate = item.endDate;
this.addMsg.lotteryCount = item.lotteryCount;
this.addMsg.groupId = item.groupId;
this.addMsg.branchId = item.branchId;
this.addMsg.lotteryStatus = item.lotteryStatus;
},
//跳转至获取抽奖奖项信息列表
goUrl(item){
this.$router.push({
name: 'awardList',
query: {
lotteryId: item.id,
blank: "y",
tab: "抽奖奖项"
}
});
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
resetPageIndex() {
this.msg.pageIndex = 1;
this.currentPage = 1;
},
closeChangeMachie(done) {
//弹出框关闭初始化弹框内表单
done();
this.resetForm("addMsg");
},
submitForm(addMsg) {
//提交创建、修改表单
this.$refs[addMsg].validate(valid => {
if (valid) {
this.addDraw();
} else {
return false;
}
});
},
resetForm(formName) {
this.$refs[formName].resetFields();
}
}
};
</script>
\ No newline at end of file
src/components/activity/awardList.vue 0 → 100644
View file @ 7306e598
<template>
<div class="flexOne">
<div class="query-box">
<ul class="user_time_picker">
<li>
<input type="button" @click="outerVisible = true,dialogTitle='新增奖项',resetInfo()" class="normalBtn" value="新增">
</li>
</ul>
</div>
<div class="clearfix"></div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
<tr>
<th>奖项名</th>
<th>奖项数量</th>
<th>奖项状态</th>
<th>奖项类型</th>
<th>操作</th>
</tr>
<tr v-for="item in dataList">
<td>{{item.awardName}}</td>
<td>{{item.awardCount}}</td>
<td>{{item.awardStatus==1?'正常':'禁用'}}</td>
<td v-if="item.awardType==1">谢谢参与</td>
<td v-if="item.awardType==2">一般奖项</td>
<td v-if="item.awardType==3">优惠券</td>
<td>
<el-tooltip class="item" effect="dark" content="修改抽奖信息" placement="top">
<el-button
type="primary"
icon="el-icon-edit"
circle
@click="outerVisible=true,dialogTitle='修改抽奖信息',updateData(item)"
></el-button>
</el-tooltip>
</td>
</tr>
</table>
<div class="noDataNotice" v-if="dataList.length<1">
<i class="iconfont icon-kong"></i>
<p>没有找到你需要的数据</p>
</div>
<el-dialog
custom-class="w800"
:title="dialogTitle"
:visible.sync="outerVisible"
center
:before-close="closeChangeMachie"
>
<el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="100px">
<table class="layerTable layerNoIcon">
<tr>
<td>
<el-form-item label="奖项名" prop="awardName">
<el-input v-model="addMsg.awardName" class="w217" placeholder="奖项名"/>
</el-form-item>
</td>
<td>
<el-form-item label="奖项数量" prop="awardCount">
<el-input v-model="addMsg.awardCount" class="w217" @keyup.native="checkInteger(addMsg,'awardCount')" placeholder="奖项数量"/>
</el-form-item>
</td>
</tr>
<td>
<el-form-item label="奖项类型" prop="awardType">
<el-select filterable v-model="addMsg.awardType" class="w217" @change="getAwardRelationId()">
<el-option label="谢谢参与" :value="1"></el-option>
<el-option label="一般奖项" :value="2"></el-option>
<el-option label="优惠券" :value="3"></el-option>
</el-select>
</el-form-item>
</td>
<td>
<el-form-item label="奖项关联" prop="awardRelationId" v-if="addMsg.awardType==3">
<el-select filterable v-model="addMsg.awardRelationId" class="w217" >
<el-option label="不限" :value="0"></el-option>
<el-option v-for="item in awardRelationList" :label="item.couponsName" :value="item.couponId" :key="item.couponId"></el-option>
</el-select>
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item label="排序" prop="rank">
<el-input v-model="addMsg.rank" class="w217" @keyup.native="checkInteger(addMsg,'rank')" placeholder="排序"/>
</el-form-item>
</td>
<td>
<el-form-item label="奖项状态" prop="awardStatus">
<el-select filterable v-model="addMsg.awardStatus" class="w217">
<el-option label="正常" :value="1"></el-option>
<el-option label="禁用" :value="2"></el-option>
</el-select>
</el-form-item>
</td>
</tr>
</table>
</el-form>
<div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="outerVisible = false">取 消</button> &nbsp;
<button class="normalBtn" @click="submitForm('addMsg')">保存</button>
</div>
</el-dialog>
</div>
</template>
<script>
export default {
data() {
return {
//请求
msg: {
lotteryId: '',
},
addMsg:{
id:0,
lotteryId:0,
awardName:'',
awardType:1,
//谢谢参与和一般奖项为0，优惠券 请求接口返回
awardRelationId:'',
awardCount:'',
awardStatus:1,
rank:'',
},
rules:{
awardName: [{ required: true, message: "请输入公司", trigger: "blur" }],
awardType: [{ required: true, message: "请选择奖项类型", trigger: "change" }],
awardRelationId: [{required: true, message: "请选择奖项关联", trigger: "change"}],
awardCount: [{ required: true, message: "请输入奖项数量", trigger: "blur" }],
awardStatus: [{ required: true, message: "请选择奖项状态", trigger: "change" }],
rank: [{ required: true, message: "请输入排序", trigger: "blur" }],
},
loading:true,
outerVisible:false,
dialogTitle:'',
dataList:[],
awardRelationList:[],
};
},
mounted() {
this.msg.lotteryId = this.$route.query.lotteryId;
this.getList();
},
filters: {
},
methods: {
//获取数据
getList() {
this.loading = true;
this.apiJavaPost("/api/sell/lottery/getLotteryAwardList", this.msg, res => {
console.log(res,'getList');
this.loading = false;
if (res.data.resultCode === 1) {
this.dataList = res.data.data;
} else {
this.Error(res.data.message)
}
}, null);
},
//提交
submitForm(addMsg) {
//提交创建、修改表单
this.$refs[addMsg].validate(valid => {
if (valid) {
this.addAward();
} else {
return false;
}
});
},
//提交添加
addAward(){
this.addMsg.lotteryId = this.$route.query.lotteryId;
if(this.addMsg.awardType==1||this.addMsg.awardType==2){
this.addMsg.awardRelationId = 0;
}
this.apiJavaPost("/api/sell/lottery/setLotteryAward", this.addMsg, res => {
console.log(res,'getList');
if (res.data.resultCode === 1) {
this.Success(res.data.message);
this.outerVisible = false;
this.getList();
} else {
this.Error(res.data.message)
}
}, null);
},
//修改信息
updateData(item){
this.addMsg.id=item.id;
this.addMsg.lotteryId = item.lotteryId;
this.addMsg.awardName = item.awardName;
this.addMsg.awardType = item.awardType;
this.addMsg.awardRelationId = item.awardRelationId;
this.addMsg.awardCount = item.awardCount;
this.addMsg.awardStatus = item.awardStatus;
this.addMsg.rank = item.rank;
this.getAwardRelationId();
},
//根据奖项类型请求关联Id
getAwardRelationId(){
let msg = {
couponId:0
}
this.apiJavaPost("/api/sell/lottery/getCouponsList", msg, res => {
if (res.data.resultCode === 1) {
this.awardRelationList = res.data.data;
} else {
this.Error(res.data.message)
}
}, null);
},
//重置信息
resetInfo(){
var newMsg = {
id:0,
lotteryId:0,
awardName:'',
awardType:1,
awardRelationId:'',
awardCount:'',
awardStatus:1,
rank:'',
}
this.addMsg = newMsg;
},
closeChangeMachie(done) {
//弹出框关闭初始化弹框内表单
done();
this.resetForm("addMsg");
},
resetForm(formName) {
this.$refs[formName].resetFields();
}
}
};
</script>
\ No newline at end of file
src/components/dmc/manager/dmcTotalTable.vue
View file @ 7306e598
......@@ -228,11 +228,11 @@
<br/>
<el-button @click='openChart(item)' type="primary" style="background:#6DD875; border-color:#6DD875">联系OP</el-button>
<el-popover placement="bottom" width="300" trigger="click">
<el-input class='mt10' v-model='NumObj.newCombinationNum' type='textarea'></el-input>
<el-input class='mt10' v-model='NumObj.DMCNum' type='textarea'></el-input>
<p class="alcenter mt10">
<input type="button" value="保存" @click="UpdateCombinationNum()" class="normalBtn" />
</p>
<el-button type="primary" slot="reference" @click='ClickNumItem(outItem.NewCombinationNum,outItem.TCIDs)'
<el-button type="primary" slot="reference" @click='ClickNumItem(item.DMCNum,outItem.NewCombinationNum,outItem.TCIDs)'
style="background:#3333FF; border-color:#AD9AF6; border-radius: 0;">地接团号</el-button>
</el-popover>
</el-button-group>
......@@ -243,6 +243,7 @@
<td colspan="20" style="text-align: left!important;padding:0 20px;">
<div class="link">
<p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')" style="padding-top:4px;">{{item.Titles}}</p>
<div v-if="outItem.StaticsReportList[index].DMCNum && outItem.StaticsReportList[index].DMCNum!=''" class="colorE95252" style="padding-top:5px;">地接备注团号:{{outItem.StaticsReportList[index].DMCNum}}</div>
<div v-show="outItem.StaticsReportList[index].OPRemark!=''" class="colorE95252" style="padding-top:5px;">OP备注:{{outItem.StaticsReportList[index].OPRemark}}</div>
<div v-show="outItem.StaticsReportList[0].DMCRemark!=''" class="colorE95252" style="padding-top:5px;padding-bottom:4px;">地接备注:{{outItem.StaticsReportList[index].DMCRemark}}</div>
</div>
......@@ -285,7 +286,7 @@
colspanTotal: 0,
//地接团号对象
NumObj: {
newCombinationNum: "",
DMCNum: "",
TCIDs: ""
}
}
......@@ -443,15 +444,22 @@
}
}, err => {})
},
ClickNumItem(newCombinationNum, tcids) {
this.NumObj.newCombinationNum = newCombinationNum;
ClickNumItem(DMCNum,newCombinationNum, tcids) {
if(DMCNum&& DMCNum!="")
{
this.NumObj.DMCNum = DMCNum;
}
else
{
this.NumObj.DMCNum = newCombinationNum;
}
this.NumObj.TCIDs = tcids;
},
//保存地接团号
UpdateCombinationNum() {
this.loading = true;
let msg = {
newCombinationNum: this.NumObj.newCombinationNum,
DMCNum: this.NumObj.DMCNum,
TCIDs: this.NumObj.TCIDs
};
this.apipost('dmcstatistics_post_UpdateCombinationNum', msg, res => {
......
src/router/config.js
View file @ 7306e598
......@@ -2357,7 +2357,14 @@ export default {
meta: {
title: '年度营收报表'
},
}, { // 销售 制作广告
}, {
path: '/JumpReport',
name: 'JumpReport',
component: resolve => require(['@/components/FinancialModule/JumpReport'], resolve),
meta: {
title: '单据明细'
},
},{ // 销售 制作广告
path: '/advert',
name: 'advert',
component: resolve => require(['@/components/SalesModule/advert'], resolve),
......@@ -2739,6 +2746,21 @@ export default {
meta: {
title: '优惠券列表'
}
},
{
path: '/LuckyDraw',
name: 'LuckyDraw',
component: resolve => require(['@/components/activity/LuckyDraw'], resolve),
meta: {
title: '抽奖列表'
}
},{
path: '/awardList',
name: 'awardList',
component: resolve => require(['@/components/activity/awardList'], resolve),
meta: {
title: '奖项列表'
}
}
]
},
......
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