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

优化

master
陈裕财 4 years ago
parent
c059ad9f10
commit
b7970f9059
2 changed files with 202 additions and 201 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. 91
      src/views/xm/core/xmTask/XmTaskMng.vue
  2. 312
      src/views/xm/core/xmTask/XmTaskMngBatch.vue

91
src/views/xm/core/xmTask/XmTaskMng.vue
View File

@ -134,11 +134,18 @@
icon="el-icon-search" icon="el-icon-search"
v-loading="load.list" v-loading="load.list"
></el-button> ></el-button>
<el-button type="danger"
<el-button
v-if="isTaskCenter != '1' && isMy != '1'" v-if="isTaskCenter != '1' && isMy != '1'"
@click="batchDel"
@click="showBatchEdit"
v-loading="load.edit" v-loading="load.edit"
icon="el-icon-edit" icon="el-icon-edit"
>修改</el-button
>
<el-button type="danger"
v-if="isTaskCenter != '1' && isMy != '1'"
@click="batchDel"
v-loading="load.del"
icon="el-icon-del"
>删除</el-button >删除</el-button
> >
<el-popover <el-popover
@ -1094,81 +1101,7 @@ export default {
const tasksTreeData = treeTool.translateDataToTree(xmTasks,"parentTaskid","id"); const tasksTreeData = treeTool.translateDataToTree(xmTasks,"parentTaskid","id");
return tasksTreeData; return tasksTreeData;
}, },
taskBudgetData() {
var rows = this.xmTasks;
var surplusPhaseBudgetCostAt =
this.getFloatValue(this.projectPhase.phaseBudgetInnerUserAt) +
this.getFloatValue(this.projectPhase.phaseBudgetOutUserAt) +
this.getFloatValue(this.projectPhase.phaseBudgetNouserAt);
var surplusPhaseBudgetInnerUserAt = this.getFloatValue(
this.projectPhase.phaseBudgetInnerUserAt
);
var surplusPhaseBudgetOutUserAt = this.getFloatValue(
this.projectPhase.phaseBudgetOutUserAt
);
var surplusPhaseBudgetNouserAt = this.getFloatValue(
this.projectPhase.phaseBudgetNouserAt
);
var surplusPhaseBudgetUserAt =
this.getFloatValue(this.projectPhase.phaseBudgetInnerUserAt) +
this.getFloatValue(this.projectPhase.phaseBudgetOutUserAt);
var total = {
surplusPhaseBudgetCostAt: surplusPhaseBudgetCostAt,
surplusPhaseBudgetInnerUserAt: surplusPhaseBudgetInnerUserAt,
surplusPhaseBudgetOutUserAt: surplusPhaseBudgetOutUserAt,
surplusPhaseBudgetNouserAt: surplusPhaseBudgetNouserAt,
surplusPhaseBudgetUserAt: surplusPhaseBudgetUserAt,
taskBudgetNouserAt: 0,
taskBudgetInnerUserAt: 0,
taskBudgetOutUserAt: 0,
taskBudgetUserAt: 0,
};
//phaseBudgetHours:'',phaseBudgetStaffNu:'',ctime:'',phaseBudgetNouserAt:'',phaseBudgetInnerUserAt:'',phaseBudgetOutUserAt
rows.forEach((row2) => {
var row = row2;
if (this.valueChangeRows.length != 0) {
var changeRows = this.valueChangeRows.filter((i) => i.id == row2.id);
if (changeRows && changeRows.length > 0) {
row = changeRows[0];
}
}
var budgetCost = this.getFloatValue(row.budgetCost);
if (row.taskOut == "1") {
row.taskBudgetOutUserAt = budgetCost;
row.taskBudgetInnerUserAt = 0;
row.taskBudgetNouserAt = 0;
} else {
row.taskBudgetOutUserAt = 0;
row.taskBudgetInnerUserAt = budgetCost;
row.taskBudgetNouserAt = 0;
}
total.taskBudgetNouserAt =
total.taskBudgetNouserAt + row.taskBudgetNouserAt;
total.taskBudgetInnerUserAt =
total.taskBudgetInnerUserAt + row.taskBudgetInnerUserAt;
total.taskBudgetOutUserAt =
total.taskBudgetOutUserAt + row.taskBudgetOutUserAt;
});
total.taskBudgetUserAt =
total.taskBudgetInnerUserAt + total.taskBudgetOutUserAt;
total.surplusPhaseBudgetCostAt =
total.surplusPhaseBudgetCostAt -
total.taskBudgetNouserAt -
total.taskBudgetUserAt;
total.surplusPhaseBudgetInnerUserAt =
total.surplusPhaseBudgetInnerUserAt - total.taskBudgetInnerUserAt;
total.surplusPhaseBudgetOutUserAt =
total.surplusPhaseBudgetOutUserAt - total.taskBudgetOutUserAt;
total.surplusPhaseBudgetNouserAt =
total.surplusPhaseBudgetNouserAt - total.taskBudgetNouserAt;
total.surplusPhaseBudgetUserAt =
total.surplusPhaseBudgetUserAt - total.taskBudgetUserAt;
return total;
},
}, },
props: [ props: [
"selProject", "selProject",
@ -1658,6 +1591,10 @@ export default {
}, },
//批量删除xmTask //批量删除xmTask
batchDel: function () { batchDel: function () {
if(this.sels.length==0){
this.$notify.error("请先选中要删除的记录")
return;
}
this.$confirm("确认删除选中记录吗？", "提示", { this.$confirm("确认删除选中记录吗？", "提示", {
type: "warning", type: "warning",
}).then(() => { }).then(() => {

312
src/views/xm/core/xmTask/XmTaskMngBatch.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<section class="page-container padding border"> <section class="page-container padding border">
<el-row> <el-row>
<el-row v-if="projectPhase">
<el-row>
<el-button <el-button
type="warning" type="warning"
@click="saveBatchEdit" @click="saveBatchEdit"
@ -25,66 +25,7 @@
v-loading="load.edit" v-loading="load.edit"
icon="el-icon-back" icon="el-icon-back"
>返回</el-button >返回</el-button
>
<el-button
type="danger"
@click="batchDel"
v-loading="load.edit"
icon="el-icon-delete"
></el-button>
<span
class="hidden-lg-and-down"
style="margin-left: 10px; font-size: 14px"
>计划总预算：</span
><el-tag class="hidden-lg-and-down" type="success">
{{
(
(projectPhase.phaseBudgetNouserAt +
projectPhase.phaseBudgetInnerUserAt +
projectPhase.phaseBudgetOutUserAt) /
10000
).toFixed(2)
}}万，剩{{
(taskBudgetData.surplusPhaseBudgetCostAt / 10000).toFixed(2)
}}万</el-tag
>
<span
class="hidden-lg-and-down"
style="margin-left: 10px; font-size: 14px"
>非人力总预算：</span
><el-tag
class="hidden-lg-and-down"
:type="
taskBudgetData.surplusPhaseBudgetNouserAt > 0 ? 'warning' : 'danger'
"
>{{ (projectPhase.phaseBudgetNouserAt / 10000).toFixed(2) }}万，剩{{
(taskBudgetData.surplusPhaseBudgetNouserAt / 10000).toFixed(2)
}}万</el-tag
>
<span style="margin-left: 10px; font-size: 14px">内部人力总预算：</span
><el-tag
:type="
taskBudgetData.surplusPhaseBudgetInnerUserAt > 0
? 'warning'
: 'danger'
"
>{{
(projectPhase.phaseBudgetInnerUserAt / 10000).toFixed(2)
}}万，剩{{
(taskBudgetData.surplusPhaseBudgetInnerUserAt / 10000).toFixed(2)
}}万</el-tag
>
<span style="margin-left: 10px; font-size: 14px">外购人力总预算：</span
><el-tag
:type="
taskBudgetData.surplusPhaseBudgetOutUserAt > 0
? 'warning'
: 'danger'
"
>{{ (projectPhase.phaseBudgetOutUserAt / 10000).toFixed(2) }}万，剩{{
(taskBudgetData.surplusPhaseBudgetOutUserAt / 10000).toFixed(2)
}}万</el-tag
>
>
</el-row> </el-row>
<el-row style="padding-top: 12px"> <el-row style="padding-top: 12px">
<!-- show-summary --> <!-- show-summary -->
@ -109,8 +50,8 @@
row-key="id" row-key="id"
> >
<el-table-column type="selection" width="50"></el-table-column> <el-table-column type="selection" width="50"></el-table-column>
<el-table-column prop="sortLevel" label="序号" width="300">
<template slot-scope="scope">
<el-table-column prop="sortLevel" label="序号" width="350">
<template slot-scope="scope">
<el-popover placement="top" width="400" trigger="click"> <el-popover placement="top" width="400" trigger="click">
<div style="text-align: center; margin: 0"> <div style="text-align: center; margin: 0">
<div <div
@ -149,14 +90,22 @@
<el-input style="width: 100%" <el-input style="width: 100%"
v-model="scope.row.name" v-model="scope.row.name"
@change="fieldChange(scope.row, 'name')" @change="fieldChange(scope.row, 'name')"
></el-input>
></el-input>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column sortable width="40" type="selection"></el-table-column> -->
<el-table-column prop="startTime" label="任务起止时间" width="150">
<template slot-scope="scope">
<el-row>
<el-col :span="24">
<el-table-column width="100" prop="createUsername">
<template slot="header">
<el-button type="text" icon="el-icon-user" title="批量修改负责人人" @click="showBatchCreateUserSelectVisible">负责人</el-button>
</template>
</el-table-column>
<el-table-column width="100" prop="executorUsername">
<template slot="header">
<el-button type="text" icon="el-icon-user" title="批量修改执行人" @click="showBatchExecUserSelectVisible">执行人</el-button>
</template>
</el-table-column>
<el-table-column label="预估工作量与金额">
<el-table-column prop="startTime" label="起止时间" width="300">
<template slot-scope="scope">
<el-date-picker <el-date-picker
v-model="scope.row.startTime" v-model="scope.row.startTime"
size="small" size="small"
@ -169,9 +118,7 @@
:picker-options="pickerOptions" :picker-options="pickerOptions"
@change="fieldChange(scope.row, 'startTime')" @change="fieldChange(scope.row, 'startTime')"
> >
</el-date-picker>
</el-col>
<el-col :span="24">
</el-date-picker>
<el-date-picker <el-date-picker
v-model="scope.row.endTime" v-model="scope.row.endTime"
size="small" size="small"
@ -184,12 +131,10 @@
:picker-options="pickerOptions" :picker-options="pickerOptions"
@change="fieldChange(scope.row, 'endTime')" @change="fieldChange(scope.row, 'endTime')"
> >
</el-date-picker>
</el-col>
</el-row>
</el-date-picker>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="预计工作量" prop="budgetWorkload" width="140">
<el-table-column label="工作量(人时)" prop="budgetWorkload" width="140">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input <el-input
v-model="scope.row.budgetWorkload" v-model="scope.row.budgetWorkload"
@ -198,39 +143,87 @@
@change="fieldChange(scope.row, 'budgetWorkload')" @change="fieldChange(scope.row, 'budgetWorkload')"
></el-input> ></el-input>
</template> </template>
</el-table-column>
<el-table-column label="预算金额.元" prop="budgetCost" width="140">
<template slot-scope="scope">
<el-input
v-model="scope.row.budgetCost"
</el-table-column><el-table-column label="单价.元/人时" prop="uniInnerPrice" width="150">
<template slot-scope="scope">
<el-checkbox
v-model="scope.row.taskOut"
false-label="0"
true-label="1"
@change="fieldChange(scope.row, 'taskOut')"
>外购</el-checkbox>
&nbsp;
<el-row>
<el-col :span="24" v-if="scope.row.taskOut!='1'">
<el-input style="width:100%;"
v-model="scope.row.uniInnerPrice"
type="number" type="number"
::precision="2" ::precision="2"
@change="fieldChange(scope.row, 'budgetCost')"
@change="fieldChange(scope.row, 'uniInnerPrice')"
></el-input>
</el-col>
<el-col :span="24" v-else>
<el-input style="width:100%;"
v-model="scope.row.uniOutPrice"
type="number"
::precision="2"
@change="fieldChange(scope.row, 'uniOutPrice')"
></el-input> ></el-input>
</el-col>
</el-row>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="rate" label="进度" width="100">
<el-table-column label="金额.元" prop="budgetCost" width="140">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input <el-input
v-model="scope.row.budgetCost"
type="number" type="number"
:precision="0"
v-model="scope.row.rate"
min="0"
max="100"
@change="fieldChange(scope.row, 'rate')"
::precision="2"
@change="fieldChange(scope.row, 'budgetCost')"
></el-input> ></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="外购" prop="taskOut" width="80">
<template slot-scope="scope">
<el-checkbox
v-model="scope.row.taskOut"
false-label="0"
true-label="1"
@change="fieldChange(scope.row, 'taskOut')"
></el-checkbox>
</template>
</el-table-column>
</el-table-column>
<el-table-column label="实际工作量与应结算金额">
<el-table-column prop="rate" label="进度" width="100">
<template slot-scope="scope">
<el-input
type="number"
:precision="0"
v-model="scope.row.rate"
min="0"
max="100"
@change="fieldChange(scope.row, 'rate')"
></el-input>
</template>
</el-table-column>
<el-table-column prop="actWorkload" label="工作量.人时" width="100">
<template slot-scope="scope">
<el-input
:disabled="scope.row.calcType=='1'"
type="number"
:precision="0"
v-model="scope.row.actWorkload"
min="0"
max="100"
@change="fieldChange(scope.row, 'actWorkload')"
></el-input>
</template>
</el-table-column>
<el-table-column prop="actCost" label="金额.元" width="100">
<template slot-scope="scope">
<el-input
:disabled="scope.row.calcType=='1'"
type="number"
:precision="0"
v-model="scope.row.actWorkload"
min="0"
max="100"
@change="fieldChange(scope.row, 'actWorkload')"
></el-input>
</template>
</el-table-column>
</el-table-column>
<el-table-column label="结算方案" prop="settleSchemel" width="160"> <el-table-column label="结算方案" prop="settleSchemel" width="160">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select <el-select
@ -246,11 +239,12 @@
</el-select> </el-select>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="description" label="任务描述" min-width="150">
<el-table-column prop="description" label="任务描述" width="350">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input <el-input
type="textarea" type="textarea"
v-model="scope.row.description" v-model="scope.row.description"
:rows="1"
@change="fieldChange(scope.row, 'description')" @change="fieldChange(scope.row, 'description')"
></el-input> ></el-input>
</template> </template>
@ -268,6 +262,37 @@
></el-pagination> ></el-pagination>
</el-row> </el-row>
</el-row> </el-row>
<el-drawer
append-to-body
title="选择执行人"
:visible.sync="batchExecUserSelectVisible"
:size="650"
:close-on-click-modal="false"
>
<xm-group-select
:visible="batchExecUserSelectVisible"
:sel-project="selProject"
:isSelectSingleUser="1"
@user-confirm="batchExecUserSelectConfirm"
></xm-group-select>
</el-drawer>
<el-drawer
append-to-body
title="选择负责人"
:visible.sync="batchGroupUserSelectVisible"
:size="650"
:close-on-click-modal="false"
>
<xm-group-select
:visible="batchGroupUserSelectVisible"
:sel-project="selProject"
:isSelectSingleUser="1"
@user-confirm="batchCreateUserSelectConfirm"
></xm-group-select>
</el-drawer>
</section> </section>
</template> </template>
@ -291,6 +316,9 @@ import {
import { mapGetters } from "vuex"; import { mapGetters } from "vuex";
import { sn } from "@/common/js/sequence"; import { sn } from "@/common/js/sequence";
import XmGantt from "../components/xm-gantt";
import XmGroupSelect from "../xmGroup/XmGroupSelect.vue";
export default { export default {
computed: { computed: {
...mapGetters(["userInfo", "roles"]), ...mapGetters(["userInfo", "roles"]),
@ -542,7 +570,10 @@ export default {
menuDetailVisible: false, menuDetailVisible: false,
pickerOptions: util.pickerOptions(), pickerOptions: util.pickerOptions(),
gstcVisible: false, gstcVisible: false,
tableHeight: 300,
tableHeight: 300,
batchExecUserSelectVisible:false,
batchGroupUserSelectVisible:false,
maps:new Map(), maps:new Map(),
/**end 自定义属性请在上面加 请加备注**/ /**end 自定义属性请在上面加 请加备注**/
}; };
@ -1089,30 +1120,7 @@ export default {
}); });
return; return;
} else { } else {
if (this.taskBudgetData.surplusPhaseBudgetInnerUserAt < 0) {
this.$notify({
showClose: true,
message: "内部人力预算不足，请调整",
type: "error",
});
return;
}
if (this.taskBudgetData.surplusPhaseBudgetOutUserAt < 0) {
this.$notify({
showClose: true,
message: "外购人力预算不足，请调整",
type: "error",
});
return;
}
if (this.taskBudgetData.surplusPhaseBudgetNouserAt < 0) {
this.$notify({
showClose: true,
message: "非人力预算不足请调整",
type: "error",
});
return;
}
this.load.edit = true; this.load.edit = true;
batchSaveBudget(this.valueChangeRows) batchSaveBudget(this.valueChangeRows)
@ -1647,10 +1655,66 @@ export default {
} }
}) })
.catch((err) => (this.load.list = false)); .catch((err) => (this.load.list = false));
},
//查询时选择责任人
createUserSelectConfirm(groupUsers) {
if (groupUsers && groupUsers.length > 0) {
this.editForm.createUserid = groupUsers[0].userid;
this.editForm.createUsername = groupUsers[0].username;
}else{
this.editForm.createUserid = "";
this.editForm.createUsername = "";
}
this.groupUserSelectVisible=false;
},
//查询时选择责任人
showBatchCreateUserSelectVisible() {
if(!this.sels||this.sels.length==0){
this.$notify({showClose:true,message:'请先选中一条或多条数据',type:'error'})
return;
}else{
this.batchGroupUserSelectVisible=true;
}
},
//查询时选择责任人
showBatchExecUserSelectVisible() {
if(!this.sels||this.sels.length==0){
this.$notify({showClose:true,message:'请先选中一条或多条数据',type:'error'})
return;
}else{
this.batchExecUserSelectVisible=true;
}
},
//查询时选择责任人
batchCreateUserSelectConfirm(groupUsers) {
var user={};
if (groupUsers && groupUsers.length > 0) {
user=groupUsers[0]
}
this.batchGroupUserSelectVisible=false;
this.sels.forEach(i=>{
i.createUserid=user.userid;
i.createUsername=user.username;
this.fieldChange(i,"executorUsername")
})
},
//查询时选择责任人
batchExecUserSelectConfirm(groupUsers) {
var user={};
if (groupUsers && groupUsers.length > 0) {
user=groupUsers[0]
}
this.batchExecUserSelectVisible=false;
this.sels.forEach(i=>{
i.executorUserid=user.userid;
i.executorUsername=user.username;
this.fieldChange(i,"executorUsername")
})
}, },
}, //end methods }, //end methods
components: { components: {
//在下面添加其它组件 //在下面添加其它组件
XmGroupSelect,XmGantt,
}, },
mounted() { mounted() {
if (this.selProject) { if (this.selProject) {

Write Preview
Loading…
Cancel
Save