外协人员充值

src/api/base/canteenOutsourcerRechargeRecord.js

@@ -0,0 +1,47 @@
+import request from '@/utils/request'
+import constant from '@/constant'
+
+function pageList(formData) {
+  return request.post(constant.serverUrl + "/base/canteenOutsourcerRechargeRecord/pageList", formData);
+}
+
+function create() {
+  return request.get(constant.serverUrl + "/base/canteenOutsourcerRechargeRecord/create");
+}
+
+function edit(personId) {
+  return request.get(constant.serverUrl + "/base/canteenOutsourcerRechargeRecord/edit/" + personId);
+}
+
+function add(formModel) {
+  return request.post(constant.serverUrl + "/base/canteenOutsourcerRechargeRecord/add", formModel, {
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function update(formModel) {
+  return request.post(constant.serverUrl + "/base/canteenOutsourcerRechargeRecord/update", formModel, {
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function remove(id) {
+  return request.post(constant.serverUrl + "/base/canteenOutsourcerRechargeRecord/delete/" + id);
+}
+
+function batchRemove(idList) {
+  return request.post(constant.serverUrl + "/base/canteenOutsourcerRechargeRecord/batchDelete", idList, {
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+
+export default {
+  create, edit, add, update, remove, batchRemove, pageList
+}

src/views/base/canteenOutsourcerBalance-list.vue

@@ -38,6 +38,9 @@
       </el-form-item>
     </el-form>
     <el-divider></el-divider>
+    <el-row class="button-group">
+      <el-button type="success" size="small" plain icon="el-icon-upload2" @click="batchRecharge">批量充值</el-button>
+    </el-row>
     <el-table
       ref="formTable"
       :data="tableData"
@@ -50,20 +53,20 @@
     >
       <el-table-column type="selection" width="55"></el-table-column>
       <el-table-column type="index" label="序号" :index="indexMethod" width="50"></el-table-column>
-      <el-table-column prop="companyName" label="部门" width="200"></el-table-column>
+      <el-table-column prop="companyName" label="部门" width="250"></el-table-column>
       <el-table-column prop="personName" label="姓名" width="100"></el-table-column>
-      <el-table-column prop="cardNumber" label="卡号" width="150"></el-table-column>
-      <el-table-column prop="balanceFee" label="剩余金额（元）" width="120" ></el-table-column>
-      <el-table-column prop="lastRechargeTime" label="上次充值时间"  width="150"></el-table-column>
-      <el-table-column prop="lastMealTime" label="上次就餐时间"  width="150"></el-table-column>
+      <el-table-column prop="jobNumber" label="工号" width="130"></el-table-column>
+      <el-table-column prop="balanceFee" label="剩余金额（元）" width="150" ></el-table-column>
+      <el-table-column prop="lastRechargeTime" label="上次充值时间"  ></el-table-column>
+      <el-table-column prop="lastMealTime" label="上次就餐时间" ></el-table-column>
       <el-table-column label="操作" width="250" fixed="right">
         <template slot-scope="{row}">
           <el-row>
             <el-col :span="6">
-              <el-link type="success" @click="handleEdit(row)">充值</el-link>
+              <el-link type="success" @click="handleRecharge(row)">充值</el-link>
             </el-col>
             <el-col :span="8">
-              <el-link type="primary" @click="handleDelete(row)">充值记录</el-link>
+              <el-link type="primary" @click="searchRechargeRecord(row)">充值记录</el-link>
             </el-col>
             <el-col :span="8">
               <el-link type="primary" @click="searchRecord(row)">就餐记录</el-link>
@@ -86,10 +89,24 @@
       :title="modalTitle"
       @close="onDetailModalClose"
     ></canteenDiningRecord-list>
+    <canteenOutsourcerRechargeRecord-list
+      v-if="showModal2"
+      :personId="personId"
+      :title="modalTitle2"
+      @close="onDetailModalClose2"
+    ></canteenOutsourcerRechargeRecord-list>
+    <canteenOutsourcerRecharge
+      v-if="showModal3"
+      :personId="personId"
+      :title="modalTitle3"
+      @close="onDetailModalClose3"
+    ></canteenOutsourcerRecharge>
   </div>
 </template>
 <script>
 import Constant from "@/constant";
+import canteenOutsourcerRechargeRecordList from "./canteenOutsourcerRechargeRecord-list";
+import canteenOutsourcerRecharge from "./canteenOutsourcerRecharge";
 import canteenDiningRecordList from "./canteenDiningRecord-list";
 import canteenOutsourcerBalanceApi from "@/api/base/canteenOutsourcerBalance";
 import pageUtil from "@/utils/page";
@@ -119,7 +136,11 @@ export default {
       pageSizeList: [10, 20, 30],
       multipleSelection: [],
       showModal: false,
+      showModal2: false,
+      showModal3: false,
       modalTitle: "",
+      modalTitle2: "",
+      modalTitle3: "",
       businessKey: "",
       companyResult: [],
       tableHeight: 400,
@@ -281,10 +302,44 @@ export default {
         this.changePage(this.pageIndex);
       }
     },
+    onDetailModalClose2(refreshed) {
+      //保存成功后回调
+      this.showModal2 = false;
+
+      if (refreshed) {
+        this.changePage(this.pageIndex);
+      }
+    },
+    onDetailModalClose3(refreshed) {
+      //保存成功后回调
+      this.showModal3 = false;
+
+      if (refreshed) {
+        this.changePage(this.pageIndex);
+      }
+    },
+    searchRechargeRecord(record) {
+      this.personId = record.personId;
+      this.showModal2 = true;
+    },
     searchRecord(record) {
       this.personId = record.personId;
       this.showModal = true;
     },
+    handleRecharge(record){
+      this.personId = record.personId;
+      this.showModal3 = true;
+    },
+    batchRecharge(){
+      var self = this;
+      var idList = this.multipleSelection.map(record => {
+        return record.personId;
+      });
+
+      self.personId = idList;
+
+      this.showModal3 = true;
+    }
   },
   mounted: function() {
     var self = this;
@@ -296,6 +351,8 @@ export default {
   },
   components: {
     "canteenDiningRecord-list": canteenDiningRecordList,
+    "canteenOutsourcerRechargeRecord-list": canteenOutsourcerRechargeRecordList,
+    "canteenOutsourcerRecharge":canteenOutsourcerRecharge,
   }
 };
 </script>

src/views/base/canteenOutsourcerRecharge.vue

@@ -0,0 +1,153 @@
+
+<style scoped>
+.user-panel {
+  margin: 10px auto;
+}
+.el-tag + .el-tag {
+  margin-left: 10px;
+}
+</style>
+<template>
+  <el-dialog
+    :visible.sync="showDialog"
+    title="充值"
+    :modal-append-to-body="false"
+    style="text-align:left;"
+    @close="closeDialog"
+    :close-on-click-modal="false"
+    width="35%"
+  >
+    <div class="user-panel" v-loading="loading">
+      <el-form ref="form" :model="formModel" :rules="ruleValidate" :label-width="'100px'">
+        <el-form-item label="充值人员" prop="name" style="width:450px">
+            <el-tag
+              v-for="tag in tags"
+              :key="tag.name"
+              :value="tag.id"
+              closable
+              @close="handleClose(tag)">
+              {{tag.name}}
+            </el-tag>
+        </el-form-item>
+        <el-form-item label="充值金额" prop="rechargeAmount" style="width:450px">
+            <el-input type="number" v-model="formModel.rechargeAmount" placeholder="请输入金额" ></el-input>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark" style="width:450px">
+            <el-input type="text" v-model="formModel.remark" placeholder="请输入备注" ></el-input>
+        </el-form-item>
+        
+      </el-form>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="closeDialog">取 消</el-button>
+      <el-button type="primary" @click="handleSubmit" :loading="submitting">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+import Constant from "@/constant";
+import canteenOutsourcerRechargeRecordApi from "@/api/base/canteenOutsourcerRechargeRecord";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  props: ["personId"],
+  data() {
+    return {
+      formModel: {
+        tags:[],
+      },
+      ruleValidate: {
+        rechargeAmount: [{ required: true, message: "地点不能为空", trigger: "blur" }],
+      },
+      showDialog: true,
+      loading: false,
+      submitting: false,
+      canQuery: true,
+      treeData: [],
+      tags:[],
+      props: {
+        // 配置项（必选）
+        value: "id",
+        label: "name",
+        children: "children"
+      },
+    };
+  },
+  created() {
+  },
+  methods: {
+    closeDialog() {
+      this.$emit("close", false);
+    },
+    handleClose(tag) {
+      if(this.tags.length>1){
+        this.tags.splice(this.tags.indexOf(tag), 1);
+      }
+      else{
+        this.$message({
+          message: "充值人员至少保留一个人",
+          type: "error"
+        });
+      } 
+      
+    },
+    handleSubmit() {
+      var self = this;
+
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          (function() {
+            self.loading = true;
+
+            self.formModel.tags = self.tags;
+
+            return canteenOutsourcerRechargeRecordApi.add(self.formModel);
+
+          })().then(function(response) {
+            self.loading = false;
+            var jsonData = response.data;
+
+            if (jsonData.result) {
+              self.$message({
+                message: "保存成功!",
+                type: "success"
+              });
+
+              self.$emit("close", true);
+            } else {
+              self.$message({
+                message: jsonData.message + "",
+                type: "warning"
+              });
+
+              //self.$emit("close", false);
+            }
+          });
+        }
+      });
+    },
+  },
+  mounted: function() {
+    var self = this;
+    (function() {
+      self.loading = true;
+      return canteenOutsourcerRechargeRecordApi.edit(self.personId);
+    })()
+      .then(response => {
+        var jsonData = response.data;
+        self.loading = false;
+
+        if (jsonData.result) {
+            self.tags = jsonData.data;
+
+        } else {
+          self.$message.error(jsonData.message + "");
+        }
+      })
+      .catch(error => {
+        self.$message.error(error + "");
+      });
+  },
+};
+</script>

src/views/base/canteenOutsourcerRechargeRecord-list.vue

@@ -0,0 +1,207 @@
+<template>
+  <el-dialog
+    :visible.sync="showDialog"
+    title="充值记录"
+    :modal-append-to-body="false"
+    append-to-body
+    :modal="true"
+    style="text-align:left;"
+    @close="closeDialog"
+    :close-on-click-modal="false"
+    width="60%"
+  >
+    <div>
+      <!--
+      要resetFields起作用，必须配置:model和prop
+      -->
+      <el-form
+        ref="queryForm"
+        :model="queryModel"
+        inline
+        class="demo-form-inline"
+        label-width="100px"
+      >
+      </el-form>
+      <el-divider></el-divider>
+        <el-row class="button-group">
+        <el-button type="primary" size="small" plain icon="el-icon-circle-plus" @click="exportXls">导出数据</el-button>
+        </el-row>
+      <el-table
+        :data="tableData"
+        style="min-height:400px;"
+        v-loading="loading"
+        stripe
+        @sort-change="sortChange"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column prop="createTime" label="时间" width="180"></el-table-column>
+        <el-table-column prop="personName" label="姓名" width="100"></el-table-column>
+        <el-table-column prop="jobNumber" label="工号" width="100"></el-table-column>
+        <el-table-column prop="rechargeAmount" label="充值金额（元）" ></el-table-column>
+        <el-table-column prop="createName" label="操作人" ></el-table-column>
+        <el-table-column prop="remark" label="备注" ></el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page.sync="pageIndex"
+        :total="totalElements"
+        :page-sizes="pageSizeList"
+        @current-change="changePage"
+        @size-change="pageSizeChange"
+        layout="total, sizes, prev, pager, next, jumper"
+      ></el-pagination>
+    </div>
+  </el-dialog>
+</template>
+<script>
+import Constant from "@/constant";
+import canteenOutsourcerRechargeRecordApi from "@/api/base/canteenOutsourcerRechargeRecord";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  props: ["personId"],
+  data() {
+    var self = this;
+
+    return {
+      formModel: {},
+      queryModel: {
+        personId: ""
+      },
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],
+      showModal: false,
+      modalTitle: "",
+      showDialog: true
+    };
+  },
+  methods: {
+    closeDialog() {
+      this.$emit("close", false);
+    },
+    disableSelect(row, rowIndex) {
+      //多选按钮是否禁用
+      if (row.isBindPerson) {
+        return false;
+      } else {
+        return true;
+      }
+    },
+    changePage(pageIndex,exportFlag) {
+        var self = this;
+
+        self.loading = true;
+
+        self.pageIndex = pageIndex;
+        var formData = new FormData();
+
+        formData.append("pageIndex", self.pageIndex);
+
+        if(exportFlag!=null) {        
+            formData.append("exportFlag", 1);
+            formData.append("pageSize", 10000);
+        }
+        else{
+            formData.append("pageSize", self.pageSize);
+        }
+
+        formData.append("personId", self.personId);
+
+
+      canteenOutsourcerRechargeRecordApi
+        .pageList(formData)
+        .then(function(response) {
+          self.loading = false;
+
+          var jsonData = response.data;
+
+          if(jsonData.result) {
+            if(exportFlag){
+              //导出
+              self.$message({
+                showClose: true,
+                type: "success",
+                message: `报表已生成，<a href="${jsonData.data}">请点击链接下载</a>`,
+                dangerouslyUseHTMLString: true,
+                duration: 30000
+              });
+            }
+            else{
+              //分页查看
+              var page = jsonData.data;
+
+              self.tableData = page.data;
+              self.totalPages = page.totalPages;
+              self.totalElements = page.recordsTotal;
+            }
+          }
+          else{
+            self.$message.warning(jsonData.message + "");
+          }
+        })
+        .catch(error => {
+          self.loading = false;
+          // self.$message.error(error + "");
+        });
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize;
+    },
+    sortChange(data) {
+      this.field = data.column.field;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
+
+      this.changePage(this.pageIndex);
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    handleReset(name) {
+      this.$refs[name].resetFields();
+      this.queryModel.timeRanges = "";
+    },
+    onDetailModalClose(refreshed) {
+      //保存成功后回调
+      this.showModal = false;
+
+      if (refreshed) {
+        this.changePage(this.pageIndex);
+      }
+    },
+    exportXls() {
+      this.changePage(1,true);
+    }
+  },
+  mounted: function() {
+    this.changePage(1);
+  },
+};
+</script>
+<style lang="scss" scoped>
+.el-breadcrumb {
+  margin: 10px;
+  line-height: 20px;
+}
+
+.el-divider {
+  margin: 5px 0;
+}
+
+.demo-form-inline {
+  margin-left: 10px;
+  text-align: left;
+}
+
+.button-group {
+  margin-left: 10px;
+  text-align: left;
+}
+</style>