From 371466618742e490d4e66f639bc67aecf78ffe5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Fri, 8 Jul 2022 15:55:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xm/core/xmTaskSbill/XmTaskSbillEdit.vue | 1 + .../XmTaskSbillDetailMng.vue | 173 ++++-- .../XmTaskWorkloadInfoToSet.vue | 573 ------------------ .../XmTaskWorkloadSimpleListForBizDate.vue | 10 +- 4 files changed, 146 insertions(+), 611 deletions(-) delete mode 100644 src/views/xm/core/xmTaskWorkload/XmTaskWorkloadInfoToSet.vue diff --git a/src/views/xm/core/xmTaskSbill/XmTaskSbillEdit.vue b/src/views/xm/core/xmTaskSbill/XmTaskSbillEdit.vue index fbe31f50..77bac6bf 100644 --- a/src/views/xm/core/xmTaskSbill/XmTaskSbillEdit.vue +++ b/src/views/xm/core/xmTaskSbill/XmTaskSbillEdit.vue @@ -118,6 +118,7 @@ diff --git a/src/views/xm/core/xmTaskSbillDetail/XmTaskSbillDetailMng.vue b/src/views/xm/core/xmTaskSbillDetail/XmTaskSbillDetailMng.vue index 2c5bcf46..0656abc9 100644 --- a/src/views/xm/core/xmTaskSbillDetail/XmTaskSbillDetailMng.vue +++ b/src/views/xm/core/xmTaskSbillDetail/XmTaskSbillDetailMng.vue @@ -4,7 +4,7 @@ 查询 - + @@ -20,30 +20,24 @@ --> - - + - - + + @@ -85,6 +84,16 @@ ￥ {{scope.row.tactAt}}元 + + + + + + - - - @@ -200,12 +249,12 @@ import { initDicts,listXmTaskSbillDetail, delXmTaskSbillDetail, batchDelXmTaskSbillDetail,editSomeFieldsXmTaskSbillDetail } from '@/api/xm/core/xmTaskSbillDetail'; import XmTaskSbillDetailEdit from './XmTaskSbillDetailEdit';//新增修改界面 import { mapGetters } from 'vuex' - import XmTaskWorkloadSimpleList from '../xmTaskWorkload/XmTaskWorkloadSimpleList'; + import XmTaskWorkloadSimpleListForBizDate from '../xmTaskWorkload/XmTaskWorkloadSimpleListForBizDate'; export default { name:'xmTaskSbillDetailMng', components: { - XmTaskSbillDetailEdit,XmTaskWorkloadSimpleList, + XmTaskSbillDetailEdit,XmTaskWorkloadSimpleListForBizDate, }, props:['visible','branchId','userid','bizMonth','projectId','sbillId'], computed: { @@ -249,6 +298,24 @@ userid:'',username:'',ctime:'',taskId:'',bizDate:'',remark:'',id:'',sbillId:'',stime:'',sstatus:'',amt:'',samt:'',workload:'',projectId:'',sworkload:'',bizMonth:'',budgetAt:'',budgetWorkload:'',initWorkload:'',quoteAt:'',quoteWorkload:'',sschemel:'',uniPrice:'',qendTime:'',qstartTime:'',actEndTime:'',actStartTime:'' }, maxTableHeight:300, + popoverConfig:{ + workloadDialogVisible:false, + wstatus:'', + sstatus:'', + subTitle:'', + taskId:'', + projectId:'', + sbillId:'', + detailId:'', + userid:'', + }, + popoverPlusConfig:{ + workloadDialogVisible:false, + wstatus:'1', + sstatus:'1', + subTitle:'查询项目下的所有【待结算】工时记录', + projectId:'', + } } },//end data methods: { @@ -342,9 +409,9 @@ this.editForm = Object.assign({}, row); }, //显示新增界面 XmTaskSbillDetail 工时登记表 - showAdd: function () { - this.addFormVisible = true; - //this.addForm=Object.assign({}, this.editForm); + showAdd: function () { + this.popoverPlusConfig.workloadDialogVisible=true + this.popoverPlusConfig.projectId=this.projectId }, afterAddSubmit(){ this.addFormVisible=false; @@ -461,6 +528,38 @@ }, + showPopover(row, fieldName, wstatus, sstatus) { + this.editForm = row; + this.popoverConfig={ + workloadDialogVisible:false, + wstatus:'', + sstatus:'', + subTitle:'', + taskId:'', + projectId:'', + subTitle:'', + sbillId:'', + detailId:'', + userid:'', + } + this.popoverConfig.workloadDialogVisible = true; + this.popoverConfig.wstatus = wstatus; + this.popoverConfig.sstatus = sstatus; + if(fieldName=='username'){ + this.popoverConfig.subTitle="查看【"+row.username+"】在任务【"+row.taskName+"】下的所有报工记录" + this.popoverConfig.taskId=row.taskId + this.popoverConfig.userid=row.userid + }else if(fieldName=='taskName'){ + this.popoverConfig.subTitle="查看任务【"+row.taskName+"】下的所有报工记录" + this.popoverConfig.taskId=row.taskId + }else if(fieldName=='sworkload'||fieldName=='workload'){ + this.popoverConfig.subTitle="查看【"+row.username+"】已加入当前任务，当前结算单的待结工时明细" + this.popoverConfig.taskId=row.taskId + this.popoverConfig.detailId=row.id + this.popoverConfig.userid=row.userid + } + + }, },//end methods mounted() { this.$nextTick(() => { diff --git a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadInfoToSet.vue b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadInfoToSet.vue deleted file mode 100644 index 46fce18c..00000000 --- a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadInfoToSet.vue +++ /dev/null @@ -1,573 +0,0 @@ - - - - - diff --git a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadSimpleListForBizDate.vue b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadSimpleListForBizDate.vue index ec050395..225aaf5f 100644 --- a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadSimpleListForBizDate.vue +++ b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadSimpleListForBizDate.vue @@ -68,7 +68,7 @@ components: { XmTaskSbillSelect }, - props:[ 'visible','wstatus','sstatus','bizDate','projectId','userid','taskId','bizMonth'], + props:[ 'visible','wstatus','sstatus','bizDate','projectId','userid','taskId','bizMonth','detailId','sbillId'], computed: { ...mapGetters(['userInfo']), @@ -223,6 +223,14 @@ if(this.bizDate){ params.bizDate=this.bizDate } + + if(this.detailId){ + params.detailId=this.detailId + } + + if(this.sbillId){ + params.sbillId=this.sbillId + } this.load.list = true; listXmTaskWorkload(params).then((res) => { var tips=res.data.tips;