Merge branch 'dev' into songshankun/adjust-style

songshankun

2023-10-17 b12ea16fa2d9440e9680127d126a4f3af450afd2

 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
    },