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

优化

master
陈裕财 3 years ago
parent
1117c60d56
commit
ac7302f195
3 changed files with 33 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. 5
      src/components/MdpSelectUserX/index.vue
  2. 37
      src/views/xm/core/components/MdpSelectUserXm/index.vue
  3. 19
      src/views/xm/core/xmQuestion/XmQuestionEdit.vue

5
src/components/MdpSelectUserX/index.vue
View File

@ -13,6 +13,7 @@
</slot> </slot>
</div> </div>
<div v-if="disabled!==true" class="field-oper" :value="myVal" :class="{disabled:disabled===true,enabled:disabled!==true}"> <div v-if="disabled!==true" class="field-oper" :value="myVal" :class="{disabled:disabled===true,enabled:disabled!==true}">
<slot name="oper">
<el-select v-model="myVal" @change="onSelectChange" :clearable="clearable"> <el-select v-model="myVal" @change="onSelectChange" :clearable="clearable">
<el-option disabled value="" style="margin-bottom:5px;"> <el-option disabled value="" style="margin-bottom:5px;">
<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" :type="projectVisible?'primary':''" @click.stop="projectVisible=true">项目组</el-button> </el-row>
@ -27,6 +28,10 @@
</div> </div>
</el-option> </el-option>
</el-select> </el-select>
<slot name="extOper">
</slot>
</slot>
</div> </div>
</div> </div>
<el-dialog :visible.sync="deptUserVisible" append-to-body top="20px" width="60%"> <el-dialog :visible.sync="deptUserVisible" append-to-body top="20px" width="60%">

37
src/views/xm/core/components/MdpSelectUserXm/index.vue
View File

@ -13,24 +13,29 @@
</slot> </slot>
</div> </div>
<div v-if="disabled!==true" class="field-oper" :class="{disabled:disabled===true,enabled:disabled!==true}"> <div v-if="disabled!==true" class="field-oper" :class="{disabled:disabled===true,enabled:disabled!==true}">
<el-select v-model="myVal" @change="onSelectChange" :clearable="clearable" filterable value-key="userid">
<slot name="oper">
<el-select v-model="myVal" @change="onSelectChange" :clearable="clearable" filterable value-key="userid">
<el-option :value="myVal" disabled v-if="users && users.length>10">
<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-option>
<el-option class="avatar-container" v-for="(item,index) in users" :key="index" :value="item" :label="item.username">
<el-option :value="myVal" disabled v-if="users && users.length>10">
<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-option>
<el-option class="avatar-container" v-for="(item,index) in users" :key="index" :value="item" :label="item.username">
<div class="avatar-wrapper">
<el-avatar class="user-avatar" :style="{backgroundColor:getMyColor(item)}">{{item.username}}</el-avatar>
<span class="username">{{item.username}}</span>
<i v-if="myVal.userid==item.userid" class="el-icon-check"></i>
<i v-else>&nbsp;&nbsp;</i>
</div>
</el-option>
<el-option :value="myVal" disabled>
<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 class="avatar-wrapper">
<el-avatar class="user-avatar" :style="{backgroundColor:getMyColor(item)}">{{item.username}}</el-avatar>
<span class="username">{{item.username}}</span>
<i v-if="myVal.userid==item.userid" class="el-icon-check"></i>
<i v-else>&nbsp;&nbsp;</i>
</div>
</el-option>
<el-option :value="myVal" disabled>
<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>
<slot name="extOper">
</slot>
</slot>
</div> </div>
</div> </div>
<el-dialog v-if="disabled!==true" :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%">

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

@ -40,20 +40,13 @@
<el-row class="padding"> <el-row class="padding">
<el-col :span="6"> <el-col :span="6">
<mdp-select-user-xm :project-id="editForm.projectId" :product-id="editForm.productId" label="责任人" v-model="editForm" userid-key="handlerUserid" username-key="handlerUsername" @change="editXmQuestionSomeFields(editForm,'handlerUserid',$event)"> <mdp-select-user-xm :project-id="editForm.projectId" :product-id="editForm.productId" label="责任人" v-model="editForm" userid-key="handlerUserid" username-key="handlerUsername" @change="editXmQuestionSomeFields(editForm,'handlerUserid',$event)">
</mdp-select-user-xm>
<el-popover
placement="top-start"
title="重新指派给"
width="200"
trigger="hover" >
<el-row>
<el-button type="text" @click="sendToAsk">提出人</el-button><br>
<el-button type="text" @click="sendToCreater">创建人</el-button><br>
<el-button type="text" @click="showGroupUsers('handlerUserid')">其它人</el-button><br>
<el-row slot="extOper">
<el-button type="text" @click="sendToAsk">指派给提出人</el-button>
<el-button type="text" @click="sendToCreater">指派给创建人</el-button>
</el-row> </el-row>
<el-button slot="reference" type="text">指派给</el-button>
</el-popover>
</mdp-select-user-xm>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">

Write Preview
Loading…
Cancel
Save