田源
2024-02-23 9e890991a32479c0f8c0dd885862f2020947c6bd
主数据模块高级查询不生效bug
已修改3个文件
62 ■■■■■ 文件已修改
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue 55 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/views/docking/info.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -415,9 +415,8 @@
    },
    tableHeadDataFateher: {
      handler(newval, oldval) {
        // console.log(newval)
        if (newval.length > 0) {
          this.options = newval.tableDefineVO.seniorQueryColumns
        if (Object.keys(newval).length > 0) {
          this.options = newval.tableDefineVO.seniorQueryColumns;
        }
      }
    },
Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue
@@ -5,31 +5,31 @@
 -->
<template>
    <el-dialog
        title="高级查询"
        append-to-body
        width="46vw"
        style="height: 100vh;overflow: hidden"
        v-dialogDrag
        :visible.sync="isShowDialog"
        lock-scroll
    append-to-body
        class="avue-dialog avue-dialog--top"
        top="-3%"
        destroy-on-close
    lock-scroll
    style="height: 100vh;overflow: hidden"
    title="高级查询"
    top="-3%"
    width="46vw"
        @close="recoverPage">
        <div class="search-total">
            <!-- 头部按钮区域 -->
            <div slot="title" class="dialog-search-button">
                <el-button
                    type="primary"
                    size="small"
                    icon="el-icon-search"
          size="small"
          type="primary"
                    @click="searchSubmit">
                    查询
                </el-button>
                <el-button
                    type="warning"
                    size="small"
                    icon="el-icon-refresh"
          size="small"
          type="warning"
                    @click="resetInput">
                    重置
                </el-button>
@@ -42,7 +42,7 @@
                    :span="24">
                    <el-col :span="6">
                        <div class="grid-content">
                            <el-select disabled placeholder="请选择" v-model="searchFormArrays[index].queryField">
              <el-select v-model="searchFormArrays[index].queryField" disabled placeholder="请选择">
                                <el-option
                                    v-for="feildName in options"
                                    :key="feildName.queryField"
@@ -54,7 +54,7 @@
                    </el-col>
                    <el-col :span="4">
                        <div class="grid-content">
                            <el-select placeholder="请选择" v-model="searchFormArrays[index].condition">
              <el-select v-model="searchFormArrays[index].condition" placeholder="请选择">
                                <el-option
                                    v-for="condition in item.conditions"
                                    :key="condition.value"
@@ -66,8 +66,10 @@
                    </el-col>
                    <el-col :span="12">
                        <div class="grid-content">
                            <el-input v-if="item.fieldType==='text' || item.fieldType===''" v-model="searchFormArrays[index].fieldValue" type="text" placeholder="请输入"></el-input>
                            <el-select v-else-if="item.fieldType==='combox'" v-model="searchFormArrays[index].fieldValue" placeholder="请选择">
              <el-input v-if="item.fieldType==='text' || item.fieldType===''"
                        v-model="searchFormArrays[index].fieldValue" placeholder="请输入" type="text"></el-input>
              <el-select v-else-if="item.fieldType==='combox'" v-model="searchFormArrays[index].fieldValue"
                         placeholder="请选择">
                                <el-option
                                    v-for="option in item.data"
                                    :key="option.itemValue || option.value"
@@ -75,18 +77,19 @@
                                    :value="option.itemValue || option.value">
                                </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==='datetime'"
                                v-model="searchFormArrays[index].fieldValue"
                                type="date"
                                placeholder="选择日期">
                              placeholder="选择日期"
                              type="date">
                            </el-date-picker>
                            <vci-web-refer
                                v-else-if="item.fieldType==='refer'"
                                :referConfig="item.referConfigData || {}"
                                :value="searchFormArrays[index].fieldValue"
                                :text="item.showField"
                                :display="!item.hidden"
                :referConfig="item.referConfigData || {}"
                :text="item.showField"
                :value="searchFormArrays[index].fieldValue"
                                @setReferValue="val=>setReferValue(val,index)">
                            </vci-web-refer>
                        </div>
@@ -106,6 +109,7 @@
import { getDictionary } from "@/api/omd/enum";
import moment from 'moment';
import vciWebRefer from '../refer/vciWebRefer.vue';
export default {
  components: { vciWebRefer },
    name: "advancedQuery",
@@ -344,9 +348,11 @@
      border-radius: 4px;
      margin-top: -10px;
    }
    .dialog-search-button {
      margin-bottom: 15px;
    }
    // .search-total > .search-content > .el-row{
    //     margin-bottom: 5px;
    //     &:last-child {
@@ -355,36 +361,45 @@
    // }
    .search-total > .search-content {
    }
    .search-total > .search-content > .el-row > .el-col {
      border-radius: 4px;
    }
    .search-total > .search-content > .el-row > .el-col > .grid-content {
      border-radius: 4px;
      min-height: 36px;
    }
    .search-total > .search-content > .el-row > .el-col {
      margin-right: 6px;
      &:last-child {
        margin-right: 0;
      }
    }
    .grid-content > .el-icon-close {
      font-size: 30px;
      line-height: 40px;
      cursor: pointer;
      color: rgb(222, 130, 105);
    }
    .grid-content > .el-icon-close:hover {
      font-size: 30px;
      color: rgb(219, 52, 6);
    }
    .grid-content > .el-select {
      width: 100%;
    }
    .grid-content > .el-switch {
      line-height: 40px;
      height: 40px;
    }
    .grid-content > .el-date-editor.el-input, .el-date-editor.el-input__inner {
      width: 100%;
    }
Source/UBCS-WEB/src/views/docking/info.vue
@@ -373,8 +373,6 @@
        this.$refs.infoForm.formData.sysIntParamVOs = res.data.data.records;
      })
    },
    deleteSave(row, index) {
      this.$confirm("删除数据将无法被恢复, 是否继续?", "提示", {
        iconClass: 'el-icon-question',