Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
bd01b4234b
@ -64,14 +64,6 @@
|
|||||||
<el-option v-for="item in postOptions" :key="item.id" :label="item.name" :value="item.id" />
|
<el-option v-for="item in postOptions" :key="item.id" :label="item.name" :value="item.id" />
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<!-- <el-form-item-->
|
|
||||||
<!-- v-if="userTaskForm.candidateStrategy == 30"-->
|
|
||||||
<!-- label="用户部门"-->
|
|
||||||
<!-- prop="candidateParam"-->
|
|
||||||
<!-- span="24"-->
|
|
||||||
<!-- >-->
|
|
||||||
<!-- <el-input v-model="input" placeholder="选择部门" @click="drawer = true"/>-->
|
|
||||||
<!-- </el-form-item>-->
|
|
||||||
<el-form-item
|
<el-form-item
|
||||||
v-if="userTaskForm.candidateStrategy == 30"
|
v-if="userTaskForm.candidateStrategy == 30"
|
||||||
label="指定用户"
|
label="指定用户"
|
||||||
@ -80,8 +72,15 @@
|
|||||||
>
|
>
|
||||||
<el-button
|
<el-button
|
||||||
@click="drawer = true"
|
@click="drawer = true"
|
||||||
style="margin-bottom: 10px; height: auto; width: auto"
|
style="height: auto; width: auto"
|
||||||
>选择用户部门</el-button>
|
>选择用户部门</el-button>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item
|
||||||
|
v-if="userTaskForm.candidateStrategy == 30"
|
||||||
|
label="指定用户"
|
||||||
|
prop="candidateParam"
|
||||||
|
span="24"
|
||||||
|
>
|
||||||
<el-select
|
<el-select
|
||||||
v-model="userTaskForm.candidateParam"
|
v-model="userTaskForm.candidateParam"
|
||||||
clearable
|
clearable
|
||||||
|
Loading…
Reference in New Issue
Block a user