Browse Source

优化

master
陈裕财 4 years ago
parent
commit
3714666187
  1. 1
      src/views/xm/core/xmTaskSbill/XmTaskSbillEdit.vue
  2. 165
      src/views/xm/core/xmTaskSbillDetail/XmTaskSbillDetailMng.vue
  3. 573
      src/views/xm/core/xmTaskWorkload/XmTaskWorkloadInfoToSet.vue
  4. 10
      src/views/xm/core/xmTaskWorkload/XmTaskWorkloadSimpleListForBizDate.vue

1
src/views/xm/core/xmTaskSbill/XmTaskSbillEdit.vue

@ -118,6 +118,7 @@
<el-row v-if="editForm.id &&activateName=='1'">
<xm-task-sbill-detail-mng
:sbill-id="editForm.id"
:project-id="editForm.projectId"
></xm-task-sbill-detail-mng>
</el-row>
</el-tab-pane>

165
src/views/xm/core/xmTaskSbillDetail/XmTaskSbillDetailMng.vue

@ -4,7 +4,7 @@
<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"></el-input>
<el-button v-loading="load.list" :disabled="load.list==true" @click="searchXmTaskSbillDetails" icon="el-icon-search">查询</el-button>
<span style="float:right;">
<!--<el-button type="primary" @click="showAdd" icon="el-icon-plus" plain> </el-button>-->
<el-button type="primary" @click="showAdd" icon="el-icon-plus" plain> </el-button>
<el-button type="danger" v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true" icon="el-icon-delete" plain></el-button>
</span>
</el-row>
@ -21,29 +21,23 @@
-->
<el-table-column prop="username" label="姓名" min-width="120" show-overflow-tooltip fixed="left">
<template slot-scope="scope">
<span class="cell-text">
{{scope.row.username}}
</span>
<span class="cell-bar">
<el-popover :title="'【'+scope.row.username+'】在本任务的所有工时记录'" fixed="left">
<xm-task-workload-simple-list :visible="scope.row.id==editForm.id" :userid="scope.row.userid" :xm-task="{id:scope.row.taskId,name:scope.row.taskName,projectName:scope.row.projectName,projectId:scope.row.projectId,budgetWorkload:scope.row.budgetWorkload,actWorkload:scope.row.actWorkload}" ref="xmTaskWorkloadSimpleList1" @edit-some-fields="searchXmTaskSbillDetails"></xm-task-workload-simple-list>
<el-button slot="reference" icon="el-icon-search" style="display:inline;">所有工时记录</el-button>
</el-popover>
</span>
<el-link title="查看该人员在当前任务下的所有工时记录"
type="primary"
style="display: inline"
@click="showPopover(scope.row, 'username', '', '')"
>{{ scope.row.username }}</el-link
>
</template>
</el-table-column>
<el-table-column prop="taskName" label="任务" min-width="120" show-overflow-tooltip fixed="left">
<template slot-scope="scope">
<span class="cell-text">
{{scope.row.taskName}}
</span>
<span class="cell-bar">
<el-popover title="当前任务所有工时记录">
<xm-task-workload-simple-list :visible="scope.row.id==editForm.id" :xm-task="{id:scope.row.taskId,name:scope.row.taskName,projectName:scope.row.projectName,projectId:scope.row.projectId,budgetWorkload:scope.row.budgetWorkload,actWorkload:scope.row.actWorkload}" ref="xmTaskWorkloadSimpleList2" @edit-some-fields="searchXmTaskSbillDetails"></xm-task-workload-simple-list>
<el-button slot="reference" icon="el-icon-search" style="display:inline;">所有工时记录</el-button>
</el-popover>
</span>
<el-link title="查看该任务下的所有工时记录"
type="primary"
style="display: inline"
@click="showPopover(scope.row, 'taskName', '', '')"
>{{ scope.row.taskName }}</el-link
>
</template>
</el-table-column>
<el-table-column label="结算信息">
@ -70,14 +64,19 @@
<span> {{scope.row.uniPrice}}&nbsp; &nbsp;/ &nbsp;h </span>
</template>
</el-table-column>
<el-table-column prop="budgetAt" label="预算金额" min-width="120" show-overflow-tooltip>
<el-table-column prop="sworkload" label="待结工时" min-width="120" show-overflow-tooltip>
<template slot-scope="scope">
<span> {{scope.row.budgetAt}} </span>
<el-link title="查看登记工时明细"
type="primary"
style="display: inline"
@click="showPopover(scope.row, 'sworkload', '', '')"
>{{ scope.row.workload }} h</el-link
>
</template>
</el-table-column>
<el-table-column prop="quoteAt" label="报价金额" min-width="120" show-overflow-tooltip>
<el-table-column prop="samt" label="待结金额" min-width="120" show-overflow-tooltip>
<template slot-scope="scope">
<span> {{scope.row.quoteAt}} </span>
{{scope.row.samt}}
</template>
</el-table-column>
<el-table-column prop="tactAt" label="已结金额" min-width="120" show-overflow-tooltip>
@ -85,6 +84,16 @@
{{scope.row.tactAt}}
</template>
</el-table-column>
<el-table-column prop="budgetAt" label="预算金额" min-width="120" show-overflow-tooltip>
<template slot-scope="scope">
<span> {{scope.row.budgetAt}} </span>
</template>
</el-table-column>
<el-table-column prop="quoteAt" label="报价金额" min-width="120" show-overflow-tooltip>
<template slot-scope="scope">
<span> {{scope.row.quoteAt}} </span>
</template>
</el-table-column>
<el-table-column prop="sfee" label="服务费" min-width="120" show-overflow-tooltip>
<template slot-scope="scope">
{{scope.row.sfee}}
@ -101,11 +110,6 @@
<span class="cell-bar"><el-input style="display:inline;" type="number" v-model="scope.row.othFee" placeholder="" @change="editSomeFields(scope.row,'othFee',$event)"></el-input></span>
</template>
</el-table-column>
<el-table-column prop="samt" label="结算金额" min-width="120" show-overflow-tooltip>
<template slot-scope="scope">
{{scope.row.samt}}
</template>
</el-table-column>
<el-table-column prop="bizMonth" label="月份" min-width="120" show-overflow-tooltip>
<template slot-scope="scope">
<span> {{scope.row.bizMonth}} </span>
@ -135,7 +139,12 @@
</el-table-column>
<el-table-column prop="workload" label="登记工时" min-width="120" show-overflow-tooltip>
<template slot-scope="scope">
<span> {{scope.row.workload}} </span>
<el-link title="查看登记工时明细"
type="primary"
style="display: inline"
@click="showPopover(scope.row, 'workload', '', '')"
>{{ scope.row.workload }} h</el-link
>
</template>
</el-table-column>
<el-table-column prop="budgetAt" label="预算金额" min-width="120" show-overflow-tooltip>
@ -191,6 +200,46 @@
<xm-task-sbill-detail-edit op-type="add" :visible="addFormVisible" @cancel="addFormVisible=false" @submit="afterAddSubmit"></xm-task-sbill-detail-edit>
</el-drawer>
</el-row>
<el-dialog
:title="
popoverConfig.subTitle
"
append-to-body
:visible.sync="popoverConfig.workloadDialogVisible"
top="20px"
width="80%"
>
<xm-task-workload-simple-list-for-biz-date
:visible="popoverConfig.workloadDialogVisible"
:task-id="popoverConfig.taskId"
:project-id="popoverConfig.projectId"
:sbill-id="popoverConfig.sbillId"
:detail-id="popoverConfig.detailId"
:wstatus="popoverConfig.wstatus"
:sstatus="popoverConfig.sstatus"
:userid="popoverConfig.userid"
></xm-task-workload-simple-list-for-biz-date>
</el-dialog>
<el-dialog
:title="
popoverPlusConfig.subTitle
"
append-to-body
:visible.sync="popoverPlusConfig.workloadDialogVisible"
top="20px"
width="80%"
@close="searchXmTaskSbillDetails()"
>
<xm-task-workload-simple-list-for-biz-date
:visible="popoverPlusConfig.workloadDialogVisible"
:project-id="popoverPlusConfig.projectId"
:wstatus="popoverPlusConfig.wstatus"
:sstatus="popoverPlusConfig.sstatus"
></xm-task-workload-simple-list-for-biz-date>
</el-dialog>
</section>
</template>
@ -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: {
@ -343,8 +410,8 @@
},
// XmTaskSbillDetail
showAdd: function () {
this.addFormVisible = true;
//this.addForm=Object.assign({}, this.editForm);
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(() => {

573
src/views/xm/core/xmTaskWorkload/XmTaskWorkloadInfoToSet.vue

@ -1,573 +0,0 @@
<template>
<section class="page-container border padding">
<el-row>
<xm-project-select style="display:inline;" ref="xmProjectSelect" :auto-select="false" @row-click="onProjectConfirm" @clear="clearProject"></xm-project-select>
<el-input v-model="filters.key" style="width: 150px;" clearable placeholder="模糊查询员工名称"></el-input>
<el-input v-model="filters.userid" style="width: 150px;" clearable placeholder="员工编号"></el-input>
<el-input v-model="filters.taskId" style="width: 150px;" clearable placeholder="任务编号"></el-input>
<el-button type="primary" v-loading="load.list" :disabled="load.list==true" @click="searchXmTaskWorkloads" icon="el-icon-search">查询</el-button>
<span style="float:right;">
<!-- <el-button type="primary" @click="showAdd" icon="el-icon-plus"> </el-button>-->
<el-button type="warning" v-loading="load.edit" @click="batchJoinToSbill" :disabled="this.sels.length===0 || load.edit==true" icon="el-icon-setting">加入结算单</el-button>
<el-button type="danger" v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true" icon="el-icon-delete"></el-button>
<el-popover placement="top-start" title="更多查询条件" width="400" v-model="moreVisible" trigger="manual" >
<el-row>
<el-col :span="24" style="padding-top:5px;">
<span class="more-label-font">创建时间:</span>
<el-date-picker v-model="dateRanger" type="daterange" align="right" unlink-panels range-separator=""
start-placeholder="开始日期" end-placeholder="完成日期" value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00','23:59:59']" :picker-options="pickerOptions"></el-date-picker>
</el-col>
<el-col :span="24" style="padding-top:10px;">
<span class="more-label-font">创建人:</span>
<el-tag v-if="filters.pmUser" closable @click="selectFiltersPmUser" @close="clearFiltersPmUser()">{{filters.pmUser.username}}</el-tag>
<el-button v-else @click="selectFiltersPmUser()">选择</el-button>
<el-button @click="setFiltersPmUserAsMySelf()">我的</el-button>
</el-col>
<el-col :span="24" style="padding-top:10px;">
<el-button type="text" @click="moreVisible=false" >关闭</el-button><el-button type="primary" @click="searchXmTaskWorkloads" ></el-button>
</el-col>
</el-row>
<el-button slot="reference" @click="moreVisible=!moreVisible" icon="el-icon-more"></el-button>
</el-popover>
</span>
</el-row>
<el-row class="padding-top">
<!--列表 XmTaskWorkload 工时登记表-->
<el-table ref="xmTaskWorkloadTable" :data="xmTaskWorkloads" :row-style="{height:'50px'}" :height="maxTableHeight" @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 fixed="left"></el-table-column>
<el-table-column sortable type="index" width="55" show-overflow-tooltip fixed="left"></el-table-column>
<el-table-column prop="username" label="姓名" min-width="120" show-overflow-tooltip sortable fixed="left">
<template slot-scope="scope">
<span class="cell-text">
{{scope.row.username}}
</span>
<span class="cell-bar">
<el-popover :title="'【'+scope.row.username+'】在本任务的所有工时记录'">
<xm-task-workload-simple-list :visible="scope.row.id==editForm.id" :userid="scope.row.userid" :xm-task="{id:scope.row.taskId,name:scope.row.taskName,projectName:scope.row.projectName,projectId:scope.row.projectId,budgetWorkload:scope.row.budgetWorkload,actWorkload:scope.row.actWorkload}" ref="xmTaskWorkloadSimpleList1" @edit-some-fields="searchXmTaskWorkloads"></xm-task-workload-simple-list>
<el-button slot="reference" icon="el-icon-search" style="display:inline;">所有工时记录</el-button>
</el-popover>
</span>
</template>
</el-table-column>
<el-table-column prop="taskId" label="任务" min-width="120" show-overflow-tooltip sortable fixed="left">
<template slot-scope="scope">
<span class="cell-text">
{{scope.row.taskName}}
</span>
<span class="cell-bar">
<el-popover title="当前任务所有工时记录">
<xm-task-workload-simple-list :visible="scope.row.id==editForm.id" :xm-task="{id:scope.row.taskId,name:scope.row.taskName,projectName:scope.row.projectName,projectId:scope.row.projectId,budgetWorkload:scope.row.budgetWorkload,actWorkload:scope.row.actWorkload}" ref="xmTaskWorkloadSimpleList2" @edit-some-fields="searchXmTaskWorkloads"></xm-task-workload-simple-list>
<el-button slot="reference" icon="el-icon-search" style="display:inline;">所有工时记录</el-button>
</el-popover>
</span>
</template>
</el-table-column>
<el-table-column prop="projectId" label="归属项目" min-width="120" show-overflow-tooltip sortable>
<template slot-scope="scope">
<span class="cell-text">
{{scope.row.projectName}}
</span>
<span class="cell-bar">
{{scope.row.projectId}}-{{scope.row.projectName}}
</span>
</template>
</el-table-column>
<el-table-column prop="taskState" label="任务状态" width="120" show-overflow-tooltip sortable >
<template slot-scope="scope">
<el-tag v-for="(item,index) in formatDictsWithClass(dicts,'taskState',scope.row.taskState)" :key="index" :type="item.className">{{item.name}}</el-tag>
</template>
</el-table-column>
<el-table-column label="报价信息">
<el-table-column prop="quoteWorkload" label="报价工时" width="120" show-overflow-tooltip sortable>
<template slot-scope="scope">
{{scope.row.quoteWorkload}}h
</template>
</el-table-column>
<el-table-column prop="quoteEndTime" label="完工时间" width="120" show-overflow-tooltip sortable>
<template slot-scope="scope">
{{scope.row.quoteWorkload}}h
</template>
</el-table-column>
<el-table-column prop="quoteAt" label="报价总金额" width="120" show-overflow-tooltip sortable>
<template slot-scope="scope">
{{scope.row.quoteAt}}
</template>
</el-table-column>
</el-table-column>
<el-table-column prop="toSetSworkload" label="待结算工时" width="120" show-overflow-tooltip sortable>
<template slot-scope="scope">
{{scope.row.toSetSworkload}}h
</template>
</el-table-column>
<el-table-column label="选择结算单" width="120" show-overflow-tooltip >
<template slot-scope="scope">
<xm-task-sbill-select style="display:inline;" :auto-select="false" :project-id="scope.row.projectId" placeholder="结算" @row-click="batchJoinToSbill(scope.row,$event)"></xm-task-sbill-select>
</template>
</el-table-column>
<!--
<el-table-column prop="sworkload" label="结算工时" width="120" show-overflow-tooltip sortable>
<template slot-scope="scope">
<span class="cell-text">
{{scope.row.sworkload}}h
</span>
<span class="cell-bar">
<el-input type="number" style="display:inline;" v-model="scope.row.sworkload" placeholder="结算" @change="editXmTaskWorkloadSomeFields(scope.row,'sworkload',$event)"></el-input>
</span>
</template>
</el-table-column>
<el-table-column prop="amt" label="标准金额" width="120" show-overflow-tooltip sortable>
<template slot-scope="scope">
<span class="cell-text">
<span v-if="scope.row.amt">¥{{ scope.row.amt}}</span>
<span v-else>-</span>
</span>
<span class="cell-bar">
<el-input type="number" style="display:inline;" v-model="scope.row.amt" placeholder="标准金额" @change="editXmTaskWorkloadSomeFields(scope.row,'amt',$event)"></el-input>
</span>
</template>
</el-table-column>
-->
<!--
<el-table-column prop="samt" label="结算金额" width="120" show-overflow-tooltip sortable>
<template slot-scope="scope">
<span class="cell-text">
<span v-if="scope.row.samt">¥{{ scope.row.samt}}</span>
<span v-else>-</span>
</span>
<span class="cell-bar">
<el-input type="number" style="display:inline;" v-model="scope.row.samt" placeholder="结算金额" @change="editXmTaskWorkloadSomeFields(scope.row,'samt',$event)"></el-input>
</span>
</template>
</el-table-column>
<el-table-column v-if="sstatuses && sstatuses=='1'" prop="sbillId" label="结算单" width="120" show-overflow-tooltip sortable>
<template slot-scope="scope">
<span class="cell-text">
{{scope.row.sbillId}}
</span>
<span class="cell-bar">
<xm-task-sbill-select style="display:inline;" :auto-select="false" :project-id="scope.row.projectId" placeholder="结算" @row-click="editXmTaskWorkloadSomeFields(scope.row,'sbillId',$event)"></xm-task-sbill-select>
</span>
</template>
</el-table-column>
-->
<!-- <el-table-column prop="cuserid" label="创建人编号" width="120" show-overflow-tooltip></el-table-column>
<el-table-column prop="bizDate" label="业务日期yyyy-MM-dd" width="120" show-overflow-tooltip></el-table-column>-->
<!-- <el-table-column prop="ttype" label="任务类型-关联字典taskType" width="120" show-overflow-tooltip></el-table-column>-->
<!-- <el-table-column prop="sbillId" label="结算单据编号" width="120" show-overflow-tooltip></el-table-column>
<el-table-column prop="stime" label="结算提交时间" width="120" show-overflow-tooltip></el-table-column>-->
<!-- <el-table-column prop="rworkload" label="剩余工时(同一天取最后日期更新到task表rworkload中)" width="120" show-overflow-tooltip></el-table-column>
<el-table-column prop="cusername" label="创建人姓名" width="120" show-overflow-tooltip></el-table-column>-->
<!-- <el-table-column label="操作" width="180" fixed="right">
<template scope="scope">
<el-button type="primary" @click="showEdit( scope.row,scope.$index)" icon="el-icon-edit"></el-button>
<el-button type="danger" @click="handleDel(scope.row,scope.$index)" icon="el-icon-delete"></el-button>
</template>
</el-table-column>-->
</el-table>
<el-pagination layout="total, sizes, prev, pager, next" @current-change="handleCurrentChange" @size-change="handleSizeChange" :page-sizes="[10,20, 50, 100, 500]" :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize" :total="pageInfo.total" style="float:right;"></el-pagination>
</el-row>
<el-row>
<!--编辑 XmTaskWorkload 工时登记表界面-->
<el-drawer title="编辑工时登记表" :visible.sync="editFormVisible" size="60%" append-to-body :close-on-click-modal="false">
<xm-task-workload-edit op-type="edit" :xm-task-workload="editForm" :visible="editFormVisible" @cancel="editFormVisible=false" @submit="afterEditSubmit"></xm-task-workload-edit>
</el-drawer>
<!--新增 XmTaskWorkload 工时登记表界面-->
<el-drawer title="新增工时登记表" :visible.sync="addFormVisible" size="60%" append-to-body :close-on-click-modal="false">
<xm-task-workload-edit op-type="add" :visible="addFormVisible" @cancel="addFormVisible=false" @submit="afterAddSubmit"></xm-task-workload-edit>
</el-drawer>
<el-drawer title="选择员工" :visible.sync="selectFiltersPmUserVisible" size="60%" append-to-body>
<users-select @confirm="onFiltersPmUserSelected" ref="usersSelect"></users-select>
</el-drawer>
</el-row>
</section>
</template>
<script>
import util from '@/common/js/util';//
import config from '@/common/config';//
import { getDicts,initSimpleDicts,initComplexDicts } from '@/api/mdp/meta/item';//
import { listXmTaskWorkloadGroupByTaskIdAndUseridToSet, delXmTaskWorkload, batchDelXmTaskWorkload,batchSetSbillIdNull,initDicts, } from '@/api/xm/core/xmTaskWorkload';
import XmTaskWorkloadEdit from './XmTaskWorkloadEdit';//
import { mapGetters } from 'vuex'
import XmProjectSelect from "../components/XmProjectSelect";
import XmTaskSbillSelect from "./XmTaskSbillSelect";
import {editWorkloadToSbill} from "@/api/xm/core/xmTaskWorkload";
import {batchJoinToSbill} from "@/api/xm/core/xmTaskSbill";
import {editXmTaskWorkloadSomeFields} from "../../../../api/xm/core/xmTaskWorkload";
import UsersSelect from "@/views/mdp/sys/user/UsersSelect";
import XmTaskWorkloadSimpleList from './XmTaskWorkloadSimpleList';
import { listXmTaskExecuser } from '@/api/xm/core/xmTaskExecuser';
import { listXmTask } from '@/api/xm/core/xmTask';
export default {
name:'xmTaskWorkloadMng',
components: {
XmTaskWorkloadEdit,
XmProjectSelect,
XmTaskSbillSelect,
UsersSelect,
XmTaskWorkloadSimpleList,
},
props:['visible','wstatuses','sstatuses','queryScope'/**my/all */,'sbillId'],
computed: {
...mapGetters(['userInfo']),
},
watch:{
visible:{
handler:function(o,n){
if(n==true){
this.initData();
this.searchXmTaskWorkloads()
}
},
immediate: true
},
sbillId(){
this.searchXmTaskWorkloads();
}
},
data() {
const beginDate = new Date();
const endDate = new Date();
beginDate.setTime(beginDate.getTime() - 3600 * 1000 * 24 * 7 * 4 * 12 );
return {
filters: {
key: '',
wstatus:'',
sstatus:'',
pmUser:'',
taskId:'',
userid:''
},
xmTaskWorkloads: [],//
pageInfo:{//
total:0,//0>0
pageSize:10,//
count:false,//
pageNum:1,//1
orderFields:[],// ['sex','student_id']
orderDirs:[]// asc,desc ['asc','desc']
},
load:{ list: false, edit: false, del: false, add: false },//...
sels: [],//
dicts:{
//sex: [{id:'1',name:''},{id:'2',name:''}]
wstatus:[{id:'0',name:'待确认'},{id:'1',name: '已确认'}],
sstatus:[{id:'0',name:'无需结算'},{id:'1',name: '待结算'},{id:'2',name:'已提交'},{id:'3',name:'已通过'},{id:'4',name:'已结算'}]
/**0-无需结算,1-待结算2-已提交3-已通过4-已结算 */
},// params={categoryId:'all',itemCodes:['sex']} {sex: [{id:'1',name:''},{id:'2',name:''}]}
addFormVisible: false,//xmTaskWorkload
addForm: {
userid:'',username:'',ctime:'',taskId:'',cuserid:'',bizDate:'',wstatus:'',remark:'',ttype:'',id:'',sbillId:'',stime:'',sstatus:'',amt:'',samt:'',workload:'',rworkload:'',cusername:'',projectId:''
},
editFormVisible: false,//
editForm: {
userid:'',username:'',ctime:'',taskId:'',cuserid:'',bizDate:'',wstatus:'',remark:'',ttype:'',id:'',sbillId:'',stime:'',sstatus:'',amt:'',samt:'',workload:'',rworkload:'',cusername:'',projectId:''
},
maxTableHeight:300,
selProject:'',
moreVisible:false,
pickerOptions: util.getPickerOptions('datarange'),
dateRanger: [],
selectFiltersPmUserVisible:false,
xmTaskWorkloadSimpleListVisible:false,
}
},//end data
methods: {
...util,
handleSizeChange(pageSize) {
this.pageInfo.pageSize=pageSize;
this.getXmTaskWorkloads();
},
handleCurrentChange(pageNum) {
this.pageInfo.pageNum = pageNum;
this.getXmTaskWorkloads();
},
// obj.order=ascending/descending, asc/desc ; obj.prop=,
sortChange( obj ){
if(obj.order==null){
this.pageInfo.orderFields=[];
this.pageInfo.orderDirs=[];
}else{
var dir='asc';
if(obj.order=='ascending'){
dir='asc'
}else{
dir='desc';
}
this.pageInfo.orderFields=[util.toLine(obj.prop)];
this.pageInfo.orderDirs=[dir];
}
this.getXmTaskWorkloads();
},
searchXmTaskWorkloads(){
this.pageInfo.count=true;
this.getXmTaskWorkloads();
},
// XmTaskWorkload
getXmTaskWorkloads() {
let params = {
pageSize: this.pageInfo.pageSize,
pageNum: this.pageInfo.pageNum,
total: this.pageInfo.total,
count:this.pageInfo.count,
};
if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
let orderBys=[];
for(var i=0;i<this.pageInfo.orderFields.length;i++){
orderBys.push(this.pageInfo.orderFields[i]+" "+this.pageInfo.orderDirs[i])
}
params.orderBy= orderBys.join(",")
}
if(this.filters.key){
params.key= "%" + this.filters.key + "%"
}
if(this.selProject){
params.projectId= this.selProject;
}
if(this.sstatuses){
params.sstatuses=this.sstatuses.join();
}
if(this.wstatuses){
params.wstatuses=this.wstatuses.join();
}
if(this.filters.wstatus){
params.wstatuses = this.filters.wstatus;
}
if(this.filters.sstatus){
params.sstatuses = this.filters.sstatus;
}
if(this.filters.userid){
params.userid = this.filters.userid;
}
if(this.filters.taskId){
params.taskId = this.filters.taskId;
}
if(this.filters.pmUser){
params.cuserid = this.filters.pmUser.userid;
}
if(this.dateRanger){
params.startBidDate = this.dateRanger[0];
params.endBizDate = this.dateRanger[1];
}
if(this.queryScope){
params.queryScope=this.queryScope
params.userid=this.userInfo.userid
}else{
params.queryScope="all"
}
if(this.sbillId){
params.sbillId=this.sbillId
}
params.sstatus='1'
this.load.list = true;
listXmTaskWorkloadGroupByTaskIdAndUseridToSet(params).then((res) => {
var tips=res.data.tips;
if(tips.isOk){
this.pageInfo.total = res.data.total;
this.pageInfo.count=false;
this.xmTaskWorkloads = res.data.data;
}else{
this.$notify({position:'bottom-left',showClose:true, message: tips.msg, type: 'error' });
}
this.load.list = false;
}).catch( err => this.load.list = false );
},
// XmTaskWorkload
showEdit: function ( row,index ) {
this.editFormVisible = true;
this.editForm = Object.assign({}, row);
},
// XmTaskWorkload
showAdd: function () {
this.addFormVisible = true;
//this.addForm=Object.assign({}, this.editForm);
},
afterAddSubmit(){
this.addFormVisible=false;
this.pageInfo.count=true;
this.getXmTaskWorkloads();
},
afterEditSubmit(){
this.editFormVisible=false;
},
//xmTaskWorkload
selsChange: function (sels) {
this.sels = sels;
},
//xmTaskWorkload
handleDel: function (row,index) {
this.$confirm('确认删除该记录吗?', '提示', {
type: 'warning'
}).then(() => {
this.load.del=true;
let params = { id:row.id };
delXmTaskWorkload(params).then((res) => {
this.load.del=false;
var tips=res.data.tips;
if(tips.isOk){
this.pageInfo.count=true;
this.getXmTaskWorkloads();
}
this.$notify({position:'bottom-left',showClose:true, message: tips.msg, type: tips.isOk?'success':'error' });
}).catch( err => this.load.del=false );
});
},
//xmTaskWorkload
batchJoinToSbill: function (row,sbill) {
if(!sbill || sbill.id==null){
this.$notify({position:'bottom-left',showClose:true,message:'请选择结算单',type:'warning'})
return;
}
let params={
userTasks:[{userid:row.userid,taskId:row.taskId}],
sbillId:sbill.id
};
if(this.sels.length>0){
if(this.sels.some(k=>k.projectId!=row.projectId)){
this.$notify({position:'bottom-left',showClose:true,message:'存在不同项目的工时单,请重新选择',type:'warning'})
return;
}
params.userTasks=this.sels.map(i=>{return {userid:i.userid,taskId:i.taskId}});
}
this.load.edit=true;
batchJoinToSbill(params).then((res) => {
this.load.edit=false;
var tips=res.data.tips;
if( tips.isOk ){
this.pageInfo.count=true;
this.getXmTaskWorkloads();
}
this.$notify({position:'bottom-left',showClose:true, message: tips.msg, type: tips.isOk?'success':'error'});
}).catch( err => this.load.edit=false );
},
batchDel: function () {
if(this.sels.length<=0){
return;
}
var params=this.sels.map(i=>{
return { id:i.id}
})
this.$confirm('确认删除选中记录吗?', '提示', {
type: 'warning'
}).then(() => {
this.load.del=true;
batchDelXmTaskWorkload(params).then((res) => {
this.load.del=false;
var tips=res.data.tips;
if( tips.isOk ){
this.pageInfo.count=true;
this.getXmTaskWorkloads();
}
this.$notify({position:'bottom-left',showClose:true, message: tips.msg, type: tips.isOk?'success':'error'});
}).catch( err => this.load.del=false );
});
},
rowClick: function(row, event, column){
this.editForm=row
this.$emit('row-click',row, event, column);// @row-click="rowClick"
},
initData: function(){
},
onProjectConfirm(obj){
this.selProject = obj.projectId;
this.getXmTaskWorkloads();
},
clearProject(){
this.selProject = null;
this.getXmTaskWorkloads();
},
editXmTaskWorkloadSomeFields(row,fieldName,$event){
let params={
ids:[row.id],
};
if(this.sels.length>0){
if(this.sels.some(k=>k.projectId!=row.projectId)){
this.$notify({position:'bottom-left',showClose:true,message:'存在不同项目的工时单,请重新选择',type:'warning'})
return;
}
params.ids=this.sels.map(i=>i.id);
}else{
params.ids = [row.id];
params[fieldName]=$event
}
var func = editXmTaskWorkloadSomeFields
if(fieldName==='sbillId'){
func = editWorkloadToSbill
params.sbillId=$event.id
}else{
params[fieldName]=$event
}
func(params).then(res=>{
let tips = res.data.tips;
this.getXmTaskWorkloads();
if(tips.isOk){
}else{
this.$notify({position:'bottom-left',showClose:true,message:tips.msg,type:tips.isOk?'success':'error'})
}
})
},
clearFiltersPmUser:function(){
this.filters.pmUser=null;
this.searchXmTaskWorkloads();
},
selectFiltersPmUser(){
this.selectFiltersPmUserVisible=true;
},
onFiltersPmUserSelected(users){
if(users && users.length>0){
this.filters.pmUser=users[0]
}else{
this.filters.pmUser=null;
}
this.selectFiltersPmUserVisible=false;
this.searchXmTaskWorkloads();
},
setFiltersPmUserAsMySelf(){
this.filters.pmUser=this.userInfo;
this.searchXmTaskWorkloads();
},
},//end methods
mounted() {
this.$nextTick(() => {
//initSimpleDicts('all',['sex','gradeLvl']).then(res=>this.dicts=res.data.data);
initDicts(this);
this.initData()
this.searchXmTaskWorkloads();
this.maxTableHeight = util.calcTableMaxHeight(this.$refs.xmTaskWorkloadTable.$el)
});
},
activated(){
this.initData();
this.searchXmTaskWorkloads();
}
}
</script>
<style scoped>
</style>

10
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;

Loading…
Cancel
Save