|
@@ -30,6 +30,7 @@
|
|
|
:inline="true"
|
|
|
label-width="68px"
|
|
|
@submit.native.prevent
|
|
|
+ v-show="showSearch"
|
|
|
>
|
|
|
<el-form-item label="超级查询">
|
|
|
<el-input
|
|
@@ -77,17 +78,20 @@
|
|
|
</el-form-item>
|
|
|
</span>
|
|
|
<!-- button按钮循环-->
|
|
|
- <span
|
|
|
- v-if="item.conditionType == 'button'"
|
|
|
- style="width: 500px; height: 500px"
|
|
|
+ <span
|
|
|
+ v-if="item.conditionType == 'button'"
|
|
|
+ style="width: 500px; height: 500px"
|
|
|
+ >
|
|
|
+ <el-form-item
|
|
|
+ :label="item.conditionName"
|
|
|
+ :prop="item.conditionField"
|
|
|
>
|
|
|
- <el-form-item :label="item.conditionName"
|
|
|
- :prop="item.conditionField">
|
|
|
- {{ queryParams.queryMap[item.conditionField] = item.conditionDefaultValue }}
|
|
|
- <el-button
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- @click="handleQuery">
|
|
|
- {{ item.conditionNotes == null ? '按钮' : item.conditionNotes }}
|
|
|
+ {{
|
|
|
+ (queryParams.queryMap[item.conditionField] =
|
|
|
+ item.conditionDefaultValue)
|
|
|
+ }}
|
|
|
+ <el-button @keyup.enter.native="handleQuery" @click="handleQuery">
|
|
|
+ {{ item.conditionNotes == null ? "按钮" : item.conditionNotes }}
|
|
|
</el-button>
|
|
|
</el-form-item>
|
|
|
</span>
|
|
@@ -166,13 +170,12 @@
|
|
|
</span>
|
|
|
</span>
|
|
|
</div>
|
|
|
-
|
|
|
</el-form>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
-import cardcountpanel from "../components/cardCountPanel.vue"
|
|
|
+import cardcountpanel from "../components/cardCountPanel.vue";
|
|
|
export default {
|
|
|
name: "queryfrom",
|
|
|
props: {
|
|
@@ -180,14 +183,17 @@ export default {
|
|
|
type: Array,
|
|
|
default: () => [],
|
|
|
},
|
|
|
- showCount : {
|
|
|
+ showCount: {
|
|
|
+ type: Boolean,
|
|
|
+ },
|
|
|
+ showSearch: {
|
|
|
type: Boolean,
|
|
|
},
|
|
|
- statisticList:{
|
|
|
+ statisticList: {
|
|
|
type: Array,
|
|
|
- }
|
|
|
+ },
|
|
|
},
|
|
|
- components:{cardcountpanel},
|
|
|
+ components: { cardcountpanel },
|
|
|
data() {
|
|
|
return {
|
|
|
// 时间范围临时存储
|
|
@@ -220,7 +226,6 @@ export default {
|
|
|
// 单选/按钮
|
|
|
radios: [],
|
|
|
// card
|
|
|
-
|
|
|
};
|
|
|
},
|
|
|
watch: {
|