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

代码优化

master
陈裕财 5 years ago
parent
899af6b571
commit
05314ba4d9
2 changed files with 66 additions and 34 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. 67
      src/views/xm/core/xmTask/XmTaskEdit.vue
  2. 29
      src/views/xm/core/xmTask/XmTaskMng.vue

67
src/views/xm/core/xmTask/XmTaskEdit.vue
View File

@ -1,18 +1,42 @@
<template> <template>
<section class="page-container page-height padding"> <section class="page-container page-height padding">
<el-row >
<el-row class="page-main page-main-height">
<!--新增界面 XmTask xm_task--> <!--新增界面 XmTask xm_task-->
<el-form :model="editForm" label-width="120px" :rules="editFormRules" ref="editForm">
<el-form-item label="项目名称">
<span>{{editForm.projectName}}</span>
</el-form-item>
<el-form :model="editForm" label-width="100px" :rules="editFormRules" ref="editForm">
<el-form-item v-if="editForm.parentTaskname!=null && editForm.parentTaskname!=''" label="父任务名称"> <el-form-item v-if="editForm.parentTaskname!=null && editForm.parentTaskname!=''" label="父任务名称">
<span>{{editForm.parentTaskname}}</span> <span>{{editForm.parentTaskname}}</span>
</el-form-item> </el-form-item>
<el-form-item label="任务名称" prop="name"> <el-form-item label="任务名称" prop="name">
<el-input v-model="editForm.name" placeholder="任务名称" ></el-input>
<el-row>
<el-col :span="24" style="padding-left:10px;">
<el-input v-model="editForm.name" placeholder="任务名称" ></el-input>
<el-tooltip content="归属项目"><el-tag>{{editForm.projectName}}</el-tag></el-tooltip>
<el-divider direction="vertical"></el-divider>
<el-tooltip content="上级" ><el-tag>{{editForm.parentTaskname?editForm.parentTaskname:"无上级"}}</el-tag></el-tooltip>
</el-col>
</el-row>
</el-form-item>
<el-form-item label="参与流程">
<el-steps :active="calcTaskStep" align-center>
<el-step title="发布" description="任务创建成功后即发布"></el-step>
<el-step title="竞标" description="候选人参与竞标"></el-step>
<el-step title="执行" description="候选人中标成为执行人，执行任务"></el-step>
<el-step title="验收" description="任务完成后提交验收"></el-step>
<el-step title="结算" description="验收通过后，提交结算申请"></el-step>
<el-step title="企业付款" description="自动付款到个人钱包"></el-step>
<el-step title="提现" description="个人对钱包中余额进行提现"></el-step>
</el-steps>
</el-form-item> </el-form-item>
<el-form-item label="任务状态" prop="taskState">
<el-steps :active="calcTaskStep" align-center>
<el-step title="待领取" description="任务创建成功后即为待领取"></el-step>
<el-step title="执行中" description="候选人被选定为执行人，任务自动变更为执行中"></el-step>
<el-step title="已完工待结算" description="验收通过算完工"></el-step>
<el-step title="已结算" description="结算完成，并且付款到个人钱包"></el-step>
</el-steps>
</el-form-item>
<el-form-item label="排序号" prop="sortLevel"> <el-form-item label="排序号" prop="sortLevel">
<el-input v-model="editForm.sortLevel" placeholder="如1.0或者1.2.3等" ></el-input> <el-input v-model="editForm.sortLevel" placeholder="如1.0或者1.2.3等" ></el-input>
</el-form-item> </el-form-item>
@ -122,19 +146,13 @@
<el-option v-for="i in options.xmTaskSettleSchemel" :label="i.optionName" :key="i.optionValue" :value="i.optionValue"></el-option> <el-option v-for="i in options.xmTaskSettleSchemel" :label="i.optionName" :key="i.optionValue" :value="i.optionValue"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<!--
<el-form-item label="任务创建人">
<span>{{userInfo.username}}</span>
</el-form-item>
-->
<el-form-item>
<el-col :span="24" :offset="8">
<el-button @click.native="handleCancel">取消</el-button>
<el-button v-loading="load.edit" type="primary" @click.native="editSubmit" :disabled="load.edit==true">提交</el-button>
</el-col>
</el-form-item>
</el-form> </el-form>
</el-row> </el-row>
<el-row class="page-bottom">
<el-button @click.native="handleCancel">取消</el-button>
<el-button v-loading="load.edit" type="primary" @click.native="editSubmit" :disabled="load.edit==true">提交</el-button>
</el-row>
<!-- <el-dialog append-to-body :title="'技能要求'" :visible.sync="skillVisible" width="80%" append-to-body :close-on-click-modal="false"> <!-- <el-dialog append-to-body :title="'技能要求'" :visible.sync="skillVisible" width="80%" append-to-body :close-on-click-modal="false">
@ -172,6 +190,21 @@
...mapGetters([ ...mapGetters([
'userInfo','roles' 'userInfo','roles'
]), ]),
calcTaskStep(){
if(!this.editForm.executorUserid){
return 1
}else if(this.editForm.exeUsernames.indexOf('执行中')>=0){
return 2
}else if(this.editForm.exeUsernames.indexOf('已验收')>=0){
return 3
}else if(this.editForm.exeUsernames.indexOf('已验收')>=0){
return 3
}else if(this.editForm.exeUsernames.indexOf('已验收')>=0){
return 3
} if(this.editForm.exeUsernames.indexOf('已结算')>=0){
return 4
}
}
}, },
props:['xmTask','visible','xmProject','projectPhase',"parentTask"], props:['xmTask','visible','xmProject','projectPhase',"parentTask"],
watch: { watch: {

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

@ -40,7 +40,7 @@
<el-checkbox v-model="gstcVisible" class="hidden-md-and-down" >甘特图</el-checkbox> <el-checkbox v-model="gstcVisible" class="hidden-md-and-down" >甘特图</el-checkbox>
<el-popover <el-popover
placement="top-start" placement="top-start"
title="标题"
title="选择创建任务的方式"
width="200" width="200"
trigger="hover"> trigger="hover">
<el-row> <el-row>
@ -159,17 +159,15 @@
> >
<el-table-column sortable prop="name" label="任务名称(点击详情)" min-width="240" show-overflow-tooltip> <el-table-column sortable prop="name" label="任务名称(点击详情)" min-width="240" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{scope.row.sortLevel}}&nbsp;<el-link type="primary" @click.stop="showDrawer(scope.row)">{{scope.row.name}}</el-link></span>
</template>
</el-table-column>
<el-table-column v-if=" !selProject || !selProject.id" prop="projectName" label="项目" min-width="120" show-overflow-tooltip>
<template slot="header">
项目<el-button @click="showProjectList" icon="el-icon-search" circle size="mini"></el-button>
</template>
<template slot-scope="scope">
{{scope.row.projectName}}
<span>
{{scope.row.sortLevel}}&nbsp;
<el-tag v-if="scope.row.level<='2'" type="info">轻微</el-tag>
<el-tag v-else-if="scope.row.level=='3'" type="warning">一般</el-tag>
<el-tag v-else-if="scope.row.level=='4'" type="danger">紧急</el-tag>
<el-tag v-else type="danger">特急</el-tag>
<el-link type="primary" @click.stop="showDrawer(scope.row)">{{scope.row.name}}</el-link>
</span>
<span></span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="menuId" label="故事" min-width="120" show-overflow-tooltip> <el-table-column prop="menuId" label="故事" min-width="120" show-overflow-tooltip>
@ -208,7 +206,7 @@
<el-table-column sortable prop="rate" label="进度" width="100"> <el-table-column sortable prop="rate" label="进度" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<div> <div>
<el-tag style="border-radius:30px;"> {{ (scope.row.rate!=null?scope.row.rate:0)+'%'}} </el-tag>
<el-tag style="border-radius:30px;" :type="scope.row.rate>=100?'success':'warning'"> {{ (scope.row.rate!=null?scope.row.rate:0)+'%'}} </el-tag>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
@ -389,7 +387,7 @@
</div> </div>
</el-dialog> </el-dialog>
<!--编辑 XmTask xm_task界面--> <!--编辑 XmTask xm_task界面-->
<el-drawer title="编辑任务" :visible.sync="editFormVisible" width="80%" append-to-body :close-on-click-modal="false">
<el-drawer title="编辑任务" :visible.sync="editFormVisible" :size="650" append-to-body :close-on-click-modal="false">
<xm-task-edit :xm-project="currentProject" :xm-task="editForm" :project-phase="currentProjectPhase" :visible="editFormVisible" @cancel="editFormVisible=false" @submit="afterEditSubmit"></xm-task-edit> <xm-task-edit :xm-project="currentProject" :xm-task="editForm" :project-phase="currentProjectPhase" :visible="editFormVisible" @cancel="editFormVisible=false" @submit="afterEditSubmit"></xm-task-edit>
</el-drawer> </el-drawer>
@ -1076,8 +1074,9 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue';
}, },
showDrawer: function(row){ showDrawer: function(row){
this.editFormVisible =true;
this.editForm=row; this.editForm=row;
this.drawerVisible = !this.drawerVisible;
// this.$emit('row-click',row,);// @row-click="rowClick" // this.$emit('row-click',row,);// @row-click="rowClick"
}, },

Write Preview
Loading…
Cancel
Save