Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue

@@ -52,7 +52,8 @@
                        <div class="grid-content">
                            <el-select placeholder="请选择" v-model="searchFormArrays[index].condition">
                                <el-option
                                    v-for="condition in item.fieldType=='text' ? searchConditions:switchSearchConditions"
                                    v-for="condition in item.fieldType==='text' || item.fieldType==='combox' ? 
                                    item.fieldType==='text' ? searchConditions:switchSearchConditions:dateConditions"
                                    :key="condition.value"
                                    :label="condition.label"
                                    :value="condition.value">
@@ -71,7 +72,12 @@
                                    :value="option.itemValue">
                                </el-option>
                            </el-select>
                            <el-switch  v-else-if="item.fieldType==='truefalse'" v-model="searchFormArrays[index].fieldValue"></el-switch>
                            <el-switch v-else-if="item.fieldType==='truefalse'" v-model="searchFormArrays[index].fieldValue"></el-switch>
                            <el-date-picker v-else-if="item.fieldType==='date'"
                                v-model="searchFormArrays[index].fieldValue"
                                type="date"
                                placeholder="选择日期">
                            </el-date-picker>
                        </div>
                    </el-col>
                    <el-col :span="2">
@@ -106,7 +112,7 @@
            // 对话框显示控制
            isShowDialog: this.visible,
            initOptions: [],
            // 字段是输入框类型的条件数组
            // 字段类型是输入框类型的条件数组
            searchConditions: [
                {
                    value: "_equal",
@@ -120,15 +126,9 @@
                },{
                    value: "_notlike",
                    label: "不包含",
                },{
                    value: "_ge", //大于，默认为大于等于
                    label: "大于", 
                },{
                    value: "_le", //小于，默认为小于等于
                    label: "小于",
                },
                }
            ],
            // 字段是单选或下拉框类型的条件数组
            // 字段类型是单选或下拉框类型的条件数组
            switchSearchConditions: [
                {
                    value: "_equal",
@@ -137,6 +137,22 @@
                    value: "_notequal",
                    label: "不等于",
                }
            ],
            // 字段类型是日期
            dateConditions: [
                {
                    value: "_equal",
                    label: "等于",
                },{
                    value: "_notequal",
                    label: "不等于",
                },{
                    value: "_ge", //大于，默认为大于等于
                    label: "大于", 
                },{
                    value: "_le", //小于，默认为小于等于
                    label: "小于",
                },
            ],
            searchFormArrays: [],
            fieldValue: '',
@@ -236,7 +252,7 @@
            const searchConditions = this.searchFormArrays;
            for(let index = 0; index < searchConditions.length; index++) {
                //console.log(condtionParam['conditionMap['+searchConditions[index].queryField+']']+'' == 'undefined');
                if(searchConditions[index].fieldValue.trim() != '' || searchConditions[index].fieldValue+''==='false') {
                if(searchConditions[index].fieldValue+'' != '' || searchConditions[index].fieldValue+''==='false') {
                    // 存在相同的查询条件
                    if(condtionParam['conditionMap['+searchConditions[index].queryField+']']+'' != 'undefined' ) {
                        this.$message.warning("存在重复查询条件，请仔细核对!");
@@ -247,7 +263,7 @@
                    condtionParam['conditionMap['+searchConditions[index].queryField+searchConditions[index].condition+']'] = searchConditions[index].fieldValue;
                }
            }
            // 查询条件没有出现重复属性，并且过滤掉了空值，传递给父组件
            // 查询条件没有出现重复属性，并且过滤掉了空值，就传递给父组件
            // console.log(condtionParam);
            this.$emit('echoContion',condtionParam)
            this.isShowDialog = false;
@@ -316,6 +332,9 @@
        line-height: 40px;
        height: 40px;
    }
    .grid-content > .el-date-editor.el-input, .el-date-editor.el-input__inner{
        width: 100%;
    }


</style>