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

优化

master
陈裕财 4 years ago
parent
7835b19bcd
commit
68293567ed
6 changed files with 14 additions and 50 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/views/xm/core/xmMenu/XmMenuEdit.vue
  2. 2
      src/views/xm/core/xmMenu/XmMenuMng.vue
  3. 20
      src/views/xm/core/xmQuestion/XmQuestionAdd.vue
  4. 26
      src/views/xm/core/xmQuestion/XmQuestionEdit.vue
  5. 10
      src/views/xm/core/xmQuestion/XmQuestionMng.vue
  6. 2
      src/views/xm/core/xmWorkItem/XmSubWorkItem.vue

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

@ -128,7 +128,7 @@
</el-row>
</el-tab-pane>
<el-tab-pane :label="'子工作项'+(subWorkItemNum>=0?'('+subWorkItemNum+')':'')" name="6">
<xm-sub-work-item :parent-xm-menu="editForm" @sub-work-item-num="setSubWorkItemNum" @add-sub-menu="onAddSubMenu"></xm-sub-work-item>
<xm-sub-work-item :parent-xm-menu="editForm" :link-project-id="selProject?selProject.id:null" @sub-work-item-num="setSubWorkItemNum" @add-sub-menu="onAddSubMenu"></xm-sub-work-item>
</el-tab-pane>
<el-tab-pane :label="'工时('+editForm.mactWorkload+' h)'" name="2">
<el-form-item label="数据收集方式" prop="calcType">
@ -255,7 +255,7 @@ import XmMenuExchangeMng from '../xmMenuExchange/XmMenuExchangeMng.vue';
return params;
},
},
props:['xmMenu','visible','parentMenu','product','dclass'],
props:['xmMenu','visible','parentMenu','product','dclass','selProject'],
watch: {
'xmMenu':function( xmMenu ) {
this.editForm = xmMenu;

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

@ -340,7 +340,7 @@
</el-row>
<!--编辑 XmMenu xm_project_menu界面-->
<el-dialog title="编辑需求" :visible.sync="editFormVisible" :with-header="false" width="80%" top="20px" center append-to-body :close-on-click-modal="false" >
<xm-menu-edit :xm-menu="editForm" :visible="editFormVisible" @cancel="editFormVisible=false" @submit="afterEditSubmit" @add-sub-menu="onAddSubMenu" @edit-fields="onEditSomeFields"></xm-menu-edit>
<xm-menu-edit :xm-menu="editForm" :sel-project="selProject" :visible="editFormVisible" @cancel="editFormVisible=false" @submit="afterEditSubmit" @add-sub-menu="onAddSubMenu" @edit-fields="onEditSomeFields"></xm-menu-edit>
</el-dialog>
<!--新增 XmMenu xm_project_menu界面-->

20
src/views/xm/core/xmQuestion/XmQuestionAdd.vue
View File

@ -1,22 +1,6 @@
<template>
<section class="page-container padding">
<el-row class="padding-bottom">
<!--1|新提交
2|处理中
3|已修复
4|重新打开
5|已发布
6|已拒绝
7|挂起 -->
<el-steps :active="calcBugStep" simple finish-status="success" >
<el-step v-for="(item,index) in dicts['bugStatus']" :title="item.name" :key="index" @click.native.stop="editForm.bugStatus=item.id">
<el-link slot="title" @click="editForm.bugStatus=item.id">
{{item.name}}
</el-link>
</el-step>
</el-steps>
</el-row>
<el-row class="page-main padding">
<section>
<el-row class="page-main">
<el-form :model="addForm" label-width="120px" :rules="addFormRules" ref="addForm">
<el-form-item label="缺陷标题" prop="name">
<el-input v-model="addForm.name" placeholder="缺陷标题" ></el-input>

26
src/views/xm/core/xmQuestion/XmQuestionEdit.vue
View File

@ -1,22 +1,5 @@
<template>
<section class="page-container padding border">
<el-row class="padding-bottom">
<!--1|新提交
2|处理中
3|已修复
4|重新打开
5|已发布
6|已拒绝
7|挂起 -->
<el-steps :active="calcBugStep" simple finish-status="success" >
<el-step v-for="(item,index) in dicts['bugStatus']" :title="item.name" :key="index" @click.native.stop="editForm.bugStatus=item.id">
<el-link slot="title" @click="editForm.bugStatus=item.id">
{{item.name}}
</el-link>
</el-step>
</el-steps>
</el-row>
<section>
<el-row class="page-main ">
<el-row class="padding">
<font class="font">{{editForm.name}}</font>
@ -28,17 +11,14 @@
<el-button type="text" icon="el-icon-plus" @click="tagSelectVisible=true">标签</el-button>
<el-divider direction="vertical"></el-divider>
<el-button type="text" icon="el-icon-search" @click="flowInfoVisible=true">日志</el-button>
</el-row>
<el-divider></el-divider>
</el-row>
<el-row>
<el-form :model="editForm" label-width="120px" :rules="editFormRules" ref="editForm">
<el-row>
<el-col :span="12">
<el-form-item label="归属项目" prop="projectId">
<font v-if="editForm.projectId">{{editForm.projectId?editForm.projectId:''}}</font>
<xm-project-select ref="xmProjectSelect" :auto-select="false" @row-click="onPorjectConfirm" @clear="clearProject">
</xm-project-select>
<font v-if="editForm.projectId">{{editForm.projectId?editForm.projectId:''}}</font>
</el-form-item>
</el-col>
<el-col :span="12">

10
src/views/xm/core/xmQuestion/XmQuestionMng.vue
View File

@ -235,16 +235,16 @@
<el-pagination layout="total, sizes, prev, pager, next" @current-change="handleCurrentChange" @size-change="handleSizeChange" :page-sizes="[10,20, 50, 100, 500]" :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize" :total="pageInfo.total" style="float:right;"></el-pagination>
</el-row>
<!--编辑 XmQuestion xm_question界面-->
<el-drawer title="编辑缺陷" :visible.sync="editFormVisible" :with-header="false" size="70%" :close-on-click-modal="false">
<el-dialog :title="编辑缺陷" :visible.sync="editFormVisible" width="80%" top="20px" :close-on-click-modal="false">
<xm-question-edit :sel-project=" {id:editForm.projectId,name:editForm.projectName} " :xm-question="editForm" :visible="editFormVisible" @cancel="editFormVisible=false" @submit="afterEditSubmit"></xm-question-edit>
</el-drawer>
</el-dialog>
<!--新增 XmQuestion xm_question界面-->
<el-drawer title="新增缺陷" :visible.sync="addFormVisible" :with-header="false" size="70%" append-to-body :close-on-click-modal="false">
<el-dialog title="新增缺陷" :visible.sync="addFormVisible" width="80%" top="20px" append-to-body :close-on-click-modal="false">
<xm-question-add :xm-test-case-exec="xmTestCaseExec" :xm-test-case="xmTestCase" :qtype="qtype" :sel-project=" filters.selProject " :xm-question="addForm" :visible="addFormVisible" @cancel="addFormVisible=false" @submit="afterAddSubmit"></xm-question-add>
</el-drawer>
</el-dialog>
<xm-group-dialog ref="xmGroupDialog" :sel-project=" filters.selProject " :is-select-single-user="1" @user-confirm="onUserConfirm"></xm-group-dialog>
<el-drawer append-to-body title="需求选择" :visible.sync="menuVisible" size="70%" :close-on-click-modal="false">
<el-drawer append-to-body title="需求选择" :visible.sync="menuVisible" size="60%" :close-on-click-modal="false">
<xm-menu-select :visible="menuVisible" :is-select-menu="true" :multi="true" @menus-selected="onSelectedMenus" ></xm-menu-select>
</el-drawer>

2
src/views/xm/core/xmWorkItem/XmSubWorkItem.vue
View File

@ -3,7 +3,7 @@
<el-row>
<font>共{{subWorkItemNum}}个子工作项</font> &nbsp;&nbsp;
<span style="float:right;">
<xm-project-select style="display:inline;" v-if="parentXmMenu&&parentXmMenu.menuId && parentXmMenu.dclass==='3' && !linkProjectId" :link-product-id="parentXmMenu.productId" @row-click="xmProject=$event"></xm-project-select>
<xm-project-select style="display:inline;" :auto-select="false" v-if="parentXmMenu&&parentXmMenu.menuId && parentXmMenu.dclass==='3' && !linkProjectId" :link-product-id="parentXmMenu.productId" @row-click="xmProject=$event"></xm-project-select>
<el-button v-if="parentXmMenu.dclass==='1'" icon="el-icon-plus" @click="showAdd(2)">
<div class="icon" style="background-color: rgb(0, 153, 51);">
<i class="el-icon-s-flag"></i>

Write Preview
Loading…
Cancel
Save