Skip to content

S
SuperMan
Commit ae5d6da4 authored by Mac's avatar Mac
Browse files
Options

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

parents abd34625 dd8966d5
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1531 additions and 1269 deletions
src/components/FinancialModule/CashAccount.vue
View file @ ae5d6da4
...@@ -113,7 +113,8 @@ ...@@ -113,7 +113,8 @@
<span> <span>
<span v-if="item.IsStandardCurrency!=1">{{item.showB?item.StandardCurrencyCode:item.CurrencyCode}}</span> <span v-if="item.IsStandardCurrency!=1">{{item.showB?item.StandardCurrencyCode:item.CurrencyCode}}</span>
<span v-else>{{item.StandardCurrencyCode}}</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 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 v-if="item.IsStandardCurrency!=1" class="iconfont icon-ico-renwuyaoqiu"></span>
</span> </span>
...@@ -436,6 +437,11 @@ export default { ...@@ -436,6 +437,11 @@ export default {
costType:[], costType:[],
} }
},methods:{ },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 类型 regNum(n,t){ // 判断数字 n 值 t 类型
let reg = /^\d+(\.\d{0,6})?$/ let reg = /^\d+(\.\d{0,6})?$/
if(!n)return 0 if(!n)return 0
......
src/components/FinancialModule/CompanyAccount.vue
View file @ ae5d6da4
...@@ -148,7 +148,8 @@ ...@@ -148,7 +148,8 @@
<span> <span>
<span v-if="item.IsStandardCurrency!=1">{{item.showB?item.StandardCurrencyCode:item.CurrencyCode}}</span> <span v-if="item.IsStandardCurrency!=1">{{item.showB?item.StandardCurrencyCode:item.CurrencyCode}}</span>
<span v-else>{{item.StandardCurrencyCode}}</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 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 v-if="item.IsStandardCurrency!=1" class="iconfont icon-ico-renwuyaoqiu"></span>
</span> </span>
...@@ -338,6 +339,16 @@ ...@@ -338,6 +339,16 @@
<el-input v-model="addMsg.RiskLowerLimitMoney" type="number" class=""></el-input> <el-input v-model="addMsg.RiskLowerLimitMoney" type="number" class=""></el-input>
</el-form-item> </el-form-item>
</el-col> </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-form> </el-form>
</div> </div>
...@@ -421,7 +432,9 @@ export default { ...@@ -421,7 +432,9 @@ export default {
BranchIdS:0, BranchIdS:0,
OutCharge:0, OutCharge:0,
InCharge:0, InCharge:0,
RiskLowerLimitMoney:'' RiskLowerLimitMoney:'',
AccountStartMoney:0,
AccountStartWBMoney:0,
}, },
getCompanyMsg:{ getCompanyMsg:{
RB_Group_Id:'0', RB_Group_Id:'0',
...@@ -575,6 +588,11 @@ export default { ...@@ -575,6 +588,11 @@ export default {
this.showEmployeeList2 = []; 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) { goUrl (path,id,name,source,CurrencyId) {
this.$router.push({ name: path,query:{"id":id,'name':name,'source':source,'CurrencyId':CurrencyId}}) this.$router.push({ name: path,query:{"id":id,'name':name,'source':source,'CurrencyId':CurrencyId}})
}, },
...@@ -658,7 +676,9 @@ export default { ...@@ -658,7 +676,9 @@ export default {
BranchIdS:0, BranchIdS:0,
OutCharge:0, OutCharge:0,
InCharge:0, InCharge:0,
RiskLowerLimitMoney:'' RiskLowerLimitMoney:'',
AccountStartMoney:0,
AccountStartWBMoney:0,
} }
this.SetProfitLossMsg={ this.SetProfitLossMsg={
ID:0, ID:0,
......
src/components/FinancialModule/PlatformAccount.vue
View file @ ae5d6da4
...@@ -231,6 +231,7 @@ ...@@ -231,6 +231,7 @@
sort-always sort-always
@sort-change="sortChange" @sort-change="sortChange"
@on-custom-comp='customCompFunc' @on-custom-comp='customCompFunc'
:row-click="rowClick"
></v-table> ></v-table>
<div class="_vMG_edit _scrollbar" v-if="addShow" :class="addShow==true?'edHeight':''"> <div class="_vMG_edit _scrollbar" v-if="addShow" :class="addShow==true?'edHeight':''">
<el-row> <el-row>
...@@ -459,6 +460,16 @@ ...@@ -459,6 +460,16 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </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-row> <el-row>
<el-col :span="24" :gutter="35"> <el-col :span="24" :gutter="35">
...@@ -596,7 +607,10 @@ export default { ...@@ -596,7 +607,10 @@ export default {
Remark:'', Remark:'',
BindBankID:null, BindBankID:null,
HaveContract:'0', HaveContract:'0',
ContraceDateRange:'' ContraceDateRange:'',
AccountStartMoney:0,
AccountStartWBMoney:0,
}, },
getCompanyMsg: { getCompanyMsg: {
RB_Group_Id: "0", RB_Group_Id: "0",
...@@ -708,6 +722,19 @@ export default { ...@@ -708,6 +722,19 @@ export default {
}; };
}, },
methods: { 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){ remoteQueryBankMethod(query){
if(query!=''){ if(query!=''){
this.remoteLoading=true this.remoteLoading=true
...@@ -931,7 +958,6 @@ export default { ...@@ -931,7 +958,6 @@ export default {
this.getList(); this.getList();
}, },
filterMethod(filters) { filterMethod(filters) {
console.log("filter", filters);
this.msg.Alias = filters.Alias; this.msg.Alias = filters.Alias;
this.msg.RB_Branch_Id = filters.allName; this.msg.RB_Branch_Id = filters.allName;
this.msg.SettlementType = this.msg.SettlementType =
...@@ -1107,6 +1133,7 @@ export default { ...@@ -1107,6 +1133,7 @@ export default {
this.remoteMethod(data.InemName); this.remoteMethod(data.InemName);
this.remoteMethod2(data.OutemName); this.remoteMethod2(data.OutemName);
this.addMsg = data; this.addMsg = data;
// console.log("this.addMsg",this.addMsg)
this.addMsg.HaveContract = this.addMsg.HaveContract.toString() this.addMsg.HaveContract = this.addMsg.HaveContract.toString()
this.addMsg.SettlementType =this.addMsg.SettlementType.toString() this.addMsg.SettlementType =this.addMsg.SettlementType.toString()
this.addMsg.BindBankID = this.addMsg.BindBankID==-1?null:this.addMsg.BindBankID this.addMsg.BindBankID = this.addMsg.BindBankID==-1?null:this.addMsg.BindBankID
...@@ -1135,7 +1162,9 @@ export default { ...@@ -1135,7 +1162,9 @@ export default {
BranchIdS: 0, BranchIdS: 0,
OutCharge: 0, OutCharge: 0,
InCharge: 0, InCharge: 0,
RiskLowerLimitMoney: "" RiskLowerLimitMoney: "",
AccountStartMoney:0,
AccountStartWBMoney:0,
}; };
this.SetProfitLossMsg = { this.SetProfitLossMsg = {
ID: 0, ID: 0,
......
src/components/FinancialModule/PoolAccount.vue
View file @ ae5d6da4
...@@ -114,7 +114,8 @@ ...@@ -114,7 +114,8 @@
<span> <span>
<span v-if="item.IsStandardCurrency!=1">{{item.showB?item.StandardCurrencyCode:item.CurrencyCode}}</span> <span v-if="item.IsStandardCurrency!=1">{{item.showB?item.StandardCurrencyCode:item.CurrencyCode}}</span>
<span v-else>{{item.StandardCurrencyCode}}</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 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 v-if="item.IsStandardCurrency!=1" class="iconfont icon-ico-renwuyaoqiu"></span>
</span> </span>
...@@ -432,6 +433,11 @@ export default { ...@@ -432,6 +433,11 @@ export default {
Charge:1 Charge:1
} }
},methods:{ },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) { remoteMethod(query) {
if (query !== '') { if (query !== '') {
this.loadingPeople = true this.loadingPeople = true
......
src/components/FinancialModule/ReportForm/LineReceiver.vue 0 → 100644
View file @ ae5d6da4
<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="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/>
</el-form-item>
</el-form>
</div>
<div>
<el-table :data="List" stripe 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:[],
}
},
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];
},
mounted(){
this.getList();
},
methods:{
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.apipost('financestatistics_post_GetCompanyLineGuestList',this.msg, res => {
if(res.data.resultCode == 1) {
this.ColList=res.data.data.ColList;
this.List=res.data.data.List;
console.log("this.ColList",this.ColList);
console.log("this.List",this.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,
})
}
console.log("this.newArr",this.newArr);
}else{
this.Error(res.data.message);
}
}, err => {})
},
}
}
</script>
\ No newline at end of file
src/components/FinancialModule/accDetail/CashAccDetail.vue
View file @ ae5d6da4
...@@ -364,6 +364,7 @@ ...@@ -364,6 +364,7 @@
</div> </div>
</template> </template>
<script> <script>
import moment from "moment"
export default { export default {
data(){ data(){
return{ return{
...@@ -446,7 +447,7 @@ export default { ...@@ -446,7 +447,7 @@ export default {
allWPrice:0, allWPrice:0,
} }
},created(){ },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.msg.Is_Cashier = parseInt(this.$route.query.Is_Cashier);
this.accType = parseInt(this.$route.query.TypeId); this.accType = parseInt(this.$route.query.TypeId);
this.msg.sTradeDate = this.$route.query.sTradeDate; this.msg.sTradeDate = this.$route.query.sTradeDate;
...@@ -456,6 +457,23 @@ export default { ...@@ -456,6 +457,23 @@ export default {
this.getList(); this.getList();
this.BankAccount_post_GetCashAccountList("query"); 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:{ },methods:{
addChuNaFun(){ // 添加出纳按钮点击事件 addChuNaFun(){ // 添加出纳按钮点击事件
let count = 0; let count = 0;
...@@ -798,7 +816,7 @@ export default { ...@@ -798,7 +816,7 @@ export default {
this.msg.QEndDate = this.productionDateByTC[1]; this.msg.QEndDate = this.productionDateByTC[1];
}, },
bankaccount_post_GetList(){ // 获取银行账户 bankaccount_post_GetList(){ // 获取银行账户
this.AccountId = ''; // this.AccountId = '';
let msg = { let msg = {
TypeId:this.accType, TypeId:this.accType,
BranchId:-1, BranchId:-1,
......
src/components/FinancialModule/accDetail/CompanyAccDetail.vue
View file @ ae5d6da4
...@@ -331,6 +331,7 @@ ...@@ -331,6 +331,7 @@
</div> </div>
</template> </template>
<script> <script>
import moment from "moment"
export default { export default {
data(){ data(){
return{ return{
...@@ -399,16 +400,33 @@ export default { ...@@ -399,16 +400,33 @@ export default {
allWPrice:0, allWPrice:0,
} }
},created(){ },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.msg.Is_Cashier = parseInt(this.$route.query.Is_Cashier);
this.accType = parseInt(this.$route.query.TypeId); this.accType = parseInt(this.$route.query.TypeId);
this.msg.sTradeDate = this.$route.query.sTradeDate; this.msg.sTradeDate = this.$route.query.sTradeDate?this.$route.query.sTradeDate:"";
this.msg.eTradeDate = this.$route.query.eTradeDate; this.msg.eTradeDate = this.$route.query.eTradeDate?this.$route.query.eTradeDate:"";
this.productionDate = [this.msg.sTradeDate, this.msg.eTradeDate]; this.productionDate = [this.msg.sTradeDate, this.msg.eTradeDate];
this.productionDateByTC=[this.msg.QStartDate, this.msg.QEndDate]; this.productionDateByTC=[this.msg.QStartDate, this.msg.QEndDate];
this.getList(); this.getList();
this.bankaccount_post_GetListS("query"); 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:{ },methods:{
goUrl(path,id){ goUrl(path,id){
this.$router.push({ name: path,query:{"id":id,blank:'y'} }) this.$router.push({ name: path,query:{"id":id,blank:'y'} })
...@@ -453,7 +471,7 @@ export default { ...@@ -453,7 +471,7 @@ export default {
this.msg.QEndDate = this.productionDateByTC[1]; this.msg.QEndDate = this.productionDateByTC[1];
}, },
bankaccount_post_GetList(){ // 获取银行账户 bankaccount_post_GetList(){ // 获取银行账户
this.AccountId = ''; // this.AccountId = '';
this.apipost('bankaccount_post_GetList',{TypeId:this.accType}, res => { this.apipost('bankaccount_post_GetList',{TypeId:this.accType}, res => {
if(res.data.resultCode == 1) { if(res.data.resultCode == 1) {
let data = res.data.data; let data = res.data.data;
...@@ -487,7 +505,7 @@ export default { ...@@ -487,7 +505,7 @@ export default {
}, err => {}) }, err => {})
}, },
getList(){ //获取列表 getList(){ //获取列表
this.loading = true // this.loading = true
if( this.msg.ClientID == '' ){ if( this.msg.ClientID == '' ){
this.msg.ClientID = 0; this.msg.ClientID = 0;
} }
...@@ -500,6 +518,8 @@ export default { ...@@ -500,6 +518,8 @@ export default {
} }
this.allMoney = ''; this.allMoney = '';
this.apipost('Financial_post_GetAccountDetailList',this.msg,res=>{ this.apipost('Financial_post_GetAccountDetailList',this.msg,res=>{
this.loading = false;
if(res.data.resultCode==1){ if(res.data.resultCode==1){
let data = res.data.data; let data = res.data.data;
if(data.length){ if(data.length){
...@@ -534,7 +554,7 @@ export default { ...@@ -534,7 +554,7 @@ export default {
}) })
}); });
this.DataList = data this.DataList = data
this.loading = false;
if( this.msg.ClientID == 0 ){ if( this.msg.ClientID == 0 ){
this.msg.ClientID = ''; this.msg.ClientID = '';
} }
......
src/components/FinancialModule/accDetail/PlatformAccDetail.vue
View file @ ae5d6da4
...@@ -311,6 +311,7 @@ ...@@ -311,6 +311,7 @@
</div> </div>
</template> </template>
<script> <script>
import moment from 'moment'
export default { export default {
data(){ data(){
return{ return{
...@@ -328,7 +329,7 @@ export default { ...@@ -328,7 +329,7 @@ export default {
AccountNumber:'' AccountNumber:''
}, },
Type:2, Type:2,
AccountId:'', AccountId:"",
DataList:[], DataList:[],
StartMoney:0, StartMoney:0,
AccountTypeList:[], AccountTypeList:[],
...@@ -380,7 +381,7 @@ export default { ...@@ -380,7 +381,7 @@ export default {
allWPrice:0, allWPrice:0,
} }
},created(){ },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.msg.Is_Cashier = parseInt(this.$route.query.Is_Cashier);
this.accType = parseInt(this.$route.query.TypeId); this.accType = parseInt(this.$route.query.TypeId);
this.msg.sTradeDate = this.$route.query.sTradeDate; this.msg.sTradeDate = this.$route.query.sTradeDate;
...@@ -390,6 +391,23 @@ export default { ...@@ -390,6 +391,23 @@ export default {
this.getList(); this.getList();
this.BankAccount_post_GetPlatformList("query"); 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:{ },methods:{
goUrl(path,id){ goUrl(path,id){
this.$router.push({ name: path,query:{"id":id,blank:'y'} }) this.$router.push({ name: path,query:{"id":id,blank:'y'} })
...@@ -434,7 +452,7 @@ export default { ...@@ -434,7 +452,7 @@ export default {
this.msg.QEndDate = this.productionDateByTC[1]; this.msg.QEndDate = this.productionDateByTC[1];
}, },
bankaccount_post_GetList(){ // 获取平台账户 bankaccount_post_GetList(){ // 获取平台账户
this.AccountId = ''; // this.AccountId = '';
let msg = { let msg = {
BackId:0, BackId:0,
TypeId:this.accType, TypeId:this.accType,
......
src/components/FinancialModule/accDetail/PoolAccDetail.vue
View file @ ae5d6da4
...@@ -341,6 +341,7 @@ ...@@ -341,6 +341,7 @@
</div> </div>
</template> </template>
<script> <script>
import moment from "moment"
export default { export default {
data(){ data(){
return{ return{
...@@ -410,7 +411,7 @@ export default { ...@@ -410,7 +411,7 @@ export default {
allWPrice:0, allWPrice:0,
} }
},created(){ },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.msg.Is_Cashier = parseInt(this.$route.query.Is_Cashier);
this.accType = parseInt(this.$route.query.TypeId); this.accType = parseInt(this.$route.query.TypeId);
this.msg.sTradeDate = this.$route.query.sTradeDate; this.msg.sTradeDate = this.$route.query.sTradeDate;
...@@ -420,6 +421,24 @@ export default { ...@@ -420,6 +421,24 @@ export default {
this.getList(); this.getList();
this.BankAccount_post_GetCashPoolList("query"); 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:{ },methods:{
goUrl(path,id){ goUrl(path,id){
this.$router.push({ name: path,query:{"id":id,blank:'y'} }) this.$router.push({ name: path,query:{"id":id,blank:'y'} })
...@@ -469,7 +488,7 @@ export default { ...@@ -469,7 +488,7 @@ export default {
this.msg.QEndDate = this.productionDateByTC[1]; this.msg.QEndDate = this.productionDateByTC[1];
}, },
bankaccount_post_GetList(){ // 获取银行账户 bankaccount_post_GetList(){ // 获取银行账户
this.AccountId = ''; // this.AccountId = '';
let msg = { let msg = {
TypeId:this.accType, TypeId:this.accType,
BranchId:-1, BranchId:-1,
...@@ -514,6 +533,7 @@ export default { ...@@ -514,6 +533,7 @@ export default {
this.endStartMoney = ''; this.endStartMoney = '';
this.endRStartMoney =''; this.endRStartMoney ='';
this.apipost('Financial_post_GetAccountDetailList',this.msg,res=>{ this.apipost('Financial_post_GetAccountDetailList',this.msg,res=>{
if(res.data.resultCode==1){ if(res.data.resultCode==1){
let data = res.data.data; let data = res.data.data;
if(data.length){ if(data.length){
......
src/components/FinancialModule/addReceivablesDocuments.vue
View file @ ae5d6da4
...@@ -1430,12 +1430,15 @@ export default { ...@@ -1430,12 +1430,15 @@ export default {
getCompany(){ // 获取公司 getCompany(){ // 获取公司
this.apipost('admin_get_BranchGetList', this.companyMsg, res => { this.apipost('admin_get_BranchGetList', this.companyMsg, res => {
let data = res.data.data; let data = res.data.data;
let Status=false;
if(this.$route.query.companyID!=='-1' && this.$route.query.companyID!==undefined){ if(this.$route.query.companyID!=='-1' && this.$route.query.companyID!==undefined){
Status=true;
data.forEach(x=>{ data.forEach(x=>{
x.disabled = true; x.disabled = true;
}) })
} }
if (this.orderObj && this.orderObj.companyIDList && this.orderObj.companyIDList.length>0) { if (this.orderObj && this.orderObj.companyIDList && this.orderObj.companyIDList.length>0) {
Status=true;
this.orderObj.companyIDList.forEach(x=>{ this.orderObj.companyIDList.forEach(x=>{
data.forEach(y=>{ data.forEach(y=>{
if (y.disabled === false){ if (y.disabled === false){
...@@ -1447,6 +1450,30 @@ export default { ...@@ -1447,6 +1450,30 @@ export default {
}); });
} }
this.companyList = data; 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 => {}) }, err => {})
}, },
}, },
......
src/components/Hotel/ChangeHotel.vue
View file @ ae5d6da4
This diff is collapsed.
src/components/Hotel/roomReservationsDetails.vue
View file @ ae5d6da4
...@@ -305,6 +305,9 @@ ...@@ -305,6 +305,9 @@
subItem.HotelId = 0; subItem.HotelId = 0;
subItem.HotelName = ""; subItem.HotelName = "";
subItem.OrderID = 0; subItem.OrderID = 0;
subItem.OrderDetailsList.forEach(childItem=>{
childItem.OrderDetailsId=0;
});
item.HotelOrderList.push(subItem); item.HotelOrderList.push(subItem);
}, },
//删除酒店 //删除酒店
...@@ -492,7 +495,7 @@ ...@@ -492,7 +495,7 @@
}) })
}); });
}) })
this.loading = true this.loading = true;
this.apipost('dmcstatistics_get_SetHotelOrder', this.list, res => { this.apipost('dmcstatistics_get_SetHotelOrder', this.list, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.getList(); this.getList();
......
src/components/administrative/statisticsCheckTime.vue
View file @ ae5d6da4
...@@ -184,6 +184,7 @@ ...@@ -184,6 +184,7 @@
this.$nextTick(() => { this.$nextTick(() => {
this.dataList = res.data.data.pageData; this.dataList = res.data.data.pageData;
}); });
console.log("res",res);
this.datesArr = res.data.data.columnData; this.datesArr = res.data.data.columnData;
this.newArr.length = 0; this.newArr.length = 0;
for(let i = 0; i < this.datesArr.length; i++) { for(let i = 0; i < this.datesArr.length; i++) {
...@@ -192,6 +193,7 @@ ...@@ -192,6 +193,7 @@
"title": this.datesArr[i].substring(this.datesArr[i].length - 2, this.datesArr[i].length) + '（' + this.getWeekByDay(this.datesArr[i]) + ')' "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; this.total = res.data.data.count;
} }
......
src/components/busManagement/BusInfo.vue
View file @ ae5d6da4
...@@ -129,6 +129,17 @@ ...@@ -129,6 +129,17 @@
background: #EAEAEA !important; background: #EAEAEA !important;
text-align: center; 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> </style>
<template> <template>
...@@ -209,7 +220,7 @@ ...@@ -209,7 +220,7 @@
@click="UseTypeClick(childItem.Id,scope.$index,subIndex);getBusPrice(scope.row)">{{childItem.Name}}</span> @click="UseTypeClick(childItem.Id,scope.$index,subIndex);getBusPrice(scope.row)">{{childItem.Name}}</span>
</span> </span>
<span style="width:30px;display:inline-block;"> <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> style="color:blue;cursor:pointer">删除</a>
</span> </span>
<span style="display:inline-block;width:30px;margin-left:5px;"> <span style="display:inline-block;width:30px;margin-left:5px;">
...@@ -339,8 +350,8 @@ ...@@ -339,8 +350,8 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="upBtnList"> <div class="upBtnList">
<input type="button" class="normalBtn" @click="SaveList(0)" :disabled="disButton" value="保存草稿" /> <input type="button" class="normalBtn" :class="{'disClick':!isSubmit}" @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(1)" :disabled="disButton" value="保存" />
</div> </div>
</el-form> </el-form>
</div> </div>
...@@ -488,7 +499,8 @@ ...@@ -488,7 +499,8 @@
totalFlySeat: '', totalFlySeat: '',
LeaderName: '', LeaderName: '',
GuideName: '', GuideName: '',
loading: false loading: false,
isSubmit: true,
}; };
}, },
methods: { methods: {
...@@ -497,7 +509,8 @@ ...@@ -497,7 +509,8 @@
let tempCostFee = 0; let tempCostFee = 0;
var tempHighSpeedFee = 0; var tempHighSpeedFee = 0;
if (obj.BusType) { if (obj.BusType) {
obj.PayType=1; obj.PayType=2;
obj.HighSpeedPayType = 1;
let busTypeObj = this.BusTypeList.find(item => item.Id === obj.BusType); let busTypeObj = this.BusTypeList.find(item => item.Id === obj.BusType);
if (busTypeObj) { if (busTypeObj) {
obj.DetailList.forEach(subItem => { obj.DetailList.forEach(subItem => {
...@@ -515,7 +528,7 @@ ...@@ -515,7 +528,7 @@
} }
}); });
obj.HighSpeedPrice = tempHighSpeedFee; obj.HighSpeedPrice = tempHighSpeedFee;
obj.CostPrice = tempCostFee + tempHighSpeedFee; obj.CostPrice = tempCostFee;
} }
}else{ }else{
obj.PayType=null; obj.PayType=null;
...@@ -590,15 +603,19 @@ ...@@ -590,15 +603,19 @@
item.OrderState = type item.OrderState = type
}) })
this.PostData.PlanList = this.PlanTableData; this.PostData.PlanList = this.PlanTableData;
this.apipost('bus_get_SetPlan', this.PostData, res => { if (this.isSubmit) {
if (res.data.resultCode == 1) { this.isSubmit = false;
this.Success("保存成功！"); this.apipost('bus_get_SetPlan', this.PostData, res => {
this.MsgBus.$emit('msg'); if (res.data.resultCode == 1) {
this.createTableData(); this.Success("保存成功！");
} else { this.MsgBus.$emit('msg');
this.Error(res.data.message); this.createTableData();
} } else {
}, err => {}) this.Error(res.data.message);
}
this.isSubmit = true;
}, err => {})
}
}, },
//用车类型点击事件 //用车类型点击事件
UseTypeClick(value, index, subIndex) { UseTypeClick(value, index, subIndex) {
...@@ -699,6 +716,9 @@ ...@@ -699,6 +716,9 @@
newPlanData.BusType = oldPlanData.BusType; newPlanData.BusType = oldPlanData.BusType;
newPlanData.PayType = oldPlanData.PayType; newPlanData.PayType = oldPlanData.PayType;
newPlanData.BookGroup = oldPlanData.BookGroup; newPlanData.BookGroup = oldPlanData.BookGroup;
newPlanData.HighSpeedPrice = oldPlanData.HighSpeedPrice;
newPlanData.HighSpeedPayType = oldPlanData.HighSpeedPayType;
newPlanData.CostPrice = oldPlanData.CostPrice;
} }
}, },
mounted() { mounted() {
......
src/components/busManagement/busHandBook.vue
View file @ ae5d6da4
...@@ -25,11 +25,6 @@ ...@@ -25,11 +25,6 @@
padding-left: 20px; padding-left: 20px;
} }
.comTextdisClick {
background-color: #d1d1d1;
color: #fff;
border: 1px solid #d1d1d1;
}
.addHandBook{ .addHandBook{
margin-right: 5px; margin-right: 5px;
color: seagreen; color: seagreen;
...@@ -39,6 +34,17 @@ ...@@ -39,6 +34,17 @@
.addHandBookDIS{ .addHandBookDIS{
visibility: visible!important; 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> </style>
<template> <template>
<div> <div>
...@@ -122,8 +128,8 @@ ...@@ -122,8 +128,8 @@
<tfoot> <tfoot>
<tr> <tr>
<td colspan="6"> <td colspan="6">
<input type="button" class="normalBtn" :class="{'comTextdisClick':isSave}" @click="SaveData()" value="保存" /> <input type="button" class="normalBtn" :class="{'disClick':isSave}" @click="SaveData()" value="保存" />
<input type="button" class="normalBtn" :class="{'comTextdisClick':isSave}" @click="DownLoadFile()" <input type="button" class="normalBtn" :class="{'disClick':isSave}" @click="DownLoadFile()"
value="下载" /> value="下载" />
</td> </td>
</tr> </tr>
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @ ae5d6da4
...@@ -444,7 +444,7 @@ ...@@ -444,7 +444,7 @@
:false-label="UnCheckedVaule">订团 :false-label="UnCheckedVaule">订团
</el-checkbox> </el-checkbox>
<el-checkbox v-model="priceData.IsLessPrice" :true-label="CheckedVaule" <el-checkbox v-model="priceData.IsLessPrice" :true-label="CheckedVaule"
:false-label="UnCheckedVaule">可少价 :false-label="UnCheckedLessPrice">可少价
</el-checkbox> </el-checkbox>
<input type="button" class="normalBtn" value="酒店使用情况" @click="outerVisible=true" <input type="button" class="normalBtn" value="酒店使用情况" @click="outerVisible=true"
v-if="PostConfig.LineId==14 && priceData.PriceHotelList&&priceData.PriceHotelList.length>0" /> v-if="PostConfig.LineId==14 && priceData.PriceHotelList&&priceData.PriceHotelList.length>0" />
...@@ -917,6 +917,7 @@ ...@@ -917,6 +917,7 @@
uploadList: [], uploadList: [],
CheckedVaule: 1, //选中值 CheckedVaule: 1, //选中值
UnCheckedVaule: 2, //没选中 UnCheckedVaule: 2, //没选中
UnCheckedLessPrice: 0,//不少价
isSaved: true, isSaved: true,
btnText: '保存', btnText: '保存',
//日期数组 //日期数组
...@@ -1098,7 +1099,7 @@ ...@@ -1098,7 +1099,7 @@
//是否订团，0-不订，1需要订 //是否订团，0-不订，1需要订
IsBookTeam: 0, IsBookTeam: 0,
//少价,0-不少价，1少价 //少价,0-不少价，1少价
IsLessPrice: 0, IsLessPrice: 1,
//是否重新生成行程数据 //是否重新生成行程数据
IsNew: false, IsNew: false,
//选中的酒店数组 //选中的酒店数组
......
src/router/config.js
View file @ ae5d6da4
...@@ -2733,6 +2733,14 @@ export default { ...@@ -2733,6 +2733,14 @@ export default {
meta: { meta: {
title: '简易报表' title: '简易报表'
}, },
},
{ //财务 线路收客
path: '/LineReceiver',
name: 'LineReceiver',
component: resolve => require(['@/components/FinancialModule/ReportForm/LineReceiver'], resolve),
meta: {
title: '线路收客'
},
}, { //财务 报表 年度营收报表 }, { //财务 报表 年度营收报表
path: '/YearReport', path: '/YearReport',
name: '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