|
@@ -578,9 +578,9 @@
|
|
<el-select v-model="scope.row.mark" placeholder="请选择">
|
|
<el-select v-model="scope.row.mark" placeholder="请选择">
|
|
<el-option
|
|
<el-option
|
|
v-for="item in markList"
|
|
v-for="item in markList"
|
|
- :key="item"
|
|
|
|
- :label="item"
|
|
|
|
- :value="item"
|
|
|
|
|
|
+ :key="item.value"
|
|
|
|
+ :label="item.label"
|
|
|
|
+ :value="item.value"
|
|
></el-option>
|
|
></el-option>
|
|
</el-select>
|
|
</el-select>
|
|
</template>
|
|
</template>
|
|
@@ -628,7 +628,7 @@
|
|
style="width: 100%"
|
|
style="width: 100%"
|
|
@click="addBtnHidenCondition"
|
|
@click="addBtnHidenCondition"
|
|
>
|
|
>
|
|
- 添加参数
|
|
|
|
|
|
+ 添加条件
|
|
</el-button>
|
|
</el-button>
|
|
</div>
|
|
</div>
|
|
</el-row>
|
|
</el-row>
|
|
@@ -853,7 +853,33 @@ export default {
|
|
prop: "value",
|
|
prop: "value",
|
|
},
|
|
},
|
|
],
|
|
],
|
|
- markList: [">", "<", "=", ">=", "<=", "!="],
|
|
|
|
|
|
+ // markList: [">", "<", "=", ">=", "<=", "!="],
|
|
|
|
+ markList: [
|
|
|
|
+ {
|
|
|
|
+ value: "1",
|
|
|
|
+ label: ">",
|
|
|
|
+ },
|
|
|
|
+ {
|
|
|
|
+ value: "2",
|
|
|
|
+ label: "<",
|
|
|
|
+ },
|
|
|
|
+ {
|
|
|
|
+ value: "3",
|
|
|
|
+ label: "=",
|
|
|
|
+ },
|
|
|
|
+ {
|
|
|
|
+ value: "4",
|
|
|
|
+ label: ">=",
|
|
|
|
+ },
|
|
|
|
+ {
|
|
|
|
+ value: "5",
|
|
|
|
+ label: "<=",
|
|
|
|
+ },
|
|
|
|
+ {
|
|
|
|
+ value: "6",
|
|
|
|
+ label: "!=",
|
|
|
|
+ },
|
|
|
|
+ ],
|
|
};
|
|
};
|
|
},
|
|
},
|
|
// created() {
|
|
// created() {
|
|
@@ -1067,6 +1093,7 @@ export default {
|
|
btnKey: "",
|
|
btnKey: "",
|
|
};
|
|
};
|
|
this.commonFieldData = [];
|
|
this.commonFieldData = [];
|
|
|
|
+ this.btnHidenCondtionData = [];
|
|
this.resetForm("btnGroupFormRef");
|
|
this.resetForm("btnGroupFormRef");
|
|
},
|
|
},
|
|
/** 搜索按钮操作 */
|
|
/** 搜索按钮操作 */
|