diff --git a/src/router/routes_xm.js b/src/router/routes_xm.js
index fa830fe3..84f3a4e0 100644
--- a/src/router/routes_xm.js
+++ b/src/router/routes_xm.js
@@ -171,11 +171,13 @@ export default {
iconCls: 'fa el-icon-menu',
meta: {
menu:true,
- title: '任务结算',
+ title: '财务结算',
icon: 'task'
},
//leaf: true,//只有一个节点
children: [
+ { path: 'xmProject/XmProjectCost', component: _import('xm/core/xmProject/XmProjectCost'), name: 'XmProjectCost', meta: { title: '应付款'}},
+
{ path: 'xmTaskSbill/XmTaskSbillMng', component: _import('xm/core/xmTaskSbill/XmTaskSbillMng'), name: 'XmTaskSbilllMng', meta: { title: '任务结算单'}},
{ path: 'xmTaskWorkload/XmTaskWorkloadInfoMy', component: _import('xm/core/xmTaskWorkload/XmTaskWorkloadInfoMy'), name: 'XmTaskWorkloadInfoMy', meta: { title: '工时确认(我)'}},
{ path: 'xmTaskWorkload/WorkloadSetDayListMy', component: _import('xm/core/xmTaskWorkload/WorkloadSetDayListMy'), name: 'WorkloadSetDayListMy', meta: { title: '工时日报表(我)'}},
diff --git a/src/views/xm/core/xmProject/XmProjectCost.vue b/src/views/xm/core/xmProject/XmProjectCost.vue
index 5a078cde..81ce91f7 100644
--- a/src/views/xm/core/xmProject/XmProjectCost.vue
+++ b/src/views/xm/core/xmProject/XmProjectCost.vue
@@ -31,26 +31,26 @@
border>
- {{scope.row.username}}
+ {{scope.row.username}}
- {{scope.row.projectId}}
+ {{scope.row.projectId}}
- {{scope.row.branchId}}
+ {{scope.row.branchId}}
- ¥{{scope.row[month]}}
+ ¥{{scope.row[month]}}
@@ -71,14 +71,14 @@
- {{scope.row.username}}
+ {{scope.row.username}}
- ¥{{scope.row[month]}}
+ ¥{{scope.row[month]}}
@@ -91,7 +91,7 @@
-
+
@@ -233,8 +233,10 @@ import { months } from 'moment';
listSumSamt:function(){
var parmas={
- bizYear:this.selYear,
- projectId:this.selProject.id,
+ bizYear:this.selYear,
+ }
+ if(this.selProject){
+ params.projectId=this.selProject
}
var func=listSumSamtGroupByUseridBizMonth
if(this.rptType==='1'){
@@ -265,13 +267,13 @@ import { months } from 'moment';
},
showCostUserDetails:function(row,fieldName,queryType){
this.costUser=row
- this.fileName=fieldName
+ this.fieldName=fieldName
this.queryType=queryType
this.costUserVisible=true;
},
showCostNouserDetails:function(row,fieldName,queryType){
this.costNouser=row
- this.fileName=fieldName
+ this.fieldName=fieldName
this.queryType=queryType
this.costNouserVisible=true;
},
diff --git a/src/views/xm/core/xmTaskSbillDetail/XmTaskSbillDetailMng.vue b/src/views/xm/core/xmTaskSbillDetail/XmTaskSbillDetailMng.vue
index 786bb27e..aaa7ee25 100644
--- a/src/views/xm/core/xmTaskSbillDetail/XmTaskSbillDetailMng.vue
+++ b/src/views/xm/core/xmTaskSbillDetail/XmTaskSbillDetailMng.vue
@@ -207,7 +207,7 @@
components: {
XmTaskSbillDetailEdit,XmTaskWorkloadSimpleList,
},
- props:['visible'],
+ props:['visible','branchId','userid','bizMonth','projectId'],
computed: {
...mapGetters(['userInfo']),
@@ -218,7 +218,7 @@
this.initData();
this.searchXmTaskSbillDetails()
}
- }
+ },
},
data() {
return {
@@ -304,6 +304,22 @@
params.key=this.filters.key
}
+ if(this.branchId){
+ params.branchId=this.branchId
+ }
+
+ if(this.userid){
+ params.userid=this.userid
+ }
+
+ if(this.projectId){
+ params.projectId=this.projectId
+ }
+
+ if(this.bizMonth){
+ params.bizMonth=this.bizMonth
+ }
+
this.load.list = true;
listXmTaskSbillDetail(params).then((res) => {
var tips=res.data.tips;