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

优化

master
陈裕财 4 years ago
parent
2f1eac6c2e
commit
85d9e7e4a7
4 changed files with 12 additions and 14 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. 8
      src/router/routes_xm.js
  2. 8
      src/views/xm/core/xmTaskWorkload/WorkloadSetDayList.vue
  3. 8
      src/views/xm/core/xmTaskWorkload/WorkloadSetMonthList.vue
  4. 2
      src/views/xm/core/xmTaskWorkload/XmTaskWorkloadSimpleListForBizDate.vue

8
src/router/routes_xm.js
View File

@ -172,13 +172,11 @@ export default {
{ path: 'xmProject/XmProjectCost', component: _import('xm/core/xmProject/XmProjectCost'), name: 'XmProjectCost', meta: { title: '应付款'}}, { 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: '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: '工时日报表(我)'}},
{ path: 'xmTaskWorkload/WorkloadSetDayListMy', component: _import('xm/core/xmTaskWorkload/WorkloadSetDayListMy'), name: 'WorkloadSetDayListMy', meta: { title: '工时日报表(我)'}},
{ path: 'xmTaskWorkload/WorkloadSetMonthListMy', component: _import('xm/core/xmTaskWorkload/WorkloadSetMonthListMy'), name: 'WorkloadSetMonthListMy', meta: { title: '工时月报表(我)'}}, { path: 'xmTaskWorkload/WorkloadSetMonthListMy', component: _import('xm/core/xmTaskWorkload/WorkloadSetMonthListMy'), name: 'WorkloadSetMonthListMy', meta: { title: '工时月报表(我)'}},
{ path: 'xmTaskWorkload/XmTaskWorkloadInfoToSet', component: _import('xm/core/xmTaskWorkload/XmTaskWorkloadInfoToSet'), name: 'XmTaskWorkloadInfoToSet', meta: { title: '待结算工时'}}, { path: 'xmTaskWorkload/XmTaskWorkloadInfoToSet', component: _import('xm/core/xmTaskWorkload/XmTaskWorkloadInfoToSet'), name: 'XmTaskWorkloadInfoToSet', meta: { title: '待结算工时'}},
{ path: 'xmTaskWorkload/XmTaskWorkloadInfo', component: _import('xm/core/xmTaskWorkload/XmTaskWorkloadInfo'), name: 'XmTaskWorkloadInfo', meta: { title: '工时确认'}},
{ path: 'xmTaskWorkload/WorkloadSetDayList', component: _import('xm/core/xmTaskWorkload/WorkloadSetDayList'), name: 'WorkloadSetDayList', meta: { title: '工时日报表'}},
{ path: 'xmTaskWorkload/WorkloadSetMonthList', component: _import('xm/core/xmTaskWorkload/WorkloadSetMonthList'), name: 'WorkloadSetMonthList', meta: { title: '工时月报表'}},
{ path: 'xmTaskWorkload/WorkloadSetDayList', component: _import('xm/core/xmTaskWorkload/WorkloadSetDayList'), name: 'WorkloadSetDayList', meta: { title: '工时日报'}},
{ path: 'xmTaskWorkload/WorkloadSetMonthList', component: _import('xm/core/xmTaskWorkload/WorkloadSetMonthList'), name: 'WorkloadSetMonthList', meta: { title: '工时月报'}},
] ]
} }
] ]

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

@ -123,7 +123,7 @@
<el-popover :title="'【'+ scope.row.bizDate + '】【已确认】工时记录'"> <el-popover :title="'【'+ scope.row.bizDate + '】【已确认】工时记录'">
<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> <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="success" slot="reference" style="display:inline;">{{scope.row.hadConfirmWorkload}}h</el-link>
</el-popover> </el-popover>
</template> </template>
</el-table-column> </el-table-column>
@ -138,7 +138,7 @@
<el-popover :title="'【'+ scope.row.bizDate + '】【无须结算】工时记录'"> <el-popover :title="'【'+ scope.row.bizDate + '】【无须结算】工时记录'">
<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> <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="info" slot="reference" style="display:inline;">{{scope.row.notNeedSetWorkload}}h</el-link>
</el-popover> </el-popover>
</template> </template>
</el-table-column> </el-table-column>
@ -153,7 +153,7 @@
<el-popover :title="'【'+ scope.row.bizDate + '】【待结算】工时记录'"> <el-popover :title="'【'+ scope.row.bizDate + '】【待结算】工时记录'">
<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> <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="warning" slot="reference" style="display:inline;">{{scope.row.toSetSworkload}}h</el-link>
</el-popover> </el-popover>
</template> </template>
</el-table-column> </el-table-column>
@ -201,7 +201,7 @@
<el-popover :title="'【'+ scope.row.bizDate + '】【已结算】工时记录'"> <el-popover :title="'【'+ scope.row.bizDate + '】【已结算】工时记录'">
<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> <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="danger" slot="reference" style="display:inline;">{{scope.row.hadSetSworkload}}h</el-link>
</el-popover> </el-popover>
</template> </template>
</el-table-column> </el-table-column>

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

@ -123,7 +123,7 @@
<el-popover :title="'【'+ scope.row.bizMonth + '】【已确认】工时记录'"> <el-popover :title="'【'+ scope.row.bizMonth + '】【已确认】工时记录'">
<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> <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-link type="success" slot="reference" >{{scope.row.hadConfirmWorkload}}h</el-link>
</el-popover> </el-popover>
</template> </template>
</el-table-column> </el-table-column>
@ -138,7 +138,7 @@
<el-popover :title="'【'+ scope.row.bizMonth + '】【无须结算】工时记录'"> <el-popover :title="'【'+ scope.row.bizMonth + '】【无须结算】工时记录'">
<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> <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-link type="info" slot="reference" >{{scope.row.notNeedSetWorkload}}h</el-link>
</el-popover> </el-popover>
</template> </template>
</el-table-column> </el-table-column>
@ -153,7 +153,7 @@
<el-popover :title="'【'+ scope.row.bizMonth + '】【待结算】工时记录'"> <el-popover :title="'【'+ scope.row.bizMonth + '】【待结算】工时记录'">
<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> <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-link type="warning" slot="reference" >{{scope.row.toSetSworkload}}h</el-link>
</el-popover> </el-popover>
</template> </template>
</el-table-column> </el-table-column>
@ -201,7 +201,7 @@
<el-popover :title="'【'+ scope.row.bizMonth + '】【已结算】工时记录'"> <el-popover :title="'【'+ scope.row.bizMonth + '】【已结算】工时记录'">
<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> <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-link type="danger" 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

@ -1,7 +1,7 @@
<template> <template>
<section> <section>
<el-row class="padding-top"> <el-row class="padding-top">
<el-table ref="xmTaskWorkloadTable" :data="xmTaskWorkloads" :row-style="{height:'50px'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
<el-table ref="xmTaskWorkloadTable" :max-height="maxTableHeight" :data="xmTaskWorkloads" :row-style="{height:'50px'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
<el-table-column type="selection" width="55" show-overflow-tooltip></el-table-column> <el-table-column type="selection" width="55" show-overflow-tooltip></el-table-column>
<el-table-column prop="username" label="姓名" width="120" show-overflow-tooltip></el-table-column> <el-table-column prop="username" label="姓名" width="120" show-overflow-tooltip></el-table-column>
<el-table-column prop="bizDate" label="登记日期" width="120" show-overflow-tooltip></el-table-column> <el-table-column prop="bizDate" label="登记日期" width="120" show-overflow-tooltip></el-table-column>

Write Preview
Loading…
Cancel
Save