Merge branch 'dev' of ssh://192.168.5.5:29418/web/crm-web into dev

zuozhengqing

2023-11-06 2fb4239e828bcfa9711ce4cecc4b942767621d62

 src/components/makepager/SearchCommonView.vue

@@ -1,7 +1,7 @@
<template>
  <div class="search-list">
    <div class="search-top">
      <div class="query-class">
      <!-- <div class="query-class">
        <div class="query-class-title">查询分类</div>
        <el-select v-model="queryClassValue" placeholder="请选择" class="query-class-sel" size="mini">
          <el-option v-for="item in queryClassOptions" :key="item.value" :label="item.label" :value="item.value">
@@ -10,15 +10,20 @@
        <div class="query-class-btn" @click="queryClassClick">
          <i class="el-icon-setting"></i>
        </div>
      </div>
      </div> -->
      <div class="search">
        <el-input placeholder="请输入内容" v-model="searchInput" class="input-with-select" clearable>
        <el-input placeholder="请输入内容" v-model.trim="searchInput" class="input-with-select" clearable>
          <el-select v-model="searchSelValue" slot="prepend" placeholder="请选择" class="search-sel">
            <el-option v-for="item in searchOptions" :key="item.value" :label="item.label" :value="item.value">
            </el-option>
            <el-option v-for="item in searchOptions" :key="item.value" :label="item.label" :value="item"> </el-option>
          </el-select>
          <i slot="suffix" class="el-icon-search" style="cursor: pointer" @click="searchClick"></i>
          <!-- <i slot="suffix" class="el-icon-search" style="cursor: pointer" @click="searchClick"></i> -->
        </el-input>
      </div>
      <div class="btn">
        <el-button type="primary" size="mini" @click="searchClick" icon="el-icon-search" style="margin-right: 5px"
          >搜索</el-button
        >
        <el-button size="mini" icon="el-icon-refresh-left" @click="resetClick">重置</el-button>
      </div>
      <!-- <div class="other-search">
        <div class="other-search-high" @click="highSearchClick">
@@ -35,7 +40,7 @@
        </div>
      </div> -->
    </div>
    <div v-if="isTileSearch" class="search-bottom">
    <!-- <div v-if="isTileSearch" class="search-bottom">
      <el-table :data="tileSearchData" style="width: 100%">
        <el-table-column prop="selField" label="选择字段" width="430">
          <template slot-scope="scope">
@@ -82,7 +87,7 @@
          <el-button size="small">取消</el-button>
        </div>
      </div>
    </div>
    </div> -->
    <!-- 查询分类弹窗 -->
    <QueryClassSettingDialog v-if="queryClassSetConfig.visible" :editCommonConfig="queryClassSetConfig" />
  </div>
@@ -104,8 +109,13 @@
      default: () => []
    },
    searchSel: {
      type: String,
      default: "1"
      type: Object,
      default: () => {
        return {
          value: "name",
          label: ""
        }
      }
    },
    searchOptions: {
      type: Array,
@@ -159,7 +169,12 @@
      }
    },
    searchClick() {
      console.log("sssssssssss")
      this.$emit("searchClick", this.searchSelValue, this.searchInput)
    },
    resetClick() {
      this.searchSelValue = this.searchSel
      this.searchInput = ""
      this.$emit("resetClick")
    },
    // 高级查找
    highSearchClick() {},
@@ -194,6 +209,7 @@
  color: #333;
  .search-top {
    display: flex;
    align-items: center;
    .query-class {
      display: flex;
      height: 60px;
@@ -219,6 +235,9 @@
      .el-icon-search {
        margin-top: 7px;
      }
    }
    .btn {
      margin-left: 10px;
    }
    .other-search {
      display: flex;
@@ -286,7 +305,7 @@
  }
  .search {
    .el-select .el-input {
      width: 115px;
      width: 130px;
    }
    .input-with-select .el-input-group__prepend {
      background-color: #fff;