优化
This commit is contained in:
yanran200730
@@ -121,13 +121,14 @@
|
|||||||
<el-radio-button size="small" label="1">已执行</el-radio-button>
|
<el-radio-button size="small" label="1">已执行</el-radio-button>
|
||||||
<el-radio-button size="small" label="2">无法执行</el-radio-button>
|
<el-radio-button size="small" label="2">无法执行</el-radio-button>
|
||||||
</el-radio-group>
|
</el-radio-group>
|
||||||
<div class="userSelcet" placeholder="请选择创建人">
|
<ai-user-get :instance="instance" @change="e => onUserChange(e, 'search1')" isChooseUnit isStrictly :isMultiple="false" v-model="user1">
|
||||||
<span v-if="search1.deptartId"><ai-open-data type="departmentName" :openid="search1.deptartId"></ai-open-data></span>
|
<div class="userSelcet">
|
||||||
<span v-else>请选择部门</span>
|
<span style="color: #606266;" v-if="search1.deptartId"><ai-open-data type="departmentName" :openid="search1.deptartId"></ai-open-data></span>
|
||||||
<ai-user-get :instance="instance" @change="e => onUserChange(e, 'search1')" isChooseUnit :isMultiple="false" v-model="user1">
|
<span v-else>请选择部门</span>
|
||||||
<div class="select-btn">选择</div>
|
<i class="el-icon-arrow-up" v-if="!search1.deptartId"></i>
|
||||||
</ai-user-get>
|
<i class="el-icon-circle-close" v-if="search1.deptartId" @click.stop="user1 = [], search1.deptartId = '', search1.current = 1, getMemberInfo()"></i>
|
||||||
</div>
|
</div>
|
||||||
|
</ai-user-get>
|
||||||
</div>
|
</div>
|
||||||
<el-button :type="isDisabled ? '' : 'primary'" :disabled="isDisabled" @click="sendMsg(0)" v-if="info.status === '4'">{{ isDisabled ? min + '分钟后可再次提醒' : '提醒成员发送' }}</el-button>
|
<el-button :type="isDisabled ? '' : 'primary'" :disabled="isDisabled" @click="sendMsg(0)" v-if="info.status === '4'">{{ isDisabled ? min + '分钟后可再次提醒' : '提醒成员发送' }}</el-button>
|
||||||
</div>
|
</div>
|
||||||
@@ -190,13 +191,14 @@
|
|||||||
<el-radio-button size="small" label="1">已送达</el-radio-button>
|
<el-radio-button size="small" label="1">已送达</el-radio-button>
|
||||||
<el-radio-button size="small" label="2">无法送达</el-radio-button>
|
<el-radio-button size="small" label="2">无法送达</el-radio-button>
|
||||||
</el-radio-group>
|
</el-radio-group>
|
||||||
<div class="userSelcet" placeholder="请选择创建人">
|
<ai-user-get :instance="instance" isStrictly @change="e => onUserChange(e, 'search2')" isChooseUnit :isMultiple="false" v-model="user2">
|
||||||
<span v-if="search2.deptartId"><ai-open-data type="departmentName" :openid="search2.deptartId"></ai-open-data></span>
|
<div class="userSelcet">
|
||||||
<span v-else>请选择部门</span>
|
<span style="color: #606266;" v-if="search2.deptartId"><ai-open-data type="departmentName" :openid="search2.deptartId"></ai-open-data></span>
|
||||||
<ai-user-get :instance="instance" @change="e => onUserChange(e, 'search2')" isChooseUnit :isMultiple="false" v-model="user2">
|
<span v-else>请选择部门</span>
|
||||||
<div class="select-btn">选择</div>
|
<i class="el-icon-arrow-up" v-if="!search2.deptartId"></i>
|
||||||
</ai-user-get>
|
<i class="el-icon-circle-close" v-if="search2.deptartId" @click.stop="user2 = [], search2.deptartId = '', search2.current = 1, getGroupInfo()"></i>
|
||||||
</div>
|
</div>
|
||||||
|
</ai-user-get>
|
||||||
</div>
|
</div>
|
||||||
<el-button :type="isDisabled ? '' : 'primary'" :disabled="isDisabled" @click="sendMsg(1)" v-if="info.status === '4'">{{ isDisabled ? min + '分钟后可再次提醒' : '提醒成员发送' }}</el-button>
|
<el-button :type="isDisabled ? '' : 'primary'" :disabled="isDisabled" @click="sendMsg(1)" v-if="info.status === '4'">{{ isDisabled ? min + '分钟后可再次提醒' : '提醒成员发送' }}</el-button>
|
||||||
</div>
|
</div>
|
||||||
@@ -513,32 +515,45 @@
|
|||||||
.userSelcet {
|
.userSelcet {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
justify-content: space-between;
|
||||||
|
width: 215px;
|
||||||
height: 32px;
|
height: 32px;
|
||||||
line-height: 32px;
|
line-height: 32px;
|
||||||
margin-left: 12px;
|
margin-left: 12px;
|
||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
border: 1px solid #d0d4dc;
|
border: 1px solid #d0d4dc;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
|
cursor: pointer;
|
||||||
|
transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
|
||||||
|
|
||||||
.select-btn {
|
&:hover {
|
||||||
width: 40px;
|
border-color: #26f;
|
||||||
cursor: pointer;
|
}
|
||||||
|
|
||||||
|
i {
|
||||||
|
display: flex;
|
||||||
|
position: relative;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
width: 30px;
|
||||||
|
height: 100%;
|
||||||
|
line-height: 32px;
|
||||||
|
font-size: 14px;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
border-left: 1px solid #d0d4dc;
|
color: #d0d4dc;
|
||||||
color: #666;
|
transform: rotateZ(180deg);
|
||||||
font-size: 12px;
|
}
|
||||||
|
|
||||||
&:hover {
|
.el-icon-circle-close:hover {
|
||||||
color: #2266FF;
|
opacity: 0.6;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
span {
|
span {
|
||||||
width: 200px;
|
flex: 1;
|
||||||
padding: 0 15px;
|
padding: 0 15px;
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
background: #F5F5F5;
|
// background: #F5F5F5;
|
||||||
color: #999;
|
color: #d0d4dc;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -33,13 +33,14 @@
|
|||||||
@change="search.current = 1, getList()"
|
@change="search.current = 1, getList()"
|
||||||
placeholder="选择群发结束日期">
|
placeholder="选择群发结束日期">
|
||||||
</el-date-picker>
|
</el-date-picker>
|
||||||
<div class="userSelcet" placeholder="请选择创建人">
|
<ai-user-get :instance="instance" @change="onUserChange" :isMultiple="false" v-model="user">
|
||||||
<span v-if="search.createUserId"><ai-open-data type="userName" :openid="search.createUserId"></ai-open-data></span>
|
<div class="userSelcet">
|
||||||
<span v-else>创建人</span>
|
<span style="color: #606266;" v-if="search.createUserId"><ai-open-data type="userName" :openid="search.createUserId"></ai-open-data></span>
|
||||||
<ai-user-get isStrictly :instance="instance" @change="onUserChange" :isMultiple="false" v-model="user">
|
<span v-else>创建人</span>
|
||||||
<div class="select-btn">选择</div>
|
<i class="el-icon-arrow-up" v-if="!search.createUserId"></i>
|
||||||
</ai-user-get>
|
<i class="el-icon-circle-close" v-if="search.createUserId" @click.stop="user = [], search.createUserId = '', search.current = 1, getList()"></i>
|
||||||
</div>
|
</div>
|
||||||
|
</ai-user-get>
|
||||||
</template>
|
</template>
|
||||||
<template slot="right">
|
<template slot="right">
|
||||||
<el-input
|
<el-input
|
||||||
@@ -252,31 +253,44 @@
|
|||||||
.userSelcet {
|
.userSelcet {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
justify-content: space-between;
|
||||||
|
width: 215px;
|
||||||
height: 32px;
|
height: 32px;
|
||||||
line-height: 32px;
|
line-height: 32px;
|
||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
border: 1px solid #d0d4dc;
|
border: 1px solid #d0d4dc;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
|
cursor: pointer;
|
||||||
|
transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
|
||||||
|
|
||||||
.select-btn {
|
&:hover {
|
||||||
width: 40px;
|
border-color: #26f;
|
||||||
cursor: pointer;
|
}
|
||||||
|
|
||||||
|
i {
|
||||||
|
display: flex;
|
||||||
|
position: relative;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
width: 30px;
|
||||||
|
height: 100%;
|
||||||
|
line-height: 32px;
|
||||||
|
font-size: 14px;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
border-left: 1px solid #d0d4dc;
|
color: #d0d4dc;
|
||||||
color: #666;
|
transform: rotateZ(180deg);
|
||||||
font-size: 12px;
|
}
|
||||||
|
|
||||||
&:hover {
|
.el-icon-circle-close:hover {
|
||||||
color: #2266FF;
|
opacity: 0.6;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
span {
|
span {
|
||||||
width: 200px;
|
flex: 1;
|
||||||
padding: 0 15px;
|
padding: 0 15px;
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
background: #F5F5F5;
|
// background: #F5F5F5;
|
||||||
color: #999;
|
color: #d0d4dc;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user