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

优化

master
陈裕财 4 years ago
parent
166cea4da4
commit
e3388482a9
4 changed files with 20 additions and 30 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. 9
      src/views/xm/core/components/XmMenuWorkload.vue
  2. 11
      src/views/xm/core/xmMenu/XmMenuEdit.vue
  3. 24
      src/views/xm/core/xmMenu/XmMenuMng.vue
  4. 6
      src/views/xm/core/xmTask/XmTaskMng.vue

9
src/views/xm/core/components/XmMenuWorkload.vue
View File

@ -9,9 +9,6 @@
<el-form-item label="工时进度" prop="mactRate" > <el-form-item label="工时进度" prop="mactRate" >
<el-progress style="width:50%;" :stroke-width="15" :percentage="editForm.mactRate?editForm.mactRate:0"></el-progress> <el-progress style="width:50%;" :stroke-width="15" :percentage="editForm.mactRate?editForm.mactRate:0"></el-progress>
</el-form-item> </el-form-item>
<el-form-item label="预估工期" prop="budgetHours">
{{editForm.budgetHours}}&nbsp;小时
</el-form-item>
<el-form-item label="预估工时" prop="budgetWorkload"> <el-form-item label="预估工时" prop="budgetWorkload">
{{editForm.budgetWorkload}}&nbsp;小时 {{editForm.budgetWorkload}}&nbsp;小时
</el-form-item> </el-form-item>
@ -19,8 +16,12 @@
{{editForm.mactWorkload}}&nbsp;小时 {{editForm.mactWorkload}}&nbsp;小时
</el-form-item> </el-form-item>
<el-form-item label="剩余工时" prop="rworkload">
{{editForm.rworkload}}&nbsp;小时
</el-form-item>
<el-form-item label="" class="padding"> <el-form-item label="" class="padding">
<el-button type="text" @click="cancel">关闭</el-button>
<el-button @click="cancel">关闭</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>

11
src/views/xm/core/xmMenu/XmMenuEdit.vue
View File

@ -124,7 +124,7 @@
<el-input type="textarea" :autosize="{ minRows: 6, maxRows: 20}" v-model="editForm.remark" placeholder="什么人？做什么事？，为什么？如： 作为招聘专员，我需要统计员工半年在职/离职人数，以便我能够制定招聘计划" ></el-input> <el-input type="textarea" :autosize="{ minRows: 6, maxRows: 20}" v-model="editForm.remark" placeholder="什么人？做什么事？，为什么？如： 作为招聘专员，我需要统计员工半年在职/离职人数，以便我能够制定招聘计划" ></el-input>
</el-form-item> </el-form-item>
<el-row class="padding"> <el-row class="padding">
<el-button v-loading="load.edit" type="primary" @click.native="editXmMenuSomeFields(editForm,'remark',editForm.remark)" :disabled="load.edit==true">提交</el-button>
<el-button v-loading="load.edit" type="primary" @click.native="editXmMenuSomeFields(editForm,'remark',editForm.remark)" :disabled="load.edit==true">提交概述</el-button>
</el-row> </el-row>
</el-tab-pane> </el-tab-pane>
<el-tab-pane :label="'子工作项'+(subWorkItemNum>=0?'('+subWorkItemNum+')':'')" name="6"> <el-tab-pane :label="'子工作项'+(subWorkItemNum>=0?'('+subWorkItemNum+')':'')" name="6">
@ -144,9 +144,6 @@
<el-form-item label="实际工时" prop="mactWorkload"> <el-form-item label="实际工时" prop="mactWorkload">
<el-input-number :disabled="editForm.calcType!=='2' " style="width:200px;" v-model="editForm.mactWorkload" :precision="2" :step="8" :min="0" placeholder="实际工时(小时)"></el-input-number> &nbsp;h <el-input-number :disabled="editForm.calcType!=='2' " style="width:200px;" v-model="editForm.mactWorkload" :precision="2" :step="8" :min="0" placeholder="实际工时(小时)"></el-input-number> &nbsp;h
</el-form-item> </el-form-item>
<el-row class="padding">
<el-button v-loading="load.edit" type="primary" @click.native="editXmMenuSomeFields(editForm,'workload',{mactWorkload:editForm.mactWorkload,budgetWorkload:editForm.budgetWorkload,mactRate:editForm.mactRate,budgetHours:editForm.budgetHours})" :disabled="load.edit==true">提交</el-button>
</el-row>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="成本" name="3"> <el-tab-pane label="成本" name="3">
<el-form-item label="预估金额" prop="budgetAmount"> <el-form-item label="预估金额" prop="budgetAmount">
@ -155,10 +152,6 @@
<el-form-item label="实际金额" prop="mactAmount"> <el-form-item label="实际金额" prop="mactAmount">
<el-input-number :disabled="editForm.calcType!=='2' " style="width:200px;" v-model="editForm.mactAmount" :precision="2" :step="100" :min="0" placeholder="实际金额"></el-input-number> 元 <el-input-number :disabled="editForm.calcType!=='2' " style="width:200px;" v-model="editForm.mactAmount" :precision="2" :step="100" :min="0" placeholder="实际金额"></el-input-number> 元
</el-form-item> </el-form-item>
<el-row class="padding">
<el-button v-loading="load.edit" type="primary" @click.native="editXmMenuSomeFields(editForm,'budgetAmount',{budgetAmount:editForm.budgetAmount,mactAmount:editForm.mactAmount })" :disabled="load.edit==true">提交</el-button>
</el-row>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="链接" name="5"> <el-tab-pane label="链接" name="5">
<el-form-item label="需求链接" prop="demandUrl"> <el-form-item label="需求链接" prop="demandUrl">
@ -175,7 +168,7 @@
</el-form-item> </el-form-item>
<el-row class="padding"> <el-row class="padding">
<el-button v-loading="load.edit" type="primary" @click.native="editXmMenuSomeFields(editForm,'link',{demandUrl:editForm.demandUrl,codeUrl:editForm.codeUrl,designUrl:editForm.designUrl,operDocUrl:editForm.operDocUrl})" :disabled="load.edit==true">提交</el-button>
<el-button v-loading="load.edit" type="primary" @click.native="editXmMenuSomeFields(editForm,'link',{demandUrl:editForm.demandUrl,codeUrl:editForm.codeUrl,designUrl:editForm.designUrl,operDocUrl:editForm.operDocUrl})" :disabled="load.edit==true">提交链接</el-button>
</el-row> </el-row>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="wiki" name="7"> <el-tab-pane label="wiki" name="7">

24
src/views/xm/core/xmMenu/XmMenuMng.vue
View File

@ -288,20 +288,16 @@
<div>{{scope.row.finishTaskCnt}}/{{scope.row.taskCnt}}</div> <div>{{scope.row.finishTaskCnt}}/{{scope.row.taskCnt}}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="finishRate" label="进度" min-width="80" show-overflow-tooltip sortable>
<template slot-scope="scope">
<div class="cell-text" v-if="scope.row.calcType!=='2'">
<span v-if="scope.row.finishRate"><el-tag :type="scope.row.finishRate>=100?'success':'warning'">{{scope.row.finishRate}}%</el-tag></span>
</div>
<div class="cell-text" v-else>
<span v-if="scope.row.mactRate"><el-tag :type="scope.row.mactRate>=100?'success':'warning'">{{scope.row.mactRate}}%</el-tag></span>
</div>
<span class="cell-bar">
<xm-menu-workload :menu="scope.row" placeholder="工时" style="display:block;" @submit="editXmMenuSomeFields(scope.row,'workload',$event)">
</xm-menu-workload>
</span>
</template>
<el-table-column prop="mactWorkload" label="工时" min-width="100" show-overflow-tooltip sortable>
<template slot-scope="scope">
<span title="实际工时 / 预算工时 或者 (剩余工时+实际工时)">{{scope.row.mactWorkload}} &nbsp;/ &nbsp;{{scope.row.rworkload?parseInt(scope.row.mactWorkload)+parseInt(scope.row.rworkload):scope.row.budgetWorkload}}h </span>
</template>
</el-table-column>
<el-table-column prop="mactRate" label="进度" min-width="80" show-overflow-tooltip sortable>
<template slot-scope="scope">
<span v-if="scope.row.mactRate"><el-tag :type="scope.row.mactRate>=100?'success':'warning'">{{scope.row.mactRate}}%</el-tag></span>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="bugs" label="缺陷" min-width="100" show-overflow-tooltip sortable> <el-table-column prop="bugs" label="缺陷" min-width="100" show-overflow-tooltip sortable>

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

@ -478,9 +478,9 @@
label="工时" label="工时"
width="150" width="150"
> >
<template slot-scope="scope"> {{scope.row.actWorkload}}&nbsp;/&nbsp;{{
scope.row.budgetWorkload
}}&nbsp;h
<template slot-scope="scope">
<span title="实际工时 / 预算工时 或者 (剩余工时+实际工时)">{{scope.row.actWorkload}} &nbsp;/ &nbsp;{{scope.row.rworkload?parseInt(scope.row.actWorkload)+parseInt(scope.row.rworkload):scope.row.budgetWorkload}}h </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column sortable prop="rate" label="进度" width="100"> <el-table-column sortable prop="rate" label="进度" width="100">

Write Preview
Loading…
Cancel
Save