Merge remote-tracking branch 'origin/master'

2026-10-12 14:20:26 +08:00
parent a4c2987c5f dcaa3127a0
commit 18a02a1969
9 changed files with 726 additions and 42 deletions
@@ -0,0 +1,321 @@
+<template>
+  <basic-container class="mp-user-page">
+    <avue-crud
+      :option="option"
+      :table-loading="loading"
+      :data="data"
+      v-model:page="page"
+      v-model="form"
+      ref="crud"
+      :permission="permissionList"
+      :before-open="beforeOpen"
+      @row-save="rowSave"
+      @row-update="rowUpdate"
+      @search-change="searchChange"
+      @search-reset="searchReset"
+      @selection-change="selectionChange"
+      @current-change="currentChange"
+      @size-change="sizeChange"
+      @refresh-change="refreshChange"
+      @on-load="onLoad"
+    >
+      <template #menu-left>
+        <el-button
+          type="primary"
+          v-if="permission.mp_user_add"
+          @click="$refs.crud.rowAdd()"
+        >
+          新增
+        </el-button>
+        <el-button
+          type="primary"
+          plain
+          v-if="permission.mp_user_reset"
+          @click="handleReset"
+        >
+          密码重置
+        </el-button>
+        <el-button
+          type="danger"
+          plain
+          v-if="permission.mp_user_delete"
+          @click="handleDelete"
+        >
+          批量删除
+        </el-button>
+      </template>
+      <template #identities="{ row }">
+        {{ row.identitiesName || formatIdentities(row.identities) }}
+      </template>
+      <template #status="{ row }">
+        <el-tag :type="row.status === 1 ? 'primary' : 'info'" class="status-text">
+          {{ row.status === 1 ? '启用' : '停用' }}
+        </el-tag>
+      </template>
+      <template #updateUserName="{ row }">
+        {{ formatUpdateUserName(row) }}
+      </template>
+      <template #menu="{ row, index }">
+        <el-link
+          type="primary"
+          v-if="permission.mp_user_view"
+          @click="$refs.crud.rowView(row, index)"
+        >
+          查看
+        </el-link>
+        <el-link
+          type="primary"
+          v-if="permission.mp_user_edit"
+          @click="$refs.crud.rowEdit(row, index)"
+        >
+          编辑
+        </el-link>
+        <el-link
+          type="primary"
+          v-if="permission.mp_user_status"
+          @click="handleStatus(row)"
+        >
+          {{ row.status === 1 ? '停用' : '启用' }}
+        </el-link>
+        <el-link
+          type="danger"
+          v-if="permission.mp_user_delete"
+          @click="rowDel(row)"
+        >
+          删除
+        </el-link>
+      </template>
+    </avue-crud>
+  </basic-container>
+</template>
+
+<script>
+import { h } from 'vue';
+import { getList, getDetail, submit, remove, changeStatus, resetPassword } from '@/api/system/mpUser';
+import option from '@/option/system/mpUser';
+import { mapGetters } from 'vuex';
+import { formatUpdateUserName } from '@/utils/audit';
+
+const IDENTITY_LABEL = {
+  driver: '司机',
+  admin: '管理员',
+};
+
+export default {
+  data() {
+    return {
+      form: {},
+      query: {},
+      loading: true,
+      page: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0,
+      },
+      selectionList: [],
+      option,
+      data: [],
+    };
+  },
+  computed: {
+    ...mapGetters(['permission']),
+    permissionList() {
+      return {
+        addBtn: this.validData(this.permission.mp_user_add, false),
+        viewBtn: this.validData(this.permission.mp_user_view, false),
+        delBtn: this.validData(this.permission.mp_user_delete, false),
+        editBtn: this.validData(this.permission.mp_user_edit, false),
+      };
+    },
+    ids() {
+      return this.selectionList.map(item => item.id).join(',');
+    },
+  },
+  methods: {
+    formatUpdateUserName,
+    formatIdentities(value) {
+      if (!value) return '';
+      return String(value)
+        .split(',')
+        .map(item => IDENTITY_LABEL[item] || item)
+        .filter(Boolean)
+        .join(',');
+    },
+    normalizeSubmitRow(row = {}) {
+      const payload = { ...row };
+      if (Array.isArray(payload.identities)) {
+        payload.identities = payload.identities.filter(Boolean).join(',');
+      }
+      if (payload.phone) {
+        payload.phone = String(payload.phone).trim();
+      }
+      if (!payload.account && payload.phone) {
+        payload.account = payload.phone;
+      }
+      delete payload.password;
+      delete payload.identitiesName;
+      delete payload.sexName;
+      delete payload.createUserName;
+      delete payload.updateUserName;
+      return payload;
+    },
+    beforeOpen(done, type) {
+      if (['edit', 'view'].includes(type) && this.form.id) {
+        getDetail(this.form.id).then(res => {
+          const detail = res.data.data || {};
+          if (detail.identities && typeof detail.identities === 'string') {
+            detail.identities = detail.identities.split(',').filter(Boolean);
+          }
+          this.form = detail;
+          done();
+        });
+        return;
+      }
+      if (type === 'add') {
+        this.form = {
+          status: 1,
+          identities: ['driver'],
+        };
+      }
+      done();
+    },
+    rowSave(row, done, loading) {
+      submit(this.normalizeSubmitRow(row)).then(
+        () => {
+          this.onLoad(this.page);
+          this.$message.success('操作成功');
+          done();
+        },
+        () => loading()
+      );
+    },
+    rowUpdate(row, index, done, loading) {
+      submit(this.normalizeSubmitRow(row)).then(
+        () => {
+          this.onLoad(this.page);
+          this.$message.success('操作成功');
+          done();
+        },
+        () => loading()
+      );
+    },
+    rowDel(row) {
+      this.$confirm('确定删除该小程序用户?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => remove(row.id))
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message.success('操作成功');
+        });
+    },
+    handleDelete() {
+      if (this.selectionList.length === 0) {
+        this.$message.warning('请选择至少一条数据');
+        return;
+      }
+      this.$confirm('确定删除选中的小程序用户?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => remove(this.ids))
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message.success('操作成功');
+          this.$refs.crud.toggleSelection();
+        });
+    },
+    handleStatus(row) {
+      const status = row.status === 1 ? 0 : 1;
+      const text = status === 1 ? '启用' : '停用';
+      this.$confirm(`是否${text}该小程序用户?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => changeStatus(row.id, status))
+        .then(() => {
+          this.$message.success('操作成功');
+          this.onLoad(this.page);
+        });
+    },
+    handleReset() {
+      if (this.selectionList.length === 0) {
+        this.$message.warning('请选择至少一条数据');
+        return;
+      }
+      this.$confirm('确定将选中账号密码重置为随机密码?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => resetPassword(this.ids))
+        .then(res => {
+          this.showResetPassword(res.data.data);
+          this.$refs.crud.toggleSelection();
+        });
+    },
+    showResetPassword(passwordMap) {
+      const passwordList = Object.keys(passwordMap || {}).map(account =>
+        h('div', null, `${account}：${passwordMap[account]}`)
+      );
+      this.$alert(h('div', null, passwordList), '密码重置成功，请立即保存', {
+        confirmButtonText: '我已保存',
+        type: 'success',
+      });
+    },
+    searchReset() {
+      this.query = {};
+      this.onLoad(this.page);
+    },
+    searchChange(params, done) {
+      this.query = params;
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    selectionChange(list) {
+      this.selectionList = list;
+    },
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
+    },
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.query);
+    },
+    onLoad(page, params = {}) {
+      this.loading = true;
+      const query = {
+        ...this.query,
+        ...params,
+      };
+      if (Array.isArray(query.identities)) {
+        query.identities = query.identities.filter(Boolean).join(',');
+      }
+      getList(page.currentPage, page.pageSize, query)
+        .then(res => {
+          const result = res.data.data || {};
+          this.page.total = result.total || 0;
+          this.data = result.records || [];
+        })
+        .finally(() => {
+          this.loading = false;
+        });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.mp-user-page {
+  :deep(.avue-crud__menu) {
+    min-height: auto;
+  }
+}
+</style>
@@ -139,7 +139,7 @@
          <section-card title="用户信息">
            <el-form ref="userFormRef" :model="form" :rules="isUserViewMode ? {} : userRules" label-position="right" label-width="calc(6em + 24px)">
              <el-row :gutter="18">
-                <el-col :span="6"><el-form-item label="账号名" prop="account"><el-input v-model="form.account" :disabled="isUserViewMode" /></el-form-item></el-col>
+                <el-col :span="12"><el-form-item label="账号名" prop="account"><el-input v-model="form.account" :disabled="isUserViewMode" /></el-form-item></el-col>
                <el-col v-if="userDialogMode === 'add'" :span="6">
                  <el-form-item label="登录密码" prop="password">
                    <el-input
@@ -42,6 +42,12 @@
          <el-descriptions-item label="认证类型">
            {{ bizTypeLabel }}
          </el-descriptions-item>
+          <el-descriptions-item label="审核人">
+            {{ detail.auditUserName || '-' }}
+          </el-descriptions-item>
+          <el-descriptions-item :label="auditTimeLabel">
+            {{ detail.auditTime ? formatCertDateTime(detail.auditTime) : '-' }}
+          </el-descriptions-item>
        </el-descriptions>
      </section-card>

@@ -149,6 +155,13 @@ export default {
    statusTag() {
      return certStatusTag(this.detail.status);
    },
+    // 审核时间一栏按审核结论换标签：还在「审核中」的记录没有结论，不能写成通过或驳回时间
+    auditTimeLabel() {
+      const status = String(this.detail.status);
+      if (status === String(CERT_RECORD_STATUS.APPROVED)) return '审核通过时间';
+      if (status === String(CERT_RECORD_STATUS.REJECTED)) return '审核驳回时间';
+      return '审核时间';
+    },
    // 只有「审核中」的记录可审；已通过/已驳回/已作废都是终态
    auditable() {
      return String(this.detail.status) === String(CERT_RECORD_STATUS.PENDING);
@@ -1593,17 +1593,40 @@ export default {
      const fullNation = `${nation}族`;
      return this.nationOptions.includes(fullNation) ? fullNation : nation;
    },
+    /**
+     * OCR / 手工录入日期归一化：对齐车辆侧与后端 FlexibleLocalDateDeserializer。
+     * 支持 yyyyMMdd、yyyy-MM-dd、2018.3.9、2030年05月20日及任意非数字分隔；无法识别返回空串。
+     */
    normalizeBirthday(value = '') {
      const birthday = String(value || '').trim();
-      const compactMatch = birthday.match(/^(\d{4})(\d{2})(\d{2})$/);
-      if (compactMatch) {
-        const [, year, month, day] = compactMatch;
-        return `${year}-${month}-${day}`;
+      if (!birthday) return '';
+      if (/长期|永久/.test(birthday)) return '';
+      const looseMatch = birthday.match(/(\d{4})\D+(\d{1,2})\D+(\d{1,2})/);
+      if (looseMatch) {
+        return this.toValidDateText(looseMatch[1], looseMatch[2], looseMatch[3]);
      }
-      const match = birthday.match(/^(\d{4})[-/.年](\d{1,2})[-/.月](\d{1,2})日?$/);
-      if (!match) return birthday;
-      const [, year, month, day] = match;
-      return `${year}-${month.padStart(2, '0')}-${day.padStart(2, '0')}`;
+      const compact = birthday.replace(/\D/g, '');
+      if (compact.length === 8) {
+        return this.toValidDateText(compact.slice(0, 4), compact.slice(4, 6), compact.slice(6, 8));
+      }
+      return '';
+    },
+    toValidDateText(yearText, monthText, dayText) {
+      const year = Number(yearText);
+      const month = Number(monthText);
+      const day = Number(dayText);
+      if (!Number.isInteger(year) || !Number.isInteger(month) || !Number.isInteger(day)) {
+        return '';
+      }
+      const date = new Date(year, month - 1, day);
+      if (
+        date.getFullYear() !== year ||
+        date.getMonth() !== month - 1 ||
+        date.getDate() !== day
+      ) {
+        return '';
+      }
+      return `${String(year).padStart(4, '0')}-${String(month).padStart(2, '0')}-${String(day).padStart(2, '0')}`;
    },
    parseIdCardInfo(idCardNo = '') {
      if (!/^\d{17}[\dX]$/.test(idCardNo)) {
@@ -1174,37 +1174,59 @@ export default {
      });
    },
    /**
-     * OCR 日期常为区间（如 2022-08-17至2024-01-05）或含无效日（如 01-65）。
-     * 提取可解析的合法日期；prefer=first 取登记类起始日，prefer=last 取有效期截止日。
+     * OCR 日期常为区间（如 2022-08-17至2024-01-05）、无分隔符（如 20260317）、
+     * 年月日/点分（2030年05月20日、2018.3.9）或任意非数字分隔。
+     * 对齐司机侧 normalizeBirthday / 后端 OcrFieldSupport：年与月、月与日之间允许任意非数字。
+     * prefer=first 取登记类起始日，prefer=last 取有效期截止日。
+     * 返回值统一为 YYYY-MM-DD，供 el-date-picker 展示与后端 LocalDate 反序列化。
     */
    normalizeDate(value = '', prefer = 'first') {
      const dateValue = String(value || '').trim();
      if (!dateValue) return '';
-      const segments = dateValue.match(/\d{4}[-/.年]\d{1,2}[-/.月]\d{1,2}日?/g) || [];
-      const sourceList = segments.length ? segments : [dateValue];
-      const candidates = sourceList
-        .map(item => {
-          const match = String(item)
-            .trim()
-            .match(/^(\d{4})[-/.年](\d{1,2})[-/.月](\d{1,2})日?$/);
-          if (!match) return '';
-          const year = Number(match[1]);
-          const month = Number(match[2]);
-          const day = Number(match[3]);
-          const date = new Date(year, month - 1, day);
-          if (
-            date.getFullYear() !== year ||
-            date.getMonth() !== month - 1 ||
-            date.getDate() !== day
-          ) {
-            return '';
+      if (/长期|永久/.test(dateValue)) return '';
+      const candidates = [];
+      const loosePattern = /(\d{4})\D+(\d{1,2})\D+(\d{1,2})/g;
+      let match = loosePattern.exec(dateValue);
+      while (match) {
+        const normalized = this.toValidDateText(match[1], match[2], match[3]);
+        if (normalized) {
+          candidates.push(normalized);
+        }
+        match = loosePattern.exec(dateValue);
+      }
+      if (!candidates.length) {
+        const compact = dateValue.replace(/\D/g, '');
+        if (compact.length === 8) {
+          const normalized = this.toValidDateText(
+            compact.slice(0, 4),
+            compact.slice(4, 6),
+            compact.slice(6, 8)
+          );
+          if (normalized) {
+            candidates.push(normalized);
          }
-          return `${String(year).padStart(4, '0')}-${String(month).padStart(2, '0')}-${String(day).padStart(2, '0')}`;
-        })
-        .filter(Boolean);
+        }
+      }
      if (!candidates.length) return '';
      return prefer === 'last' ? candidates[candidates.length - 1] : candidates[0];
    },
+    toValidDateText(yearText, monthText, dayText) {
+      const year = Number(yearText);
+      const month = Number(monthText);
+      const day = Number(dayText);
+      if (!Number.isInteger(year) || !Number.isInteger(month) || !Number.isInteger(day)) {
+        return '';
+      }
+      const date = new Date(year, month - 1, day);
+      if (
+        date.getFullYear() !== year ||
+        date.getMonth() !== month - 1 ||
+        date.getDate() !== day
+      ) {
+        return '';
+      }
+      return `${String(year).padStart(4, '0')}-${String(month).padStart(2, '0')}-${String(day).padStart(2, '0')}`;
+    },
    normalizeVehicleDateFields(form = {}) {
      const dateFields = [
        ['compulsoryScrapDate', 'first'],
@@ -1216,8 +1238,13 @@ export default {
        ['registrationDate', 'first'],
      ];
      dateFields.forEach(([prop, prefer]) => {
-        if (form[prop] === undefined || form[prop] === null || form[prop] === '') return;
-        form[prop] = this.normalizeDate(form[prop], prefer);
+        if (form[prop] === undefined || form[prop] === null || form[prop] === '') {
+          form[prop] = null;
+          return;
+        }
+        const normalized = this.normalizeDate(form[prop], prefer);
+        // 无法识别或空串统一置 null，避免把 "" / "20260317" 原样提交给 LocalDate
+        form[prop] = normalized || null;
      });
      return form;
    },