|
@@ -184,7 +184,7 @@
|
|
|
<span class="condition-title">{{item.operation==1?'触发机制':'如果'}}</span>
|
|
|
<a-select style="width: 300px" v-model="item.ruleRelationship" :disabled="!!item.groupId">
|
|
|
<a-select-option value='and'>满足以下所有条件</a-select-option>
|
|
|
- <a-select-option value='or'>满足以下任意条件</a-select-option>
|
|
|
+ <!-- <a-select-option value='or'>满足以下任意条件</a-select-option> -->
|
|
|
</a-select>
|
|
|
|
|
|
</a-form-model-item>
|
|
@@ -280,7 +280,7 @@
|
|
|
|
|
|
</div>
|
|
|
|
|
|
- <div class="add-rule" @click="addCondition(item,index)" v-if="!!!currentRuleId" v-show="item.ruleType=='group'||item.operation==1"> 添加条件</div>
|
|
|
+ <div class="add-rule" @click="addCondition(item,index)" v-if="!!!item.ruleDetail[0].ruleId" v-show="item.ruleType=='group'||item.operation==1"> 添加条件</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="toolbox-automate-rules-create-content_rules-and-condition_rules">
|