|
@@ -105,7 +105,7 @@
|
|
|
<el-select v-model="aaa.operator" placeholder="选择操作符" style="width: 320px">
|
|
|
<el-option v-for="b in operData" :key="b.type" :label="b.title" :value="b.type" />
|
|
|
</el-select>
|
|
|
- <el-input v-model="aaa.value" placeholder="请输入条件值" style="width: 320px" />
|
|
|
+ <el-input v-model="aaa.value[0]" placeholder="请输入条件值" style="width: 320px" />
|
|
|
|
|
|
<div class="conicon">
|
|
|
<el-icon @click="delParamss(index, bbb)">
|
|
@@ -261,7 +261,7 @@ export default defineComponent({
|
|
|
{
|
|
|
key: '',
|
|
|
operator: '',
|
|
|
- value: '',
|
|
|
+ value: [],
|
|
|
andOr: 0,
|
|
|
},
|
|
|
],
|
|
@@ -290,7 +290,7 @@ export default defineComponent({
|
|
|
{
|
|
|
key: '',
|
|
|
operator: '',
|
|
|
- value: '',
|
|
|
+ value: [],
|
|
|
andOr: 0,
|
|
|
},
|
|
|
],
|
|
@@ -342,7 +342,15 @@ export default defineComponent({
|
|
|
}
|
|
|
setType(true);
|
|
|
// 重置表单之后进行参数设置的赋值
|
|
|
- state.requestParams = res.data.condition.triggerCondition;
|
|
|
+ state.requestParams = res.data.condition.triggerCondition.map((item: any) => {
|
|
|
+ return {
|
|
|
+ andOr: item.andOr,
|
|
|
+ filters: item.filters.map((filter: any) => {
|
|
|
+ filter.value = filter.value || []
|
|
|
+ return filter
|
|
|
+ })
|
|
|
+ }
|
|
|
+ })
|
|
|
});
|
|
|
}
|
|
|
state.isShowDialog = true;
|
|
@@ -366,7 +374,7 @@ export default defineComponent({
|
|
|
{
|
|
|
key: '',
|
|
|
operator: '',
|
|
|
- value: '',
|
|
|
+ value: [],
|
|
|
andOr: 0,
|
|
|
},
|
|
|
],
|
|
@@ -408,7 +416,7 @@ export default defineComponent({
|
|
|
{
|
|
|
key: '',
|
|
|
operator: '',
|
|
|
- value: '',
|
|
|
+ value: [],
|
|
|
andOr: 0,
|
|
|
},
|
|
|
],
|
|
@@ -515,7 +523,7 @@ export default defineComponent({
|
|
|
{
|
|
|
key: '',
|
|
|
operator: '',
|
|
|
- value: '',
|
|
|
+ value: [],
|
|
|
andOr: '',
|
|
|
},
|
|
|
],
|
|
@@ -525,7 +533,7 @@ export default defineComponent({
|
|
|
state.requestParams[index].filters.push({
|
|
|
key: '',
|
|
|
operator: '',
|
|
|
- value: '',
|
|
|
+ value: [],
|
|
|
andOr: '',
|
|
|
});
|
|
|
};
|
|
@@ -555,7 +563,7 @@ export default defineComponent({
|
|
|
{
|
|
|
key: '',
|
|
|
operator: '',
|
|
|
- value: '',
|
|
|
+ value: [],
|
|
|
andOr: 0,
|
|
|
},
|
|
|
],
|