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

优化tag颜色

master
陈裕财 3 years ago
parent
c948bd73c0
commit
8856b3b37d
5 changed files with 37 additions and 36 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. 3
      src/components/Mdp/index.scss
  2. 3
      src/components/MdpSelectDictTag/index.vue
  3. 8
      src/components/MdpSelectUserX/index.vue
  4. 55
      src/views/xm/core/components/MdpSelectUserXm/index.vue
  5. 4
      src/views/xm/core/xmQuestion/XmQuestionEdit.vue

3
src/components/Mdp/index.scss
View File

@ -4,8 +4,6 @@
margin-right: 5px;
align-items: center;
cursor: pointer;
height: 28px;
line-height: 28px;
.field-avater {
background-color: #ff9f73;
}
@ -34,7 +32,6 @@
.field-oper {
height: 28px;
line-height: 28px;
margin-right: 5px;
display: none;
}
}

3
src/components/MdpSelectDictTag/index.vue
View File

@ -1,7 +1,8 @@
<template>
<div :class="{'field-box':true,'small':size=='small','medium':size=='medium'}">
<div class="field-info" :class="{disabled:disabled===true,enabled:disabled!==true}">
<div v-if="(currentItem&&currentItem.id)"><el-tag :type="currentItem.className" :closable="closable" :effect="effect">{{currentItem.name}}</el-tag></div>
<div v-if="(currentItem&&currentItem.id)">
<el-tag :type="currentItem.className" :closable="closable" :color="currentItem.color" :effect="effect">{{currentItem.name}}</el-tag></div>
<div v-else> {{currentItem.name}} </div>
</div>
<div v-if="disabled!==true" class="field-oper" :class="{disabled:disabled===true,enabled:disabled!==true}">

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

@ -26,11 +26,11 @@
<i v-if=" myVal && myVal.userid==item.userid" class="el-icon-check"></i>
<i v-else>&nbsp;&nbsp;</i>
</div>
</el-option>
</el-select>
<slot name="extOper">
</el-option>
<slot name="extOper">
</slot>
</slot>
</el-select>
</slot>
</div>
</div>

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

@ -20,36 +20,39 @@
</div>
<div v-if="disabled!==true" class="field-oper" :class="{disabled:disabled===true,enabled:disabled!==true}">
<slot name="oper">
<el-select :size="size" v-model="myVal" @change="onSelectChange" :clearable="clearable" filterable value-key="userid" @visible-change="$emit('visible-change',$event)" @focus="$emit('focus',$event)" @blur="$emit('blur',$event)" @clear="$emit('blur',$event)" @click="$emit('click',$event)">
<el-option :value="myVal" disabled v-if="users && users.length>10">
<el-row ><el-button v-if="users && users.length>0" :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-button v-if="projectId||productId" :type="productVisible?'primary':''" @click.stop="productVisible=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">
<img class="user-avatar" :style="{backgroundColor:getMyColor(item)}" :src="getHeadimgurl(item.userid,item.headimgurl)" @error="onImgError(item.userid,$event)"></img>
<span class="username">{{item.username}}</span>
<i v-if="myVal && 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 v-if="users && users.length>0" :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-button v-if="projectId||productId" :type="productVisible?'primary':''" @click.stop="productVisible=true">产品组</el-button>
<el-select :size="size" v-model="myVal" @change="onSelectChange" :clearable="clearable" filterable value-key="userid" @visible-change="$emit('visible-change',$event)" @focus="$emit('focus',$event)" @blur="$emit('blur',$event)" @clear="$emit('blur',$event)" @click="$emit('click',$event)">
<el-option :value="myVal" disabled v-if="users && users.length>10">
<el-row ><el-button v-if="users && users.length>0" :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-button v-if="projectId||productId" :type="productVisible?'primary':''" @click.stop="productVisible=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">
<img class="user-avatar" :style="{backgroundColor:getMyColor(item)}" :src="getHeadimgurl(item.userid,item.headimgurl)" @error="onImgError(item.userid,$event)"></img>
<span class="username">{{item.username}}</span>
<i v-if="myVal && 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 v-if="users && users.length>0" :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-button v-if="projectId||productId" :type="productVisible?'primary':''" @click.stop="productVisible=true">产品组</el-button>
</el-row>
</el-option>
</el-select>
</el-row>
</el-option>
<slot name="extOper">
</slot>
</slot>
</div>
</el-select>
</slot>
</div>
</div>
<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="onTeamUsersConfirm"></users-select>

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

@ -60,9 +60,9 @@
<el-row class="padding">
<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)">
<el-row slot="extOper">
<el-row slot="extOper" style="margin-left:20px;">
指派给 <el-button type="text" @click="sendToAsk"> 提出人</el-button> <el-button type="text" @click="sendToCreater"> 创建人</el-button>
</el-row>
</el-row>
</mdp-select-user-xm>

Write Preview
Loading…
Cancel
Save