Browse Source

优化

master
陈裕财 3 years ago
parent
commit
f8d2a0d859
  1. 12
      src/views/xm/core/components/XmUserField/index.vue
  2. 2
      src/views/xm/core/xmGroup/XmGroupSelect.vue
  3. 10
      src/views/xm/core/xmQuestion/XmQuestionEdit.vue

12
src/views/xm/core/components/XmUserField/index.vue

@ -27,17 +27,17 @@
</div>
</el-option>
<el-option value="" >
<el-row><el-button :type="deptUserVisible?'':'primary'" @click.stop="deptUserVisible=false">常用用户</el-button> <el-button :type="deptUserVisible?'primary':''" @click.stop="deptUserVisible=true"></el-button><el-button v-if="projectId" :type="projectVisible?'primary':''" @click.stop="projectVisible=true"></el-button> </el-row>
<el-row><el-button :type="deptUserVisible?'':'primary'" @click.stop="deptUserVisible=false">常用用户</el-button> <el-button :type="deptUserVisible?'primary':''" @click.stop="deptUserVisible=true"></el-button><el-button v-if="projectId||productId" :type="projectVisible?'primary':''" @click.stop="projectVisible=true"></el-button> </el-row>
</el-option>
</el-select>
</div>
</div>
<el-dialog :visible.sync="deptUserVisible" append-to-body top="20px" width="60%">
<el-dialog v-if="disabled!==true" :visible.sync="deptUserVisible" append-to-body top="20px" width="60%">
<users-select :visible="deptUserVisible" :isSingleUser="true" :isSelectByDept="true" @confirm="onConfirmUsers"></users-select>
</el-dialog>
<el-dialog :visible.sync="projectVisible" append-to-body top="20px" width="60%">
<xm-group-select :sel-project="{id:projectId}" :isSelectSingleUser="true" @user-confirm="onProjectUsersConfirm"></xm-group-select>
<el-dialog v-if="disabled!==true" :visible.sync="projectVisible" append-to-body top="20px" width="60%">
<xm-group-select :sel-project="{id:projectId}" :xm-product="{id:productId}" :isSelectSingleUser="true" @user-confirm="onProjectUsersConfirm"></xm-group-select>
</el-dialog>
</el-row>
</template>
@ -97,6 +97,10 @@
default:''
},
productId:{
type:String,
default:''
},
disabled:{
type:Boolean,
default:false,

2
src/views/xm/core/xmGroup/XmGroupSelect.vue

@ -7,7 +7,7 @@
<el-button type="primary" @click="userConfirm" icon="el-icon-finished">确认选择</el-button>
</el-row>
<el-row class="padding-top" v-loading="load.list" :style="{overflowX:'auto',height:maxTableHeight+'px'}" ref="table">
<el-row class="padding-top" v-loading="load.list" :style="{height:maxTableHeight+'px'}" ref="table">
<el-row v-for="(item,index) in xmGroupFormworkSels" :key="index">
<h3>
<div class="padding-top">{{item.groupName}}

10
src/views/xm/core/xmQuestion/XmQuestionEdit.vue

@ -16,9 +16,9 @@
<el-divider direction="vertical"></el-divider>
<el-button type="text" icon="el-icon-copy" @click="copyLink">拷贝链接(快速分享)</el-button>
</el-form-item>
<el-row>
<el-row class="padding">
<el-col :span="6">
<xm-user-field :project-id="editForm.projectId" label="责任人" v-model="editForm" userid-key="handlerUserid" username-key="handlerUsername" @change="editXmQuestionSomeFields(editForm,'handlerUserid',$event)"></xm-user-field>
<xm-user-field :project-id="editForm.projectId" :product-id="editForm.productId" label="责任人" v-model="editForm" userid-key="handlerUserid" username-key="handlerUsername" @change="editXmQuestionSomeFields(editForm,'handlerUserid',$event)"></xm-user-field>
<el-popover
placement="top-start"
title="重新指派给"
@ -53,8 +53,8 @@
<el-col :span="8">
<el-form-item label="提出人" prop="askUsername">
<el-tag @click="showGroupUsers('askUserid')">{{editForm.askUsername?editForm.askUsername:'未关联提出人'}}</el-tag>
</el-form-item>
<xm-user-field :project-id="editForm.projectId" :product-id="editForm.productId" label="责任人" v-model="editForm" userid-key="askUserid" username-key="askUsername" @change="editXmQuestionSomeFields(editForm,'askUserid',$event)"></xm-user-field>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="复现频率" prop="repRate">
@ -154,7 +154,7 @@
</el-tabs>
</el-col>
<el-col :span="6">
<el-col :span="6" class="padding border">
<el-form-item label="归属项目" prop="projectId">
{{editForm.projectId}}
</el-form-item>

Loading…
Cancel
Save