This commit is contained in:
陈裕财
2025-04-01 13:01:03 +08:00
parent 81f8a2323f
commit 6d25682a51
2 changed files with 6 additions and 68 deletions

View File

@@ -121,8 +121,7 @@
@click="$refs['detailDlg'].open({id:editForm.preTaskid.split(',')[0]})"
title="查看详情"
> 查看详情</el-button>
<el-button type="text" v-if="editForm.ntype=='0'" @click.stop="$refs['pretaskDlg'].open()" >选前置</el-button>
<el-button type="text" v-if="editForm.ntype=='1'" @click.stop="$refs['preplanDlg'].open()">选前置</el-button>
<el-button type="text" @click.stop="$refs['preplanDlg'].open()">选前置</el-button>
</el-form-item>
@@ -242,12 +241,6 @@
:xm-product="xmProductCpd" :xm-iteration="xmIteration" />
</mdp-dialog>
<mdp-dialog title="选中任务" v-model="selectTaskVisible" width="90%" append-to-body :close-on-click-modal="false">
<XmTaskBox v-if="selectTaskVisible" check-scope="task" query-scope="planTask"
:sel-project="editForm.projectId ? { id: editForm.projectId, name: editForm.projectName } : xmProjectCpd"
:xm-product="xmProductCpd" :ptype="editForm.ptype" @select="onSelectedTask" />
</mdp-dialog>
<mdp-dialog title="选中上级" v-model="selectParentTaskVisible" width="60%" append-to-body :close-on-click-modal="false">
<XmPhase v-if="selectParentTaskVisible"
:sel-project="editForm.projectId ? { id: editForm.projectId, name: editForm.projectName } : xmProjectCpd"
@@ -258,10 +251,7 @@
:form-data="{ menuId: editForm.menuId, menuName: editForm.menuName }" />
</mdp-dialog>
<mdp-dialog ref="pretaskDlg" title="选中前置任务" width="90%" append-to-body :close-on-click-modal="false">
<XmTaskBox :xm-product="xmProductCpd" :sel-project="xmProjectCpd" @select="onPretaskSelect" subOpType="select" :multiple="true"/>
</mdp-dialog>
<mdp-dialog ref="preplanDlg" title="选中前置计划" width="90%" append-to-body :close-on-click-modal="false">
<mdp-dialog ref="preplanDlg" title="选中前置工作项" width="60%" append-to-body :close-on-click-modal="false">
<XmPhase subOpType="select" :xm-product="xmProductCpd" :sel-project="xmProjectCpd" :multiple="true" @select="onPreplanSelect" showConfirm/>
</mdp-dialog>
@@ -574,13 +564,6 @@ import { Editor as VueEditor } from '@/components/Editor'
onTaskOutChange() {
this.onInitWorkloadChange();
},
onSelectedTask(task) {
this.selectTaskVisible = false;
if (task) {
this.editForm.preTaskid = task.id
this.editForm.preTaskname = task.name
}
},
clearPreTask() {
this.editForm.preTaskid = ''
this.editForm.preTaskname = ''
@@ -608,11 +591,6 @@ import { Editor as VueEditor } from '@/components/Editor'
}
this.selectParentTaskVisible = false;
},
clearParentTask() {
this.editForm.parentTaskid = ''
this.editForm.parentTaskname = ''
this.editForm.sortLevel = ""
},
setSkills() {
if (this.editForm.taskSkillIds && this.editForm.taskSkillNames) {
var skillNames = this.editForm.taskSkillNames.split(",");
@@ -742,15 +720,6 @@ import { Editor as VueEditor } from '@/components/Editor'
this.editForm.projectId = ""
this.editForm.projectName = ""
},
onPretaskSelect(tasks){
if(tasks && tasks.length>3){
this.$message.error('最多选3个前置任务')
return;
}
this.editForm['preTaskid']=tasks.map(k=>k.id).join(",")
this.$refs['pretaskDlg'].close()
},
onPreplanSelect(tasks){
if(tasks && tasks.length>3){
this.$message.error('最多选3个前置计划')

View File

@@ -260,8 +260,7 @@
@click="$refs['detailDlg'].open({id:editForm.preTaskid.split(',')[0]})"
title="查看详情"
> 查看详情</el-button>
<el-button type="text" v-if="editForm.ntype=='0'" @click.stop="$refs['pretaskDlg'].open()" >选前置</el-button>
<el-button type="text" v-if="editForm.ntype=='1'" @click.stop="$refs['preplanDlg'].open()">选前置</el-button>
<el-button type="text" @click.stop="$refs['preplanDlg'].open()">选前置</el-button>
</el-form-item>
</el-col>
@@ -590,13 +589,9 @@
/>
</template>
</mdp-dialog>
<mdp-dialog ref="preplanDlg" title="选择新的前置计划" append-to-body width="60%">
<mdp-dialog ref="preplanDlg" title="选择新的前置工作项" append-to-body width="60%">
<XmPhase subOpType="select" :multiple="true" showConfirm showCheckbox :sel-project="xmProjectCpd" @select="onPreplanSelect" />
</mdp-dialog>
<mdp-dialog ref="pretaskDlg" title="选中前置任务" width="90%" append-to-body :close-on-click-modal="false">
<XmPhase subOpType="select" showConfirm showCheckbox :sel-project="xmProjectCpd" :multiple="true" @select="onPretaskSelect" />
</mdp-dialog>
</template>
<script>
@@ -850,19 +845,7 @@ import { MdpFormMixin } from '@/components/mdp-ui/mixin/MdpFormMixin';
onBudgetDateRangerChange(){
this.editSomeFields(this.editForm,'dateRange',{startTime:this.editForm.startTime,endTime:this.editForm.endTime});
},
onSelectedTask(tasks){
this.selectTaskVisible=false;
if(tasks && tasks.length>3){
this.$message.error("最多只能选3个前置")
return
}else{
if(tasks.some(k=>k.id==this.editForm.id)){
this.$message.error("不能自己依赖自己")
return;
}
this.editSomeFields(this.editForm,'preTaskid',tasks.map(k=>k.id).join(","));
}
},
clearPreTask(){
this.editForm.preTaskid=''
this.editSomeFields(this.editForm,'preTaskid','')
@@ -1117,7 +1100,7 @@ import { MdpFormMixin } from '@/components/mdp-ui/mixin/MdpFormMixin';
},
onPreplanSelect(tasks){
if(tasks && tasks.length>3){
this.$message.error('最多选3个前置计划')
this.$message.error('最多选3个前置工作项')
return;
}
@@ -1128,20 +1111,6 @@ import { MdpFormMixin } from '@/components/mdp-ui/mixin/MdpFormMixin';
this.editSomeFields(this.editForm,'preTaskid',tasks.map(k=>k.id).join(","))
this.$refs['preplanDlg'].close()
},
onPretaskSelect(tasks){
if(tasks && tasks.length>3){
this.$message.error('最多选3个前置任务')
return;
}
if(tasks.some(k=>k.id==this.editForm.id)){
this.$message.error("不能自己依赖自己")
return;
}
this.editSomeFields(this.editForm,'preTaskid',tasks.map(k=>k.id).join(","))
this.$refs['pretaskDlg'].close()
},
},//end method
components: {
'TaskMng':defineAsyncComponent(()=>import("@/views/mdp/workflow/ru/task/TaskListAssigneeToMe.vue")),