|
@@ -186,17 +186,23 @@
|
|
|
@before-adding-tag="beforeAddingTag"
|
|
|
@keyup.native="btKeyUp"
|
|
|
/>
|
|
|
- <span class="textblod mg-r-10 mg-l-20">不满足</span>
|
|
|
- <vue-tags-input
|
|
|
- v-model="conditionList[conditionIndex].tag5"
|
|
|
- :tags="conditionList[conditionIndex].tags5"
|
|
|
- @focus="setMultiFocus(conditionIndex, null, 'tag5')"
|
|
|
- @blur="inputBlurMulti(conditionIndex, null, 'tag5')"
|
|
|
- placeholder="输入/参数"
|
|
|
- @before-adding-tag="beforeAddingTag"
|
|
|
- @keyup.native="btKeyUp"
|
|
|
- />
|
|
|
- <div class="mg-l-20">
|
|
|
+
|
|
|
+ <!-- 只在最后一个条件显示"不满足"输入框 -->
|
|
|
+ <template v-if="conditionIndex === conditionList.length - 1">
|
|
|
+ <span class="textblod mg-r-10 mg-l-20">不满足</span>
|
|
|
+ <vue-tags-input
|
|
|
+ v-model="conditionList[conditionIndex].tag5"
|
|
|
+ :tags="conditionList[conditionIndex].tags5"
|
|
|
+ @focus="setMultiFocus(conditionIndex, null, 'tag5')"
|
|
|
+ @blur="inputBlurMulti(conditionIndex, null, 'tag5')"
|
|
|
+ placeholder="输入/参数"
|
|
|
+ @before-adding-tag="beforeAddingTag"
|
|
|
+ @keyup.native="btKeyUp"
|
|
|
+ />
|
|
|
+ </template>
|
|
|
+
|
|
|
+ <!-- 只在最后一个条件显示"添加其他条件"按钮 -->
|
|
|
+ <div class="mg-l-20" v-if="conditionIndex === conditionList.length - 1">
|
|
|
<el-button size="small" type="primary" @click="addCondition(conditionIndex)">添加其他条件</el-button>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -230,7 +236,9 @@
|
|
|
</draggable>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div class="flex mg-t-10">
|
|
|
+
|
|
|
+ <!-- 只在最后一个条件显示"不满足"公式框 -->
|
|
|
+ <div class="flex mg-t-10" v-if="conditionIndex === conditionList.length - 1">
|
|
|
<span class="textblod mg-r-10">不满足</span>
|
|
|
<div class="border-grey sele-ele-box flex1"
|
|
|
:class="{'border-green': isCurFocus(conditionIndex, null, 'formula2')}"
|
|
@@ -258,7 +266,9 @@
|
|
|
</draggable>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <el-button size="small" @click="addCondition(conditionIndex)" type="primary">添加条件</el-button>
|
|
|
+
|
|
|
+ <!-- 只在最后一个条件显示"添加条件"按钮 -->
|
|
|
+ <el-button size="small" @click="addCondition(conditionIndex)" type="primary" v-if="conditionIndex === conditionList.length - 1">添加条件</el-button>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
@@ -571,7 +581,7 @@ export default {
|
|
|
if(this.isMore){
|
|
|
this.symbol = 'more';
|
|
|
console.log( this.moreConditions,' this.moreConditions;');
|
|
|
-
|
|
|
+ this.result = '1';
|
|
|
this.conditionList = this.moreConditions.map(item => this.clearTagsIfHasValue(item));
|
|
|
|
|
|
|