end7less
/
program_xm_vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

优化

master
陈裕财 4 years ago
parent
a8bf419f06
commit
2f1eac6c2e
3 changed files with 25 additions and 25 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      src/views/xm/core/xmTaskWorkload/WorkloadSetDayList.vue
  2. 32
      src/views/xm/core/xmTaskWorkload/WorkloadSetMonthList.vue
  3. 2
      src/views/xm/core/xmTaskWorkload/XmTaskWorkloadSimpleListForBizDate.vue

16
src/views/xm/core/xmTaskWorkload/WorkloadSetDayList.vue
View File

@ -92,7 +92,7 @@
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-popover :title="'【'+ scope.row.bizDate + '】所有工时记录'"> <el-popover :title="'【'+ scope.row.bizDate + '】所有工时记录'">
<xm-task-workload-simple-list-for-biz-date v-if="scope.row.bizDate==editForm.bizDate && columnProp=='workload'" :task-id="filters.taskId" :project-id="filters.project?filters.project.id:null" ref="xmTaskWorkloadSimpleList2" :biz-date="scope.row.bizDate"></xm-task-workload-simple-list-for-biz-date>
<xm-task-workload-simple-list-for-biz-date :visible="scope.row.bizDate==editForm.bizDate && columnProp=='workload'" :task-id="filters.taskId" :project-id="filters.project?filters.project.id:null" ref="xmTaskWorkloadSimpleList2" :biz-date="scope.row.bizDate"></xm-task-workload-simple-list-for-biz-date>
<el-link type="primary" slot="reference" style="display:inline;">{{scope.row.workload}}h</el-link> <el-link type="primary" slot="reference" style="display:inline;">{{scope.row.workload}}h</el-link>
</el-popover> </el-popover>
</template> </template>
@ -107,7 +107,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-popover :title="'【'+ scope.row.bizDate + '】【待确认】工时记录'"> <el-popover :title="'【'+ scope.row.bizDate + '】【待确认】工时记录'">
<xm-task-workload-simple-list-for-biz-date v-if="scope.row.bizDate==editForm.bizDate && columnProp=='toConfirmWorkload'" wstatus="0" :task-id="filters.taskId" :project-id="filters.project?filters.project.id:null" ref="xmTaskWorkloadSimpleList2" :biz-date="scope.row.bizDate"></xm-task-workload-simple-list-for-biz-date>
<xm-task-workload-simple-list-for-biz-date :visible="scope.row.bizDate==editForm.bizDate && columnProp=='toConfirmWorkload'" wstatus="0" :task-id="filters.taskId" :project-id="filters.project?filters.project.id:null" ref="xmTaskWorkloadSimpleList2" :biz-date="scope.row.bizDate"></xm-task-workload-simple-list-for-biz-date>
<el-link type="primary" slot="reference" style="display:inline;">{{scope.row.toConfirmWorkload}}h</el-link> <el-link type="primary" slot="reference" style="display:inline;">{{scope.row.toConfirmWorkload}}h</el-link>
</el-popover> </el-popover>
</template> </template>
@ -122,7 +122,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-popover :title="'【'+ scope.row.bizDate + '】【已确认】工时记录'"> <el-popover :title="'【'+ scope.row.bizDate + '】【已确认】工时记录'">
<xm-task-workload-simple-list-for-biz-date v-if="scope.row.bizDate==editForm.bizDate && columnProp=='hadConfirmWorkload'" wstatus="1" :task-id="filters.taskId" :project-id="filters.project?filters.project.id:null" ref="xmTaskWorkloadSimpleList2" :biz-date="scope.row.bizDate"></xm-task-workload-simple-list-for-biz-date>
<xm-task-workload-simple-list-for-biz-date :visible="scope.row.bizDate==editForm.bizDate && columnProp=='hadConfirmWorkload'" wstatus="1" :task-id="filters.taskId" :project-id="filters.project?filters.project.id:null" ref="xmTaskWorkloadSimpleList2" :biz-date="scope.row.bizDate"></xm-task-workload-simple-list-for-biz-date>
<el-link type="primary" slot="reference" style="display:inline;">{{scope.row.hadConfirmWorkload}}h</el-link> <el-link type="primary" slot="reference" style="display:inline;">{{scope.row.hadConfirmWorkload}}h</el-link>
</el-popover> </el-popover>
</template> </template>
@ -137,7 +137,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-popover :title="'【'+ scope.row.bizDate + '】【无须结算】工时记录'"> <el-popover :title="'【'+ scope.row.bizDate + '】【无须结算】工时记录'">
<xm-task-workload-simple-list-for-biz-date v-if="scope.row.bizDate==editForm.bizDate && columnProp=='notNeedSetWorkload'" wstatus="1" sstatus="0" :task-id="filters.taskId" :project-id="filters.project?filters.project.id:null" ref="xmTaskWorkloadSimpleList2" :biz-date="scope.row.bizDate"></xm-task-workload-simple-list-for-biz-date>
<xm-task-workload-simple-list-for-biz-date :visible="scope.row.bizDate==editForm.bizDate && columnProp=='notNeedSetWorkload'" wstatus="1" sstatus="0" :task-id="filters.taskId" :project-id="filters.project?filters.project.id:null" ref="xmTaskWorkloadSimpleList2" :biz-date="scope.row.bizDate"></xm-task-workload-simple-list-for-biz-date>
<el-link type="primary" slot="reference" style="display:inline;">{{scope.row.notNeedSetWorkload}}h</el-link> <el-link type="primary" slot="reference" style="display:inline;">{{scope.row.notNeedSetWorkload}}h</el-link>
</el-popover> </el-popover>
</template> </template>
@ -152,7 +152,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-popover :title="'【'+ scope.row.bizDate + '】【待结算】工时记录'"> <el-popover :title="'【'+ scope.row.bizDate + '】【待结算】工时记录'">
<xm-task-workload-simple-list-for-biz-date v-if="scope.row.bizDate==editForm.bizDate && columnProp=='toSetSworkload'" wstatus="1" sstatus="1" :task-id="filters.taskId" :project-id="filters.project?filters.project.id:null" ref="xmTaskWorkloadSimpleList2" :biz-date="scope.row.bizDate"></xm-task-workload-simple-list-for-biz-date>
<xm-task-workload-simple-list-for-biz-date :visible="scope.row.bizDate==editForm.bizDate && columnProp=='toSetSworkload'" wstatus="1" sstatus="1" :task-id="filters.taskId" :project-id="filters.project?filters.project.id:null" ref="xmTaskWorkloadSimpleList2" :biz-date="scope.row.bizDate"></xm-task-workload-simple-list-for-biz-date>
<el-link type="primary" slot="reference" style="display:inline;">{{scope.row.toSetSworkload}}h</el-link> <el-link type="primary" slot="reference" style="display:inline;">{{scope.row.toSetSworkload}}h</el-link>
</el-popover> </el-popover>
</template> </template>
@ -168,7 +168,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-popover :title="'【'+ scope.row.bizDate + '】【已提交审核】工时记录'"> <el-popover :title="'【'+ scope.row.bizDate + '】【已提交审核】工时记录'">
<xm-task-workload-simple-list-for-biz-date v-if="scope.row.bizDate==editForm.bizDate && columnProp=='hadCommitSworkload'" wstatus="1" sstatus="2" :task-id="filters.taskId" :project-id="filters.project?filters.project.id:null" ref="xmTaskWorkloadSimpleList2" :biz-date="scope.row.bizDate"></xm-task-workload-simple-list-for-biz-date>
<xm-task-workload-simple-list-for-biz-date :visible="scope.row.bizDate==editForm.bizDate && columnProp=='hadCommitSworkload'" wstatus="1" sstatus="2" :task-id="filters.taskId" :project-id="filters.project?filters.project.id:null" ref="xmTaskWorkloadSimpleList2" :biz-date="scope.row.bizDate"></xm-task-workload-simple-list-for-biz-date>
<el-link type="primary" slot="reference" style="display:inline;">{{scope.row.hadCommitSworkload}}h</el-link> <el-link type="primary" slot="reference" style="display:inline;">{{scope.row.hadCommitSworkload}}h</el-link>
</el-popover> </el-popover>
@ -184,7 +184,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-popover :title="'【'+ scope.row.bizDate + '】【已审核】工时记录'"> <el-popover :title="'【'+ scope.row.bizDate + '】【已审核】工时记录'">
<xm-task-workload-simple-list-for-biz-date v-if="scope.row.bizDate==editForm.bizDate && columnProp=='hadAgreeSworkload'" wstatus="1" sstatus="3" :task-id="filters.taskId" :project-id="filters.project?filters.project.id:null" ref="xmTaskWorkloadSimpleList2" :biz-date="scope.row.bizDate"></xm-task-workload-simple-list-for-biz-date>
<xm-task-workload-simple-list-for-biz-date :visible="scope.row.bizDate==editForm.bizDate && columnProp=='hadAgreeSworkload'" wstatus="1" sstatus="3" :task-id="filters.taskId" :project-id="filters.project?filters.project.id:null" ref="xmTaskWorkloadSimpleList2" :biz-date="scope.row.bizDate"></xm-task-workload-simple-list-for-biz-date>
<el-link type="primary" slot="reference" style="display:inline;">{{scope.row.hadAgreeSworkload}}h</el-link> <el-link type="primary" slot="reference" style="display:inline;">{{scope.row.hadAgreeSworkload}}h</el-link>
</el-popover> </el-popover>
</template> </template>
@ -200,7 +200,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-popover :title="'【'+ scope.row.bizDate + '】【已结算】工时记录'"> <el-popover :title="'【'+ scope.row.bizDate + '】【已结算】工时记录'">
<xm-task-workload-simple-list-for-biz-date v-if="scope.row.bizDate==editForm.bizDate && columnProp=='hadSetSworkload'" wstatus="1" sstatus="4" :task-id="filters.taskId" :project-id="filters.project?filters.project.id:null" ref="xmTaskWorkloadSimpleList2" :biz-date="scope.row.bizDate"></xm-task-workload-simple-list-for-biz-date>
<xm-task-workload-simple-list-for-biz-date :visible="scope.row.bizDate==editForm.bizDate && columnProp=='hadSetSworkload'" wstatus="1" sstatus="4" :task-id="filters.taskId" :project-id="filters.project?filters.project.id:null" ref="xmTaskWorkloadSimpleList2" :biz-date="scope.row.bizDate"></xm-task-workload-simple-list-for-biz-date>
<el-link type="primary" slot="reference" style="display:inline;">{{scope.row.hadSetSworkload}}h</el-link> <el-link type="primary" slot="reference" style="display:inline;">{{scope.row.hadSetSworkload}}h</el-link>
</el-popover> </el-popover>
</template> </template>

32
src/views/xm/core/xmTaskWorkload/WorkloadSetMonthList.vue
View File

@ -92,8 +92,8 @@
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-popover :title="'【'+ scope.row.bizMonth + '】所有工时记录'"> <el-popover :title="'【'+ scope.row.bizMonth + '】所有工时记录'">
<xm-task-workload-simple-list-for-biz-month v-if="scope.row.bizMonth==editForm.bizMonth && columnProp=='workload'" :task-id="filters.taskId" :project-id="filters.project?filters.project.id:null" ref="xmTaskWorkloadSimpleList2" :biz-month="scope.row.bizMonth"></xm-task-workload-simple-list-for-biz-month>
<el-link type="primary" slot="reference" style="display:inline;">{{scope.row.workload}}h</el-link>
<xm-task-workload-simple-list-for-biz-month :visible="scope.row.bizMonth==editForm.bizMonth && columnProp=='workload'" :task-id="filters.taskId" :project-id="filters.project?filters.project.id:null" ref="xmTaskWorkloadSimpleList2" :biz-month="scope.row.bizMonth"></xm-task-workload-simple-list-for-biz-month>
<el-link type="primary" slot="reference" >{{scope.row.workload}}h</el-link>
</el-popover> </el-popover>
</template> </template>
</el-table-column> </el-table-column>
@ -107,8 +107,8 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-popover :title="'【'+ scope.row.bizMonth + '】【待确认】工时记录'"> <el-popover :title="'【'+ scope.row.bizMonth + '】【待确认】工时记录'">
<xm-task-workload-simple-list-for-biz-month v-if="scope.row.bizMonth==editForm.bizMonth && columnProp=='toConfirmWorkload'" wstatus="0" :task-id="filters.taskId" :project-id="filters.project?filters.project.id:null" ref="xmTaskWorkloadSimpleList2" :biz-month="scope.row.bizMonth"></xm-task-workload-simple-list-for-biz-month>
<el-link type="primary" slot="reference" style="display:inline;">{{scope.row.toConfirmWorkload}}h</el-link>
<xm-task-workload-simple-list-for-biz-month :visible="scope.row.bizMonth==editForm.bizMonth && columnProp=='toConfirmWorkload'" wstatus="0" :task-id="filters.taskId" :project-id="filters.project?filters.project.id:null" ref="xmTaskWorkloadSimpleList2" :biz-month="scope.row.bizMonth"></xm-task-workload-simple-list-for-biz-month>
<el-link type="primary" slot="reference" >{{scope.row.toConfirmWorkload}}h</el-link>
</el-popover> </el-popover>
</template> </template>
</el-table-column> </el-table-column>
@ -122,8 +122,8 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-popover :title="'【'+ scope.row.bizMonth + '】【已确认】工时记录'"> <el-popover :title="'【'+ scope.row.bizMonth + '】【已确认】工时记录'">
<xm-task-workload-simple-list-for-biz-month v-if="scope.row.bizMonth==editForm.bizMonth && columnProp=='hadConfirmWorkload'" wstatus="1" :task-id="filters.taskId" :project-id="filters.project?filters.project.id:null" ref="xmTaskWorkloadSimpleList2" :biz-month="scope.row.bizMonth"></xm-task-workload-simple-list-for-biz-month>
<el-link type="primary" slot="reference" style="display:inline;">{{scope.row.hadConfirmWorkload}}h</el-link>
<xm-task-workload-simple-list-for-biz-month :visible="scope.row.bizMonth==editForm.bizMonth && columnProp=='hadConfirmWorkload'" wstatus="1" :task-id="filters.taskId" :project-id="filters.project?filters.project.id:null" ref="xmTaskWorkloadSimpleList2" :biz-month="scope.row.bizMonth"></xm-task-workload-simple-list-for-biz-month>
<el-link type="primary" slot="reference" >{{scope.row.hadConfirmWorkload}}h</el-link>
</el-popover> </el-popover>
</template> </template>
</el-table-column> </el-table-column>
@ -137,8 +137,8 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-popover :title="'【'+ scope.row.bizMonth + '】【无须结算】工时记录'"> <el-popover :title="'【'+ scope.row.bizMonth + '】【无须结算】工时记录'">
<xm-task-workload-simple-list-for-biz-month v-if="scope.row.bizMonth==editForm.bizMonth && columnProp=='notNeedSetWorkload'" wstatus="1" sstatus="0" :task-id="filters.taskId" :project-id="filters.project?filters.project.id:null" ref="xmTaskWorkloadSimpleList2" :biz-month="scope.row.bizMonth"></xm-task-workload-simple-list-for-biz-month>
<el-link type="primary" slot="reference" style="display:inline;">{{scope.row.notNeedSetWorkload}}h</el-link>
<xm-task-workload-simple-list-for-biz-month :visible="scope.row.bizMonth==editForm.bizMonth && columnProp=='notNeedSetWorkload'" wstatus="1" sstatus="0" :task-id="filters.taskId" :project-id="filters.project?filters.project.id:null" ref="xmTaskWorkloadSimpleList2" :biz-month="scope.row.bizMonth"></xm-task-workload-simple-list-for-biz-month>
<el-link type="primary" slot="reference" >{{scope.row.notNeedSetWorkload}}h</el-link>
</el-popover> </el-popover>
</template> </template>
</el-table-column> </el-table-column>
@ -152,8 +152,8 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-popover :title="'【'+ scope.row.bizMonth + '】【待结算】工时记录'"> <el-popover :title="'【'+ scope.row.bizMonth + '】【待结算】工时记录'">
<xm-task-workload-simple-list-for-biz-month v-if="scope.row.bizMonth==editForm.bizMonth && columnProp=='toSetSworkload'" wstatus="1" sstatus="1" :task-id="filters.taskId" :project-id="filters.project?filters.project.id:null" ref="xmTaskWorkloadSimpleList2" :biz-month="scope.row.bizMonth"></xm-task-workload-simple-list-for-biz-month>
<el-link type="primary" slot="reference" style="display:inline;">{{scope.row.toSetSworkload}}h</el-link>
<xm-task-workload-simple-list-for-biz-month :visible="scope.row.bizMonth==editForm.bizMonth && columnProp=='toSetSworkload'" wstatus="1" sstatus="1" :task-id="filters.taskId" :project-id="filters.project?filters.project.id:null" ref="xmTaskWorkloadSimpleList2" :biz-month="scope.row.bizMonth"></xm-task-workload-simple-list-for-biz-month>
<el-link type="primary" slot="reference" >{{scope.row.toSetSworkload}}h</el-link>
</el-popover> </el-popover>
</template> </template>
</el-table-column> </el-table-column>
@ -168,8 +168,8 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-popover :title="'【'+ scope.row.bizMonth + '】【已提交审核】工时记录'"> <el-popover :title="'【'+ scope.row.bizMonth + '】【已提交审核】工时记录'">
<xm-task-workload-simple-list-for-biz-month v-if="scope.row.bizMonth==editForm.bizMonth && columnProp=='workload'" wstatus="1" sstatus="2" :task-id="filters.taskId" :project-id="filters.project?filters.project.id:null" ref="xmTaskWorkloadSimpleList2" :biz-month="scope.row.bizMonth"></xm-task-workload-simple-list-for-biz-month>
<el-link type="primary" slot="reference" style="display:inline;">{{scope.row.hadCommitSworkload}}h</el-link>
<xm-task-workload-simple-list-for-biz-month :visible="scope.row.bizMonth==editForm.bizMonth && columnProp=='workload'" wstatus="1" sstatus="2" :task-id="filters.taskId" :project-id="filters.project?filters.project.id:null" ref="xmTaskWorkloadSimpleList2" :biz-month="scope.row.bizMonth"></xm-task-workload-simple-list-for-biz-month>
<el-link type="primary" slot="reference" >{{scope.row.hadCommitSworkload}}h</el-link>
</el-popover> </el-popover>
</template> </template>
@ -184,8 +184,8 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-popover :title="'【'+ scope.row.bizMonth + '】【已审核】工时记录'"> <el-popover :title="'【'+ scope.row.bizMonth + '】【已审核】工时记录'">
<xm-task-workload-simple-list-for-biz-month v-if="scope.row.bizMonth==editForm.bizMonth && columnProp=='hadAgreeSworkload'" wstatus="1" sstatus="3" :task-id="filters.taskId" :project-id="filters.project?filters.project.id:null" ref="xmTaskWorkloadSimpleList2" :biz-month="scope.row.bizMonth"></xm-task-workload-simple-list-for-biz-month>
<el-link type="primary" slot="reference" style="display:inline;">{{scope.row.hadAgreeSworkload}}h</el-link>
<xm-task-workload-simple-list-for-biz-month :visible="scope.row.bizMonth==editForm.bizMonth && columnProp=='hadAgreeSworkload'" wstatus="1" sstatus="3" :task-id="filters.taskId" :project-id="filters.project?filters.project.id:null" ref="xmTaskWorkloadSimpleList2" :biz-month="scope.row.bizMonth"></xm-task-workload-simple-list-for-biz-month>
<el-link type="primary" slot="reference" >{{scope.row.hadAgreeSworkload}}h</el-link>
</el-popover> </el-popover>
</template> </template>
</el-table-column> </el-table-column>
@ -200,8 +200,8 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-popover :title="'【'+ scope.row.bizMonth + '】【已结算】工时记录'"> <el-popover :title="'【'+ scope.row.bizMonth + '】【已结算】工时记录'">
<xm-task-workload-simple-list-for-biz-month v-if="scope.row.bizMonth==editForm.bizMonth && columnProp=='hadSetSworkload'" wstatus="1" sstatus="4" :task-id="filters.taskId" :project-id="filters.project?filters.project.id:null" ref="xmTaskWorkloadSimpleList2" :biz-month="scope.row.bizMonth"></xm-task-workload-simple-list-for-biz-month>
<el-link type="primary" slot="reference" style="display:inline;">{{scope.row.hadSetSworkload}}h</el-link>
<xm-task-workload-simple-list-for-biz-month :visible="scope.row.bizMonth==editForm.bizMonth && columnProp=='hadSetSworkload'" wstatus="1" sstatus="4" :task-id="filters.taskId" :project-id="filters.project?filters.project.id:null" ref="xmTaskWorkloadSimpleList2" :biz-month="scope.row.bizMonth"></xm-task-workload-simple-list-for-biz-month>
<el-link type="primary" slot="reference" >{{scope.row.hadSetSworkload}}h</el-link>
</el-popover> </el-popover>
</template> </template>
</el-table-column> </el-table-column>

2
src/views/xm/core/xmTaskWorkload/XmTaskWorkloadSimpleListForBizDate.vue
View File

@ -305,7 +305,7 @@
this.$nextTick(() => { this.$nextTick(() => {
initDicts(this); initDicts(this);
this.initData() this.initData()
this.searchXmTaskWorkloads();
//this.searchXmTaskWorkloads();
this.maxTableHeight = util.calcTableMaxHeight(this.$refs.xmTaskWorkloadTable.$el) this.maxTableHeight = util.calcTableMaxHeight(this.$refs.xmTaskWorkloadTable.$el)
}); });

Write Preview
Loading…
Cancel
Save