合并

MrShi

18 小时以前 e4f9739d74323aacf09d139700f22a383910ee97

 admin/src/components/business/OperaIntegralShopMoneyWindow.vue

@@ -7,25 +7,24 @@
  >
    <TableLayout :permissions="['business:integral:query']">
      <!-- 搜索表单 -->
      <el-form ref="searchForm" slot="search-form" id='curSearchForm' :model="searchForm" label-width="100px" inline>
        <el-form-item label="" prop="type">
          <el-select v-model="searchForm.type"    placeholder="请选择收支类型"   @change="search" >
      <el-form ref="searchForm" slot="search-form" id='curSearchForm' :model="searchForm" label-width="100px"  >
        <el-form-item label="" prop="type" style="margin-left: 20px">
          <el-select v-model="searchForm.type"  style="width: 150px;"   placeholder="收支类型"   @change="search" >
            <el-option :key="0" :value="0" label="收入"></el-option>
            <el-option :key="1" :value="1" label="支出"></el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="" prop="orderCode">
          <el-input v-model="searchForm.orderCode" placeholder="请输入订单号" @keypress.enter.native="search"></el-input>
        <el-form-item label="" prop="orderCode" style="margin-left: 20px">
          <el-input v-model="searchForm.orderCode"  style="width: 150px;"   placeholder="订单号" @keypress.enter.native="search"></el-input>
        </el-form-item>
        <el-form-item label="" prop="objType">
          <el-select v-model="searchForm.objType"    placeholder="请选择消费类型"   @change="search" >
        <el-form-item label="" prop="objType" style="margin-left: 20px">
          <el-select v-model="searchForm.objType"     style="width: 150px;"   placeholder="消费类型"   @change="search" >
            <el-option :key="16" :value="16" label="订单结算"></el-option>
            <el-option :key="17" :value="17" label="余额提现"></el-option>
            <el-option :key="19" :value="19" label="提现退回"></el-option>
            <el-option :key="20" :value="25" label="订单结算退回"></el-option>
          </el-select>
        </el-form-item>
        <div class="date-style" style="display: inline">
          <el-form-item label="交易时间" prop="starttime" >
            <el-date-picker
                style="width: 190px"
@@ -50,15 +49,16 @@
                placeholder="截止时间"
            ></el-date-picker>
          </el-form-item>
        </div>
        <section>
          <el-button type="primary" @click="search">搜索</el-button>
          <el-button type="primary" :loading="isWorking.export" v-permissions="['business:integral:exportExcel']" @click="exportExcel">导出</el-button>
          <el-button @click="reset">重置</el-button>
        </section>
      </el-form>
      <!-- 表格和分页 -->
      <template v-slot:table-wrap>
        <ul class="toolbar" >
          <li> <el-button type="primary" :loading="isWorking.export" v-permissions="['business:integral:exportExcel']" @click="exportExcel">导出</el-button></li>
        </ul>
        <el-table
            v-loading="isWorking.search"
            :data="tableData.list"