|
|
@@ -120,7 +120,7 @@
|
|
|
<span class="textblod">条件{{ index + 1 }}</span>
|
|
|
<el-button type="danger" size="mini" @click="removeCondition(index)" class=" mg-l-20">删除</el-button>
|
|
|
</div>
|
|
|
- <div v-for="(item,index) in conditionInnerList">
|
|
|
+ <div v-for="(item1,index1) in conditionInnerList">
|
|
|
<div class="mg-t-20 flex jc-al-c" :key="index">
|
|
|
<span class="textblod mg-r-20" >IF</span>
|
|
|
|
|
|
@@ -143,7 +143,7 @@
|
|
|
<i class="el-icon-delete mg-l-20" style="color: red;cursor: pointer;" @click="removeConditionItem(index)" v-if="index>0"></i>
|
|
|
|
|
|
</div>
|
|
|
- <div v-if="index>0" style="margin-left: 256px;" class="mg-t-10 mg-b-10">
|
|
|
+ <div v-if="index>0" style="margin-left: 235px;" class="mg-t-10 mg-b-10">
|
|
|
<el-select v-model="symbol1" @change="setCondition()" size="medium" placeholder="请选择" style="width:120px">
|
|
|
|
|
|
<el-option label="或者" value="包含"></el-option>
|
|
|
@@ -158,7 +158,7 @@
|
|
|
<span class="textblod mg-r-10 mg-l-20">不满足</span>
|
|
|
<vue-tags-input v-model="tag5" :tags="tags5" @focus="curFocusIndex = 5" @blur="inputBlur(5)" placeholder="输入/参数" @before-adding-tag="beforeAddingTag" @keyup.native="btKeyUp"/>
|
|
|
<div class="mg-l-20">
|
|
|
- <el-button size="small" type="primary" @click="addCondition(index)">添加其他条件</el-button>
|
|
|
+ <el-button size="small" type="primary" @click="addCondition(index1)">添加其他条件</el-button>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="mg-t-20" v-if="result == 2">
|
|
|
@@ -299,11 +299,11 @@ export default {
|
|
|
symbol1:'',
|
|
|
conditionList:[
|
|
|
{},
|
|
|
- {},
|
|
|
+
|
|
|
],//多条件的条件列表
|
|
|
conditionInnerList:[
|
|
|
{},
|
|
|
- {},
|
|
|
+
|
|
|
],//多条件的条件内部列表
|
|
|
|
|
|
}
|
