|
@@ -334,14 +334,9 @@
|
|
|
<i class="fa fa-trash" style="color: red;;font-size:18px;"></i>
|
|
|
</el-link>
|
|
|
<el-link type="primary" v-if="workForm.domains[index].state == 0 || workForm.domains[index].state == 2"
|
|
|
- :underline="false" style="margin-left:10px;" @click="copyProject(index)">复制{{domain.timeType}}</el-link>
|
|
|
+ :underline="false" style="margin-left:10px;" @click="copyProject(index)">复制</el-link>
|
|
|
</el-form-item>
|
|
|
|
|
|
- <el-form-item label="项目审核人">
|
|
|
- <el-select v-model="domain.projectAuditorId" :disabled="!canEdit" @change="$forceUpdate()">
|
|
|
- <el-option v-for="item in domain.auditUserList" :label="item.auditorName" :value="item.auditorId" :key="item.id"></el-option>
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
<el-form-item label="任务分组" v-if="user.company.packageProject == 1">
|
|
|
<!-- 任务分组 -->
|
|
|
<el-select v-model="domain.groupId" placeholder="请选择任务分组" style="width:200px;" clearable="true"
|
|
@@ -358,6 +353,11 @@
|
|
|
<el-option v-for="item in domain.stages" :key="item.id" :label="item.stagesName" :value="item.stagesName"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="项目审核人">
|
|
|
+ <el-select v-model="domain.projectAuditorId" :disabled="!canEdit" @change="$forceUpdate()">
|
|
|
+ <el-option v-for="item in domain.auditUserList" :label="item.auditorName" :value="item.auditorId" :key="item.id"></el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
<!-- 相关维度 -->
|
|
|
<el-form-item :label="yonghuUser.customDegreeName" v-if="domain.projectId && yonghuUser.customDegreeActive == 1">
|
|
|
<el-select v-model="domain.degreeId" clearable placeholder="请选择" :disabled="!canEdit">
|
|
@@ -431,11 +431,7 @@
|
|
|
<el-link type="primary" v-if="workForm.domains[index].state == 0 || workForm.domains[index].state == 2"
|
|
|
:underline="false" style="margin-left:10px;" @click="copyProject(index)">复制</el-link>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="项目审核人" >
|
|
|
- <el-select v-model="domain.projectAuditorId" :disabled="!canEdit" @change="$forceUpdate()">
|
|
|
- <el-option v-for="item in domain.auditUserList" :label="item.auditorName" :value="item.auditorId" :key="item.id"></el-option>
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
+
|
|
|
<el-form-item label="任务分组" v-if="user.company.packageProject == 1">
|
|
|
<!-- 任务分组 -->
|
|
|
<el-select v-model="domain.groupId" placeholder="请选择任务分组" style="width:200px;" clearable="true"
|
|
@@ -452,7 +448,11 @@
|
|
|
<el-option v-for="item in domain.stages" :key="item.id" :label="item.stagesName" :value="item.stagesName"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
-
|
|
|
+ <el-form-item label="项目审核人" >
|
|
|
+ <el-select v-model="domain.projectAuditorId" :disabled="!canEdit" @change="$forceUpdate()">
|
|
|
+ <el-option v-for="item in domain.auditUserList" :label="item.auditorName" :value="item.auditorId" :key="item.id"></el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
<!--工程专业版本模式下, 各个专业的进度填报 -->
|
|
|
<el-form-item label="专业进度" :prop="'domains.' + index + '.professionProgress'" v-if="user.company.packageEngineering==1">
|
|
|
<span v-for="item in domain.professionProgress" :key="item.professionId" style="margin-right:10px;">
|
|
@@ -630,22 +630,30 @@
|
|
|
<!-- 按周填报弹窗 -->
|
|
|
<el-dialog title="请填写" :visible.sync="tianxieDialogVisible" width="30%" :before-close="handleClose">
|
|
|
<div>
|
|
|
- <div class="zhoFel" v-if="zhoBao.auditUserList != null && zhoBao.auditUserList.length > 0">
|
|
|
- <p>审核人</p>
|
|
|
- <el-select v-model="zhoBao.projectAuditorId" placeholder="请选择" clearable="true" style="width: 355px">
|
|
|
- <el-option v-for="item in zhoBao.auditUserList" :key="item.id" :label="item.auditorName" :value="item.auditorId"></el-option>
|
|
|
- </el-select>
|
|
|
- </div>
|
|
|
<div class="zhoFel" v-if="zhoBao.subProjectList != null && zhoBao.subProjectList.length > 0">
|
|
|
<p>子项目</p>
|
|
|
<el-select v-model="zhoBao.subProjectId" placeholder="请选择" clearable="true" style="width: 355px">
|
|
|
<el-option v-for="item in zhoBao.subProjectList" :key="item.id" :label="item.name" :value="item.id"></el-option>
|
|
|
</el-select>
|
|
|
</div>
|
|
|
+ <!-- 任务分组 -->
|
|
|
+ <div class="zhoFel" v-if="user.company.packageProject == 1">
|
|
|
+ <p>任务分组</p>
|
|
|
+ <el-select v-model="zhoBao.groupId" placeholder="请选择任务分组" clearable="true" style="width: 355px"
|
|
|
+ @change="getGroupStages(zhoBao, 0)">
|
|
|
+ <el-option v-for="item in zhoBao.taskGroups" :key="item.id" :label="item.name" :value="item.id"></el-option>
|
|
|
+ </el-select>
|
|
|
+ </div>
|
|
|
<div class="zhoFel" v-if="user.company.packageProject == 1 && zhoBao.stages != null && zhoBao.stages.length> 0">
|
|
|
<p>投入阶段</p>
|
|
|
- <el-select v-model="zhoBao.stage" placeholder="请选择" style="width: 355px" clearable="true">
|
|
|
- <el-option v-for="item in zhoBao.stages" :key="item" :label="item" :value="item"></el-option>
|
|
|
+ <el-select v-model="zhoBao.stage" placeholder="请选择" style="width: 355px" clearable="true" >
|
|
|
+ <el-option v-for="item in zhoBao.stages" :key="item.id" :label="item.stagesName" :value="item.stagesName"></el-option>
|
|
|
+ </el-select>
|
|
|
+ </div>
|
|
|
+ <div class="zhoFel" v-if="zhoBao.auditUserList != null && zhoBao.auditUserList.length > 0">
|
|
|
+ <p>审核人</p>
|
|
|
+ <el-select v-model="zhoBao.projectAuditorId" placeholder="请选择" clearable="true" style="width: 355px">
|
|
|
+ <el-option v-for="item in zhoBao.auditUserList" :key="item.id" :label="item.auditorName" :value="item.auditorId"></el-option>
|
|
|
</el-select>
|
|
|
</div>
|
|
|
<div class="zhoFel" v-if="reportTimeType.type == 2">
|
|
@@ -1245,7 +1253,7 @@
|
|
|
state: 2,
|
|
|
multiWorktime:0,
|
|
|
worktimeList:[],
|
|
|
- degreeId: null
|
|
|
+ degreeId: null,
|
|
|
}],
|
|
|
},
|
|
|
workRules: {
|
|
@@ -1434,7 +1442,7 @@
|
|
|
|
|
|
//获取项目下的任务分组
|
|
|
getTaskGroups(domain, index) {
|
|
|
- this.workForm.domains[index].groupId=null;
|
|
|
+ domain.groupId=null;
|
|
|
this.http.post('/task-group/listMyJoinGroup',{
|
|
|
projectId: domain.projectId
|
|
|
},
|
|
@@ -2380,9 +2388,14 @@
|
|
|
var curProject = this.projectList.filter(p=>p.id == domain.projectId)[0];
|
|
|
if (curProject.taskGpIncharge == 0) {
|
|
|
this.getProjectAuditorList(domain, index);
|
|
|
- }
|
|
|
+ } else {
|
|
|
+ //按分组的负责人来审核
|
|
|
+ domain.projectAuditorId = null;
|
|
|
+ domain.projectAuditorName = null;
|
|
|
+ domain.auditUserList = null;
|
|
|
+ }
|
|
|
// // this.$set(this.workForm.domains[index], "taskGpIncharge", curProject.taskGpIncharge);
|
|
|
- // this.workForm.domains[index].taskGpIncharge = curProject.taskGpIncharge;
|
|
|
+ domain.taskGpIncharge = curProject.taskGpIncharge;
|
|
|
// this.$forceUpdate();
|
|
|
},
|
|
|
|
|
@@ -2454,8 +2467,8 @@
|
|
|
this.http.post("/stages/getProjectStagesByGroup", {groupId: domain.groupId},
|
|
|
res => {
|
|
|
if (res.code == "ok") {
|
|
|
- this.workForm.domains[index].stage = '';
|
|
|
- this.workForm.domains[index].stages = res.data;
|
|
|
+ domain.stage = '';
|
|
|
+ domain.stages = res.data;
|
|
|
this.$forceUpdate();
|
|
|
}
|
|
|
},
|
|
@@ -2471,7 +2484,7 @@
|
|
|
this.http.post("/task-group/getGroupIncharger", {groupId: domain.groupId},
|
|
|
res => {
|
|
|
if (res.code == "ok") {
|
|
|
- this.workForm.domains[index].getProjectAuditorList = res.data;
|
|
|
+ domain.getProjectAuditorList = res.data;
|
|
|
domain.auditUserList = res.data;
|
|
|
if (res.data.length==1) {
|
|
|
domain.projectAuditorId = domain.auditUserList[0].auditorId;
|
|
@@ -3427,6 +3440,7 @@
|
|
|
this.tianxieDialogVisible = true
|
|
|
this.scopess = item
|
|
|
var sss = {}
|
|
|
+ sss.projectId = idd;
|
|
|
sss.con = item.con
|
|
|
sss.progress = item.progress
|
|
|
sss.time = item.time
|
|
@@ -3440,12 +3454,14 @@
|
|
|
sss.stage = that.workForm.domains[0].stage
|
|
|
sss.subProjectList = that.workForm.domains[0].subProjectList
|
|
|
sss.stages = that.workForm.domains[0].stages
|
|
|
+ sss.taskGroups = that.workForm.domains[0].taskGroups;
|
|
|
sss.auditUserList = obj.auditUserList;
|
|
|
} else {
|
|
|
sss.subProjectId = item.subProjectId
|
|
|
sss.stage = item.stage
|
|
|
sss.subProjectList = item.subProjectList
|
|
|
sss.stages = item.stages
|
|
|
+ sss.taskGroups = item.taskGroups;
|
|
|
sss.auditUserList = obj.auditUserList;
|
|
|
}
|
|
|
if (sss.auditUserList != null && sss.auditUserList.length==1) {
|