|
|
@@ -322,11 +322,11 @@
|
|
|
|
|
|
<el-form-item :label="user.companyId==781?'工作任务':'投入项目'" :prop="'domains.' + index + '.projectId'"
|
|
|
:rules="{ required: true, message: user.companyId==781?'请选择工作任务':'请选择投入项目', trigger: ['change','blur'] }">
|
|
|
- <el-select v-model="domain.projectId" :placeholder="user.companyId==781?'请选择工作任务':'请选择项目'" style="width:200px;" clearable="true" filterable="true"
|
|
|
+ <el-select v-model="domain.projectItem" :placeholder="user.companyId==781?'请选择工作任务':'请选择项目'" style="width:200px;" clearable="true" filterable="true" value-key="id"
|
|
|
@change="selectProject(domain, index)"
|
|
|
:disabled="workForm.domains.length==0?true:(workForm.domains[index].state>=2?false:true)">
|
|
|
<!-- <el-option v-for="item in projectList" :disabled="item.status>=2" :key="item.id" :label="item.projectName" :value="item.id"></el-option> -->
|
|
|
- <el-option v-for="item in fillProjectList" :disabled="item.status>=2" :key="item.id" :label="item.projectName + '\u3000' + item.projectCode" :value="item.id">
|
|
|
+ <el-option v-for="item in fillProjectList" :disabled="item.status>=2" :key="item.id" :label="item.projectName + '\u3000' + item.projectCode" :value="item">
|
|
|
<span style="float: left; color: #8492a6; font-size: 13px;">{{ item.projectCode }}</span>
|
|
|
<span style="float: right;margin-left: 20px">{{ item.projectName }}</span>
|
|
|
</el-option>
|
|
|
@@ -379,7 +379,7 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<!-- 相关维度/自定义维度 -->
|
|
|
- <el-form-item :label="yonghuUser.customDegreeName" v-if="domain.projectId && yonghuUser.customDegreeActive == 1" :rules="user.timeType.customDegreeStatus == 1 && domain.wuduList != undefined && domain.wuduList != [] ? { required: true, message: '请选择' + yonghuUser.customDegreeName, trigger: ['change','blur'] } : null" :prop="'domains.' + index + '.degreeId'">
|
|
|
+ <el-form-item :label="yonghuUser.customDegreeName" v-if="domain.projectId && yonghuUser.customDegreeActive == 1" :rules="user.timeType.customDegreeStatus == 1 && domain.wuduList != undefined && domain.wuduList.length != 0 ? { required: true, message: '请选择' + yonghuUser.customDegreeName, trigger: ['change','blur'] } : null" :prop="'domains.' + index + '.degreeId'">
|
|
|
<el-select v-model="domain.degreeId" clearable placeholder="请选择" :disabled="!canEdit">
|
|
|
<el-option v-for="item in domain.wuduList" :key="item.value" :label="item.name" :value="item.id">
|
|
|
</el-option>
|
|
|
@@ -430,10 +430,10 @@
|
|
|
<div v-if="reportTimeType.multiWorktime==1">
|
|
|
<el-form-item label="投入项目" :prop="'domains.' + index + '.projectId'"
|
|
|
:rules="{ required: true, message: '请选择投入项目', trigger: ['change','blur'] }">
|
|
|
- <el-select v-model="domain.projectId" placeholder="请选择项目" style="width:200px;" clearable="true" filterable="true"
|
|
|
+ <el-select v-model="domain.projectItem" placeholder="请选择项目" style="width:200px;" clearable="true" filterable="true" value-key="id"
|
|
|
@change="selectProject(domain, index)"
|
|
|
:disabled="workForm.domains.length==0?true:(workForm.domains[index].state>=2?false:true)">
|
|
|
- <el-option v-for="item in fillProjectList" :disabled="item.status>=2" :key="item.id" :label="item.projectName + '\u3000' + item.projectCode" :value="item.id">
|
|
|
+ <el-option v-for="item in fillProjectList" :disabled="item.status>=2" :key="item.id" :label="item.projectName + '\u3000' + item.projectCode" :value="item">
|
|
|
<span style="float: left; color: #8492a6; font-size: 13px;">{{ item.projectCode }}</span>
|
|
|
<span style="float: right;margin-left: 20px">{{ item.projectName }}</span>
|
|
|
</el-option>
|
|
|
@@ -2606,8 +2606,14 @@
|
|
|
},
|
|
|
//项目选中了， 加载子项目
|
|
|
selectProject(domain, index) {
|
|
|
- if(domain.projectId == ""){
|
|
|
+ console.log(domain.projectItem);
|
|
|
+
|
|
|
+ if(!domain.projectItem){
|
|
|
+
|
|
|
return
|
|
|
+ }else {
|
|
|
+ domain.projectId = domain.projectItem.id
|
|
|
+ domain.projectName = domain.projectItem.projectName
|
|
|
}
|
|
|
this.http.post('/sub-project/list',{
|
|
|
projectId: domain.projectId
|
|
|
@@ -2740,6 +2746,17 @@
|
|
|
},
|
|
|
|
|
|
getGroupStages(domain, index) {
|
|
|
+ console.log(domain);
|
|
|
+ if(!domain.groupId){
|
|
|
+ domain.projectAuditorId = ''
|
|
|
+ domain.stages = []
|
|
|
+ let curProject = this.projectList.filter(p=>p.id == domain.projectId)[0];
|
|
|
+ if(curProject.taskGpIncharge == 1){
|
|
|
+ domain.auditUserList = []
|
|
|
+ }
|
|
|
+ this.$forceUpdate();
|
|
|
+ return
|
|
|
+ }
|
|
|
this.http.post("/stages/getProjectStagesByGroup", {groupId: domain.groupId},
|
|
|
res => {
|
|
|
if (res.code == "ok") {
|
|
|
@@ -4923,7 +4940,13 @@
|
|
|
message: "您在["+this.workForm.domains[i].projectName+"]项目上尚无参与的任务分组",
|
|
|
type: "error"
|
|
|
});
|
|
|
- }
|
|
|
+ } else if (this.workForm.domains[i].taskGroups.length > 0 && !this.workForm.domains[i].groupId) {
|
|
|
+ console.log(this.workForm.domains[i]);
|
|
|
+ this.$message({
|
|
|
+ message: "请选择["+this.workForm.domains[i].projectName+"]项目的任务分组",
|
|
|
+ type: "error"
|
|
|
+ });
|
|
|
+ }
|
|
|
|
|
|
return;
|
|
|
}
|
ggooalice