Browse Source

task优化

master
陈裕财 4 years ago
parent
commit
39438e14cd
  1. 33
      src/views/xm/core/xmTask/XmTaskAdd.vue
  2. 23
      src/views/xm/core/xmTask/XmTaskEdit.vue
  3. 4
      src/views/xm/core/xmTask/XmTaskMng.vue

33
src/views/xm/core/xmTask/XmTaskAdd.vue

@ -1,21 +1,24 @@
<template> <template>
<section class="page-container page-full-height padding"> <section class="page-container page-full-height padding">
<el-row>
<el-button type="text" @click="goAnchor('baseInfoAdd')">基础信息</el-button>
<el-button type="text" @click="goAnchor('planInfoAdd')">进度计划</el-button>
<el-button type="text" @click="goAnchor('costInfoAdd')">工作量与成本</el-button>
<el-button type="text" @click="goAnchor('settleInfoAdd')">结算信息</el-button>
<el-button type="text" @click="goAnchor('menuInfoAdd')">故事明细</el-button>
<el-button type="text" @click="goAnchor('taskOutAdd')">众包</el-button>
<el-row class="padding">
快速导航
<el-link type="text" @click="goAnchor('baseInfo')">&nbsp;&nbsp;&nbsp;基础信息&nbsp;&nbsp;&nbsp;</el-link>
<el-link type="text" @click="goAnchor('planInfo')">&nbsp;&nbsp;&nbsp;进度计划&nbsp;&nbsp;&nbsp;</el-link>
<el-link type="text" @click="goAnchor('costInfo')">&nbsp;&nbsp;&nbsp;工作量与成本&nbsp;&nbsp;&nbsp;</el-link>
<el-link type="text" @click="goAnchor('settleInfo')">&nbsp;&nbsp;&nbsp;结算信息&nbsp;&nbsp;&nbsp;</el-link>
<el-link type="text" @click="goAnchor('menuInfo')">&nbsp;&nbsp;&nbsp;故事明细&nbsp;&nbsp;&nbsp;</el-link>
<el-link type="text" @click="goAnchor('taskOut')">&nbsp;&nbsp;&nbsp;众包&nbsp;&nbsp;&nbsp;</el-link>
</el-row>
<el-row>
<el-steps :active="calcTaskStep" finish-status="success" simple> <el-steps :active="calcTaskStep" finish-status="success" simple>
<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-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-row> </el-row>
<el-row class="page-main page-height-70"> <el-row class="page-main page-height-70">
<!--新增界面 XmTask xm_task--> <!--新增界面 XmTask xm_task-->

23
src/views/xm/core/xmTask/XmTaskEdit.vue

@ -1,12 +1,15 @@
<template> <template>
<section class="page-container padding"> <section class="page-container padding">
<el-row>
<el-button type="text" @click="goAnchor('baseInfo')">基础信息</el-button>
<el-button type="text" @click="goAnchor('planInfo')">进度计划</el-button>
<el-button type="text" @click="goAnchor('costInfo')">工作量与成本</el-button>
<el-button type="text" @click="goAnchor('settleInfo')">结算信息</el-button>
<el-button type="text" @click="goAnchor('menuInfo')">故事明细</el-button>
<el-button type="text" @click="goAnchor('taskOut')">众包</el-button>
<el-row class="padding">
快速导航
<el-link type="text" @click="goAnchor('baseInfo')">&nbsp;&nbsp;&nbsp;基础信息&nbsp;&nbsp;&nbsp;</el-link>
<el-link type="text" @click="goAnchor('planInfo')">&nbsp;&nbsp;&nbsp;进度计划&nbsp;&nbsp;&nbsp;</el-link>
<el-link type="text" @click="goAnchor('costInfo')">&nbsp;&nbsp;&nbsp;工作量与成本&nbsp;&nbsp;&nbsp;</el-link>
<el-link type="text" @click="goAnchor('settleInfo')">&nbsp;&nbsp;&nbsp;结算信息&nbsp;&nbsp;&nbsp;</el-link>
<el-link type="text" @click="goAnchor('menuInfo')">&nbsp;&nbsp;&nbsp;故事明细&nbsp;&nbsp;&nbsp;</el-link>
<el-link type="text" @click="goAnchor('taskOut')">&nbsp;&nbsp;&nbsp;众包&nbsp;&nbsp;&nbsp;</el-link>
</el-row>
<el-row>
<el-steps :active="calcTaskStep" finish-status="success" simple> <el-steps :active="calcTaskStep" finish-status="success" simple>
<el-step title="发布" description="任务创建成功后即发布"></el-step> <el-step title="发布" description="任务创建成功后即发布"></el-step>
<el-step title="竞标" description="候选人参与竞标,或者由责任人主动设置候选人"></el-step> <el-step title="竞标" description="候选人参与竞标,或者由责任人主动设置候选人"></el-step>
@ -50,7 +53,7 @@
</el-tooltip> </el-tooltip>
</el-form-item> </el-form-item>
<el-form-item label="所属故事" prop="menuId" id="menuInfo"> <el-form-item label="所属故事" prop="menuId" id="menuInfo">
{{editForm.menuName}} <el-button @click="menuVisible=true" round>选择归属故事</el-button><el-button @click="toMenu" round></el-button>
{{editForm.menuName}} &nbsp;&nbsp;&nbsp; <el-link @click="menuVisible=true" type="primary">{{editForm.menuName?'更改归属故事':'设置归属故事'}}</el-link>&nbsp;&nbsp;&nbsp;<el-link v-if="editForm.menuName" @click="toMenu" type="primary"></el-link>
</el-form-item> </el-form-item>
<el-form-item prop="skill" label="技能要求"> <el-form-item prop="skill" label="技能要求">
<el-button class="useradd-icon" type="text" @click.stop="showSkill()" icon="el-icon-circle-plus-outline">增加</el-button> <el-button class="useradd-icon" type="text" @click.stop="showSkill()" icon="el-icon-circle-plus-outline">增加</el-button>
@ -173,11 +176,11 @@
<el-drawer append-to-body title="选择负责人" :visible.sync="groupUserSelectVisible" size="80%" :close-on-click-modal="false"> <el-drawer append-to-body title="选择负责人" :visible.sync="groupUserSelectVisible" size="80%" :close-on-click-modal="false">
<xm-project-group-select :visible="groupUserSelectVisible" :sel-project="xmProject" :isSelectSingleUser="1" @user-confirm="groupUserSelectConfirm"></xm-project-group-select> <xm-project-group-select :visible="groupUserSelectVisible" :sel-project="xmProject" :isSelectSingleUser="1" @user-confirm="groupUserSelectConfirm"></xm-project-group-select>
</el-drawer> </el-drawer>
<el-drawer append-to-body title="新增技能" :visible.sync="skillVisible" size="50%" :close-on-click-modal="false">
<el-drawer append-to-body title="新增技能" :visible.sync="skillVisible" size="60%" :close-on-click-modal="false">
<skill-mng :task-skills="taskSkills" :jump="true" @select-confirm="onTaskSkillsSelected"></skill-mng> <skill-mng :task-skills="taskSkills" :jump="true" @select-confirm="onTaskSkillsSelected"></skill-mng>
</el-drawer> </el-drawer>
<el-drawer append-to-body title="故事选择" :visible.sync="menuVisible" fullscreen :close-on-click-modal="false">
<el-drawer append-to-body title="故事选择" :visible.sync="menuVisible" size="80%" :close-on-click-modal="false">
<xm-menu-select :is-select-menu="true" @selected="onMenuSelected" :sel-project="xmProject"></xm-menu-select> <xm-menu-select :is-select-menu="true" @selected="onMenuSelected" :sel-project="xmProject"></xm-menu-select>
</el-drawer> </el-drawer>

4
src/views/xm/core/xmTask/XmTaskMng.vue

@ -202,7 +202,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="menuId" label="故事" width="120" show-overflow-tooltip> <el-table-column prop="menuId" label="故事" width="120" show-overflow-tooltip>
<template slot="header"> <template slot="header">
故事<el-button @click="showMenuStory" icon="el-icon-search" circle ></el-button>
故事
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<el-link @click.stop="toMenu(scope.row)">{{scope.row.menuName?scope.row.menuName:'去关联故事'}}</el-link> <el-link @click.stop="toMenu(scope.row)">{{scope.row.menuName?scope.row.menuName:'去关联故事'}}</el-link>
@ -239,6 +239,7 @@
v-if="drawerVisible == true" v-if="drawerVisible == true"
:size="600" :size="600"
:visible.sync="drawerVisible" append-to-body > :visible.sync="drawerVisible" append-to-body >
<el-row class="padding">
<el-row style="font-size: 12px;overflow-x:hidden"> <el-row style="font-size: 12px;overflow-x:hidden">
<div class="task-header extra"> <div class="task-header extra">
<div class="title"> <div class="title">
@ -300,6 +301,7 @@
<div v-if="drawerkey == '1' && drawerVisible==true" style="overflow-x:hidden"> <div v-if="drawerkey == '1' && drawerVisible==true" style="overflow-x:hidden">
<xm-exchange-mng :xm-task="editForm"></xm-exchange-mng> <xm-exchange-mng :xm-task="editForm"></xm-exchange-mng>
</div> </div>
</el-row>
</el-drawer> </el-drawer>
<!--编辑 XmTask xm_task界面--> <!--编辑 XmTask xm_task界面-->
<el-drawer title="编辑任务" :visible.sync="editFormVisible" :with-header="false" :size="750" append-to-body :close-on-click-modal="false"> <el-drawer title="编辑任务" :visible.sync="editFormVisible" :with-header="false" :size="750" append-to-body :close-on-click-modal="false">

Loading…
Cancel
Save