|
@@ -100,6 +100,13 @@
|
|
|
<div class="barBtn" v-else>
|
|
|
<el-form ref="form" :model="formData1" label-width="100px">
|
|
|
<el-form-item v-for="(item, index) in formData1.seniorList" :key="index">
|
|
|
+ <!-- 下拉框开始 -->
|
|
|
+ <el-select v-if="index != 0" v-model="item.select_type" :class="index != 0 ? 'marginLeft' : ''" class="width100" filterable placeholder="" :disabled="item.lock">
|
|
|
+ <!-- fieldList -->
|
|
|
+ <el-option label="且" :value="0" />
|
|
|
+ <el-option label="或者" :value="1" />
|
|
|
+ <el-option label="不包含" :value="2" />
|
|
|
+ </el-select>
|
|
|
<!-- 下拉框开始 -->
|
|
|
<el-select class="width150" filterable v-model="item.key" @change="getOneCleck(item, index)" placeholder="请选择">
|
|
|
<!-- fieldList -->
|
|
@@ -358,12 +365,7 @@ export default {
|
|
|
startTime: '',
|
|
|
seniorList: [
|
|
|
{
|
|
|
- key: '',
|
|
|
- value: '',
|
|
|
- type: '0',
|
|
|
- selectList: [],
|
|
|
- },
|
|
|
- {
|
|
|
+ select_type: 0,
|
|
|
key: '',
|
|
|
value: '',
|
|
|
type: '0',
|
|
@@ -612,7 +614,6 @@ export default {
|
|
|
},
|
|
|
];
|
|
|
} else if (val.key == 'AAC11N') {
|
|
|
- console.log('vvvvvvvvvvvvvvvvv');
|
|
|
let selectArr = [];
|
|
|
for (let item in this.departmentList) {
|
|
|
this.departmentList[item];
|
|
@@ -789,6 +790,7 @@ export default {
|
|
|
},
|
|
|
funAdd() {
|
|
|
this.formData1.seniorList.push({
|
|
|
+ select_type: 0,
|
|
|
key: '',
|
|
|
value: '',
|
|
|
type: '0',
|
|
@@ -1034,4 +1036,7 @@ export default {
|
|
|
.flextab-item > div span.s-2 {
|
|
|
font-weight: bold;
|
|
|
}
|
|
|
+.width100 {
|
|
|
+ width: 100px;
|
|
|
+}
|
|
|
</style>
|