Skip to content

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

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

parents 8d6b2504 64790d77
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2150 additions and 1646 deletions
src/components/FinancialModule/CashAccount.vue
View file @ 991f7ffc
......@@ -113,7 +113,8 @@
<span>
<span v-if="item.IsStandardCurrency!=1">{{item.showB?item.StandardCurrencyCode:item.CurrencyCode}}</span>
<span v-else>{{item.StandardCurrencyCode}}</span>
<span class="fc_green PingFangSC _underline" @click="item.IsStandardCurrency!=1?goUrl('FineBalance',item.ID,item.Alias):''">{{item.showB?moneyFormat(item.benBalance):moneyFormat(item.Initialbalance)}}</span>
<!-- <span class="fc_green PingFangSC _underline" @click="item.IsStandardCurrency!=1?goUrl('FineBalance',item.ID,item.Alias):''">{{item.showB?moneyFormat(item.benBalance):moneyFormat(item.Initialbalance)}}</span> -->
<span class="fc_green PingFangSC _underline" @click="goUrlNew(item)">{{item.showB?moneyFormat(item.benBalance):moneyFormat(item.Initialbalance)}}</span>
<span class="iconfont icon-qiehuan" @click="item.showB=!item.showB" v-if="item.IsStandardCurrency!=1"></span>
<span v-if="item.IsStandardCurrency!=1" class="iconfont icon-ico-renwuyaoqiu"></span>
</span>
......@@ -436,6 +437,11 @@ export default {
costType:[],
}
},methods:{
goUrlNew (item) {
// console.log(item);
let path="CashAccDetail";
this.$router.push({ name: path,query:{"TypeId":item.TypeId,'ID':item.ID, blank: "y",}})
},
regNum(n,t){ // 判断数字 n 值 t 类型
let reg = /^\d+(\.\d{0,6})?$/
if(!n)return 0
......
src/components/FinancialModule/CompanyAccount.vue
View file @ 991f7ffc
......@@ -148,7 +148,8 @@
<span>
<span v-if="item.IsStandardCurrency!=1">{{item.showB?item.StandardCurrencyCode:item.CurrencyCode}}</span>
<span v-else>{{item.StandardCurrencyCode}}</span>
<span class="fc_green PingFangSC _underline" @click="item.IsStandardCurrency!=1?goUrl('FineBalance',item.ID,item.Alias):''">{{item.showB?moneyFormat(item.benBalance):moneyFormat(item.Initialbalance)}}</span>
<!-- <span class="fc_green PingFangSC _underline" @click="item.IsStandardCurrency!=1?goUrl('FineBalance',item.ID,item.Alias):''">{{item.showB?moneyFormat(item.benBalance):moneyFormat(item.Initialbalance)}}</span> -->
<span class="fc_green PingFangSC _underline" @click="goUrlNew(item)">{{item.showB?moneyFormat(item.benBalance):moneyFormat(item.Initialbalance)}}</span>
<span class="iconfont icon-qiehuan" @click="item.showB=!item.showB" v-if="item.IsStandardCurrency!=1"></span>
<span v-if="item.IsStandardCurrency!=1" class="iconfont icon-ico-renwuyaoqiu"></span>
</span>
......@@ -338,6 +339,16 @@
<el-input v-model="addMsg.RiskLowerLimitMoney" type="number" class=""></el-input>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="初始本位币金额">
<el-input v-model="addMsg.AccountStartWBMoney" type="number" class></el-input>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="初始原币金额">
<el-input v-model="addMsg.AccountStartMoney" type="number" class></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
......@@ -421,7 +432,9 @@ export default {
BranchIdS:0,
OutCharge:0,
InCharge:0,
RiskLowerLimitMoney:''
RiskLowerLimitMoney:'',
AccountStartMoney:0,
AccountStartWBMoney:0,
},
getCompanyMsg:{
RB_Group_Id:'0',
......@@ -575,6 +588,11 @@ export default {
this.showEmployeeList2 = [];
}
},
goUrlNew (item) {
console.log("1223",item)
let path="CompanyAccDetail";
this.$router.push({ name: path,query:{"TypeId":item.TypeId,'ID':item.ID, blank: "y",}})
},
goUrl (path,id,name,source,CurrencyId) {
this.$router.push({ name: path,query:{"id":id,'name':name,'source':source,'CurrencyId':CurrencyId}})
},
......@@ -658,7 +676,9 @@ export default {
BranchIdS:0,
OutCharge:0,
InCharge:0,
RiskLowerLimitMoney:''
RiskLowerLimitMoney:'',
AccountStartMoney:0,
AccountStartWBMoney:0,
}
this.SetProfitLossMsg={
ID:0,
......
src/components/FinancialModule/PlatformAccount.vue
View file @ 991f7ffc
......@@ -231,6 +231,7 @@
sort-always
@sort-change="sortChange"
@on-custom-comp='customCompFunc'
:row-click="rowClick"
></v-table>
<div class="_vMG_edit _scrollbar" v-if="addShow" :class="addShow==true?'edHeight':''">
<el-row>
......@@ -459,6 +460,16 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="初始本位币金额">
<el-input v-model="addMsg.AccountStartWBMoney" type="number" class></el-input>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="初始原币金额">
<el-input v-model="addMsg.AccountStartMoney" type="number" class></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24" :gutter="35">
......@@ -596,7 +607,10 @@ export default {
Remark:'',
BindBankID:null,
HaveContract:'0',
ContraceDateRange:''
ContraceDateRange:'',
AccountStartMoney:0,
AccountStartWBMoney:0,
},
getCompanyMsg: {
RB_Group_Id: "0",
......@@ -708,6 +722,19 @@ export default {
};
},
methods: {
rowClick(rowIndex,rowData,column){
let path='PlatformAccDetail';
if(column.title=="账户余额"){
this.$router.push({
name: path,
query: {
TypeId: rowData.TypeId,
ID:rowData.ID,
blank: "y",
}
});
}
},
remoteQueryBankMethod(query){
if(query!=''){
this.remoteLoading=true
......@@ -931,7 +958,6 @@ export default {
this.getList();
},
filterMethod(filters) {
console.log("filter", filters);
this.msg.Alias = filters.Alias;
this.msg.RB_Branch_Id = filters.allName;
this.msg.SettlementType =
......@@ -1107,6 +1133,7 @@ export default {
this.remoteMethod(data.InemName);
this.remoteMethod2(data.OutemName);
this.addMsg = data;
// console.log("this.addMsg",this.addMsg)
this.addMsg.HaveContract = this.addMsg.HaveContract.toString()
this.addMsg.SettlementType =this.addMsg.SettlementType.toString()
this.addMsg.BindBankID = this.addMsg.BindBankID==-1?null:this.addMsg.BindBankID
......@@ -1135,7 +1162,9 @@ export default {
BranchIdS: 0,
OutCharge: 0,
InCharge: 0,
RiskLowerLimitMoney: ""
RiskLowerLimitMoney: "",
AccountStartMoney:0,
AccountStartWBMoney:0,
};
this.SetProfitLossMsg = {
ID: 0,
......
src/components/FinancialModule/PoolAccount.vue
View file @ 991f7ffc
......@@ -114,7 +114,8 @@
<span>
<span v-if="item.IsStandardCurrency!=1">{{item.showB?item.StandardCurrencyCode:item.CurrencyCode}}</span>
<span v-else>{{item.StandardCurrencyCode}}</span>
<span class="fc_green PingFangSC _underline" @click="item.IsStandardCurrency!=1?goUrl('FineBalance',item.ID,item.Alias):''">{{item.showB?moneyFormat(item.benBalance):moneyFormat(item.Initialbalance)}}</span>
<!-- <span class="fc_green PingFangSC _underline" @click="item.IsStandardCurrency!=1?goUrl('FineBalance',item.ID,item.Alias):''">{{item.showB?moneyFormat(item.benBalance):moneyFormat(item.Initialbalance)}}</span> -->
<span class="fc_green PingFangSC _underline" @click="goUrlNew(item)">{{item.showB?moneyFormat(item.benBalance):moneyFormat(item.Initialbalance)}}</span>
<span class="iconfont icon-qiehuan" @click="item.showB=!item.showB" v-if="item.IsStandardCurrency!=1"></span>
<span v-if="item.IsStandardCurrency!=1" class="iconfont icon-ico-renwuyaoqiu"></span>
</span>
......@@ -432,6 +433,11 @@ export default {
Charge:1
}
},methods:{
goUrlNew (item) {
console.log(item);
let path="PoolAccDetail";
this.$router.push({ name: path,query:{"TypeId":item.TypeId,'ID':item.ID, blank: "y",}})
},
remoteMethod(query) {
if (query !== '') {
this.loadingPeople = true
......
src/components/FinancialModule/ReportForm/LineReceiver.vue 0 → 100644
View file @ 991f7ffc
<style scoped>
.LineReceiver .el-form-item{
display: inline-block;
}
</style>
<template>
<div class="LineReceiver">
<div>
<el-form>
<el-form-item label="收客日期">
<el-date-picker size="small"
@change="timeAdd"
v-model="productionDate"
type="daterange"
value-format="yyyy-MM-dd"
:range-separator="$t('restaurant.res_To')">
</el-date-picker>
</el-form-item>
<el-form-item>
<input type="button" class="normalBtn" :value="$t('pub.searchBtn')" @click="getList()"/>
<input type="button" class="hollowFixedBtn" value="导出" @click="Export"/>
</el-form-item>
</el-form>
</div>
<div v-loading="loading">
<el-table :data="List" border>
<el-table-column fixed prop="BranchName" label="公司名称" min-width="100">
</el-table-column>
<el-table-column min-width="130" @sort-by="SortBy" sortable v-for='(item,index) in newArr' :prop='item.Rank' :label="item.title" :key='index'>
<template slot-scope="scope">
<p>{{scope.row[item.Rank]}} ({{scope.row[item.value]}})</p>
</template>
</el-table-column>
</el-table>
</div>
</div>
</template>
<script>
import moment from "moment"
export default {
data (){
return{
productionDate:[],
msg:{
StartTime:"",
EndTime:"",
},
ColList:[],
List:[],
newArr:[],
loading:false,
userId:0,
}
},
created(){
let mon1=moment().format("YYYY-MM-DD");
let mon2=moment().subtract(1, "months").format("YYYY-MM-DD");
this.productionDate=[mon2,mon1];
this.msg.StartTime=this.productionDate[0];
this.msg.EndTime=this.productionDate[1];
let userInfo = this.getLocalStorage();
this.userId = userInfo.EmployeeId;
},
mounted(){
this.getList();
},
methods:{
Export(){
this.msg.EmployeeId = this.userId;
let msg = JSON.parse(JSON.stringify(this.msg));
this.GetLocalFile(
"financestatistics_post_OutToExcelGetCompanyLineGuestList",
msg,
"线路收客统计.xls"
);
},
SortBy(){
},
timeAdd(){
if(!this.productionDate){
this.msg.StartTime="";
this.msg.EndTime="";
}else{
this.msg.StartTime=this.productionDate[0];
this.msg.EndTime=this.productionDate[1];
}
},
getList(){
this.loading=true;
this.apipost('financestatistics_post_GetCompanyLineGuestList',this.msg, res => {
this.loading=false;
if(res.data.resultCode == 1) {
this.ColList=res.data.data.ColList;
this.List=res.data.data.List;
for(let i = 1; i < this.ColList.length; i++) {
this.newArr.push({
"Rank":this.ColList[i].Sort,
'value': this.ColList[i].Col,
"title": this.ColList[i].Name,
})
}
}else{
this.Error(res.data.message);
}
}, err => {})
},
}
}
</script>
\ No newline at end of file
src/components/FinancialModule/accDetail/CashAccDetail.vue
View file @ 991f7ffc
......@@ -364,6 +364,7 @@
</div>
</template>
<script>
import moment from "moment"
export default {
data(){
return{
......@@ -446,7 +447,7 @@ export default {
allWPrice:0,
}
},created(){
if(this.$route.query.TypeId){
if(this.$route.query.TypeId&&!this.$route.query.ID){
this.msg.Is_Cashier = parseInt(this.$route.query.Is_Cashier);
this.accType = parseInt(this.$route.query.TypeId);
this.msg.sTradeDate = this.$route.query.sTradeDate;
......@@ -456,6 +457,23 @@ export default {
this.getList();
this.BankAccount_post_GetCashAccountList("query");
}
if(this.$route.query.ID){
this.accType = parseInt(this.$route.query.TypeId)?parseInt(this.$route.query.TypeId):'';
this.AccountId=parseInt(this.$route.query.ID);
let mon1=moment().format("YYYY-MM-DD");
let mon2=moment().subtract(1, "months").format("YYYY-MM-DD");
this.productionDate=[mon2,mon1];
this.msg.sTradeDate=mon2;
this.msg.eTradeDate=mon1;
this.msg.BankList=[];
this.msg.BankList.push({
Type:this.Type,
AccountId:this.AccountId
})
this.bankaccount_post_GetList();
this.getList();
}
},methods:{
addChuNaFun(){ // 添加出纳按钮点击事件
let count = 0;
......@@ -798,7 +816,7 @@ export default {
this.msg.QEndDate = this.productionDateByTC[1];
},
bankaccount_post_GetList(){ // 获取银行账户
this.AccountId = '';
// this.AccountId = '';
let msg = {
TypeId:this.accType,
BranchId:-1,
......
src/components/FinancialModule/accDetail/CompanyAccDetail.vue
View file @ 991f7ffc
......@@ -331,6 +331,7 @@
</div>
</template>
<script>
import moment from "moment"
export default {
data(){
return{
......@@ -399,16 +400,33 @@ export default {
allWPrice:0,
}
},created(){
if(this.$route.query.TypeId){
if(this.$route.query.TypeId&&!this.$route.query.ID){
this.msg.Is_Cashier = parseInt(this.$route.query.Is_Cashier);
this.accType = parseInt(this.$route.query.TypeId);
this.msg.sTradeDate = this.$route.query.sTradeDate;
this.msg.eTradeDate = this.$route.query.eTradeDate;
this.msg.sTradeDate = this.$route.query.sTradeDate?this.$route.query.sTradeDate:"";
this.msg.eTradeDate = this.$route.query.eTradeDate?this.$route.query.eTradeDate:"";
this.productionDate = [this.msg.sTradeDate, this.msg.eTradeDate];
this.productionDateByTC=[this.msg.QStartDate, this.msg.QEndDate];
this.getList();
this.getList();
this.bankaccount_post_GetListS("query");
}
if(this.$route.query.ID){
this.accType = parseInt(this.$route.query.TypeId);
this.AccountId=parseInt(this.$route.query.ID);
let mon1=moment().format("YYYY-MM-DD");
let mon2=moment().subtract(1, "months").format("YYYY-MM-DD");
this.productionDate=[mon2,mon1];
this.msg.sTradeDate=mon2;
this.msg.eTradeDate=mon1;
this.msg.BankList=[];
this.msg.BankList.push({
Type:this.Type,
AccountId:this.AccountId
})
this.bankaccount_post_GetList();
this.getList();
}
},methods:{
goUrl(path,id){
this.$router.push({ name: path,query:{"id":id,blank:'y'} })
......@@ -453,7 +471,7 @@ export default {
this.msg.QEndDate = this.productionDateByTC[1];
},
bankaccount_post_GetList(){ // 获取银行账户
this.AccountId = '';
// this.AccountId = '';
this.apipost('bankaccount_post_GetList',{TypeId:this.accType}, res => {
if(res.data.resultCode == 1) {
let data = res.data.data;
......@@ -487,7 +505,7 @@ export default {
}, err => {})
},
getList(){ //获取列表
this.loading = true
// this.loading = true
if( this.msg.ClientID == '' ){
this.msg.ClientID = 0;
}
......@@ -500,6 +518,8 @@ export default {
}
this.allMoney = '';
this.apipost('Financial_post_GetAccountDetailList',this.msg,res=>{
this.loading = false;
if(res.data.resultCode==1){
let data = res.data.data;
if(data.length){
......@@ -534,7 +554,7 @@ export default {
})
});
this.DataList = data
this.loading = false;
if( this.msg.ClientID == 0 ){
this.msg.ClientID = '';
}
......
src/components/FinancialModule/accDetail/PlatformAccDetail.vue
View file @ 991f7ffc
......@@ -311,6 +311,7 @@
</div>
</template>
<script>
import moment from 'moment'
export default {
data(){
return{
......@@ -328,7 +329,7 @@ export default {
AccountNumber:''
},
Type:2,
AccountId:'',
AccountId:"",
DataList:[],
StartMoney:0,
AccountTypeList:[],
......@@ -380,7 +381,7 @@ export default {
allWPrice:0,
}
},created(){
if(this.$route.query.TypeId){
if(this.$route.query.TypeId&&!this.$route.query.ID){
this.msg.Is_Cashier = parseInt(this.$route.query.Is_Cashier);
this.accType = parseInt(this.$route.query.TypeId);
this.msg.sTradeDate = this.$route.query.sTradeDate;
......@@ -390,6 +391,23 @@ export default {
this.getList();
this.BankAccount_post_GetPlatformList("query");
}
if(this.$route.query.ID){
this.accType = parseInt(this.$route.query.TypeId)?parseInt(this.$route.query.TypeId):"";
this.AccountId=parseInt(this.$route.query.ID);
let mon1=moment().format("YYYY-MM-DD");
let mon2=moment().subtract(1, "months").format("YYYY-MM-DD");
this.productionDate=[mon2,mon1];
this.msg.sTradeDate=mon2;
this.msg.eTradeDate=mon1;
this.msg.BankList=[];
this.msg.BankList.push({
Type:this.Type,
AccountId:this.AccountId
})
this.bankaccount_post_GetList();
this.getList();
}
},methods:{
goUrl(path,id){
this.$router.push({ name: path,query:{"id":id,blank:'y'} })
......@@ -434,7 +452,7 @@ export default {
this.msg.QEndDate = this.productionDateByTC[1];
},
bankaccount_post_GetList(){ // 获取平台账户
this.AccountId = '';
// this.AccountId = '';
let msg = {
BackId:0,
TypeId:this.accType,
......
src/components/FinancialModule/accDetail/PoolAccDetail.vue
View file @ 991f7ffc
......@@ -341,6 +341,7 @@
</div>
</template>
<script>
import moment from "moment"
export default {
data(){
return{
......@@ -410,7 +411,7 @@ export default {
allWPrice:0,
}
},created(){
if(this.$route.query.TypeId){
if(this.$route.query.TypeId&&!this.$route.query.ID){
this.msg.Is_Cashier = parseInt(this.$route.query.Is_Cashier);
this.accType = parseInt(this.$route.query.TypeId);
this.msg.sTradeDate = this.$route.query.sTradeDate;
......@@ -420,6 +421,24 @@ export default {
this.getList();
this.BankAccount_post_GetCashPoolList("query");
}
if(this.$route.query.ID){
this.accType = parseInt(this.$route.query.TypeId)?parseInt(this.$route.query.TypeId):0;
this.AccountId=parseInt(this.$route.query.ID);
let mon1=moment().format("YYYY-MM-DD");
let mon2=moment().subtract(1, "months").format("YYYY-MM-DD");
this.productionDate=[mon2,mon1];
this.msg.sTradeDate=mon2;
this.msg.eTradeDate=mon1;
this.msg.BankList=[];
this.msg.BankList.push({
Type:this.Type,
AccountId:this.AccountId
})
this.bankaccount_post_GetList();
this.getList();
}
},methods:{
goUrl(path,id){
this.$router.push({ name: path,query:{"id":id,blank:'y'} })
......@@ -469,7 +488,7 @@ export default {
this.msg.QEndDate = this.productionDateByTC[1];
},
bankaccount_post_GetList(){ // 获取银行账户
this.AccountId = '';
// this.AccountId = '';
let msg = {
TypeId:this.accType,
BranchId:-1,
......@@ -514,6 +533,7 @@ export default {
this.endStartMoney = '';
this.endRStartMoney ='';
this.apipost('Financial_post_GetAccountDetailList',this.msg,res=>{
if(res.data.resultCode==1){
let data = res.data.data;
if(data.length){
......
src/components/FinancialModule/addFinancialDocuments.vue
View file @ 991f7ffc
......@@ -1320,12 +1320,15 @@ export default {
getCompany(){ //公司
this.apipost('admin_get_BranchGetList', this.companyMsg, res => {
let data = res.data.data;
let Status=false;
if(this.$route.query.companyID!=='-1' && this.$route.query.companyID!==undefined){
Status=true;
data.forEach(x=>{
x.disabled = true;
})
}
if (this.orderObj && this.orderObj.companyIDList && this.orderObj.companyIDList.length>0) {
Status=true;
this.orderObj.companyIDList.forEach(x=>{
data.forEach(y=>{
if (y.disabled === false){
......@@ -1337,6 +1340,29 @@ export default {
});
}
this.companyList = data;
if(!Status){
let id=this.$route.query.id;
this.apipost('FinancialFlowTemplate_post_GetTemplateBranch', {ID:id}, res => {
if (res.data.resultCode == 1) {
let resdata = res.data.data;
if(resdata.IsGroupCommon==0){
let BranchList=resdata.BranchList;
data.forEach(x=>{
x.disabled=true;
BranchList.forEach(y=>{
if(x.Id==y){
x.disabled=false;
}
})
})
this.companyList = data;
}
}
}, err => {})
}
}, err => {})
},
//设置选中单据名单
......
src/components/FinancialModule/addReceivablesDocuments.vue
View file @ 991f7ffc
......@@ -1430,12 +1430,15 @@ export default {
getCompany(){ // 获取公司
this.apipost('admin_get_BranchGetList', this.companyMsg, res => {
let data = res.data.data;
let Status=false;
if(this.$route.query.companyID!=='-1' && this.$route.query.companyID!==undefined){
Status=true;
data.forEach(x=>{
x.disabled = true;
})
}
if (this.orderObj && this.orderObj.companyIDList && this.orderObj.companyIDList.length>0) {
Status=true;
this.orderObj.companyIDList.forEach(x=>{
data.forEach(y=>{
if (y.disabled === false){
......@@ -1447,6 +1450,30 @@ export default {
});
}
this.companyList = data;
if(!Status){
let id=this.$route.query.id;
this.apipost('FinancialFlowTemplate_post_GetTemplateBranch', {ID:id}, res => {
if (res.data.resultCode == 1) {
let resdata = res.data.data;
if(resdata.IsGroupCommon==0){
let BranchList=resdata.BranchList;
data.forEach(x=>{
x.disabled=true;
BranchList.forEach(y=>{
if(x.Id==y){
x.disabled=false;
}
})
})
this.companyList = data;
}
}
}, err => {})
}
}, err => {})
},
},
......
src/components/FinancialModule/invoicesManager.vue
View file @ 991f7ffc
......@@ -123,6 +123,15 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="公司">
<el-select v-model="msg.RB_Branch_Id" filterable style="width: 130px">
<el-option :value="-1" :label="$t('pub.unlimitedSel')"></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="8" :gutter="35">
<el-form-item label="申请日期">
<el-date-picker
......@@ -215,7 +224,7 @@
<div class="noDataNotice" v-if="dataList.length<1"><i class="iconfont icon-kong"></i> <p>没有找到你需要的数据</p></div>
<div v-if="dataList.length>0">
<el-pagination
background
background
@current-change="handleCurrentChange"
:current-page.sync="currentPage"
layout="total,prev, pager, next, jumper"
......@@ -230,6 +239,8 @@ export default {
data() {
return {
active: 1,
RB_Group_Id:'',
companyList:[],
msg: {
TCID: 0,
TCNUM: '',
......@@ -243,6 +254,7 @@ export default {
eDate: '',
pageIndex: 1,
pageSize: 10,
RB_Branch_Id:-1
},
productionDate: [],
dataList: [],
......@@ -288,6 +300,7 @@ export default {
this.msg.eDate = this.productionDate[1];
},
getPageList: function () {
console.log(this.msg.BName)
this.loading = true
if (this.msg.OrderId === '') {
this.msg.OrderId = 0
......@@ -298,7 +311,7 @@ export default {
this.total = res.data.data.count;
this.dataList = res.data.data.pageData
}
if (this.msg.OrderId === 0) {
this.msg.OrderId = ''
}
......@@ -311,7 +324,7 @@ export default {
});
},
goUrlT: function (path, obj, title){
this.$router.push({ name:path,query:{"id":obj,blank:'y',tab:title}})
this.$router.push({ name:path,query:{"id":obj,blank:'y',tab:title}})
},
goUrlO: function (OrderId) {
this.$router.push({ name: 'enrollTotal', query: { id: OrderId, blank: 'y', tab: '报名统计'} });
......@@ -324,9 +337,19 @@ export default {
this.msg.pageIndex=1;
this.currentPage = 1;
},
getBranchList(){
this.RB_Group_Id = this.getLocalStorage().RB_Group_id;
this.apipost('admin_get_BranchGetList', {RB_Group_Id:this.RB_Group_Id}, res=>{
if (res.data.resultCode == 1) {
this.companyList=res.data.data;
}
}, null)
}
},
mounted() {
this.getPageList();
this.getBranchList();
}
};
</script>
src/components/Hotel/ChangeHotel.vue
View file @ 991f7ffc
This diff is collapsed.
src/components/Hotel/roomQuery.vue
View file @ 991f7ffc
......@@ -92,6 +92,22 @@
<el-option v-for="item in HotelList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select>
</span>
</li>
<li style="display:none;">
<span>
<em>酒店状态</em>
<el-select v-model="msg.HotelStatus" :placeholder="$t('pub.pleaseSel')" filterable>
<el-option :label="$t('pub.unlimitedSel')" :value='-1'></el-option>
<el-option label="全部OK" :value='100'></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-option label="暂定五晚" :value='5'></el-option>
<el-option label="暂定六晚" :value='6'></el-option>
<el-option label="暂定七晚以上" :value='7'></el-option>
</el-select>
</span>
</li>
<li>
<input type="button" class="normalBtn" value="查询" @click="getList();resetPageIndex()" />
......@@ -149,8 +165,12 @@
<p class="pDateStyle">{{childItem.CheckInDateStr}}</p>
<p @click="goUrlR('HotelManagement',childItem.HotelId,'酒店管理')"
class="pDateStyle phoverStype ownScrollbarStyle" style="height: 50px!important; overflow:auto;">
{{childItem.NewHotelName}}<span
class="colorE95252">（{{childItem.HotelOrderState==1?"OK":"暂定"}}）</span>
{{childItem.NewHotelName}}
<span class="colorE95252">
<template v-if="childItem.OPState==1">[OP选房-OK]</template>
<template v-else>{{childItem.DMCState==1?"[地接-OK]":(childItem.DMCState==0?"[未操作]":"[暂定]")}}
</template>
</span>
</p>
</div>
</div>
......@@ -191,7 +211,8 @@
CreateBy: 0,
TCNUM: '',
PriceStatus: 0,
CombinationNum: ''
CombinationNum: '',
HotelStatus:-1,
},
//分公司类表
companyList: [],
......
src/components/Hotel/roomReservationsDetails.vue
View file @ 991f7ffc
......@@ -305,6 +305,9 @@
subItem.HotelId = 0;
subItem.HotelName = "";
subItem.OrderID = 0;
subItem.OrderDetailsList.forEach(childItem=>{
childItem.OrderDetailsId=0;
});
item.HotelOrderList.push(subItem);
},
//删除酒店
......@@ -492,7 +495,7 @@
})
});
})
this.loading = true
this.loading = true;
this.apipost('dmcstatistics_get_SetHotelOrder', this.list, res => {
if (res.data.resultCode == 1) {
this.getList();
......
src/components/TravelManager/TravelList/RegistrationStatistics.vue
View file @ 991f7ffc
......@@ -149,7 +149,7 @@
</span>
</li>
<li>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()" /> &nbsp;
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex(),getList()" /> &nbsp;
<button class="hollowFixedBtn" @click="DownLoadFile()">{{$t('adm.adm_download')}}</button>
</li>
</ul>
......@@ -202,6 +202,17 @@
</tr>
</tbody>
</table>
<div class="noDataNotice" v-if="DataList.length<1"><i class="iconfont icon-kong"></i> <p>没有找到你需要的数据</p></div>
<div v-if="DataList.length>0">
<el-pagination
background
@current-change="handleCurrentChange"
:current-page.sync="currentPage"
layout="total,prev, pager, next, jumper"
:page-size='queryMsg.pageSize'
:total='total'>
</el-pagination>
</div>
</div>
</template>
<script>
......@@ -224,7 +235,7 @@
},
queryMsg: {
pageIndex: 1,
pageSize: 15,
pageSize: 50,
LineID: 0,
ltID: 0,
OutBranchId: -1,
......@@ -232,7 +243,9 @@
QEndDate: ""
},
//数据列表
DataList: []
DataList: [],
currentPage: 0,
total:0,
};
},
methods: {
......@@ -285,8 +298,8 @@
res => {
this.queryCommonData.loading = false;
if (res.data.resultCode == 1) {
this.DataList = res.data.data;
this.total = res.data.data.count
this.DataList = res.data.data.pageData;
this.DataList.forEach(item => {
switch (item.StartCityName) {
case '成都':
......@@ -374,6 +387,14 @@
d = new Date(ds[0], ds[1] - 1 + m, _d > max ? max : _d);
return d.toLocaleDateString().match(/\d+/g).join('-')
},
handleCurrentChange: function (val) { //翻页
this.queryMsg.pageIndex = val;
this.getList();
},
resetPageIndex: function (){ // 重置页码
this.queryMsg.pageIndex=1;
this.currentPage = 1;
},
},
mounted() {
let myDate = new Date();
......
src/components/TravelManager/TravelList/RegistrationStatistics_Sale.vue
View file @ 991f7ffc
......@@ -81,7 +81,7 @@
</span>
</li>
<li>
<input type="button" class="hollowFixedBtn" value="查询" @click="getList()" /> &nbsp;
<input type="button" class="hollowFixedBtn" value="查询" @click="resetPageIndex(),getList()" /> &nbsp;
<button class="hollowFixedBtn" @click="DownLoadFile()">下载</button>
</li>
</ul>
......@@ -126,6 +126,18 @@
</tr>
</tbody>
</table>
<div class="noDataNotice" v-if="DataList.length<1"><i class="iconfont icon-kong"></i> <p>没有找到你需要的数据</p></div>
<div v-if="DataList.length>0">
<el-pagination
background
@current-change="handleCurrentChange"
:current-page.sync="currentPage"
layout="total,prev, pager, next, jumper"
:page-size='queryMsg.pageSize'
:total='total'>
</el-pagination>
</div>
</div>
</template>
<script>
......@@ -148,7 +160,7 @@
},
queryMsg: {
pageIndex: 1,
pageSize: 15,
pageSize: 50,
LineID: 0,
ltID: 0,
OutBranchId: -1,
......@@ -156,7 +168,9 @@
QEndDate: ""
},
//数据列表
DataList: []
DataList: [],
currentPage: 0,
total:0,
};
},
methods: {
......@@ -209,7 +223,8 @@
res => {
this.queryCommonData.loading = false;
if (res.data.resultCode == 1) {
this.DataList = res.data.data;
this.total = res.data.data.count
this.DataList = res.data.data.pageData;
this.DataList.forEach(item => {
switch (item.StartCityName) {
case '成都':
......@@ -289,6 +304,14 @@
}
});
},
handleCurrentChange: function (val) { //翻页
this.queryMsg.pageIndex = val;
this.getList();
},
resetPageIndex: function (){ // 重置页码
this.queryMsg.pageIndex=1;
this.currentPage = 1;
},
},
mounted() {
this.getCompanyList();
......
src/components/administrative/ExaminationStatistics.vue
View file @ 991f7ffc
......@@ -346,6 +346,17 @@ export default {
return `<span>${rowData.discountPrice <= 0 ? '' : that.moneyFormat(rowData.discountPrice)}</span>`
}
};
let shaoJian = {
title: "违反少价规定",
titleAlign: "left",
columnAlign: "left",
isResize: true,
width: 80,
orderBy: "",
formatter: function(rowData, rowIndex, pagingIndex, field) {
return ''
}
};
this.columns = [];
this.columns.push(company);
this.columns.push(department);
......@@ -353,6 +364,7 @@ export default {
this.columns.push(periods);
this.columns.push(LllegalModifyRemarkCount);
this.columns.push(AppletOrderCount);
this.columns.push(shaoJian);
this.columns.push(rejectCount);
this.columns.push(receivedPeopleCount);
this.columns.push(orderCount);
......
src/components/administrative/statisticsCheckTime.vue
View file @ 991f7ffc
......@@ -184,6 +184,7 @@
this.$nextTick(() => {
this.dataList = res.data.data.pageData;
});
console.log("res",res);
this.datesArr = res.data.data.columnData;
this.newArr.length = 0;
for(let i = 0; i < this.datesArr.length; i++) {
......@@ -192,6 +193,7 @@
"title": this.datesArr[i].substring(this.datesArr[i].length - 2, this.datesArr[i].length) + '（' + this.getWeekByDay(this.datesArr[i]) + ')'
})
}
console.log("this.newArr",this.newArr)
this.total = res.data.data.count;
}
......
src/components/busManagement/BusInfo.vue
View file @ 991f7ffc
......@@ -129,6 +129,17 @@
background: #EAEAEA !important;
text-align: center;
}
.disClick {
background-color: #d1d1d1;
color: #fff;
border: 1px solid #d1d1d1;
}
.disClick:hover {
background-color: #d1d1d1 !important;
cursor: default !important;
box-shadow: none !important;
}
</style>
<template>
......@@ -209,7 +220,7 @@
@click="UseTypeClick(childItem.Id,scope.$index,subIndex);getBusPrice(scope.row)">{{childItem.Name}}</span>
</span>
<span style="width:30px;display:inline-block;">
<a v-if="subIndex>0" @click="DeleteSubItem(scope.row,subIndex)"
<a v-if="subIndex>0" @click="DeleteSubItem(scope.row,subIndex),getBusPrice(scope.row)"
style="color:blue;cursor:pointer">删除</a>
</span>
<span style="display:inline-block;width:30px;margin-left:5px;">
......@@ -339,8 +350,8 @@
</el-table-column>
</el-table>
<div class="upBtnList">
<input type="button" class="normalBtn" @click="SaveList(0)" :disabled="disButton" value="保存草稿" />
<input type="button" class="normalBtn" @click="SaveList(1)" :disabled="disButton" value="保存" />
<input type="button" class="normalBtn" :class="{'disClick':!isSubmit}" @click="SaveList(0)" :disabled="disButton" value="保存草稿" />
<input type="button" class="normalBtn" :class="{'disClick':!isSubmit}" @click="SaveList(1)" :disabled="disButton" value="保存" />
</div>
</el-form>
</div>
......@@ -488,7 +499,8 @@
totalFlySeat: '',
LeaderName: '',
GuideName: '',
loading: false
loading: false,
isSubmit: true,
};
},
methods: {
......@@ -497,7 +509,8 @@
let tempCostFee = 0;
var tempHighSpeedFee = 0;
if (obj.BusType) {
obj.PayType=1;
obj.PayType=2;
obj.HighSpeedPayType = 1;
let busTypeObj = this.BusTypeList.find(item => item.Id === obj.BusType);
if (busTypeObj) {
obj.DetailList.forEach(subItem => {
......@@ -515,7 +528,7 @@
}
});
obj.HighSpeedPrice = tempHighSpeedFee;
obj.CostPrice = tempCostFee + tempHighSpeedFee;
obj.CostPrice = tempCostFee;
}
}else{
obj.PayType=null;
......@@ -590,15 +603,19 @@
item.OrderState = type
})
this.PostData.PlanList = this.PlanTableData;
this.apipost('bus_get_SetPlan', this.PostData, res => {
if (res.data.resultCode == 1) {
this.Success("保存成功！");
this.MsgBus.$emit('msg');
this.createTableData();
} else {
this.Error(res.data.message);
}
}, err => {})
if (this.isSubmit) {
this.isSubmit = false;
this.apipost('bus_get_SetPlan', this.PostData, res => {
if (res.data.resultCode == 1) {
this.Success("保存成功！");
this.MsgBus.$emit('msg');
this.createTableData();
} else {
this.Error(res.data.message);
}
this.isSubmit = true;
}, err => {})
}
},
//用车类型点击事件
UseTypeClick(value, index, subIndex) {
......@@ -699,6 +716,9 @@
newPlanData.BusType = oldPlanData.BusType;
newPlanData.PayType = oldPlanData.PayType;
newPlanData.BookGroup = oldPlanData.BookGroup;
newPlanData.HighSpeedPrice = oldPlanData.HighSpeedPrice;
newPlanData.HighSpeedPayType = oldPlanData.HighSpeedPayType;
newPlanData.CostPrice = oldPlanData.CostPrice;
}
},
mounted() {
......
src/components/busManagement/busHandBook.vue
View file @ 991f7ffc
......@@ -25,11 +25,6 @@
padding-left: 20px;
}
.comTextdisClick {
background-color: #d1d1d1;
color: #fff;
border: 1px solid #d1d1d1;
}
.addHandBook{
margin-right: 5px;
color: seagreen;
......@@ -39,6 +34,17 @@
.addHandBookDIS{
visibility: visible!important;
}
.disClick {
background-color: #d1d1d1;
color: #fff;
border: 1px solid #d1d1d1;
}
.disClick:hover {
background-color: #d1d1d1 !important;
cursor: default !important;
box-shadow: none !important;
}
</style>
<template>
<div>
......@@ -122,8 +128,8 @@
<tfoot>
<tr>
<td colspan="6">
<input type="button" class="normalBtn" :class="{'comTextdisClick':isSave}" @click="SaveData()" value="保存" />
<input type="button" class="normalBtn" :class="{'comTextdisClick':isSave}" @click="DownLoadFile()"
<input type="button" class="normalBtn" :class="{'disClick':isSave}" @click="SaveData()" value="保存" />
<input type="button" class="normalBtn" :class="{'disClick':isSave}" @click="DownLoadFile()"
value="下载" />
</td>
</tr>
......
src/components/dmc/manager/tripsManager.vue
View file @ 991f7ffc
This diff is collapsed.
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @ 991f7ffc
......@@ -444,7 +444,7 @@
:false-label="UnCheckedVaule">订团
</el-checkbox>
<el-checkbox v-model="priceData.IsLessPrice" :true-label="CheckedVaule"
:false-label="UnCheckedVaule">可少价
:false-label="UnCheckedLessPrice">可少价
</el-checkbox>
<input type="button" class="normalBtn" value="酒店使用情况" @click="outerVisible=true"
v-if="PostConfig.LineId==14 && priceData.PriceHotelList&&priceData.PriceHotelList.length>0" />
......@@ -917,6 +917,7 @@
uploadList: [],
CheckedVaule: 1, //选中值
UnCheckedVaule: 2, //没选中
UnCheckedLessPrice: 0,//不少价
isSaved: true,
btnText: '保存',
//日期数组
......@@ -1098,7 +1099,7 @@
//是否订团，0-不订，1需要订
IsBookTeam: 0,
//少价,0-不少价，1少价
IsLessPrice: 0,
IsLessPrice: 1,
//是否重新生成行程数据
IsNew: false,
//选中的酒店数组
......
src/components/systemLogs.vue
View file @ 991f7ffc
<style>
.sysLog_Content {
border-left: 2px solid #D2D2D2;
margin: 40px 0 0 40px;
height:90%;
overflow-y: auto;
}
.sysLog_List {
position: relative;
margin: 0 0 20px 16px;
margin-left: 10px;
border-left:1px solid #d1d1d1;
padding:0 0 20px 17px;
}
.sysLog_List:first-child{
margin-top:5px;
}
.sysLog_List:last-child{
border-left:0;
}
.sysCircle {
display: inline-block;
width: 13px;
......
src/router/config.js
View file @ 991f7ffc
......@@ -2733,6 +2733,14 @@ export default {
meta: {
title: '简易报表'
},
},
{ //财务 线路收客
path: '/LineReceiver',
name: 'LineReceiver',
component: resolve => require(['@/components/FinancialModule/ReportForm/LineReceiver'], resolve),
meta: {
title: '线路收客'
},
}, { //财务 报表 年度营收报表
path: '/YearReport',
name: 'YearReport',
......
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