"searchCommonView冲突解决"

zzq

2023-09-27 e4b192185eae1d8311743bb30c163295a3a9b393

"searchCommonView冲突解决"

 src/components/makepager/SearchCommonView.vue

@@ -2,7 +2,7 @@
  <div class="search-list">
    <div class="search-top">
      <div class="left">
        <el-button v-if="showAdd" type="primary" size="mini" @click="addBtn">{{ addTitle }}</el-button>
        <el-button v-if="showAdd" :disabled="isDisabled" type="primary" size="mini" @click="addBtn">{{ addTitle }}</el-button>
        <el-button v-if="showDiscard" size="mini" @click="discardBtn" style="margin-left: 0px">{{ "取消" }}</el-button>
        <div class="download" @click="downloadClick" :style="{ cursor: showDownload ? 'pointer' : 'no-drop' }">
          <img src="@/assets/img/xiazai.png" style="width: 13px" />
@@ -83,6 +83,10 @@
      type: Boolean,
      default: true
    },
    isDisabled:{
      type:Boolean,
      default:false
    },
    showDiscard: {
      default: false
    },

 src/views/reportForm/locationReport/index.vue

@@ -10,6 +10,7 @@
          :amount-view="false"
          @addCommonClick="addBtnClick"
          @searchClick="getList"
          :isDisabled="true"
        />
      </div>
    </div>