Commit 524d1591 authored by Mac's avatar Mac

1

parent 55f9c44c
......@@ -677,7 +677,7 @@ export default {
path: '/financial/financalDocument/ChoiceAddFinancialDocuments',
query: {
"Type": type,
"companyID": this.getLocalStorage().School_Id,
"companyID": obj.ClassSchoolId,
"path": "",
'blank': 'y',
'orderObj': JSON.stringify(orderObj),
......
......@@ -485,7 +485,8 @@
that.getList()
that.Resetsystem()
that.Floading = false
that.ISsystem=false
that.ISsystem=false;
that.$forceUpdate()
}
......
......@@ -72,28 +72,28 @@
<template v-slot:body-cell-optioned="props">
<q-td :props="props">
<q-btn flat size="xs" icon="iconfont icon-xiangqing-" style="font-weight:400;color: #3FC4FF" class="q-mr-xs" label="明细" @click="goDetailed(props.row,'0')" />
<q-btn-dropdown flat size="xs" color="dark" label="更多" style="margin-left:10px;">
<q-btn-dropdown flat size="xs" color="dark" label="更多" style="margin-left:10px;" >
<q-list>
<q-item clickable v-close-popup v-if="props.row.State==1">
<q-item-section @click="gostudent(props.row,1)">
<q-item-label>确认</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-close-popup v-if="props.row.State==1 || props.row.State==2">
<q-item clickable v-close-popup v-if="(props.row.State==1 || props.row.State==2) && props.row.FrIdList==0">
<q-item-section @click="gostudent(props.row,2)">
<q-item-label>取消</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-close-popup v-if="props.row.State==2">
<q-item clickable v-close-popup v-if="props.row.State==2 && props.row.FrIdList==0 && props.row.Money>0">
<q-item-section @click="systemShan(props.row)">
<q-item-label>制单</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-close-popup v-if="props.row.State==1||props.row.State==2">
<q-item-section @click="goexport(props.row)">
<q-item-label>导出</q-item-label>
</q-item-section>
</q-item>
<!-- <q-item clickable v-close-popup v-if="props.row.State==1||props.row.State==2">-->
<!-- <q-item-section @click="goexport(props.row)">-->
<!-- <q-item-label>导出</q-item-label>-->
<!-- </q-item-section>-->
<!-- </q-item>-->
</q-list>
</q-btn-dropdown>
......@@ -287,7 +287,6 @@ export default {
getTeachingBonusPageList(this.msg).then(res => {
this.loading = false
this.data = res.Data.PageData
console.log(this.data)
this.pageCount = res.Data.PageCount;
}).catch(() => {
......@@ -382,6 +381,8 @@ export default {
this.resetSearch()
this.drawer = false
}
}).catch(err=>{
this.Dloading = false
})
},
......@@ -457,7 +458,8 @@ export default {
that.getList()
that.Resetsystem()
that.Floading = false
that.ISsystem = false
that.ISsystem = false;
that.$forceUpdate()
}
}).catch(() => {
......
......@@ -206,7 +206,7 @@
</td>
<td>
<p>{{item.CostTypeName}}</p>
<p v-for=" ( son , sIndex ) in item.TCIDAndTCNUMList"> <span>{{ son.TCNUM }} ( <span> {{ son.TCID }} </span> )</span> </p>
<p v-for=" ( son , sIndex ) in item.TCIDAndTCNUMList"> <span>{{ son.ClassName }} ( <span> {{ son.ClassId }} </span> )</span> </p>
</td>
<td>
<span v-if=" item.Type == 1">{{$t('fnc.hnrdanwei')}}{{ item.RemitterName }}</span>
......@@ -439,7 +439,7 @@
import moment from "moment"
import {getSchoolPage} from '../../../api/school/index'
import {UploadSelfFile} from '../../../api/common/common'
import {getClassNameList} from '../../../api/finance/index'
export default {
data(){
return{
......@@ -589,13 +589,13 @@
})
}
if(status){
this.$router.push({ name: "CapitalAllocationDetail",query:{"id":item.FinanceId,blank:'y'} })
this.$router.push({ path: "/financial/financalDocument/CapitalAllocationDetail",query:{"id":item.FinanceId,blank:'y'} })
}else{
this.$router.push({ name: "FinancialDocumentsDetail",query:{"id":item.FinanceId,blank:'y'} })
this.$router.push({ path: "/financial/financalDocument/FinancialDocumentsDetail",query:{"id":item.FinanceId,blank:'y'} })
}
},
goUrl(path,id){
this.$router.push({ name: path,query:{"id":id,blank:'y'} })
this.$router.push({ path: path,query:{"id":id,blank:'y'} })
},
accountListChange(){
this.msg.BankList = [];
......@@ -714,6 +714,7 @@
this.OutMoney = OutMoney;
}
this.DataList = data;
let da = []
this.DataList.forEach(x=>{
this.checkList.push({
FinanceId:null,
......@@ -723,8 +724,31 @@
OriginalMoney:0,
Money:0,
})
if(x.TCIDList.length>0){
da =da.concat(x.TCIDList)
}
});
this.DataList = data
if(da.length>0){
let str = da.join(',')
getClassNameList({ClassIds:str}).then(res => {
this.DataList.forEach(x=>{
if(x.TCIDList.length>0){
x.TCIDList.forEach(z=>{
res.Data.forEach(j=>{
if(z == j.ClassId){
x.TCIDAndTCNUMList.push(j)
}
})
})
}
})
}).catch(() => {
})
}
if( this.msg.ClientID == 0 ){
this.msg.ClientID = '';
......
......@@ -1745,12 +1745,71 @@
},
getCompany() { //公司
getSchoolPage(this.schoolMsg).then(res => {
this.CompanyList = res.Data.PageData;
this.CompanyList.forEach(x=>{//给msg传校区的名字
let data = res.Data.PageData;
data.forEach(x=>{//给msg传校区的名字
if(x.SId==this.msg.RB_Branch_Id){
this.msg.RB_BranchName = x.SName;
}
})
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){
y.disabled = false
}else {
y.disabled = x !== y.Id;
}
})
});
}
this.CompanyList = data;
if(!Status){
let id=0;
if(this.$route.query.id){
id=this.$route.query.id;
}else{
id=this.editTemplateId;
}
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;
let num = 0
data.forEach(x=>{
x.disabled=true;
let thisId = this.getLocalStorage().Group_Id
BranchList.forEach(y=>{
if(x.SId==y){
x.disabled=false;
if(num < 1 && !this.$route.query.edit) {
this.msg.RB_Branch_Id = x.SId
}
if (thisId === x.SId && !this.$route.query.edit) {
this.msg.RB_Branch_Id = x.SId
}
num = num + 1
}
})
})
this.CompanyList = data;
}
}
}, err => {})
}
}).catch(() => {
})
......
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