Commit f4dfbf9f authored by youjie's avatar youjie

no message

parent 8e7093e5
...@@ -123,6 +123,9 @@ ...@@ -123,6 +123,9 @@
.ct_Edit:hover{ .ct_Edit:hover{
color:#E95252; color:#E95252;
} }
.cm_content._scrollbar{
max-height: calc(100%-200px) !important;
}
</style> </style>
<template> <template>
...@@ -141,7 +144,7 @@ ...@@ -141,7 +144,7 @@
</li> </li>
</ul> </ul>
</div> </div>
<div class="cm_content _scrollbar"> <div class="cm_content _scrollbar" style="position: absolute;top:117px;bottom: 50px;left: 15px;right:15px;overflow-y: scroll;">
<table class="po_content singeRowTable" <table class="po_content singeRowTable"
style="border:1px solid #E6E6E6;" cellspacing="0" style="border:1px solid #E6E6E6;" cellspacing="0"
...@@ -151,7 +154,9 @@ ...@@ -151,7 +154,9 @@
<th>科目代码</th> <th>科目代码</th>
<th>科目类别</th> <th>科目类别</th>
<th>余额方向</th> <th>余额方向</th>
<th>项目辅助核算 </th>
<th>公司</th> <th>公司</th>
</tr> </tr>
<tr v-for="(item,index) in DataList" :key="index"> <tr v-for="(item,index) in DataList" :key="index">
<td>{{item.Name}}</td> <td>{{item.Name}}</td>
...@@ -165,10 +170,14 @@ ...@@ -165,10 +170,14 @@
<span v-if="item.Direction==1"></span> <span v-if="item.Direction==1"></span>
<span v-if="item.Direction==2"></span> <span v-if="item.Direction==2"></span>
</td> </td>
<td>
{{item.ItemCheck}}
</td>
<td> <td>
{{item.BranchName}} {{item.BranchName}}
</td> </td>
</tr> </tr>
</table> </table>
<div class="noData" v-if="DataList&&DataList.length==0"> <div class="noData" v-if="DataList&&DataList.length==0">
{{$t('system.content_noData')}} {{$t('system.content_noData')}}
......
...@@ -1038,39 +1038,40 @@ ...@@ -1038,39 +1038,40 @@
Finance_InvoiceUpdate:false, Finance_InvoiceUpdate:false,
Finance_ExpenseType:false, Finance_ExpenseType:false,
msg: { msg: {
pageIndex: 1, pageIndex:1,// 是 [string] 查看
pageSize: 5, pageSize:5,// 是 [string] 查看
FrID: '', FrID:'0',// 是 [string] 查看
sDate: '', sDate:'',// 是 [string]
eDate: '', eDate:'',// 是 [string]
Status: '-1', Status:'-1',// 是 [string] 查看
TemplateId: '0', TemplateId:'0',// 是 [string] 查看
RB_Branch_Id: '', RB_Branch_Id:'',// 是 [string] 查看
RB_Depart_Id: '', RB_Depart_Id:'',// 是 [string] 查看
sTradeDate: '', sTradeDate:'',// 是 [string]
eTradeDate: '', eTradeDate:'',// 是 [string]
ClientType: '', ClientType:'',// 是 [string] 查看
RemitterName: '', RemitterName:'',// 是 [string]
ClientID: '', ClientID:'',// 是 [string] 查看
sMoney: '', sMoney:'',// 是 [string]
eMoney: '', eMoney:'',// 是 [string]
CurrencyId: '0', CurrencyId:'0',// 是 [string] 查看
CostTypeID: '', CostTypeID:'',// 是 [string] 查看
Conditon: '', Conditon:'',// 是 [string] 查看
TCNUM: '', TCNUM:'',// 是 [string]
TradeWay: '', TradeWay:'',// 是 [string] 查看
Type: '-1', Type:'',// 是 [string] 查看
AccountType: '', AccountType:'',// 是 [string] 查看
QEndDate: '', QEndDate:'',// 是 [string]
QStartDate: '', QStartDate:'',// 是 [string]
UpdateBy: '', UpdateBy:'',// 是 [string] 查看
IsFormRecPayQuery: '1', IsFormRecPayQuery:'1',// 是 [string] 查看
KJCostTypeId: 0, KJCostTypeId:0,// 是 [string] 查看
IsSelectKJSetCostType: 0, IsSelectKJSetCostType:0,// 是 [string] 查看
Remark: '', //备注查询 Remark:'',// 是 [string]
Sort: '2', Sort:'2',// 是 [string] 查看
EmployeeId: '', EmployeeId:'',// 是 [string] 查看
IsSellOrderForm: 1 TCID:'',// 是 [string] 查看
OrderID:'',//
}, },
getCompanyMsg: { // 校区 getCompanyMsg: { // 校区
RB_Group_Id: '0', RB_Group_Id: '0',
...@@ -1157,58 +1158,7 @@ ...@@ -1157,58 +1158,7 @@
} }
}, },
created() { 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 + '';
}
if (this.$route.query.rec) {
this.msg.AccountType = 15;
this.msg.TradeWay = 4;
this.getAccountList(this.msg.AccountType, this.msg.TradeWay)
this.msg.BankID = this.$route.query.BankID;
this.transactionDate[0] = this.$route.query.StartDate;
this.transactionDate[1] = this.$route.query.StartDate;
this.msg.sTradeDate = this.$route.query.StartDate;
this.msg.eTradeDate = this.$route.query.StartDate;
if (this.$route.query.BankID == '') {
// 费用类型:机票折让费
this.msg.CostTypeID = 197;
}
}
if (this.$route.query.air) {
this.msg.AccountType = 17;
this.msg.TradeWay = 4;
this.getAccountList(this.msg.AccountType, this.msg.TradeWay)
this.msg.BankID = 20;
this.transactionDate[0] = this.$route.query.StartDate;
this.transactionDate[1] = this.$route.query.StartDate;
}
var localStorageData = window.localStorage["loginUserInfo"];
let ActionMenuList = JSON.parse(localStorageData).data.ActionMenuList
if (ActionMenuList && ActionMenuList.length > 0) {
ActionMenuList.forEach(x => {
if (x.FunctionCode == 'Finance_InvoiceUpdate') {//发票修改权限
this.Finance_InvoiceUpdate = true
}
if(x.FunctionCode == 'Finance_ExpenseType'){//费用类型修改权限
this.Finance_ExpenseType = true
}
})
}
}, },
components: { components: {
"my-Bill": myBill, "my-Bill": myBill,
...@@ -1216,32 +1166,7 @@ ...@@ -1216,32 +1166,7 @@
}, },
mounted() { mounted() {
let userInfo = this.getLocalStorage(); 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(0);
this.getDepartment(0);
this.Financial_post_GetBranchAccountList();
this.financeinfo_post_GetClientTypeList();
this.FinancialFlowTemplate_post_GetStatusList();
this.getPageList(); this.getPageList();
this.AccountType_post_GetList();
this.get_GetInvoiceTypeEnumList()
var that = this;
that.MsgBus.$on('getRecQuery', function (FrID) {
that.zhuanjiaoMsg.CreateBy = '';
that.zhuanjiaoMsg.RB_CreateByName = '';
that.zhuanjiaoMsg.FrIDList = [];
that.zhuanjiaoMsg.FrIDList.push(FrID);
that.zhuanjiaoBox = true;
});
}, },
methods: { methods: {
......
...@@ -12,19 +12,26 @@ ...@@ -12,19 +12,26 @@
style="border:1px solid #E6E6E6;" cellspacing="0" style="border:1px solid #E6E6E6;" cellspacing="0"
cellpadding="0" v-loading="loading"> cellpadding="0" v-loading="loading">
<tr> <tr>
<th>账户名称</th>
<th>别名</th> <th>别名</th>
<th>开户人</th>
<th>类型</th> <th>类型</th>
<th>关联科目</th> <th>关联科目</th>
<th width="150px">操作</th> <th width="150px">操作</th>
</tr> </tr>
<tr v-for="(item,index) in list" :key="index"> <tr v-for="(item,index) in list" :key="index">
<td>{{item.BackName}}</td>
<td>{{item.Alias}}</td> <td>{{item.Alias}}</td>
<td>{{item.Accountholder}}</td>
<td>{{item.TypeName}}</td> <td>{{item.TypeName}}</td>
<td style="white-space: warp;"> <td style="white-space: warp;">
<el-tag size="mini" class="tagF" v-for="(i,indexs) in item.KingdeeList" :key="indexs" <p v-for="(i,indexs) in item.KingdeeList" :key="indexs">
<span class="q-mr-xs">{{i.BranchName}}: </span>
<el-tag size="mini" class="tagF"
closable @close="Delete(item,i)"> closable @close="Delete(item,i)">
{{i.KingdeeName}} {{i.KingdeeName}}
</el-tag> </el-tag>
</p>
</td> </td>
<td width="150px"> <td width="150px">
<span style="cursor: pointer;color:blue;text-decoration:underline;margin-right: 5px" @click="AddR(item)">新增</span> <span style="cursor: pointer;color:blue;text-decoration:underline;margin-right: 5px" @click="AddR(item)">新增</span>
......
...@@ -194,10 +194,17 @@ ...@@ -194,10 +194,17 @@
<td class="cursorpointer_last" width="150px"> <td class="cursorpointer_last" width="150px">
<span class="cursorpointer">{{grSon.Name}}</span></td> <span class="cursorpointer">{{grSon.Name}}</span></td>
<td width="150px" style="white-space:wrap"> <td width="150px" style="white-space:wrap">
<span class="tagF KingdeeName" v-for="(i,indexs) in grSon.KingdeeList" :key="indexs"> <p v-for="(i,indexs) in grSon.KingdeeList" :key="indexs">
<span class="q-mr-xs">{{i.BranchName}}: </span>
<el-tag size="mini" class="tagF"
closable @close="Delete(grSon,i)">
{{i.KingdeeName}}
</el-tag>
</p>
<!-- <span class="tagF KingdeeName" v-for="(i,indexs) in grSon.KingdeeList" :key="indexs">
{{i.KingdeeName}} {{i.KingdeeName}}
<i class="iconfont icon-close" @click="Delete(grSon,i)"></i> <i class="iconfont icon-close" @click="Delete(grSon,i)"></i>
</span> </span> -->
</td> </td>
<td width="50px"> <td width="50px">
<span style="cursor: pointer;color:blue;text-decoration:underline;margin-right: 5px" <span style="cursor: pointer;color:blue;text-decoration:underline;margin-right: 5px"
...@@ -211,10 +218,17 @@ ...@@ -211,10 +218,17 @@
<template v-else> <template v-else>
<td width="150px"></td> <td width="150px"></td>
<td width="150px" style="white-space:wrap"> <td width="150px" style="white-space:wrap">
<span class="tagF KingdeeName" v-for="(i,indexs) in son.KingdeeList" :key="indexs"> <p v-for="(i,indexs) in son.KingdeeList" :key="indexs">
<span class="q-mr-xs">{{i.BranchName}}: </span>
<el-tag size="mini" class="tagF"
closable @close="Delete(son,i)">
{{i.KingdeeName}}
</el-tag>
</p>
<!-- <span class="tagF KingdeeName" v-for="(i,indexs) in son.KingdeeList" :key="indexs">
{{i.KingdeeName}} {{i.KingdeeName}}
<i class="iconfont icon-close" @click="Delete(son,i)"></i> <i class="iconfont icon-close" @click="Delete(son,i)"></i>
</span> </span> -->
</td> </td>
<td width="50px"> <td width="50px">
<span style="cursor: pointer;color:blue;text-decoration:underline;margin-right: 5px" <span style="cursor: pointer;color:blue;text-decoration:underline;margin-right: 5px"
...@@ -230,10 +244,17 @@ ...@@ -230,10 +244,17 @@
<td width="150px"></td> <td width="150px"></td>
<td width="150px"></td> <td width="150px"></td>
<td width="150px" style="white-space:wrap"> <td width="150px" style="white-space:wrap">
<span class="tagF KingdeeName" v-for="(i,indexs) in item.KingdeeList" :key="indexs"> <p v-for="(i,indexs) in item.KingdeeList" :key="indexs">
<span class="q-mr-xs">{{i.BranchName}}: </span>
<el-tag size="mini" class="tagF"
closable @close="Delete(item,i)">
{{i.KingdeeName}}
</el-tag>
</p>
<!-- <span class="tagF KingdeeName" v-for="(i,indexs) in item.KingdeeList" :key="indexs">
{{i.KingdeeName}} {{i.KingdeeName}}
<i class="iconfont icon-close" @click="Delete(item,i)"></i> <i class="iconfont icon-close" @click="Delete(item,i)"></i>
</span> </span> -->
</td> </td>
<td> <td>
<span style="cursor: pointer;color:blue;text-decoration:underline;margin-right: 5px" <span style="cursor: pointer;color:blue;text-decoration:underline;margin-right: 5px"
......
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