更新

admin-ui/src/views/work/money/out/audit.vue

@@ -18,10 +18,13 @@
             <template slot="append">账户余额：{{ company.money }}</template>
           </el-input>
         </el-form-item>
+        <div class="opp" v-if="form.updateTime">
+          <span>操作人：{{ form.updateBy }}，</span>
+          <span>操作时间：{{ form.updateTime }}</span>
+        </div>
       </el-form>
-      <el-form-item label="申请人">
-        <el-input v-model="company.bankAccount" disabled />
-      </el-form-item>
+      <el-alert title="提现成功" type="success" show-icon class="cg" v-if="form.state === 1"></el-alert>
+      <el-alert title="提现失败" :description="form.msg" type="error" show-icon class="cg" v-if="form.state === 2" :closable="false"></el-alert>
     </div>
     <div class="mfooter" v-if="!param.detail">
       <el-button type="primary" @click="submitForm(1)">确 认</el-button>

admin-ui/src/views/work/money/out/index.vue

@@ -9,13 +9,13 @@
       </el-form-item>
       <el-form-item label="提现状态" prop="state">
         <el-select v-model="queryParams.state" placeholder="提现状态" clearable style="width: 117px">
-          <el-option value="0" label="待确认"></el-option>
-          <el-option value="1" label="已确认"></el-option>
-          <el-option value="2" label="提现无效"></el-option>
+          <el-option value="0" label="待提现"></el-option>
+          <el-option value="1" label="提现成功"></el-option>
+          <el-option value="2" label="提现失败"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="时间范围">
-        <el-date-picker v-model="dateRange" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+        <el-date-picker v-model="dateRange" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :clearable="false"></el-date-picker>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
@@ -24,6 +24,7 @@
     </el-form>
     <el-row :gutter="10" class="mb8">
       <el-button type="success" icon="el-icon-edit" :disabled="ids.length != 1" @click="op('edit', ids)" v-hasPermi="['work:out:edit']">审核</el-button>
+      <el-button type="primary" icon="el-icon-download" @click="handleExport" v-hasPermi="['work:out:export']">导出</el-button>
       <el-button type="danger" icon="el-icon-delete" :disabled="ids.length == 0" @click="del" v-hasPermi="['work:out:remove']">删除{{ ids.length > 0 ? '(' + ids.length + ')' : '' }}</el-button>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -34,10 +35,13 @@
       <el-table-column label="提现金额（元）" align="center" prop="money" width="130" />
       <el-table-column label="提现状态" align="center" width="110">
         <template slot-scope="scope">
-          <el-tag type="danger" v-if="scope.row.state == 0">待确认</el-tag>
-          <el-tag type="success" v-if="scope.row.state == 1">已确认</el-tag>
+          <el-tag type="danger" v-if="scope.row.state == 0">待提现</el-tag>
+          <el-tag type="success" v-if="scope.row.state == 1">提现成功</el-tag>
           <el-popover placement="top-start" v-if="scope.row.state == 2" title="原因" width="200" trigger="hover" :content="scope.row.msg">
-            <el-tag type="danger" slot="reference">提现无效</el-tag>
+            <div slot="reference">
+              <el-tag type="info">提现失败</el-tag>
+              <i class="el-icon-warning"></i>
+            </div>
           </el-popover>
         </template>
       </el-table-column>
@@ -45,7 +49,7 @@
       <el-table-column label="申请人" align="center" prop="opBy" width="130" />
       <el-table-column label="操作" align="center" width="180">
         <template slot-scope="scope">
-          <el-button size="mini" type="text" icon="el-icon-view" @click="op('detail', scope.row)" v-hasPermi="['work:out:list']">查看</el-button>
+          <el-button size="mini" type="text" icon="el-icon-view" @click="op('detail', scope.row)" v-hasPermi="['work:out:list']">详情</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="op('edit', scope.row)" v-hasPermi="['work:out:edit']" :disabled="scope.row.state != 0">审核</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="del(scope.row)" v-hasPermi="['work:out:remove']">删除</el-button>
         </template>
@@ -98,15 +102,20 @@ export default {
     },
     resetQuery() {
       this.resetForm('queryForm');
+      this.dateRange = [];
       this.handleQuery();
     },
     selects(rows) {
       this.ids = rows.map((item) => item.id);
     },
     op(tag, row) {
+      if (tag == 'detail') {
+        const id = row.id || this.ids[0];
+        this.iframe({ obj: audit, param: { id: id, detail: true, companyName: row.companyName }, title: '提现详情', width: '40%', height: '50%' });
+      }
       if (tag == 'edit') {
         const id = row.id || this.ids[0];
-        this.iframe({ obj: audit, param: { id: id }, title: '提现确认', width: '45%', height: '65%' });
+        this.iframe({ obj: audit, param: { id: id }, title: '提现确认', width: '40%', height: '50%' });
       }
     },
     del(row) {
@@ -116,6 +125,10 @@ export default {
           this.getList();
         });
       });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('/work/out/export', { ...this.queryParams }, '充值明细.xlsx');
     }
   }
 };

admin-ui/src/views/work/money/out/record.vue

@@ -2,7 +2,7 @@
   <div class="cmain">
     <el-form :model="queryParams" ref="queryForm" :inline="true" @submit.native.prevent v-show="showSearch">
       <el-form-item label="提现编号" prop="nums">
-        <el-input v-model="queryParams.nums" placeholder="请输入提现编号" @keyup.enter.native="handleQuery" class="inp" clearable />
+        <el-input v-model="queryParams.nums" placeholder="请输入提现编号" @keyup.enter.native="handleQuery" clearable />
       </el-form-item>
       <el-form-item label="提现状态" prop="state">
         <el-select v-model="queryParams.state" placeholder="提现状态" clearable style="width: 117px">
@@ -18,7 +18,7 @@
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
-      <el-button type="primary" icon="el-icon-download" @click="handleExport" v-hasPermi="['work:recharge:export']" style="float: right">导出</el-button>
+      <el-button type="primary" icon="el-icon-download" @click="handleExport" v-hasPermi="['work:out:export']" style="float: right">导出</el-button>
     </el-form>
     <el-table :data="response.rows" border>
       <el-table-column type="index" label="序号" align="center" width="80" />
@@ -86,24 +86,12 @@ export default {
     },
     resetQuery() {
       this.resetForm('queryForm');
+      this.dateRange = [];
       this.handleQuery();
     },
-    selects(rows) {
-      this.ids = rows.map((item) => item.id);
-    },
-    op(tag, row) {
-      if (tag == 'edit') {
-        const id = row.id || this.ids[0];
-        this.iframe({ obj: audit, param: { id: id }, title: '提现确认', width: '45%', height: '65%' });
-      }
-    },
-    del(row) {
-      this.$confirm('是否确认删除选中数据?', '警告', { type: 'warning' }).then(() => {
-        this.get({ url: '/work/out/remove/' + (row.id || this.ids) }).then((response) => {
-          this.$modal.msgSuccess('删除成功');
-          this.getList();
-        });
-      });
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('/work/out/export', { ...this.queryParams }, '提现明细.xlsx');
     }
   }
 };

admin-ui/src/views/work/money/recharge/audit.vue

@@ -22,7 +22,7 @@
         <el-form-item label="充值凭证" prop="certificate">
           <ImageUpload v-model="form.certificate" :isShowTip="false" :limit="1"></ImageUpload>
         </el-form-item>
-        <div class="opp">
+        <div class="opp" v-if="form.updateTime">
           <span>操作人：{{ form.updateBy }}，</span>
           <span>操作时间：{{ form.updateTime }}</span>
         </div>

admin-ui/src/views/work/money/recharge/index.vue

@@ -15,7 +15,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="申请日期">
-        <el-date-picker v-model="dateRange" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+        <el-date-picker v-model="dateRange" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :clearable="false"></el-date-picker>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
@@ -49,7 +49,7 @@
       <el-table-column label="申请日期" align="center" prop="createTime" width="170" />
       <el-table-column label="操作" align="center" width="180">
         <template slot-scope="scope">
-          <el-button size="mini" type="text" icon="el-icon-view" @click="op('detail', scope.row)" v-hasPermi="['work:recharge:list']">查看</el-button>
+          <el-button size="mini" type="text" icon="el-icon-view" @click="op('detail', scope.row)" v-hasPermi="['work:recharge:list']">详情</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="op('edit', scope.row)" v-hasPermi="['work:recharge:edit']" :disabled="scope.row.state != 0">审核</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="del(scope.row)" v-hasPermi="['work:recharge:remove']">删除</el-button>
         </template>

ruoyi-admin/src/main/java/com/ruoyi/web/work/controller/MoneyOutController.java

@@ -5,6 +5,8 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.web.work.domain.MoneyOut;
 import com.ruoyi.web.work.domain.dto.MoneyOutDto;
 import com.ruoyi.web.work.service.ICompanyService;
@@ -14,6 +16,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
 import java.rmi.ServerException;
 import java.util.Arrays;
 import java.util.List;
@@ -72,4 +75,17 @@ public class MoneyOutController extends BaseController {
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(moneyOutService.removeByIds(Arrays.asList(ids)));
     }
+
+    @Log(title = "提现管理", businessType = BusinessType.EXPORT)
+    @PreAuthorize("@ss.hasPermi('work:out:export')")
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, MoneyOut moneyOut) {
+        if (getLoginUser().getUser().getType() == 1) {
+            moneyOut.setCompanyId(getLoginUser().getUser().getCompanyId());
+        }
+        PageUtils.orderBy("r.id desc");
+        List<MoneyOut> list = moneyOutService.selectList(moneyOut);
+        ExcelUtil<MoneyOut> util = new ExcelUtil<MoneyOut>(MoneyOut.class);
+        util.exportExcel(response, list, "提现明细");
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/work/domain/MoneyOut.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.Version;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.web.work.domain.base.BaseData;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -35,24 +36,29 @@ public class MoneyOut extends BaseData {
     private Long userId;
 
     @ApiModelProperty(value = "提现编号")
+    @Excel(name = "提现编号", width = 30, sort = 1)
     private String nums;
 
     @NotNull(message = "提现金额不能为空")
     @DecimalMin(value = "1", inclusive = false, message = "提现金额不能小于1")
     @ApiModelProperty(value = "提现金额")
+    @Excel(name = "提现金额",sort = 2)
     private BigDecimal money;
 
     @ApiModelProperty(value = "状态:0=正常,1=停用")
+    @Excel(name = "提现状态", readConverterExp = "0=待提现,1=提现成功,2=提现失败", sort = 3)
     private Integer state;
 
     @ApiModelProperty(value = "充值无效原因")
     private String msg;
 
     @ApiModelProperty(value = "创建者")
+    @Excel(name = "申请人", sort = 4)
     private String opBy;
 
     @TableField(fill = FieldFill.INSERT)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "申请时间", dateFormat = "yyyy-MM-dd HH:mm:ss", width = 30, sort = 5)
     private Date createTime;
 
     @TableField(fill = FieldFill.UPDATE)
@@ -69,6 +75,7 @@ public class MoneyOut extends BaseData {
 
     @ApiModelProperty(value = "企业名称")
     @TableField(exist = false)
+    @Excel(name = "企业名称", sort = 0, width = 40)
     private String companyName;
 
     @TableField(exist = false)

ruoyi-admin/src/main/java/com/ruoyi/web/work/domain/Recharge.java

@@ -51,7 +51,7 @@ public class Recharge extends BaseData {
     private String certificate;
 
     @ApiModelProperty(value = "状态:0=正常,1=停用")
-    @Excel(name = "充值状态", readConverterExp = "0=待充值,1=成功,2=充值失败", sort = 3)
+    @Excel(name = "充值状态", readConverterExp = "0=待充值,1=充值成功,2=充值失败", sort = 3)
     private Integer state;
 
     @ApiModelProperty(value = "充值无效原因")