驾驶证管理

src/api/bst/driver.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询驾驶证认证列表
+export function listDriver(query) {
+  return request({
+    url: '/bst/driver/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询驾驶证认证详细
+export function getDriver(id) {
+  return request({
+    url: '/bst/driver/' + id,
+    method: 'get'
+  })
+}
+
+// 新增驾驶证认证
+export function addDriver(data) {
+  return request({
+    url: '/bst/driver',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改驾驶证认证
+export function updateDriver(data) {
+  return request({
+    url: '/bst/driver',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除驾驶证认证
+export function delDriver(id) {
+  return request({
+    url: '/bst/driver/' + id,
+    method: 'delete'
+  })
+}
+
+// 审核驾驶证认证
+export function verifyDriver(data) {
+  return request({
+    url: '/bst/driver/verify',
+    method: 'put',
+    data: data
+  })
+}

src/utils/enums.js

@@ -447,3 +447,15 @@ export const CreditStatus = {
   NORMAL: "1", // 正常
   DISABLED: "2", // 停用
 }
+
+// 驾驶证认证状态
+export const DriverStatus = {
+  WAIT_VERIFY: "1", // 待认证
+  SUCCESS: "2", // 认证通过
+  FAILED: "3", // 认证失败
+
+  // 获取可审核的状态
+  canVerify() {
+    return [this.WAIT_VERIFY];
+  }
+}

src/views/bst/area/edit/edit.vue

@@ -61,8 +61,10 @@
               <form-col :span="span * 2" label="禁行区内断电" prop="noRidingOutage" label-width="8em" tip="开启后，当车辆进入禁行区内将断电，直到车辆离开禁行区重新上电">
                 <el-switch v-model="form.noRidingOutage" active-text="断电" inactive-text="不断电"/>
               </form-col>
-              <form-col :span="span * 2" label="实名认证" prop="authentication" tip="开启后，用户需要实名认证后才能解锁骑行">
+              <form-col :span="span * 2" label="用户认证" prop="authentication" tip="设置用户需要哪些认证才能解锁骑行">
-                <el-switch v-model="form.authentication" active-text="开启" inactive-text="关闭"/>
+                <el-select v-model="form.authentication" placeholder="请选择认证类型" multiple style="width: 100%" >
+                  <el-option v-for="dict of dict.type.user_auth_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
+                </el-select>
               </form-col>
               <form-col :span="span * 2" label="短信通知" prop="msgSwitch" tip="开启短信通知，费用0.1元/条，从运营商余额中扣除（场景：还车审核）">
                 <el-switch v-model="form.msgSwitch" active-text="开启" inactive-text="关闭"/>
@@ -127,7 +129,7 @@ import { mapGetters } from 'vuex';
 
 export default {
   name: "AreaEdit",
-  dicts: ['area_status'],
+  dicts: ['area_status', 'user_auth_type'],
   components: { FormCol, EditHeader, UserInput, CollapsePanel },
   data() {
     return {

src/views/bst/driver/components/DriverVerifyDialog.vue

@@ -0,0 +1,116 @@
+<template>
+  <el-dialog 
+    title="驾驶证审核" 
+    :visible.sync="dialogVisible" 
+    width="500px" 
+    append-to-body 
+    @open="handleOpen"
+  > 
+    <el-form :model="form" :rules="rules" ref="form" label-width="5em" v-loading="loading" size="small">
+      <el-form-item label="审核备注" prop="remark">
+        <el-input 
+          v-model="form.remark" 
+          type="textarea" 
+          placeholder="请输入审核备注" 
+          show-word-limit 
+          maxlength="255" 
+        />
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="success" plain @click="handleSubmit(true)" icon="el-icon-check" :loading="submitLoading">通过</el-button>
+      <el-button type="danger" plain @click="handleSubmit(false)" icon="el-icon-close" :loading="submitLoading">驳回</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDriver, verifyDriver } from '@/api/bst/driver'
+
+export default {
+  name: 'DriverVerifyDialog',
+  props: {
+    id: {
+      type: [String, Number],
+      default: null
+    },
+    visible: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      detail: {},
+      form: {
+        id: null,
+        pass: null,
+        remark: null
+      },
+      loading: false,
+      submitLoading: false,
+      rules: {
+      }
+    }
+  },
+  computed: {
+    dialogVisible: {
+      get() {
+        return this.visible
+      },
+      set(val) {
+        this.$emit('update:visible', val)
+      }
+    }
+  },
+  methods: {
+    getDetail() {
+      this.loading = true
+      getDriver(this.id).then(response => {
+        this.detail = response.data
+      }).finally(() => {
+        this.loading = false
+      })
+    },
+    handleOpen() {
+      this.getDetail()
+      this.reset()
+    },
+    reset() {
+      this.form = {
+        id: this.id,
+        pass: null,
+        remark: null
+      }
+      this.resetForm('form')
+    },
+    handleSubmit(pass) {
+      this.form.pass = pass;
+      this.$refs.form.validate().then(() => {
+        this.$confirm('是否确认审核？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.submitLoading = true
+          verifyDriver(this.form).then((response) => {
+            if (response.code === 200) {
+              this.$message.success('操作成功')
+              this.dialogVisible = false
+              this.$emit('success')
+            }
+          }).finally(() => {
+            this.submitLoading = false
+          })
+        })
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.dialog-footer {
+  text-align: right;
+}
+</style>

src/views/bst/driver/index.vue

@@ -0,0 +1,345 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="用户" prop="userName">
+        <el-input
+          v-model="queryParams.userName"
+          placeholder="请输入用户名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="驾驶证号" prop="no">
+        <el-input
+          v-model="queryParams.no"
+          placeholder="请输入驾驶证号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="姓名" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入姓名"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable @change="handleQuery">
+          <el-option
+            v-for="dict in dict.type.driver_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="审核人" prop="verifyName">
+        <el-input
+          v-model="queryParams.verifyName"
+          placeholder="请输入审核人名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-has-permi="['bst:driver:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="driverList" @selection-change="handleSelectionChange" :default-sort="defaultSort"  @sort-change="onSortChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <template v-for="column of showColumns">
+        <el-table-column
+            :key="column.key"
+            :label="column.label"
+            :prop="column.key"
+            :align="column.align"
+            :min-width="column.minWidth"
+            :sort-orders="orderSorts"
+            :sortable="column.sortable"
+            :show-overflow-tooltip="column.overflow"
+            :width="column.width"
+        >
+          <template slot-scope="d">
+            <template v-if="column.key === 'id'">
+              {{d.row[column.key]}}
+            </template>
+            <template v-else-if="column.key === 'status'">
+              <dict-tag :options="dict.type.driver_status" :value="d.row[column.key]"/>
+            </template>
+            <template v-else-if="column.key === 'userName'">
+              <user-link :id="d.row.userId" :text="d.row.userName"/>
+            </template>
+            <template v-else-if="column.key === 'pictureFront'">
+              <image-preview :src="d.row[column.key]" :width="50" :height="50"/>
+            </template>
+            <template v-else-if="column.key === 'pictureBack'">
+              <image-preview :src="d.row[column.key]" :width="50" :height="50"/>
+            </template>
+            <template v-else>
+              {{d.row[column.key]}}
+            </template>
+          </template>
+        </el-table-column>
+      </template>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-s-check"
+            @click="handleVerify(scope.row)"
+            v-has-permi="['bst:driver:verify']"
+            v-show="DriverStatus.canVerify().includes(scope.row.status)"
+          >审核</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <driver-verify-dialog :id="row.id" :visible.sync="showVerifyDialog" @success="getList"/>
+
+  </div>
+</template>
+
+<script>
+import { listDriver, getDriver, delDriver, addDriver, updateDriver } from "@/api/bst/driver";
+import { $showColumns } from '@/utils/mixins';
+import FormCol from "@/components/FormCol/index.vue";
+import UserLink from '@/components/Business/User/UserLink.vue';
+import DriverVerifyDialog from '@/views/bst/driver/components/DriverVerifyDialog.vue';
+import { DriverStatus } from '@/utils/enums';
+
+  // 默认排序字段
+const defaultSort = {
+  prop: "createTime",
+  order: "descending"
+}
+
+export default {
+  name: "Driver",
+  mixins: [$showColumns],
+  dicts: ['driver_status'],
+  components: {FormCol, UserLink, DriverVerifyDialog},
+  data() {
+    return {
+      DriverStatus,
+      row: {},
+      showVerifyDialog: false,
+      span: 24,
+      // 字段列表
+      columns: [
+        {key: 'id', visible: false, label: 'ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: "80"},
+        {key: 'userName', visible: true, label: '用户', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'no', visible: true, label: '驾驶证号', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'name', visible: true, label: '姓名', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'pictureFront', visible: true, label: '正面照片', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'pictureBack', visible: true, label: '背面照片', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'status', visible: true, label: '状态', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'verifyName', visible: true, label: '审核人', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'verifyRemark', visible: true, label: '审核备注', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'verifyTime', visible: true, label: '审核时间', minWidth: null, sortable: false, overflow: false, align: 'center', width: null},
+        {key: 'createTime', visible: true, label: '创建时间', minWidth: null, sortable: false, overflow: false, align: 'center', width: null},
+      ],
+      // 排序方式
+      orderSorts: ['ascending', 'descending', null],
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 驾驶证认证表格数据
+      driverList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      defaultSort,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        orderByColumn: defaultSort.prop,
+        isAsc: defaultSort.order,
+        id: null,
+        userId: null,
+        no: null,
+        name: null,
+        status: null,
+        verifyId: null,
+        verifyRemark: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        userId: [
+          { required: true, message: "用户ID不能为空", trigger: "blur" }
+        ],
+        no: [
+          { required: true, message: "驾驶证号不能为空", trigger: "blur" }
+        ],
+        name: [
+          { required: true, message: "姓名不能为空", trigger: "blur" }
+        ],
+        status: [
+          { required: true, message: "状态不能为空", trigger: "change" }
+        ],
+        createTime: [
+          { required: true, message: "创建时间不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    handleVerify(row) {
+      this.row = row;
+      this.showVerifyDialog = true
+    },
+    /** 当排序按钮被点击时触发 **/
+    onSortChange(column) {
+      if (column.order == null) {
+        this.queryParams.orderByColumn = defaultSort.prop;
+        this.queryParams.isAsc = defaultSort.order;
+      } else {
+        this.queryParams.orderByColumn = column.prop;
+        this.queryParams.isAsc = column.order;
+      }
+      this.getList();
+    },
+    /** 查询驾驶证认证列表 */
+    getList() {
+      this.loading = true;
+      listDriver(this.queryParams).then(response => {
+        this.driverList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        userId: null,
+        no: null,
+        name: null,
+        pictureFront: null,
+        pictureBack: null,
+        status: null,
+        createTime: null,
+        verifyId: null,
+        verifyRemark: null,
+        verifyTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加驾驶证认证";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getDriver(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改驾驶证认证";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateDriver(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addDriver(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除驾驶证认证编号为"' + ids + '"的数据项？').then(function() {
+        return delDriver(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('bst/driver/export', {
+        ...this.queryParams
+      }, `driver_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

src/views/bst/order/index.vue

@@ -171,8 +171,8 @@
                       trigger="hover"
                     >
                       <div>
-                        <div v-if="d.row.creditName">挂账方：{{d.row.creditName | fix2 | dv}} 元</div>
+                        <div v-if="d.row.creditName">挂账方：{{d.row.creditName | dv}}</div>
-                        <div v-if="d.row.creditUserName">挂账人：{{d.row.creditUserName | fix2 | dv}} 元</div>
+                        <div v-if="d.row.creditUserName">挂账人：{{d.row.creditUserName | dv}}</div>
                         <div>押金：{{d.row.depositFee | fix2 | dv}} 元</div>
                       </div>
                       <div slot="reference">

src/views/bst/order/view/view.vue

@@ -14,8 +14,8 @@
             <el-col>
               <el-popover placement="bottom" width="200" trigger="hover">
                 <div>
-                  <div v-if="detail.creditName">挂账方：{{detail.creditName | fix2 | dv}} 元</div>
+                  <div v-if="detail.creditName">挂账方：{{detail.creditName | dv}}</div>
-                  <div v-if="detail.creditUserName">挂账人：{{detail.creditUserName | fix2 | dv}} 元</div>
+                  <div v-if="detail.creditUserName">挂账人：{{detail.creditUserName | dv}}</div>
                   <div>押金：{{detail.depositFee | fix2 | dv}} 元</div>
                 </div>
                 <el-statistic slot="reference" title="押金" :value="detail.depositFee" :precision="2" suffix="元">

src/views/system/user/index.vue

@@ -56,15 +56,19 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="实名状态" prop="isReal" v-if="isShow('nickName')">
+      <el-form-item label="认证类型" prop="authType" v-if="isShow('authTypes')">
         <el-select
-          v-model="queryParams.isReal"
+          v-model="queryParams.authType"
-          placeholder="实名状态"
+          placeholder="请选择认证类型"
           clearable
           @change="handleQuery"
         >
-          <el-option label="已实名" :value="true" />
+          <el-option
-          <el-option label="未实名" :value="false" />
+            v-for="dict in dict.type.user_auth_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -143,13 +147,16 @@
               <avatar :src="d.row.avatar" :size="24" :name="d.row.nickName" :char-index="-1" style="margin-right:4px"/>
               <user-link :id="d.row.userId" :text="d.row.nickName" />
               <dict-tag :options="dict.type.user_status" :value="d.row.status" size="mini" style="margin-left: 4px;"/>
-              <boolean-tag :value="d.row.isReal" size="mini" true-text="已实名" false-text="未实名" style="margin-left: 4px;"/>
+              <!-- <boolean-tag :value="d.row.isReal" size="mini" true-text="已实名" false-text="未实名" style="margin-left: 4px;"/> -->
               <br/>
               <user-link :id="d.row.userId" :text="d.row.userName" />
             </template>
             <template v-else-if="column.key === 'agentName'">
               <user-link :id="d.row.agentId" :text="d.row.agentName" />
             </template>
+            <template v-else-if="column.key === 'authTypes'">
+              <dict-tag :options="dict.type.user_auth_type" :value="d.row.authTypes" size="small" style="margin-left: 4px;"/>
+            </template>
             <template v-else>
               {{d.row[column.key]}}
             </template>
@@ -249,7 +256,7 @@ const defaultSort = {
 export default {
   name: "User",
   mixins: [$showColumns],
-  dicts: ['user_status', 'sys_user_sex', 'user_employ_status', 'withdraw_service_type'],
+  dicts: ['user_status', 'sys_user_sex', 'user_employ_status', 'withdraw_service_type', 'user_auth_type'],
   components: {UserFormDialog, FormCol, DeptSelect, BooleanTag, UserLink, RoleSelect, UserShowPasswordDialog, Avatar},
   data() {
     return {
@@ -309,7 +316,8 @@ export default {
         {key: 'agentName', visible: true, label: '所属代理', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'deptName', visible: true, label: '归属部门', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'email', visible: false, label: '邮箱', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'loginIp', visible: true, label: '登录IP', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'authTypes', visible: true, label: '认证', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'loginIp', visible: false, label: '登录IP', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'loginDate', visible: true, label: '登录时间', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100"},
         {key: 'createTime', visible: true, label: '创建时间', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100"},
       ],