合并

MrShi

7 小时以前 41115bb4b6d0161ff6d2c15ef6b3d5386a14ac9c

 admin/src/components/business/OperaIntegralShopMoneyWindow.vue

@@ -25,7 +25,6 @@
            <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,7 +49,6 @@
                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>