mod: 合并

apps/web-ele/src/api/system/infoEntry/employeeSettings/employeeSettings.ts

@@ -0,0 +1,78 @@
+import type { EmployeeSettingsModel } from './model';
+
+import type { BaseResult } from '#/api/base-result';
+
+import { commonExport } from '#/api/helper';
+import { requestClient } from '#/api/request';
+
+// API路径常量枚举
+enum Api {
+  // 导出
+  export = '/sysEvaluation/evaluation/export',
+  // 列表查询
+  list = '/sysEvaluation/evaluation/list',
+  // 基础路径
+  root = '/sysEvaluation/evaluation',
+}
+
+/**
+ * 查询员工评价项设置列表
+ * @param params 查询参数
+ * @returns 分页结果
+ */
+export function employeeSettingsList(params: any) {
+  return requestClient.get<BaseResult<EmployeeSettingsModel[]>>(Api.list, {
+    params,
+  });
+}
+
+/**
+ * 获取员工评价项设置详细信息
+ * @param id 员工评价项设置ID
+ * @returns 员工评价项设置详情
+ */
+export function getEmployeeSettingsDetail(id: number) {
+  return requestClient.get<EmployeeSettingsModel>(`${Api.root}/${id}`);
+}
+
+/**
+ * 新增员工评价项设置
+ * @param data 员工评价项设置数据
+ * @returns 操作结果
+ */
+export function addEmployeeSettings(data: EmployeeSettingsModel) {
+  return requestClient.post(Api.root, data, {
+    successMessageMode: 'message',
+  });
+}
+
+/**
+ * 修改员工评价项设置
+ * @param data 员工评价项设置数据
+ * @returns 操作结果
+ */
+export function updateEmployeeSettings(data: EmployeeSettingsModel) {
+  return requestClient.put(Api.root, data, {
+    successMessageMode: 'message',
+  });
+}
+
+/**
+ * 删除员工评价项设置
+ * @param ids 员工评价项设置ID数组
+ * @returns 操作结果
+ */
+export function deleteEmployeeSettings(ids: number[]) {
+  return requestClient.delete(`${Api.root}/${ids.join(',')}`, {
+    successMessageMode: 'message',
+  });
+}
+
+/**
+ * 导出员工评价项设置列表
+ * @param data 导出参数
+ * @returns 导出结果
+ */
+export function exportEmployeeSettings(data: Partial<EmployeeSettingsModel>) {
+  return commonExport(Api.export, data);
+}

apps/web-ele/src/api/system/infoEntry/employeeSettings/model.ts

@@ -0,0 +1,22 @@
+export interface EmployeeSettingsModel {
+  // 主键id
+  id?: number;
+  // 考核项
+  itemName?: string;
+  // 分数
+  standardScore?: number;
+  // 排序
+  sortOrder?: number;
+  // 详细说明
+  description?: string;
+  // 逻辑删除标识
+  delFlag?: number;
+  // 创建人
+  createBy?: string;
+  // 创建时间
+  createTime?: string;
+  // 更新人
+  updateBy?: string;
+  // 更新时间
+  updateTime?: string;
+}

apps/web-ele/src/api/system/infoEntry/scoreEntry/model.ts

@@ -0,0 +1,18 @@
+export interface ScoreEntryModel {
+  // 主键id
+  id?: number;
+  // 创建人
+  createBy?: string;
+  // 创建时间
+  createTime?: string;
+  // 删除标记
+  delFlag?: number;
+  // 备注
+  remark?: string;
+  // 更新人
+  updateBy?: string;
+  // 更新时间
+  updateTime?: string;
+  // 其他评分标准相关字段
+  // 可根据实际需求添加
+}

apps/web-ele/src/api/system/infoEntry/scoreEntry/scoreEntry.ts

@@ -0,0 +1,56 @@
+import type { ScoreEntryModel } from './model';
+
+import type { BaseResult } from '#/api/base-result';
+
+import { commonExport } from '#/api/helper';
+import { requestClient } from '#/api/request';
+
+// API路径常量枚举
+enum Api {
+  // 导出
+  export = '/sysScoreStandard/standard/export',
+  // 列表查询
+  list = '/sysScoreStandard/standard/list',
+  // 基础路径
+  root = '/sysScoreStandard/standard',
+}
+
+/**
+ * 查询评分标准设置列表
+ * @param params 查询参数
+ * @returns 分页结果
+ */
+export function scoreEntryList(params: any) {
+  return requestClient.get<BaseResult<ScoreEntryModel[]>>(Api.list, {
+    params,
+  });
+}
+
+/**
+ * 获取评分标准设置详细信息
+ * @param id 评分标准设置ID
+ * @returns 评分标准设置详情
+ */
+export function getScoreEntryDetail(id: number) {
+  return requestClient.get<ScoreEntryModel>(`${Api.root}/${id}`);
+}
+
+/**
+ * 修改评分标准设置
+ * @param data 评分标准设置数据
+ * @returns 操作结果
+ */
+export function updateScoreEntry(data: ScoreEntryModel) {
+  return requestClient.put(Api.root, data, {
+    successMessageMode: 'message',
+  });
+}
+
+/**
+ * 导出评分标准设置列表
+ * @param data 导出参数
+ * @returns 导出结果
+ */
+export function exportScoreEntry(data: Partial<ScoreEntryModel>) {
+  return commonExport(Api.export, data);
+}

apps/web-ele/src/views/system/infoEntry/scoreEntry/index.vue

@@ -1,21 +1,38 @@
 <script lang="ts" setup>
 // 导入部分
-import { ref, computed } from 'vue';
+import { ref, computed, onMounted } from 'vue';
 import { Page } from '@vben/common-ui';
-import { ElTable, ElTableColumn, ElButton, ElInput, ElTabs, ElTabPane } from 'element-plus';
+import { ElTable, ElTableColumn, ElButton, ElInput, ElTabs, ElTabPane, ElSelect, ElOption } from 'element-plus';
+
+// API 导入
+import { scoreEntryList, updateScoreEntry } from '#/api/system/infoEntry/scoreEntry/scoreEntry';
+// 数据字典导入
+import { getDictOptions } from '#/utils/dict';
 
 // 类型定义
 interface TabOption {
   label: string;
-  value: 'stationManager' | 'stationStaff' | 'areaStaff' | 'headquarters' | 'station' | 'area';
+  value: string;
+  typeValue: string;
+}
+
+interface StandardItem {
+  score: number;
+  condition: string;
+  max_value?: number;
+  min_value?: number;
 }
 
 interface ScoreItem {
-  id: number;
+  id: string;
+  type: string;
+  typeName: string;
   dimension: string;
+  dimensionName: string;
   indicator: string;
-  standard: string;
-  score: number;
+  indicatorName: string;
+  standardJson: string;
+  standards: StandardItem[];
   isEditing?: boolean;
   // 拆分后的标准字段
   threshold1: number;
@@ -29,549 +46,161 @@ interface ScoreItem {
   threshold6: number;
   threshold7: number;
   score4: number;
+  // API 响应中的其他字段
+  createBy?: string;
+  createTime?: string;
+  updateBy?: string;
+  updateTime?: string;
+  remark?: string;
 }
 
+// 数据字典选项
+const typeOptions = ref<any[]>([]);
+const dimensionOptions = ref<any[]>([]);
+const indicatorOptions = ref<any[]>([]);
+
 // 响应式数据
 // Tab切换数据
-const activeTab = ref<'stationManager' | 'stationStaff' | 'areaStaff' | 'headquarters' | 'station' | 'area'>('stationManager');
+const activeTab = ref<string>('stationManager');
 const tabOptions: TabOption[] = [
-  { label: '油站管理人员', value: 'stationManager' },
-  { label: '油站员工', value: 'stationStaff' },
-  { label: '片区人员', value: 'areaStaff' },
-  { label: '总部人员', value: 'headquarters' },
-  { label: '油站', value: 'station' },
-  { label: '片区', value: 'area' },
+  { label: '油站管理人员', value: 'stationManager', typeValue: 'oil_station_manager' },
+  { label: '油站员工', value: 'stationStaff', typeValue: 'oil_station_employee' },
+  { label: '片区人员', value: 'areaStaff', typeValue: 'region_personnel' },
+  { label: '总部人员', value: 'headquarters', typeValue: 'headquarters_personnel' },
+  { label: '油站', value: 'station', typeValue: 'oil_station' },
+  { label: '片区', value: 'area', typeValue: 'region' },
 ];
 
-// 油站管理人员评分数据
-const stationManagerScores = ref<ScoreItem[]>([
-  {
-    id: 1,
-    dimension: '任务数量',
-    indicator: '完成率',
-    standard: '(≥ 98% ：20分  区间 95% — 98% ：16分  区间 90% — 95% ：12分  区间 0% — 90% ：0分)',
-    score: 20,
-    isEditing: false,
-    // 拆分后的标准字段
-    threshold1: 98,
-    score1: 20,
-    threshold2: 95,
-    threshold3: 98,
-    score2: 16,
-    threshold4: 90,
-    threshold5: 95,
-    score3: 12,
-    threshold6: 0,
-    threshold7: 90,
-    score4: 0,
-  },
-  {
-    id: 2,
-    dimension: '任务质量',
-    indicator: '任务得分',
-    standard: '(≥ 4.5分 ：30分  区间 4分 — 4.5分 ：24分  区间 3分 — 4分 ：18分  区间 0分 — 3分 ：0分)',
-    score: 30,
-    isEditing: false,
-    // 拆分后的标准字段
-    threshold1: 4.5,
-    score1: 30,
-    threshold2: 4,
-    threshold3: 4.5,
-    score2: 24,
-    threshold4: 3,
-    threshold5: 4,
-    score3: 18,
-    threshold6: 0,
-    threshold7: 3,
-    score4: 0,
-  },
-  {
-    id: 3,
-    dimension: '查阅情况',
-    indicator: '已阅比例',
-    standard: '(≥ 95% ：20分  区间 90% — 95% ：15分  区间 80% — 90% ：9分  区间 0% — 80% ：0分)',
-    score: 20,
-    isEditing: false,
-    // 拆分后的标准字段
-    threshold1: 95,
-    score1: 20,
-    threshold2: 90,
-    threshold3: 95,
-    score2: 15,
-    threshold4: 80,
-    threshold5: 90,
-    score3: 9,
-    threshold6: 0,
-    threshold7: 80,
-    score4: 0,
-  },
-  {
-    id: 4,
-    dimension: '授权',
-    indicator: '授权点评率',
-    standard: '(≥ 70% ：30分  区间 60% — 70% ：24分  区间 50% — 60% ：18分  区间 0% — 50% ：0分)',
-    score: 30,
-    isEditing: false,
-    // 拆分后的标准字段
-    threshold1: 70,
-    score1: 30,
-    threshold2: 60,
-    threshold3: 70,
-    score2: 24,
-    threshold4: 50,
-    threshold5: 60,
-    score3: 18,
-    threshold6: 0,
-    threshold7: 50,
-    score4: 0,
-  },
-]);
-
-// 油站员工评分数据
-const stationStaffScores = ref<ScoreItem[]>([
-  {
-    id: 1,
-    dimension: '任务数量',
-    indicator: '完成率',
-    standard: '(≥ 98% ：45分  区间 95% — 98% ：36分  区间 90% — 95% ：27分  区间 0% — 90% ：0分)',
-    score: 45,
-    isEditing: false,
-    threshold1: 98,
-    score1: 45,
-    threshold2: 95,
-    threshold3: 98,
-    score2: 36,
-    threshold4: 90,
-    threshold5: 95,
-    score3: 27,
-    threshold6: 0,
-    threshold7: 90,
-    score4: 0,
-  },
-  {
-    id: 2,
-    dimension: '任务数量',
-    indicator: '新增任务率',
-    standard: '(≥ 5% ：50分  区间 3% — 5% ：40分  区间 1% — 3% ：30分  区间 0% — 1% ：0分)',
-    score: 50,
-    isEditing: false,
-    threshold1: 5,
-    score1: 50,
-    threshold2: 3,
-    threshold3: 5,
-    score2: 40,
-    threshold4: 1,
-    threshold5: 3,
-    score3: 30,
-    threshold6: 0,
-    threshold7: 1,
-    score4: 0,
-  },
-  {
-    id: 3,
-    dimension: '任务质量',
-    indicator: '任务得分',
-    standard: '(≥ 4.5分 ：5分  区间 4分 — 4.5分 ：3分  区间 3分 — 4分 ：2分  区间 0分 — 3分 ：0分)',
-    score: 5,
-    isEditing: false,
-    threshold1: 4.5,
-    score1: 5,
-    threshold2: 4,
-    threshold3: 4.5,
-    score2: 3,
-    threshold4: 3,
-    threshold5: 4,
-    score3: 2,
-    threshold6: 0,
-    threshold7: 3,
-    score4: 0,
-  },
-]);
-
-// 片区人员评分数据
-const areaStaffScores = ref<ScoreItem[]>([
-  {
-    id: 1,
-    dimension: '任务数量',
-    indicator: '完成率',
-    standard: '(≥ 98% ：40分  区间 95% — 98% ：32分  区间 90% — 95% ：24分  区间 0% — 90% ：0分)',
-    score: 40,
-    isEditing: false,
-    threshold1: 98,
-    score1: 40,
-    threshold2: 95,
-    threshold3: 98,
-    score2: 32,
-    threshold4: 90,
-    threshold5: 95,
-    score3: 24,
-    threshold6: 0,
-    threshold7: 90,
-    score4: 0,
-  },
-  {
-    id: 2,
-    dimension: '任务质量',
-    indicator: '任务得分',
-    standard: '(≥ 4.5分 ：20分  区间 4分 — 4.5分 ：16分  区间 3分 — 4分 ：12分  区间 0分 — 3分 ：0分)',
-    score: 20,
-    isEditing: false,
-    threshold1: 4.5,
-    score1: 20,
-    threshold2: 4,
-    threshold3: 4.5,
-    score2: 16,
-    threshold4: 3,
-    threshold5: 4,
-    score3: 12,
-    threshold6: 0,
-    threshold7: 3,
-    score4: 0,
-  },
-  {
-    id: 3,
-    dimension: '点评',
-    indicator: '点评完成率',
-    standard: '(≥ 95% ：25分  区间 90% — 95% ：20分  区间 80% — 90% ：15分  区间 0% — 80% ：0分)',
-    score: 25,
-    isEditing: false,
-    threshold1: 95,
-    score1: 25,
-    threshold2: 90,
-    threshold3: 95,
-    score2: 20,
-    threshold4: 80,
-    threshold5: 90,
-    score3: 15,
-    threshold6: 0,
-    threshold7: 80,
-    score4: 0,
-  },
-  {
-    id: 4,
-    dimension: '点评',
-    indicator: '按时点评率',
-    standard: '(≥ 95% ：0分  区间 90% — 95% ：0分  区间 80% — 90% ：0分  区间 0% — 80% ：0分)',
-    score: 0,
-    isEditing: false,
-    threshold1: 95,
+// 评分数据
+const scoreData = ref<ScoreItem[]>([]);
+const loading = ref<boolean>(false);
+
+// 获取当前选中tab对应的typeValue
+const getCurrentTypeValue = () => {
+  const tab = tabOptions.find(tab => tab.value === activeTab.value);
+  return tab ? tab.typeValue : '';
+};
+
+// 解析standardJson字段
+const parseStandardJson = (standardJson: string): StandardItem[] => {
+  try {
+    const parsed = JSON.parse(standardJson);
+    return parsed.standards || [];
+  } catch (error) {
+    console.error('解析standardJson失败:', error);
+    return [];
+  }
+};
+
+// 格式化标准项为阈值和分数
+const formatStandardsToThresholds = (standards: StandardItem[]): Partial<ScoreItem> => {
+  // 默认值
+  const defaults = {
+    threshold1: 0,
     score1: 0,
-    threshold2: 90,
-    threshold3: 95,
+    threshold2: 0,
+    threshold3: 0,
     score2: 0,
-    threshold4: 80,
-    threshold5: 90,
+    threshold4: 0,
+    threshold5: 0,
     score3: 0,
     threshold6: 0,
-    threshold7: 80,
-    score4: 0,
-  },
-  {
-    id: 5,
-    dimension: '逾期',
-    indicator: '逾期未完成数',
-    standard: '(≥ 9个 ：0分  区间 6个 — 9个 ：5分  区间 3个 — 6个 ：10分  区间 0个 — 3个 ：15分)',
-    score: 15,
-    isEditing: false,
-    threshold1: 9,
-    score1: 0,
-    threshold2: 6,
-    threshold3: 9,
-    score2: 5,
-    threshold4: 3,
-    threshold5: 6,
-    score3: 10,
-    threshold6: 0,
-    threshold7: 3,
-    score4: 15,
-  },
-]);
-
-// 总部人员评分数据
-const headquartersScores = ref<ScoreItem[]>([
-  {
-    id: 1,
-    dimension: '任务数量',
-    indicator: '完成率',
-    standard: '(≥ 98% ：30分  区间 95% — 98% ：24分  区间 90% — 95% ：18分  区间 0% — 90% ：0分)',
-    score: 30,
-    isEditing: false,
-    threshold1: 98,
-    score1: 30,
-    threshold2: 95,
-    threshold3: 98,
-    score2: 24,
-    threshold4: 90,
-    threshold5: 95,
-    score3: 18,
-    threshold6: 0,
-    threshold7: 90,
-    score4: 0,
-  },
-  {
-    id: 2,
-    dimension: '任务质量',
-    indicator: '任务得分',
-    standard: '(≥ 4.5分 ：20分  区间 4分 — 4.5分 ：16分  区间 3分 — 4分 ：12分  区间 0分 — 3分 ：0分)',
-    score: 20,
-    isEditing: false,
-    threshold1: 4.5,
-    score1: 20,
-    threshold2: 4,
-    threshold3: 4.5,
-    score2: 16,
-    threshold4: 3,
-    threshold5: 4,
-    score3: 12,
-    threshold6: 0,
-    threshold7: 3,
-    score4: 0,
-  },
-  {
-    id: 3,
-    dimension: '点评',
-    indicator: '点评完成率',
-    standard: '(≥ 95% ：30分  区间 90% — 95% ：20分  区间 80% — 90% ：15分  区间 0% — 80% ：0分)',
-    score: 30,
-    isEditing: false,
-    threshold1: 95,
-    score1: 30,
-    threshold2: 90,
-    threshold3: 95,
-    score2: 20,
-    threshold4: 80,
-    threshold5: 90,
-    score3: 15,
-    threshold6: 0,
-    threshold7: 80,
-    score4: 0,
-  },
-  {
-    id: 4,
-    dimension: '点评',
-    indicator: '按时点评率',
-    standard: '(≥ 95% ：20分  区间 90% — 95% ：15分  区间 80% — 90% ：8分  区间 0% — 80% ：0分)',
-    score: 20,
-    isEditing: false,
-    threshold1: 95,
-    score1: 20,
-    threshold2: 90,
-    threshold3: 95,
-    score2: 15,
-    threshold4: 80,
-    threshold5: 90,
-    score3: 8,
-    threshold6: 0,
-    threshold7: 80,
-    score4: 0,
-  },
-]);
-
-// 油站评分数据
-const stationScores = ref<ScoreItem[]>([
-  {
-    id: 1,
-    dimension: '任务数量',
-    indicator: '完成率',
-    standard: '(≥ 98% ：30分  区间 95% — 98% ：24分  区间 90% — 95% ：18分  区间 0% — 90% ：0分)',
-    score: 30,
-    isEditing: false,
-    threshold1: 98,
-    score1: 30,
-    threshold2: 95,
-    threshold3: 98,
-    score2: 24,
-    threshold4: 90,
-    threshold5: 95,
-    score3: 18,
-    threshold6: 0,
-    threshold7: 90,
+    threshold7: 0,
     score4: 0,
-  },
-  {
-    id: 2,
-    dimension: '任务质量',
-    indicator: '任务得分',
-    standard: '(≥ 4.5分 ：20分  区间 4分 — 4.5分 ：16分  区间 3分 — 4分 ：12分  区间 0分 — 3分 ：0分)',
-    score: 20,
-    isEditing: false,
-    threshold1: 4.5,
-    score1: 20,
-    threshold2: 4,
-    threshold3: 4.5,
-    score2: 16,
-    threshold4: 3,
-    threshold5: 4,
-    score3: 12,
-    threshold6: 0,
-    threshold7: 3,
-    score4: 0,
-  },
-  {
-    id: 3,
-    dimension: '绩效',
-    indicator: '最多相同分数率',
-    standard: '(≥ 60% ：0分  区间 40% — 60% ：6分  区间 20% — 40% ：8分  区间 0% — 20% ：10分)',
-    score: 10,
-    isEditing: false,
-    threshold1: 60,
-    score1: 0,
-    threshold2: 40,
-    threshold3: 60,
-    score2: 6,
-    threshold4: 20,
-    threshold5: 40,
-    score3: 8,
-    threshold6: 0,
-    threshold7: 20,
-    score4: 10,
-  },
-  {
-    id: 4,
-    dimension: '查阅情况',
-    indicator: '已阅比例',
-    standard: '(≥ 95% ：15分  区间 90% — 95% ：12分  区间 80% — 90% ：9分  区间 0% — 80% ：0分)',
-    score: 15,
-    isEditing: false,
-    threshold1: 95,
-    score1: 15,
-    threshold2: 90,
-    threshold3: 95,
-    score2: 12,
-    threshold4: 80,
-    threshold5: 90,
-    score3: 9,
-    threshold6: 0,
-    threshold7: 80,
-    score4: 0,
-  },
-  {
-    id: 5,
-    dimension: '逾期',
-    indicator: '逾期未完成数',
-    standard: '(≥ 9个 ：0分  区间 6个 — 9个 ：5分  区间 3个 — 6个 ：12分  区间 0个 — 3个 ：20分)',
-    score: 20,
-    isEditing: false,
-    threshold1: 9,
-    score1: 0,
-    threshold2: 6,
-    threshold3: 9,
-    score2: 5,
-    threshold4: 3,
-    threshold5: 6,
-    score3: 12,
-    threshold6: 0,
-    threshold7: 3,
-    score4: 20,
-  },
-]);
-
-// 片区评分数据
-const areaScores = ref<ScoreItem[]>([
-  {
-    id: 1,
-    dimension: '任务数量',
-    indicator: '完成率',
-    standard: '(≥ 98% ：40分  区间 95% — 98% ：32分  区间 90% — 95% ：24分  区间 0% — 90% ：0分)',
-    score: 40,
-    isEditing: false,
-    threshold1: 98,
-    score1: 40,
-    threshold2: 95,
-    threshold3: 98,
-    score2: 32,
-    threshold4: 90,
-    threshold5: 95,
-    score3: 24,
-    threshold6: 0,
-    threshold7: 90,
-    score4: 0,
-  },
-  {
-    id: 2,
-    dimension: '任务质量',
-    indicator: '任务得分',
-    standard: '(≥ 4.5分 ：20分  区间 4分 — 4.5分 ：16分  区间 3分 — 4分 ：12分  区间 0分 — 3分 ：0分)',
-    score: 20,
-    isEditing: false,
-    threshold1: 4.5,
-    score1: 20,
-    threshold2: 4,
-    threshold3: 4.5,
-    score2: 16,
-    threshold4: 3,
-    threshold5: 4,
-    score3: 12,
-    threshold6: 0,
-    threshold7: 3,
-    score4: 0,
-  },
-  {
-    id: 3,
-    dimension: '绩效',
-    indicator: '最多相同分数率',
-    standard: '(≥ 95% ：0分  区间 90% — 95% ：12分  区间 80% — 90% ：9分  区间 0% — 80% ：15分)',
-    score: 15,
-    isEditing: false,
-    threshold1: 95,
-    score1: 0,
-    threshold2: 90,
-    threshold3: 95,
-    score2: 12,
-    threshold4: 80,
-    threshold5: 90,
-    score3: 9,
-    threshold6: 0,
-    threshold7: 80,
-    score4: 15,
-  },
-  {
-    id: 4,
-    dimension: '查阅情况',
-    indicator: '已阅比例',
-    standard: '(≥ 95% ：15分  区间 90% — 95% ：12分  区间 80% — 90% ：9分  区间 0% — 80% ：0分)',
-    score: 15,
-    isEditing: false,
-    threshold1: 95,
-    score1: 15,
-    threshold2: 90,
-    threshold3: 95,
-    score2: 12,
-    threshold4: 80,
-    threshold5: 90,
-    score3: 9,
-    threshold6: 0,
-    threshold7: 80,
-    score4: 0,
-  },
-]);
+  };
+  
+  if (!standards || standards.length === 0) {
+    return defaults;
+  }
+  
+  // 按min_value降序排序
+  const sortedStandards = [...standards].sort((a, b) => (b.min_value || 0) - (a.min_value || 0));
+  
+  // 填充阈值和分数
+  return {
+    threshold1: sortedStandards[0]?.min_value || 0,
+    score1: sortedStandards[0]?.score || 0,
+    threshold2: sortedStandards[1]?.min_value || 0,
+    threshold3: sortedStandards[1]?.max_value || 0,
+    score2: sortedStandards[1]?.score || 0,
+    threshold4: sortedStandards[2]?.min_value || 0,
+    threshold5: sortedStandards[2]?.max_value || 0,
+    score3: sortedStandards[2]?.score || 0,
+    threshold6: sortedStandards[3]?.min_value || 0,
+    threshold7: sortedStandards[3]?.max_value || 0,
+    score4: sortedStandards[3]?.score || 0,
+  };
+};
+
+// 加载评分数据
+const loadScoreData = async () => {
+  const typeValue = getCurrentTypeValue();
+  if (!typeValue) return;
+  
+  loading.value = true;
+  try {
+    const response = await scoreEntryList({ type: typeValue });
+    console.log('原始响应:', response);
+    if (response.rows) {
+      scoreData.value = response.rows.map((item: any) => {
+        const standards = parseStandardJson(item.standardJson);
+        const thresholds = formatStandardsToThresholds(standards);
+        return {
+          ...item,
+          standards,
+          isEditing: false,
+          ...thresholds,
+        };
+      });
+    }
+  } catch (error) {
+    console.error('加载评分数据失败:', error);
+  } finally {
+    loading.value = false;
+  }
+};
+
+// 监听tab切换，重新加载数据
+const handleTabChange = () => {
+  loadScoreData();
+};
 
 // 计算当前选中的评分数据
 const currentScores = computed(() => {
-  switch (activeTab.value) {
-    case 'stationManager':
-      return stationManagerScores.value;
-    case 'stationStaff':
-      return stationStaffScores.value;
-    case 'areaStaff':
-      return areaStaffScores.value;
-    case 'headquarters':
-      return headquartersScores.value;
-    case 'station':
-      return stationScores.value;
-    case 'area':
-      return areaScores.value;
-    default:
-      return [];
-  }
+  return scoreData.value;
 });
 
+// 初始化数据
+onMounted(async () => {
+  // 加载数据字典
+  typeOptions.value = getDictOptions("score_standard_type");
+  dimensionOptions.value = getDictOptions("score_standard_dimension");
+  indicatorOptions.value = getDictOptions("score_standard_indicator");
+  
+  // 加载初始数据
+  await loadScoreData();
+});
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 // 计算需要合并的行
 const getRowspan = (scores: ScoreItem[], index: number): number => {
-  const currentDimension = scores[index].dimension;
+  const currentDimension = scores[index].dimensionName;
   let rowspan = 1;
   for (let i = index + 1; i < scores.length; i++) {
-    if (scores[i].dimension === currentDimension) {
+    if (scores[i].dimensionName === currentDimension) {
       rowspan++;
     } else {
       break;
@@ -585,10 +214,10 @@ const tableSpanMethod = ({ row, column, rowIndex, columnIndex }: any) => {
   // 只处理维度列的合并
   if (columnIndex === 0) {
     const scores = currentScores.value;
-    const currentDimension = scores[rowIndex].dimension;
+    const currentDimension = scores[rowIndex].dimensionName;
     
     // 检查当前行是否是连续相同维度行的第一行
-    if (rowIndex === 0 || scores[rowIndex - 1].dimension !== currentDimension) {
+    if (rowIndex === 0 || scores[rowIndex - 1].dimensionName !== currentDimension) {
       const rowspan = getRowspan(scores, rowIndex);
       return [rowspan, 1];
     } else {
@@ -601,7 +230,7 @@ const tableSpanMethod = ({ row, column, rowIndex, columnIndex }: any) => {
 
 // 事件处理函数
 // 编辑按钮点击事件
-const handleEdit = (id: number) => {
+const handleEdit = (id: string) => {
   const scores = currentScores.value;
   const item = scores.find(item => item.id === id);
   if (item) {
@@ -610,13 +239,55 @@ const handleEdit = (id: number) => {
 };
 
 // 保存按钮点击事件
-const handleSave = (id: number) => {
+const handleSave = async (id: string) => {
   const scores = currentScores.value;
   const item = scores.find(item => item.id === id);
   if (item) {
-    // 更新standard字段以保持数据一致性
-    item.standard = `≥ ${item.threshold1}% ：${item.score1}分  区间 ${item.threshold2}% — ${item.threshold3}% ：${item.score2}分  区间 ${item.threshold4}% — ${item.threshold5}% ：${item.score3}分  区间 ${item.threshold6}% — ${item.threshold7}% ：${item.score4}分`;
-    item.isEditing = false;
+    // 生成新的standardJson
+    const standards = [
+      {
+        score: item.score1,
+        condition: `≥${item.threshold1}%`,
+        min_value: item.threshold1,
+        max_value: null
+      },
+      {
+        score: item.score2,
+        condition: `${item.threshold2}%—${item.threshold3}%`,
+        min_value: item.threshold2,
+        max_value: item.threshold3
+      },
+      {
+        score: item.score3,
+        condition: `${item.threshold4}%—${item.threshold5}%`,
+        min_value: item.threshold4,
+        max_value: item.threshold5
+      },
+      {
+        score: item.score4,
+        condition: `${item.threshold6}%—${item.threshold7}%`,
+        min_value: item.threshold6,
+        max_value: item.threshold7
+      }
+    ];
+    
+    const updatedItem = {
+      id: item.id,
+      type: item.type,
+      dimension: item.dimension,
+      indicator: item.indicator,
+      standardJson: JSON.stringify({ standards })
+    };
+    
+    try {
+      const response = await updateScoreEntry(updatedItem);
+      console.log('更新响应:', response);
+      item.isEditing = false;
+      // 重新加载数据以确保一致性
+      await loadScoreData();
+    } catch (error) {
+      console.error('保存失败:', error);
+    }
   }
 };
 
@@ -627,13 +298,13 @@ const handleSave = (id: number) => {
     <div class="score-entry">
       <!-- Tab切换区域 -->
       <div class="tab-container">
-        <ElTabs v-model="activeTab">
+        <ElTabs v-model="activeTab" @tab-click="handleTabChange">
           <ElTabPane v-for="tab in tabOptions" :key="tab.value" :label="tab.label" :name="tab.value">
             <!-- 评分表格 -->
             <div class="score-table-container">
               <ElTable :data="currentScores" border stripe style="width: 100%" :span-method="tableSpanMethod">
-                <ElTableColumn prop="dimension" label="维度" width="150" />
-                <ElTableColumn prop="indicator" label="指标" width="180" />
+                <ElTableColumn prop="dimensionName" label="维度" width="150" />
+                <ElTableColumn prop="indicatorName" label="指标" width="180" />
                 <ElTableColumn label="标准及分值">
                   <template #default="scope">
                     <div v-if="scope.row.isEditing" class="standard-edit">

apps/web-ele/src/views/workflow/components/approval-content.vue

@@ -1,26 +0,0 @@
-<!-- 审批终止 Modal弹窗的content属性专用 用于填写审批意见 -->
-<script setup lang="ts">
-// import { Textarea } from 'ant-design-vue';
-
-defineOptions({
-  name: 'ApprovalContent',
-  inheritAttrs: false,
-});
-
-defineProps<{ description: string; value: string }>();
-
-defineEmits<{ 'update:value': [string] }>();
-</script>
-
-<template>
-  <div class="flex flex-col gap-2">
-    <div>{{ description }}</div>
-    <ElInput
-      :allow-clear="true"
-      :auto-size="true"
-      :model="value"
-      placeholder="审批意见(可选)"
-      @change="(e) => $emit('update:value', e.target.value!)"
-    />
-  </div>
-</template>

apps/web-ele/src/views/workflow/components/helper.tsx

@@ -1,11 +1,8 @@
-import { defineComponent, h, ref } from 'vue';
 
-import { ElMessageBox } from 'element-plus';
 import dayjs from 'dayjs';
 import duration from 'dayjs/plugin/duration';
 import relativeTime from 'dayjs/plugin/relativeTime';
 
-import ApprovalContent from './approval-content.vue';
 
 export interface ApproveWithReasonModalProps {
   title: string;
@@ -13,41 +10,6 @@ export interface ApproveWithReasonModalProps {
   onOk: (reason: string) => void;
 }
 
-/**
- * 带审批意见的confirm
- * @param props props
- */
-export function approveWithReasonModal(props: ApproveWithReasonModalProps) {
-  const { onOk, title, description } = props;
-  const content = ref('');
-  ElMessageBox.confirm(
-    h(
-      defineComponent({
-        setup() {
-          return () =>
-            h(ApprovalContent, {
-              description,
-              value: content.value,
-              'onUpdate:value': (v) => (content.value = v),
-            });
-        },
-      }),
-    ),
-    title,
-    {
-      confirmButtonText: '确定',
-      cancelButtonText: '取消',
-      center: true,
-      confirmButtonClass: 'el-button--danger',
-      callback: (action) => {
-        if (action === 'confirm') {
-          onOk(content.value);
-        }
-      },
-    },
-  );
-}
-
 dayjs.extend(duration);
 dayjs.extend(relativeTime);
 /**

apps/web-ele/src/views/workflow/leave/data.tsx

@@ -49,16 +49,15 @@ export const querySchema: FormSchemaGetter = () => [
 
 export const columns: VxeGridProps['columns'] = [
   { type: 'checkbox', width: 60 },
-  {
-    title: '请假类型',
-    field: 'leaveType',
-    // slots: {
-    //   default: ({ row }) => {
-    //     // return renderDict(row.leaveType, leaveTypeOptions);
-    //     // return <OptionsTag options={leaveTypeOptions} value={row.leaveType} />;
-    //   },
-    // },
-  },
+  // {
+  //   title: '请假类型',
+  //   field: 'leaveType',
+  //   slots: {
+  //     default: ({ row }) => {
+  //       // return <OptionsTag options={leaveTypeOptions} value={row.leaveType} />;
+  //     },
+  //   },
+  // },
   {
     title: '开始时间',
     field: 'startDate',

apps/web-ele/src/views/workflow/leave/index.vue

@@ -1,243 +0,0 @@
-<script setup lang="ts">
-import type { VbenFormProps } from '@vben/common-ui';
-
-import type { LeaveForm } from './api/model';
-
-import type { VxeGridProps } from '#/adapter/vxe-table';
-
-import { Page, useVbenDrawer, useVbenModal } from '@vben/common-ui';
-import { getVxePopupContainer } from '@vben/utils';
-
-// import { Modal, Popconfirm, Space } from 'ant-design-vue';
-import { useVbenVxeGrid } from '#/adapter/vxe-table';
-import { cancelProcessApply } from '#/api/workflow/instance';
-import { commonDownloadExcel } from '#/utils/file/download';
-
-import { applyModal, flowInfoModal } from '../components';
-import { leaveExport, leaveList, leaveRemove } from './api';
-import { columns, querySchema } from './data';
-import { useRouteIdEdit } from './hook';
-import leaveDrawer from './leave-drawer.vue';
-
-const formOptions: VbenFormProps = {
-  commonConfig: {
-    labelWidth: 80,
-    componentProps: {
-      allowClear: true,
-    },
-  },
-  schema: querySchema(),
-  wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4',
-};
-
-const gridOptions: VxeGridProps = {
-  checkboxConfig: {
-    // 高亮
-    highlight: true,
-    // 翻页时保留选中状态
-    reserve: true,
-    // 选中 需要根据状态判断
-    checkMethod: ({ row }) => ['back', 'cancel', 'draft'].includes(row.status),
-  },
-  columns,
-  height: 'auto',
-  keepSource: true,
-  pagerConfig: {},
-  proxyConfig: {
-    ajax: {
-      query: async ({ page }, formValues = {}) => {
-        return await leaveList({
-          pageNum: page.currentPage,
-          pageSize: page.pageSize,
-          ...formValues,
-        });
-      },
-    },
-  },
-  rowConfig: {
-    keyField: 'id',
-  },
-  // 表格全局唯一表示 保存列配置需要用到
-  id: 'workflow-leave-index',
-  cellClassName: ({ row }) => {
-    // 草稿状态 可点击
-    if (row.status !== 'draft') {
-      return 'cursor-pointer';
-    }
-  },
-};
-
-const [BasicTable, tableApi] = useVbenVxeGrid({
-  formOptions,
-  gridOptions,
-  gridEvents: {
-    cellClick: ({ row, column }) => {
-      // 草稿状态 不做处理
-      // 操作列 不做处理
-      if (row.status === 'draft' || column.field === 'action') {
-        return;
-      }
-      // 查看详情
-      handleInfo(row);
-    },
-  },
-});
-
-const [ApplyModal, applyModalApi] = useVbenModal({
-  connectedComponent: applyModal,
-});
-const [LeaveDrawer, leaveDrawerApi] = useVbenDrawer({
-  connectedComponent: leaveDrawer,
-});
-
-function handleAdd() {
-  leaveDrawerApi.setData({ applyModalApi }).open();
-}
-
-async function handleEdit(row: Required<LeaveForm>) {
-  leaveDrawerApi.setData({ id: row.id, applyModalApi }).open();
-}
-
-useRouteIdEdit((id) => {
-  // 打开编辑
-  leaveDrawerApi.setData({ id, applyModalApi }).open();
-});
-
-async function handleCompleteOrCancel() {
-  leaveDrawerApi.close();
-  tableApi.query();
-}
-
-async function handleDelete(row: Required<LeaveForm>) {
-  await leaveRemove(row.id);
-  await tableApi.query();
-}
-
-async function handleRevoke(row: Required<LeaveForm>) {
-  await cancelProcessApply({
-    businessId: row.id,
-    message: '申请人撤销流程！',
-  });
-  await tableApi.query();
-}
-
-function handleMultiDelete() {
-  const rows = tableApi.grid.getCheckboxRecords();
-  const ids = rows.map((row: Required<LeaveForm>) => row.id);
-  Modal.confirm({
-    title: '提示',
-    okType: 'danger',
-    content: `确认删除选中的${ids.length}条记录吗？`,
-    onOk: async () => {
-      await leaveRemove(ids);
-      await tableApi.query();
-    },
-  });
-}
-
-function handleDownloadExcel() {
-  commonDownloadExcel(
-    leaveExport,
-    '请假申请数据',
-    tableApi.formApi.form.values,
-    {
-      fieldMappingTime: formOptions.fieldMappingTime,
-    },
-  );
-}
-const [FlowInfoModal, flowInfoModalApi] = useVbenModal({
-  connectedComponent: flowInfoModal,
-});
-
-function handleInfo(row: Required<LeaveForm>) {
-  flowInfoModalApi.setData({ businessId: row.id });
-  flowInfoModalApi.open();
-}
-</script>
-
-<template>
-  <Page :auto-content-height="true">
-    <BasicTable table-title="请假申请列表">
-      <template #toolbar-tools>
-        <Space>
-          <a-button
-            v-access:code="['workflow:leave:export']"
-            @click="handleDownloadExcel"
-          >
-            {{ $t('pages.common.export') }}
-          </a-button>
-          <a-button
-            :disabled="!vxeCheckboxChecked(tableApi)"
-            danger
-            type="primary"
-            v-access:code="['workflow:leave:remove']"
-            @click="handleMultiDelete"
-          >
-            {{ $t('pages.common.delete') }}
-          </a-button>
-          <a-button
-            type="primary"
-            v-access:code="['workflow:leave:add']"
-            @click="handleAdd"
-          >
-            {{ $t('pages.common.add') }}
-          </a-button>
-        </Space>
-      </template>
-      <template #action="{ row }">
-        <a-button
-          size="small"
-          type="link"
-          :disabled="!['draft', 'cancel', 'back'].includes(row.status)"
-          v-access:code="['workflow:leave:edit']"
-          @click.stop="handleEdit(row)"
-        >
-          {{ $t('pages.common.edit') }}
-        </a-button>
-        <Popconfirm
-          :get-popup-container="getVxePopupContainer"
-          placement="left"
-          title="确认撤销？"
-          :disabled="!['waiting'].includes(row.status)"
-          @confirm.stop="handleRevoke(row)"
-          @cancel.stop=""
-        >
-          <a-button
-            size="small"
-            type="link"
-            :disabled="!['waiting'].includes(row.status)"
-            v-access:code="['workflow:leave:edit']"
-            @click.stop=""
-          >
-            撤销
-          </a-button>
-        </Popconfirm>
-        <Popconfirm
-          :get-popup-container="getVxePopupContainer"
-          placement="left"
-          title="确认删除？"
-          :disabled="!['draft', 'cancel', 'back'].includes(row.status)"
-          @confirm.stop="handleDelete(row)"
-          @cancel.stop=""
-        >
-          <a-button
-            size="small"
-            type="link"
-            :disabled="!['draft', 'cancel', 'back'].includes(row.status)"
-            danger
-            v-access:code="['workflow:leave:remove']"
-            @click.stop=""
-          >
-            {{ $t('pages.common.delete') }}
-          </a-button>
-        </Popconfirm>
-      </template>
-    </BasicTable>
-    <FlowInfoModal />
-    <ApplyModal
-      @complete="handleCompleteOrCancel"
-      @cancel="handleCompleteOrCancel"
-    />
-    <LeaveDrawer @reload="() => tableApi.query()" />
-  </Page>
-</template>

apps/web-ele/src/views/workflow/leave/leave-drawer.vue

@@ -1,190 +0,0 @@
-<script setup lang="ts">
-import type { ExtendedModalApi } from '@vben/common-ui';
-
-import type { StartWorkFlowReqData } from '#/api/workflow/task/model';
-
-import { computed, ref, shallowRef } from 'vue';
-
-import { useVbenDrawer } from '@vben/common-ui';
-import { $t } from '@vben/locales';
-import { cloneDeep } from '@vben/utils';
-
-import dayjs from 'dayjs';
-import { omit } from 'lodash-es';
-
-import { useVbenForm } from '#/adapter/form';
-import { startWorkFlow } from '#/api/workflow/task';
-
-import {
-  leaveAdd,
-  leaveInfo,
-  leaveUpdate,
-  submitAndStartWorkflow,
-} from './api';
-import { formSchema } from './data';
-
-const emit = defineEmits<{ reload: [] }>();
-
-const isUpdate = ref(false);
-const title = computed(() => {
-  return isUpdate.value ? $t('pages.common.edit') : $t('pages.common.add');
-});
-
-const [BasicForm, formApi] = useVbenForm({
-  layout: 'vertical',
-  commonConfig: {
-    formItemClass: 'col-span-2',
-    componentProps: {
-      class: 'w-full',
-    },
-    labelWidth: 100,
-  },
-  schema: formSchema(),
-  showDefaultActions: false,
-  wrapperClass: 'grid-cols-2',
-});
-
-const modalApi = shallowRef<ExtendedModalApi | null>(null);
-
-const [BasicDrawer, drawerApi] = useVbenDrawer({
-  closeOnClickModal: false,
-  onClosed: handleClosed,
-  onConfirm: handleStartWorkFlow,
-  async onOpenChange(isOpen) {
-    if (!isOpen) {
-      return null;
-    }
-    drawerApi.drawerLoading(true);
-
-    const { id, applyModalApi } = drawerApi.getData() as {
-      applyModalApi: ExtendedModalApi;
-      id?: number | string;
-    };
-    modalApi.value = applyModalApi;
-    isUpdate.value = !!id;
-    // 赋值
-    if (isUpdate.value && id) {
-      const resp = await leaveInfo(id);
-      await formApi.setValues(resp);
-      const dateRange = [dayjs(resp.startDate), dayjs(resp.endDate)];
-      await formApi.setFieldValue('dateRange', dateRange);
-    }
-
-    drawerApi.drawerLoading(false);
-  },
-});
-
-async function handleClosed() {
-  await formApi.resetForm();
-}
-
-/**
- * 获取已经处理好的表单参数
- */
-async function getFormData() {
-  const { valid } = await formApi.validate();
-  if (!valid) {
-    throw new Error('表单验证失败');
-  }
-  let data = cloneDeep(await formApi.getValues()) as any;
-  data = omit(data, 'flowType', 'type');
-  // 处理日期
-  data.startDate = dayjs(data.dateRange[0]).format('YYYY-MM-DD HH:mm:ss');
-  data.endDate = dayjs(data.dateRange[1]).format('YYYY-MM-DD HH:mm:ss');
-  return data;
-}
-
-/**
- * 暂存/提交 提取通用逻辑
- */
-async function handleSaveOrUpdate() {
-  const data = await getFormData();
-  return await (isUpdate.value ? leaveUpdate(data) : leaveAdd(data));
-}
-
-/**
- * 暂存 草稿状态
- */
-async function handleTempSave() {
-  try {
-    await handleSaveOrUpdate();
-    emit('reload');
-    drawerApi.close();
-  } catch (error) {
-    console.error(error);
-  }
-}
-
-/**
- * 保存业务 & 发起流程
- */
-async function handleStartWorkFlow() {
-  drawerApi.lock(true);
-  try {
-    const { valid } = await formApi.validate();
-    if (!valid) {
-      return;
-    }
-    // 获取发起类型
-    const { type } = await formApi.getValues();
-    /**
-     * 这里只是demo 实际只会用到一种
-     */
-    switch (type) {
-      // 后端发起流程
-      case 'backend': {
-        const data = await getFormData();
-        await submitAndStartWorkflow(data);
-        emit('reload');
-        drawerApi.close();
-        break;
-      }
-      // 前端发起流程
-      case 'frontend': {
-        // 保存业务
-        const leaveResp = await handleSaveOrUpdate();
-        // 启动流程
-        const taskVariables = {
-          leaveDays: leaveResp!.leaveDays,
-          userList: ['1', '3', '4'],
-        };
-        const formValues = await formApi.getValues();
-        const flowCode = formValues?.flowType ?? 'leave1';
-        const startWorkFlowData: StartWorkFlowReqData = {
-          businessId: leaveResp!.id,
-          flowCode,
-          variables: taskVariables,
-          flowInstanceBizExtBo: {
-            businessTitle: '请假申请 - 自定义标题',
-            businessCode: leaveResp!.applyCode,
-          },
-        };
-        const { taskId } = await startWorkFlow(startWorkFlowData);
-        // 打开窗口
-        modalApi.value?.setData({
-          taskId,
-          taskVariables,
-          variables: {},
-        });
-        modalApi.value?.open();
-        break;
-      }
-    }
-    emit('reload');
-    drawerApi.close();
-  } catch (error) {
-    console.error(error);
-  } finally {
-    drawerApi.lock(false);
-  }
-}
-</script>
-
-<template>
-  <BasicDrawer :title="title" class="w-[600px]">
-    <BasicForm />
-    <template #center-footer>
-      <a-button @click="handleTempSave">暂存</a-button>
-    </template>
-  </BasicDrawer>
-</template>

apps/web-ele/src/views/workflow/task/allTaskWaiting.vue

@@ -8,18 +8,16 @@ import { computed, nextTick, onMounted, ref, useTemplateRef } from 'vue';
 import { Page } from '@vben/common-ui';
 import { useTabs } from '@vben/hooks';
 
-// import {
-//   Empty,
-//   Form,
-//   FormItem,
-//   Input,
-//   InputSearch,
-//   Popover,
-//   Segmented,
-//   Spin,
-//   Tooltip,
-//   TreeSelect,
-// } from 'ant-design-vue';
+import { Filter, Refresh } from '@element-plus/icons-vue';
+import {
+  ElButton,
+  ElForm,
+  ElFormItem,
+  ElInput,
+  ElMessage,
+  ElPopover,
+  ElTooltip,
+} from 'element-plus';
 import { cloneDeep, debounce, uniqueId } from 'lodash-es';
 
 import { categoryTree } from '#/api/workflow/category';