Merge branch 'main' of http://49.232.154.205:10100/liujingchao/fad_oa into main

2026-04-15 17:26:25 +08:00
parent 50f3f15f48 9c64dd8451
commit 365fc08b62
25 changed files with 609 additions and 92 deletions
--- a/ruoyi-ui/src/views/hrm/components/BizDetailContainer/index.vue
+++ b/ruoyi-ui/src/views/hrm/components/BizDetailContainer/index.vue
@@ -4,14 +4,13 @@
      <div slot="header" class="card-header">
        <span>{{ bizTitle }}</span>
        <div class="actions">
-          <el-button size="mini" icon="el-icon-arrow-left" @click="$router.back()">返回</el-button>
+          <el-button v-if="!preview" size="mini" icon="el-icon-arrow-left" @click="$router.back()">返回</el-button>
          <el-button size="mini" icon="el-icon-refresh" @click="loadDetail">刷新</el-button>

-          <!-- 审批操作按钮 -->
-          <el-button v-if="canApprove" type="success" size="mini" :loading="actionLoading" @click="handleApprove">
+          <el-button v-if="!preview && canApprove" type="success" size="mini" :loading="actionLoading" @click="handleApprove">
            通过
          </el-button>
-          <el-button v-if="canApprove" type="danger" size="mini" :loading="actionLoading" @click="handleReject">
+          <el-button v-if="!preview && canApprove" type="danger" size="mini" :loading="actionLoading" @click="handleReject">
            驳回
          </el-button>
        </div>
@@ -54,20 +53,21 @@
        <ProjectInfo :info="detail" />
      </el-card>

-      <div class="block-title">审批操作</div>
-      <el-card class="inner-card" shadow="never">
-        <div class="hint-text">系统将自动识别你在该单据上的“当前待办任务”。若你不是当前办理人，将不会显示办理按钮。</div>
-        <div v-if="currentTask" class="btn-row">
-          <el-input v-model="actionRemark" type="textarea" :rows="3" placeholder="填写审批意见（可选）" />
-          <div class="btn-row mt10">
-            <el-button type="success" v-if="canApprove" :loading="actionSubmitting"
-              @click="submitTaskAction('approve')">通过</el-button>
-            <el-button type="danger" v-if="canApprove" :loading="actionSubmitting"
-              @click="submitTaskAction('reject')">驳回</el-button>
+      <div v-if="!preview">
+        <div class="block-title">审批操作</div>
+        <el-card class="inner-card" shadow="never">
+          <div v-if="currentTask" class="btn-row">
+            <el-input v-model="actionRemark" type="textarea" :rows="3" placeholder="填写审批意见（可选）" />
+            <div class="btn-row mt10">
+              <el-button type="success" v-if="canApprove" :loading="actionSubmitting"
+                @click="submitTaskAction('approve')">通过</el-button>
+              <el-button type="danger" v-if="canApprove" :loading="actionSubmitting"
+                @click="submitTaskAction('reject')">驳回</el-button>
+            </div>
          </div>
-        </div>
-        <div v-else class="empty">当前无待办任务（可能已处理完成，或你不是当前审批人）</div>
-      </el-card>
+          <div v-else class="empty">当前无待办任务（可能已处理完成，或你不是当前审批人）</div>
+        </el-card>
+      </div>
    </el-card>

    <el-card class="report-card" shadow="never">
@@ -75,7 +75,7 @@
        <span>操作汇报</span>
      </div>

-      <div class="comment-form">
+      <div v-if="!preview" class="comment-form">
        <editor v-model="commentForm.commentContent" placeholder="填写操作汇报（可选）" />
        <file-upload v-model="commentForm.attachments" />
        <div class="form-actions">
@@ -89,7 +89,7 @@
            <div class="comment-meta">
              <span class="comment-operator">{{ item.createByName }}</span>
              <span class="comment-time">{{ item.createTime }}</span>
-              <el-button v-if="isSelf(item)" type="danger" size="mini" @click="handleDeleteComment(item.commentId)"
+              <el-button v-if="!preview && isSelf(item)" type="danger" size="mini" @click="handleDeleteComment(item.commentId)"
                :loading="buttonLoading">删除</el-button>
            </div>
          </div>
@@ -132,7 +132,8 @@ export default {
  name: 'BizDetailContainer',
  props: {
    bizId: { type: String, required: true },
-    bizType: { type: String, required: true }
+    bizType: { type: String, required: true },
+    preview: { type: Boolean, default: false }
  },
  components: {
    FilePreview,
@@ -414,7 +415,7 @@ export default {
    async exportComment () {
      try {
        this.buttonLoading = true
-        const res = await addFlowComment({
+        await addFlowComment({
          instId: this.flowInstance.instId,
          commentContent: this.commentForm.commentContent,
          attachments: this.commentForm.attachments
--- a/ruoyi-ui/src/views/hrm/flow/taskHistory.vue
+++ b/ruoyi-ui/src/views/hrm/flow/taskHistory.vue
@@ -0,0 +1,209 @@
+<template>
+  <div class="hrm-page">
+    <div class="flow-task-layout">
+      <el-card class="metal-panel left" shadow="never">
+        <div slot="header" class="panel-header">
+          <div class="actions-inline">
+            <el-button size="mini" plain icon="el-icon-refresh" @click="fetchList">刷新</el-button>
+          </div>
+        </div>
+
+        <el-table
+          :data="list"
+          v-loading="loading"
+          height="680"
+          stripe
+          highlight-current-row
+          @row-click="openDetail"
+        >
+          <el-table-column label="业务" min-width="140">
+            <template slot-scope="scope">
+              <div class="biz-cell">
+                <span class="biz-type">{{ bizTypeText(scope.row.bizType) }}</span>
+                <span class="biz-title">{{ scope.row.title || scope.row.remark }}</span>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="审批状态" min-width="100">
+            <template slot-scope="scope">
+              <el-tag :type="statusType(scope.row.status)" size="mini">{{ statusText(scope.row.status) }}</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column label="审批时间" min-width="160">
+            <template slot-scope="scope">
+              <span>{{ formatDate(scope.row.updateTime || scope.row.createTime) || '-' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="备注" prop="remark" show-overflow-tooltip />
+        </el-table>
+      </el-card>
+
+      <el-card class="metal-panel right" shadow="never">
+        <div slot="header" class="panel-header"></div>
+
+        <div v-if="!detailTask" class="placeholder">
+          <div class="p-title">请在左侧选择一条审批记录</div>
+          <div class="p-sub">右侧将展示表单内容和流转历史</div>
+        </div>
+
+        <div v-else class="detail-wrap">
+          <div class="detail-summary">
+            <div class="ds-left">
+              <div class="ds-title">{{ bizTypeText(detailTask.bizType) }} · {{ detailTask.title || '审批详情' }}</div>
+              <div class="ds-sub">
+                <el-tag size="mini" :type="statusType(detailTask.status)">{{ statusText(detailTask.status) }}</el-tag>
+                <span class="muted">审批时间 {{ formatDate(detailTask.updateTime || detailTask.createTime) || '-' }}</span>
+              </div>
+            </div>
+          </div>
+
+          <el-tabs value="form">
+            <el-tab-pane label="表单数据" name="form">
+              <LeaveDetail v-if="detailTask && detailTask.bizType === 'leave'" :biz-id="detailTask.bizId" :embedded="true" :preview="true" />
+              <TravelDetail v-else-if="detailTask && detailTask.bizType === 'travel'" :biz-id="detailTask.bizId" :embedded="true" :preview="true" />
+              <SealDetail v-else-if="detailTask && detailTask.bizType === 'seal'" :biz-id="detailTask.bizId" :embedded="true" :preview="true" />
+              <ReimburseDetail v-else-if="detailTask && detailTask.bizType === 'reimburse'" :biz-id="detailTask.bizId" :embedded="true" :preview="true" />
+
+              <div v-else>
+                <el-table :data="formData" v-loading="formLoading" size="mini" height="260">
+                  <el-table-column label="字段" prop="fieldName" min-width="140" />
+                  <el-table-column label="展示" prop="fieldLabel" min-width="160" show-overflow-tooltip />
+                  <el-table-column label="值" prop="fieldValue" min-width="220" show-overflow-tooltip />
+                </el-table>
+              </div>
+            </el-tab-pane>
+
+            <el-tab-pane label="流转历史" name="history">
+              <el-timeline v-loading="actionLoading" v-if="actionList.length">
+                <el-timeline-item
+                  v-for="(a, idx) in actionList"
+                  :key="idx"
+                  :timestamp="formatDate(a.createTime)"
+                  :type="actionTagType(a.action)"
+                >
+                  <div class="timeline-row">
+                    <div class="t-main">
+                      <span class="t-action">{{ actionText(a.action) }}</span>
+                      <span class="t-user">· 办理人：{{ formatUser(a.createBy, 'createBy') }}</span>
+                    </div>
+                    <div class="t-remark" v-if="a.remark">{{ a.remark }}</div>
+                  </div>
+                </el-timeline-item>
+              </el-timeline>
+              <div v-else class="empty">暂无流转记录</div>
+            </el-tab-pane>
+          </el-tabs>
+        </div>
+      </el-card>
+    </div>
+  </div>
+</template>
+
+<script>
+import { listHistoryFlowTask, listFlowAction, listFlowFormData } from '@/api/hrm/flow'
+import { listUser } from '@/api/system/user'
+import LeaveDetail from '@/views/hrm/requests/leaveDetail.vue'
+import ReimburseDetail from '@/views/hrm/requests/reimburseDetail.vue'
+import SealDetail from '@/views/hrm/requests/sealDetail.vue'
+import TravelDetail from '@/views/hrm/requests/travelDetail.vue'
+
+export default {
+  name: 'HrmFlowHistory',
+  dicts: ['hrm_stamp_image'],
+  components: { LeaveDetail, TravelDetail, SealDetail, ReimburseDetail },
+  data() {
+    return {
+      query: { status: undefined, pageNum: 1, pageSize: 50 },
+      list: [],
+      total: 0,
+      loading: false,
+      detailTask: null,
+      actionList: [],
+      actionLoading: false,
+      formData: [],
+      formLoading: false,
+      allUsers: []
+    }
+  },
+  created() {
+    this.loadAllUsers()
+    this.fetchList()
+  },
+  methods: {
+    bizTypeText(val) { const map = { leave: '请假', travel: '出差', seal: '用印', payroll: '薪酬', reimburse: '报销' }; return map[val] || val || '-' },
+    statusText(status) { const map = { pending: '待办', done: '已通过', approved: '已通过', rejected: '已驳回', withdrawn: '已撤回' }; return map[status] || status || '-' },
+    statusType(status) { const map = { pending: 'warning', done: 'success', approved: 'success', rejected: 'danger', withdrawn: 'info' }; return map[status] || 'info' },
+    formatDate(val) { if (!val) return ''; const d = new Date(val); const p = n => (n < 10 ? `0${n}` : n); return `${d.getFullYear()}-${p(d.getMonth() + 1)}-${p(d.getDate())} ${p(d.getHours())}:${p(d.getMinutes())}` },
+    actionText(action) { const map = { submit: '提交', approve: '通过', reject: '驳回', withdraw: '撤回', cancel: '撤销', stamp: '盖章', transfer: '转发' }; return map[action] || action || '-' },
+    actionTagType(action) { const map = { submit: 'primary', approve: 'success', reject: 'danger', withdraw: 'info', cancel: 'info', stamp: 'primary', transfer: 'warning' }; return map[action] || 'info' },
+    async loadAllUsers() { try { const res = await listUser({ pageNum: 1, pageSize: 1000 }); this.allUsers = res.rows || [] } catch (e) { this.allUsers = [] } },
+    formatUser(userId, fieldName) { if (!userId) return '-'; const user = this.allUsers.find(u => u[fieldName] === userId); return user ? `${user.nickName || user.userName}` : '-' },
+
+    fetchList() {
+      this.loading = true
+      listHistoryFlowTask(this.query).then(res => {
+        this.list = res.rows || []
+        this.total = res.total || 0
+        if (!this.detailTask && this.list.length) this.openDetail(this.list[0])
+      }).finally(() => { this.loading = false })
+    },
+
+    openDetail(row) {
+      if (!row) return
+      this.detailTask = row
+      this.loadActions(row)
+      this.loadFormData(row)
+    },
+
+    loadActions(row) {
+      if (!row || !row.instId) return
+      this.actionLoading = true
+      listFlowAction({ instId: row.instId }).then(res => { this.actionList = res.rows || [] }).finally(() => { this.actionLoading = false })
+    },
+
+    loadFormData(row) {
+      if (!row || !row.instId) return
+      this.formLoading = true
+      listFlowFormData({ instId: row.instId }).then(res => { this.formData = res.rows || [] }).finally(() => { this.formLoading = false })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.hrm-page {
+  padding: 0;
+  background: transparent;
+}
+.flow-task-layout {
+  display: grid;
+  grid-template-columns: 520px 1fr;
+  gap: 12px;
+  align-items: start;
+}
+.metal-panel {
+  border: 1px solid rgba(215, 217, 223, 0.55);
+  border-radius: 8px;
+  background: #fff;
+  box-shadow: none;
+}
+.panel-header { display: flex; justify-content: space-between; align-items: center; font-weight: 700; color: #2b2f36; padding: 0; min-height: 0; }
+.header-title { display: flex; flex-direction: column; }
+.header-title .sub { font-size: 12px; color: #8a8f99; margin-top: 2px; font-weight: 500; }
+.actions-inline { display: flex; gap: 8px; align-items: center; }
+.biz-cell { display: flex; flex-direction: column; gap: 2px; }
+.biz-type { font-size: 12px; color: #8a8f99; }
+.biz-title { font-weight: 500; color: #2b2f36; line-height: 1.2; }
+.muted { color: #8a8f99; font-size: 12px; }
+.placeholder { padding: 18px 14px; border: 1px dashed #eef0f3; border-radius: 8px; background: #fff; }
+.p-title { font-weight: 700; color: #2b2f36; }
+.p-sub { margin-top: 6px; color: #8a8f99; font-size: 13px; }
+.detail-wrap { padding-right: 2px; }
+.detail-summary { display: flex; justify-content: space-between; align-items: flex-start; gap: 12px; padding: 12px; border: 1px solid rgba(230, 232, 237, 0.65); border-radius: 8px; background: #fff; }
+.ds-title { font-weight: 700; color: #2b2f36; }
+.ds-sub { margin-top: 6px; display: flex; gap: 8px; align-items: center; flex-wrap: wrap; }
+/* removed extra right-side summary metadata */
+.empty { padding: 12px; color: #8a8f99; }
+.timeline-row .t-main { font-weight: 600; color: #2b2f36; }
+.timeline-row .t-remark { margin-top: 4px; color: #606266; font-size: 13px; }
+</style>
--- a/ruoyi-ui/src/views/hrm/index.vue
+++ b/ruoyi-ui/src/views/hrm/index.vue
@@ -17,6 +17,9 @@
          <router-link to="/hrm/payroll">
            <el-button type="success" plain icon="el-icon-coin">薪酬与指标</el-button>
          </router-link>
+          <router-link to="/oa/taskHistory">
+    <el-button type="default" plain icon="el-icon-tickets">审批历史</el-button>
+  </router-link>
        </div>
      </div>
      <div class="hero-stat">
--- a/ruoyi-ui/src/views/hrm/js/History
+++ b/ruoyi-ui/src/views/hrm/js/History
@@ -0,0 +1,36 @@
+import request from '@/utils/request'
+
+// 获取审批历史（已完成）
+export function listHistoryFlowTask(query) {
+  return request({
+    url: '/workflow/task/historyList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 任务详情
+export function getTodoTaskByBiz(taskId) {
+  return request({
+    url: '/workflow/task/getByTaskId/' + taskId,
+    method: 'get'
+  })
+}
+
+// 审批记录
+export function listFlowAction(query) {
+  return request({
+    url: '/workflow/instance/action/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 表单数据
+export function listFlowFormData(query) {
+  return request({
+    url: '/workflow/instance/form/data',
+    method: 'get',
+    params: query
+  })
+}
--- a/ruoyi-ui/src/views/hrm/requests/appropriationDetail.vue
+++ b/ruoyi-ui/src/views/hrm/requests/appropriationDetail.vue
@@ -1,5 +1,5 @@
 <template>
-  <BizDetailContainer :bizId="currentBizId" bizType="appropriation">
+  <BizDetailContainer :bizId="currentBizId" bizType="appropriation" :preview="preview">
    <template slot-scope="{ detail }">
      <div>
        <!-- 拨款金额信息 -->
@@ -59,7 +59,8 @@ export default {
  name: 'AppropriationDetail',
  props: {
    bizId: { type: [String, Number], default: null },
-    embedded: { type: Boolean, default: false }
+    embedded: { type: Boolean, default: false },
+    preview: { type: Boolean, default: false }
  },
  components: {
    FilePreview,
@@ -114,8 +115,7 @@ export default {
      return this.detail.status === 'pending' && (this.currentTask?.assigneeUserName === this.$store.getters.name || this.currentTask?.assigneeUserId === this.$store.getters.id)
    },
    canWithdraw () {
-      return false;
-      return this.detail.status === 'pending' && this.detail.createBy === this.$store.getters.name
+      return false
    }
  },
  created () {
--- a/ruoyi-ui/src/views/hrm/requests/leaveDetail.vue
+++ b/ruoyi-ui/src/views/hrm/requests/leaveDetail.vue
@@ -1,5 +1,5 @@
 <template>
-  <BizDetailContainer :bizId="currentBizId" bizType="leave">
+  <BizDetailContainer :bizId="currentBizId" bizType="leave" :preview="preview">
    <template slot-scope="{ detail }">
      <div>
        <!-- 请假日期信息 -->
@@ -50,7 +50,8 @@ export default {
  name: 'LeaveDetail',
  props: {
    bizId: { type: [String, Number], default: null },
-    embedded: { type: Boolean, default: false }
+    embedded: { type: Boolean, default: false },
+    preview: { type: Boolean, default: false }
  },
  components: {
    FilePreview,
--- a/ruoyi-ui/src/views/hrm/requests/reimburseDetail.vue
+++ b/ruoyi-ui/src/views/hrm/requests/reimburseDetail.vue
@@ -1,5 +1,5 @@
 <template>
-  <BizDetailContainer :bizId="currentBizId" bizType="reimburse">
+  <BizDetailContainer :bizId="currentBizId" bizType="reimburse" :preview="preview">
    <template slot-scope="{ detail }">
      <div>
        <!-- 报销金额信息 -->
@@ -47,7 +47,8 @@ export default {
  name: 'ReimburseDetail',
  props: {
    bizId: { type: [String, Number], default: null },
-    embedded: { type: Boolean, default: false }
+    embedded: { type: Boolean, default: false },
+    preview: { type: Boolean, default: false }
  },
  components: {
    BizDetailContainer,
--- a/ruoyi-ui/src/views/hrm/requests/travelDetail.vue
+++ b/ruoyi-ui/src/views/hrm/requests/travelDetail.vue
@@ -1,5 +1,5 @@
 <template>
-  <BizDetailContainer :bizId="currentBizId" bizType="travel">
+  <BizDetailContainer :bizId="currentBizId" bizType="travel" :preview="preview">
    <template slot-scope="{ detail }">
      <div>
        <!-- 出差时间与行程 -->
@@ -46,7 +46,8 @@ export default {
  name: 'TravelDetail',
  props: {
    bizId: { type: [String, Number], default: '' },
-    embedded: { type: Boolean, default: false }
+    embedded: { type: Boolean, default: false },
+    preview: { type: Boolean, default: false }
  },
  components: {
    BizDetailContainer,