From a69512ef0ee752ef1f9dace7195e78de8efaae6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E9=9B=AA?= <1617763071@qq.com>
Date: Thu, 19 Mar 2026 11:28:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BE=E6=89=8B=E5=85=8D=E8=B4=A3=E6=B8=B2?=
 =?UTF-8?q?=E6=9F=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/exemption/exemption.js                |  67 +++++
 src/views/exemption/components/addDialog.vue  | 219 ++++++++++++----
 .../exemption/components/checkDialog.vue      |  40 +--
 .../exemption/components/detailsDialog.vue    | 233 +++++++++-------
 src/views/exemption/index.vue                 | 248 +++++++++++-------
 5 files changed, 564 insertions(+), 243 deletions(-)
 create mode 100644 src/api/exemption/exemption.js

diff --git a/src/api/exemption/exemption.js b/src/api/exemption/exemption.js
new file mode 100644
index 00000000..d3c1c357
--- /dev/null
+++ b/src/api/exemption/exemption.js
@@ -0,0 +1,67 @@
+
+import request from '@/axios';
+
+export const exemptionList = (current, size, params) => {
+  return request({
+    url: '/blade-desk/QA/RaiseHand/list',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    },
+  });
+};
+
+export const saveItem = params => {
+  return request({
+    url: '/blade-desk/QA/RaiseHand/save',
+    method: 'post',
+    data: params,
+  });
+};
+export const updateItem = params => {
+  return request({
+    url: '/blade-desk/QA/RaiseHand/update',
+    method: 'post',
+    data: params,
+  });
+};
+export const detailItem = id => {
+  return request({
+    url: '/blade-desk/QA/RaiseHand/detail',
+    method: 'get',
+    params: {
+      id,
+    },
+  });
+};
+export const reviewDataItem = params => {
+  return request({
+    url: '/blade-desk/QA/RaiseHand/reviewData',
+    method: 'post',
+    data: params,
+  });
+};
+  export const removeItem = ids => {
+  return request({
+    url: '/blade-desk/QA/RaiseHand/remove',
+    method: 'post',
+    params: {
+      ids,
+    },
+  });
+};
+export const userList = (current, size, params) => {
+  return request({
+    url: '/blade-system/user/userListByRaise',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    },
+  });
+};
+
+
diff --git a/src/views/exemption/components/addDialog.vue b/src/views/exemption/components/addDialog.vue
index 15a865e3..00d3c05f 100644
--- a/src/views/exemption/components/addDialog.vue
+++ b/src/views/exemption/components/addDialog.vue
@@ -6,7 +6,14 @@
     width="30%"
     @close="closeDialog"
   >
-    <avue-form ref="form" :option="option"></avue-form>
+    <avue-form
+      ref="form"
+      :option="option"
+      v-model="formData"
+      :upload-after="uploadAfter"
+      :upload-exceed="uploadExceed"
+      :upload-delete="uploadDelete"
+    ></avue-form>
 
     <template #footer>
       <span class="dialog-footer">
@@ -17,6 +24,7 @@
   </el-dialog>
 </template>
 <script>
+import { saveItem, updateItem ,userList} from '@/api/exemption/exemption';
 // import {
 //   updateProcess,
 // } from '../../api/flowManagement/index';
@@ -30,76 +38,100 @@ export default {
       type: String,
       default: '新增',
     },
+    rowItem: {
+      type: Object,
+      default: () => {},
+    },
   },
   data() {
     return {
+      attachLink:'',
       openShow: false,
+      formData: {},
+      userListData: [],
       option: {
         submitBtn: false,
         emptyBtn: false,
+        labelWidth: 100,
         column: [
+              {
+            label: '提出人',
+            prop: 'reportUserId',
+            type: 'select',
+            span: 24,
+            rules: [{ required: true, message: '请选择提出人', trigger: 'change' }],
+            dicData: [],
+            props: {
+              label: 'label',
+              value: 'value',
+            },
+            filterable: true,
+          },
+          {
+            label: '岗位',
+            prop: 'postName',
+            span: 24,
+            rules: [{ required: true, message: '请输入岗位', trigger: 'blur' }],
+          },
+          {
+            label: '发生时间',
+            prop: 'happenDate',
+            type: 'date',
+            span: 24,
+            rules: [{ required: true, message: '请选择发生时间', trigger: 'change' }],
+          },
           {
-            label: '问题描述',
-            prop: 'input',
+            label: '免责问题描述',
+            prop: 'notes',
+            type: 'textarea',
+            rows: 3,
             span: 24,
-            rules: [{ required: true, message: '请输入', trigger: 'blur' }],
+            rules: [{ required: true, message: '请输入免责问题描述', trigger: 'blur' }],
           },
           {
             label: '原因',
-            prop: 'input2',
-            // type: 'textarea',
+            prop: 'reason',
+            type: 'textarea',
             rows: 3,
             span: 24,
-            rules: [{ required: true, message: '请输入', trigger: 'blur' }],
+            rules: [{ required: true, message: '请输入原因', trigger: 'blur' }],
           },
           {
             label: '措施',
-            prop: 'input2',
-            // type: 'textarea',
-            span: 24,
+            prop: 'measure',
+            type: 'textarea',
             rows: 3,
-            rules: [{ required: true, message: '请输入', trigger: 'blur' }],
+            span: 24,
+            rules: [{ required: true, message: '请输入措施', trigger: 'blur' }],
           },
           {
             label: '免责理由',
-            prop: 'input2',
-            // type: 'textarea',
-            span: 24,
+            prop: 'raiseHandReason',
+            type: 'textarea',
             rows: 3,
-            rules: [{ required: true, message: '请输入', trigger: 'blur' }],
+            span: 24,
+            rules: [{ required: true, message: '请输入免责理由', trigger: 'blur' }],
           },
           {
             label: '免责金额',
-            prop: 'input2',
+            prop: 'amount',
             type: 'number',
             span: 24,
-            rules: [{ required: true, message: '请输入', trigger: 'blur' }],
-          },
-          {
-            label: '审核工艺员',
-            prop: 'input2',
-            type: 'select',
-            span: 24,
-            rules: [{ required: true, message: '请选择', trigger: 'blur' }],
-            dicData: [
-              {
-                label: '张三',
-                value: '1',
-              },
-            ],
+            rules: [{ required: true, message: '请输入免责金额', trigger: 'blur' }],
           },
+      
           {
             label: '固化文件',
-            prop: 'imgUrl',
+            prop: 'fileUrl',
             type: 'upload',
             multiple: true,
             span: 24,
-            // propsHttp: {
-            //   url: 'url',
-            //   name: 'name',
-            //   res: 'data',
-            // },
-            // action,
+            propsHttp: {
+              res: 'data',
+              url: 'link',
+              name: 'originalName',
+            },
+            action: '/blade-resource/oss/endpoint/put-file-attach',
           },
         ],
       },
@@ -107,28 +139,119 @@ export default {
   },
   mounted() {
     this.openShow = this.showDialog;
+    this.loadUserList({ currentPage: 1, pageSize: 10 });
+  },
+  watch: {
+    rowItem: {
+      handler(newVal) {
+        if (newVal && Object.keys(newVal).length > 0) {
+          // 修改模式，回显数据
+          this.$nextTick(() => {
+            const formData = { ...newVal };
+            // 确保 reportUserId 类型与 userListData 中的 value 类型一致（转换为字符串）
+            if (formData.reportUserId !== undefined && formData.reportUserId !== null) {
+              formData.reportUserId = String(formData.reportUserId);
+            }
+            this.formData = formData;
+          });
+        } else {
+          // 新增模式，清空表单
+          this.formData = {};
+        }
+      },
+      immediate: true,
+      deep: true,
+    },
   },
   methods: {
+     loadUserList(page, params = {}) {
+
+      userList(page.currentPage, page.pageSize).then(res => {
+        console.log('用户列表接口返回', res);
+        if (res.data.code == 200) {
+          const users = res.data.data;
+            console.log('用户列表数据', users);
+
+          this.userListData = users.map(user => ({
+            label: user.realName || user.name,
+            value: String(user.id)
+          }));
+          console.log('转换后的 userListData', this.userListData);
+
+          // 同步到 option 的 dicData
+          this.option.column[0].dicData = this.userListData;
+        }
+      }).catch(error => {
+        console.error('获取用户列表失败', error);
+      });
+    },
+      uploadAfter(res, done, loading, column) {
+      console.log('uploadAfter1', res, done, loading, column);
+      this.attachLink  = res.link;
+      // this.fileForm.excelFile = [res.link];
+      // done();
+    },
+    uploadDelete(file, column) {
+      console.log('uploadDelete', file, column);
+      this.attachLink = '';
+    },
+    uploadExceed(limit, files, fileList, column) {
+      this.$message.error('最多只能上传一个文件');
+    },
+   
     closeDialog() {
       this.openShow = false;
+      this.formData = {};
+      this.attachLink = '';
       this.$emit('closeDialog');
     },
+ 
     submit() {
       this.$refs.form.validate(async valid => {
         if (valid) {
           let params = {
-            id: this.$route.query.id,
-            approvalStatus: '',
-
-            // status: this.option.column[0].value,
-            // reason: this.option.column[1].value,
+            ...this.formData,
           };
-          //   updateProcess(params).then((res) => {
-          //     if (res.code == 200) {
-          //       this.$message.success('操作成功');
-          //       this.closeDialog();
-          //     }
-          //   });
+
+          // 处理日期格式：将日期转换为 yyyy-MM-dd 格式
+          if (params.happenDate) {
+            const date = new Date(params.happenDate);
+            const year = date.getFullYear();
+            const month = String(date.getMonth() + 1).padStart(2, '0');
+            const day = String(date.getDate()).padStart(2, '0');
+            params.happenDate = `${year}-${month}-${day}`;
+          }
+
+          // 添加文件URL
+          if (this.attachLink) {
+            params.fileUrl = this.attachLink;
+          }
+
+          console.log('【表单提交】', this.infoTitle, params);
+
+          try {
+            let res;
+            if (this.infoTitle === '修改') {
+              console.log('修改模式，需要调用修改接口');
+              // 调用修改接口
+              res = await updateItem(params);
+            } else {
+              console.log('新增模式，需要调用新增接口');
+              // 调用新增接口
+              res = await saveItem(params);
+            }
+
+            if (res.data.code == 200) {
+              this.$message.success(this.infoTitle + '成功');
+              this.closeDialog();
+            } else {
+              console.error('操作失败', res);
+              this.$message.error(res.msg || '操作失败');
+            }
+          } catch (error) {
+            console.error('操作失败', error);
+            this.$message.error('操作失败，请稍后重试');
+          }
         }
       });
     },
diff --git a/src/views/exemption/components/checkDialog.vue b/src/views/exemption/components/checkDialog.vue
index fb31cf53..211ec9a5 100644
--- a/src/views/exemption/components/checkDialog.vue
+++ b/src/views/exemption/components/checkDialog.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog title="审核" append-to-body :modelValue="openShow" width="30%" @close="closeDialog">
-    <avue-form ref="form" :option="option"></avue-form>
+    <avue-form ref="form" :option="option" v-model="form"></avue-form>
 
     <template #footer>
       <span class="dialog-footer">
@@ -14,6 +14,8 @@
 // import {
 //   updateProcess,
 // } from '../../api/flowManagement/index';
+
+import { reviewDataItem} from '@/api/exemption/exemption';
 export default {
   props: {
     showDialog: {
@@ -28,13 +30,15 @@ export default {
   data() {
     return {
       openShow: false,
+      form: {},
       option: {
         submitBtn: false,
         emptyBtn: false,
+        labelWidth: 100,
         column: [
           {
             label: '审批结果',
-            prop: 'input',
+            prop: 'isSuccess',
             span: 24,
             type: 'radio',
             dicData: [
@@ -45,7 +49,7 @@ export default {
           },
           {
             label: '驳回原因',
-            prop: 'input2',
+            prop: 'reason',
             // type: 'select',
             type: 'textarea',
             span: 24,
@@ -75,20 +79,24 @@ export default {
     submit() {
       this.$refs.form.validate(async (valid) => {
         if (valid) {
-          let params = {
-            id: this.$route.query.id,
-            approvalStatus:'',
-            
-            // status: this.option.column[0].value,
-            // reason: this.option.column[1].value,
+          const formData = this.$refs.form.form;
+          const params = {
+            id: this.rowItem.id,
+            isSuccess: formData.isSuccess,
+            notes: formData.reason || '',
           };
-          // updateProcess(params).then((res) => { 
-          //   if (res.code == 200) {
-          //     this.$message.success('操作成功');
-          //     this.closeDialog();
-          //   }
-          // });
-          
+          reviewDataItem(params).then((res) => {
+            if (res.data.code == 200) {
+              this.$message.success('审核成功');
+              this.closeDialog();
+              this.$emit('refresh');
+            } else {
+              this.$message.error(res.data.msg || '审核失败');
+            }
+          }).catch(error => {
+            console.error('审核失败', error);
+            this.$message.error('审核失败');
+          });
         }
       })
     }
diff --git a/src/views/exemption/components/detailsDialog.vue b/src/views/exemption/components/detailsDialog.vue
index ff8b51b3..d72e6683 100644
--- a/src/views/exemption/components/detailsDialog.vue
+++ b/src/views/exemption/components/detailsDialog.vue
@@ -8,51 +8,54 @@
       :column="2"
       :size="size"
       border
-      label-width="100px"
+      label-width="120px"
     >
-      <el-descriptions-item label="提出人"> </el-descriptions-item>
-      <el-descriptions-item label="岗位"> </el-descriptions-item>
-      <el-descriptions-item label="免责问题描述"> </el-descriptions-item>
-      <el-descriptions-item label="原因"> </el-descriptions-item>
-      <el-descriptions-item label="措施"> </el-descriptions-item>
-      <el-descriptions-item label="免责理由"> </el-descriptions-item>
-      <el-descriptions-item label="免责金额"> </el-descriptions-item>
+      <el-descriptions-item label="提出人">
+        <span v-if="userListData && userListData.length > 0">{{ reportUserName }}</span>
+        <span v-else>{{ detailData.reportUserId || '-' }}</span>
+      </el-descriptions-item>
+      <el-descriptions-item label="岗位">{{ detailData.postName || '-' }}</el-descriptions-item>
+      <el-descriptions-item label="免责问题描述">{{ detailData.notes || '-' }}</el-descriptions-item>
+      <el-descriptions-item label="原因">{{ detailData.reason || '-' }}</el-descriptions-item>
+      <el-descriptions-item label="措施">{{ detailData.measure || '-' }}</el-descriptions-item>
+      <el-descriptions-item label="免责理由">{{ detailData.raiseHandReason || '-' }}</el-descriptions-item>
+      <el-descriptions-item label="免责金额">{{ detailData.amount || '-' }}</el-descriptions-item>
     </el-descriptions>
-    <el-descriptions
-      class="margin-top"
-      title="审批信息"
-      :column="3"
-      :size="size"
-      border
-      style="margin-top: 15px"
-    >
-    </el-descriptions>
-    <el-steps :active="active" finish-status="success" class="center-steps">
+   
+   <el-steps :active="active" finish-status="success" class="center-steps" align-center>
       <el-step title="提交">
-       <template #description>
-            <div>提交人</div>
-            <div>2025-09-09</div>
+        <template #description>
+          <div class="step-info">
+            <div>{{ getApprovalData(0, 'pointName') }}</div>
+            <div>{{ getApprovalData(0, 'createTime') }}</div>
+          </div>
         </template>
       </el-step>
       <el-step title="工艺员">
-         <template #description>
-            <div>工艺员</div>
-            <div>2025-09-09</div>
-            <div>驳回原因</div>
+        <template #description>
+          <div class="step-info">
+            <div>{{ getApprovalData(1, 'pointName') }}</div>
+            <div>{{ getApprovalData(1, 'createTime') }}</div>
+            <div class="reject-reason">{{ getApprovalData(1, 'rejectReason') || '' }}</div>
+          </div>
         </template>
       </el-step>
       <el-step title="质量工程师">
-         <template #description>
-            <div>质量工程师名字</div>
-            <div>2025-09-09</div>
-            <div>驳回原因</div>
+        <template #description>
+          <div class="step-info">
+            <div>{{ getApprovalData(2, 'pointName') }}</div>
+            <div>{{ getApprovalData(2, 'createTime') }}</div>
+            <div class="reject-reason">{{ getApprovalData(2, 'rejectReason') || '' }}</div>
+          </div>
         </template>
       </el-step>
       <el-step title="业务主管">
-         <template #description>
-            <div>厂长名字</div>
-            <div>2025-09-09</div>
-            <div>驳回原因</div>
+        <template #description>
+          <div class="step-info">
+            <div>{{ getApprovalData(3, 'pointName') }}</div>
+            <div>{{ getApprovalData(3, 'createTime') }}</div>
+            <div class="reject-reason">{{ getApprovalData(3, 'rejectReason') || '' }}</div>
+          </div>
         </template>
       </el-step>
     </el-steps>
@@ -68,6 +71,7 @@
 // import {
 //   updateProcess,
 // } from '../../api/flowManagement/index';
+import { detailItem} from '@/api/exemption/exemption';
 export default {
   props: {
     showDialog: {
@@ -78,80 +82,133 @@ export default {
       type: Object,
       default: () => {},
     },
+    userListData: {
+      type: Array,
+      default: () => [],
+    },
   },
   data() {
     return {
       openShow: false,
-      active:1,
-     
-      //   option: {
-      //     submitBtn: false,
-      //     emptyBtn: false,
-      //     column: [
-      //       {
-      //         label: '审批结果',
-      //         prop: 'input',
-      //         span: 24,
-      //         type: 'radio',
-      //         dicData: [
-      //           { label: '审批通过', value: 0 },
-      //           { label: '审批不通过', value: 1 },
-      //         ],
-      //         rules: [{ required: true, message: '请输入姓名', trigger: 'blur' }],
-      //       },
-      //       {
-      //         label: '驳回原因',
-      //         prop: 'input2',
-      //         // type: 'select',
-      //         type: 'textarea',
-      //         span: 24,
-      //         // dicData: [
-      //         //     {
-      //         //         label: '不需要结算',
-      //         //         value: '1',
-      //         //     },
-      //         //     {
-      //         //         label: '基础数据有误',
-      //         //         value: '2',
-      //         //     }
-      //         // ]
-      //       },
-      //     ],
-      //   },
+      active: 0,
+      detailData: {},
     };
   },
+  computed: {
+    userMapObj() {
+      const map = {};
+      this.userListData.forEach(user => {
+        map[user.value] = user.label;
+      });
+      return map;
+    },
+    reportUserName() {
+      const userId = this.detailData.reportUserId;
+      if (!userId || Object.keys(this.userMapObj).length === 0) {
+        return userId || '-';
+      }
+      return this.userMapObj[userId] || userId;
+    },
+  },
   mounted() {
+
     this.openShow = this.showDialog;
+    this.loadDetail();
+  },
+  watch: {
+    rowItem: {
+      handler(newVal) {
+        if (newVal && newVal.id) {
+          this.loadDetail();
+        }
+      },
+      deep: true,
+      immediate: true,
+    },
   },
   methods: {
+    // 安全获取审批数据
+    getApprovalData(index, field) {
+      const all = this.detailData.all || [];
+      const item = all[index];
+      return item ? (item[field] || '-') : '-';
+    },
     closeDialog() {
       this.openShow = false;
       this.$emit('closeDialog');
     },
-    submit() {
-      this.$refs.form.validate(async valid => {
-        if (valid) {
-          let params = {
-            id: this.$route.query.id,
-            approvalStatus: '',
+    // 加载详情数据
+    loadDetail() {
 
-            // status: this.option.column[0].value,
-            // reason: this.option.column[1].value,
-          };
-          //   updateProcess(params).then((res) => {
-          //     if (res.code == 200) {
-          //       this.$message.success('操作成功');
-          //       this.closeDialog();
-          //     }
-          //   });
-        }
-      });
+
+      if (this.rowItem.id) {
+
+        detailItem(this.rowItem.id).then(res => {
+          
+          if (res.data.code == 200) {
+            this.detailData = res.data.data;
+           
+            this.updateActiveStatus();
+          }
+        }).catch(error => {
+          console.error('获取详情失败', error);
+          this.$message.error('获取详情失败');
+        });
+      }
+    },
+    // 根据状态更新步骤条进度
+    updateActiveStatus() {
+      const status = Number(this.detailData.status-1);
+      switch (status) {
+        case 0:
+          this.active = 1; // 待工艺员审批 - 第1步激活
+          break;
+        case 1:
+          this.active = 2; // 待质量工程师审批 - 第2步激活
+          break;
+        case 2:
+          this.active = 3; // 待业务主管审批 - 第3步激活
+          break;
+        case 3:
+        case 4:
+          this.active = 3; // 驳回/退回 - 显示到当前步骤
+          break;
+        case 5:
+          this.active = 3; // 业务主管审批通过 - 第3步完成
+          break;
+        default:
+          this.active = 0; // 初始状态 - 第0步
+      }
     },
   },
 };
 </script>
 <style lang="scss" scoped>
- ::v-deep(.el-step__title) {
-    font-size: 14px;
+::v-deep(.el-step__title) {
+  font-size: 14px;
+  font-weight: 500;
+}
+
+.center-steps {
+  margin-top: 30px;
+  margin-bottom: 20px;
+}
+
+.step-info {
+  font-size: 12px;
+  line-height: 1.8;
+
+  > div {
+    &:nth-child(1) {
+      font-weight: 500;
+      margin-bottom: 4px;
+    }
   }
+}
+
+.reject-reason {
+  color: #f56c6c;
+  margin-top: 4px;
+  font-size: 12px;
+}
 </style>
diff --git a/src/views/exemption/index.vue b/src/views/exemption/index.vue
index aa9532d7..5022f7b1 100644
--- a/src/views/exemption/index.vue
+++ b/src/views/exemption/index.vue
@@ -22,18 +22,31 @@
       <template #menu-right> </template>
       <template #menu="{ row }">
         <el-button type="text" @click="detailsDialog(row)">详情</el-button>
-        <el-button
+        <!-- <el-button
           type="text"
           @click="updateDialog(row)"
-          v-if="row.arr10 == '3' || row.arr10 == '4' || row.arr10 == '5'"
+        
+          >修改</el-button
+        > -->
+         <!-- <el-button
+          type="text"
+          @click="review(row)"
+         
+          >审核</el-button
+        > -->
+          <el-button
+          type="text"
+          @click="updateDialog(row)"
+          v-if="row.status == '3' || row.status == '4' || row.status == '5'"
           >修改</el-button
         >
         <el-button
           type="text"
           @click="review(row)"
-          v-if="row.arr10 == '1' || row.arr10 == '2' || row.arr10 == '0'"
+          v-if="row.status == '1' || row.status == '2' || row.status == '0'"
           >审核</el-button
         >
+        <el-button type="text" @click="removeLog(row)">删除</el-button>
       </template>
     </avue-crud>
 
@@ -43,6 +56,8 @@
       :showDialog="infoShow"
       @closeDialog="closeDialog"
       :infoTitle="infoTitle"
+      :rowItem="rowItem"
+      :userListData="userListData"
     ></addDialog>
 
     <!-- 审核 -->
@@ -59,11 +74,14 @@
       :showDialog="detailsOpen"
       @closeDialog="closeDialog"
       :rowItem="rowItem"
+      :userListData="userListData"
     ></detailsDialog>
   </basic-container>
 </template>
 
 <script>
+
+import { exemptionList, removeItem, userList } from '@/api/exemption/exemption';
 import addDialog from './components/addDialog.vue';
 import checkDialog from './components/checkDialog.vue';
 import detailsDialog from './components/detailsDialog.vue';
@@ -108,7 +126,7 @@ export default {
         delBtn: false,
         editBtnText: '修改',
         labelWidth: 120,
-        menuWidth: 100,
+        menuWidth: 180,
         dialogWidth: 900,
         dialogClickModal: false,
         searchEnter: true,
@@ -125,63 +143,65 @@ export default {
         searchLabelPosition: 'left',
         searchGutter: 24,
         searchSpan: 6,
-        menuAlign: 'left',
+        menuAlign: 'center',
         gridBtn: false,
         searchMenuPosition: 'right',
         align: 'center',
         column: [
           {
             label: '提出人',
-            prop: 'arr1',
-            search: true,
+            prop: 'reportUserId',
             sortable: true,
             span: 12,
+            formatter: (row, value, label, column) => {
+              return this.userMapObj[value] || value || '-';
+            },
           },
           {
             label: '岗位',
-            prop: 'arr2',
+            prop: 'postName',
             search: true,
             sortable: true,
             span: 12,
           },
           {
             label: '发生时间',
-            prop: 'arr3',
+            prop: 'happenDate',
             search: true,
             sortable: true,
             span: 12,
           },
           {
             label: '免责问题描述',
-            prop: 'arr4',
+            prop: 'notes',
             search: true,
             sortable: true,
             span: 12,
           },
           {
             label: '原因',
-            prop: 'arr5',
+            prop: 'reason',
             search: true,
             sortable: true,
             span: 12,
           },
           {
             label: '措施',
-            prop: 'arr6',
+            prop: 'measure',
             search: true,
             sortable: true,
             span: 12,
           },
           {
             label: '免责理由',
-            prop: 'arr7',
+            prop: 'raiseHandReason',
             search: true,
             sortable: true,
             span: 12,
           },
           {
             label: '免责金额',
-            prop: 'arr8',
+            prop: 'amount',
             search: true,
             sortable: true,
             span: 12,
@@ -195,7 +215,7 @@ export default {
           // },
           {
             label: '状态',
-            prop: 'arr10',
+            prop: 'status',
             search: true,
             sortable: true,
             span: 12,
@@ -232,9 +252,38 @@ export default {
 
       data: [],
       rowItem: {},
+      userListData: [],
+      userMap: {},
     };
   },
+  computed: {
+    userMapObj() {
+      const map = {};
+      this.userListData.forEach(user => {
+        map[user.value] = user.label;
+      });
+      return map;
+    },
+  },
   methods: {
+    loadUserList(page, params = {}) {
+      
+      userList(page.currentPage, page.pageSize).then(res => {
+        
+        if (res.data.code == 200) {
+          const users = res.data.data;
+           
+
+          this.userListData = users.map(user => ({
+            label: user.realName || user.name,
+            value: String(user.id)
+          }));
+         
+        }
+      }).catch(error => {
+        console.error('获取用户列表失败', error);
+      });
+    },
     // 详情
     detailsDialog(row) {
       this.detailsOpen = true;
@@ -249,16 +298,19 @@ export default {
     addDialog() {
       this.infoShow = true;
       this.infoTitle = '新增';
+      this.rowItem = {};
     },
     // 修改
-    updateDialog() {
+    updateDialog(row) {
       this.infoShow = true;
       this.infoTitle = '修改';
+      this.rowItem = row;
     },
     // 关闭
     closeDialog() {
       this.infoShow = false;
       this.detailsOpen = false;
+      this.checkResultOpen = false;
       this.onLoad(this.page, this.query);
     },
     rowSave(row, done, loading) {
@@ -293,17 +345,17 @@ export default {
       //   }
       // );
     },
-    rowDel(row) {
+    removeLog(row) {
       this.$confirm('确定将选择数据删除?', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning',
       })
         .then(() => {
-          // return removePersonAbility(row.id);
+          return removeItem(String(row.id));
         })
         .then(() => {
-          this.onLoad(this.page);
+          this.onLoad(this.page, this.query);
           this.$message({
             type: 'success',
             message: '操作成功!',
@@ -347,76 +399,87 @@ export default {
         message: '操作成功!',
       });
     },
-
-    onLoad(page, params = {}) {
-      this.data = [
-        {
-          arr1: '张三',
-          arr2: '热表分厂',
-          arr3: '2026-01-09',
-          arr4: '问题描述1',
-          arr5: '正常操作',
-          arr6: '下次注意',
-          arr7: '正常损耗',
-          arr8: '55',
-          arr10: 0,
-        },
-        {
-          arr1: '张三',
-          arr2: '热表分厂',
-          arr3: '2026-01-09',
-          arr4: '问题描述1',
-          arr5: '正常操作',
-          arr6: '下次注意',
-          arr7: '正常损耗',
-          arr8: '55',
-          arr10: '1',
-        },
-        {
-          arr1: '张三',
-          arr2: '热表分厂',
-          arr3: '2026-01-09',
-          arr4: '问题描述1',
-          arr5: '正常操作',
-          arr6: '下次注意',
-          arr7: '正常损耗',
-          arr8: '55',
-          arr10: '2',
-        },
-        {
-          arr1: '张三',
-          arr2: '热表分厂',
-          arr3: '2026-01-09',
-          arr4: '问题描述1',
-          arr5: '正常操作',
-          arr6: '下次注意',
-          arr7: '正常损耗',
-          arr8: '55',
-          arr10: '3',
-        },
-        {
-          arr1: '张三',
-          arr2: '热表分厂',
-          arr3: '2026-01-09',
-          arr4: '问题描述1',
-          arr5: '正常操作',
-          arr6: '下次注意',
-          arr7: '正常损耗',
-          arr8: '55',
-          arr10: '4',
-        },
-        {
-          arr1: '张三',
-          arr2: '热表分厂',
-          arr3: '2026-01-09',
-          arr4: '问题描述1',
-          arr5: '正常操作',
-          arr6: '下次注意',
-          arr7: '正常损耗',
-          arr8: '55',
-          arr10: '5',
-        },
-      ];
+ onLoad(page, params = {}) {
+    
+      exemptionList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+        console.log(res,'00000001');
+        
+        const data = res.data.data;
+        this.page.total = data.total;
+        this.data = data.records;
+        this.loading = false;
+       
+      });
+    },
+    // onLoad(page, params = {}) {
+    //   this.data = [
+    //     {
+    //       arr1: '张三',
+    //       arr2: '热表分厂',
+    //       arr3: '2026-01-09',
+    //       arr4: '问题描述1',
+    //       arr5: '正常操作',
+    //       arr6: '下次注意',
+    //       arr7: '正常损耗',
+    //       arr8: '55',
+    //       arr10: 0,
+    //     },
+    //     {
+    //       arr1: '张三',
+    //       arr2: '热表分厂',
+    //       arr3: '2026-01-09',
+    //       arr4: '问题描述1',
+    //       arr5: '正常操作',
+    //       arr6: '下次注意',
+    //       arr7: '正常损耗',
+    //       arr8: '55',
+    //       arr10: '1',
+    //     },
+    //     {
+    //       arr1: '张三',
+    //       arr2: '热表分厂',
+    //       arr3: '2026-01-09',
+    //       arr4: '问题描述1',
+    //       arr5: '正常操作',
+    //       arr6: '下次注意',
+    //       arr7: '正常损耗',
+    //       arr8: '55',
+    //       arr10: '2',
+    //     },
+    //     {
+    //       arr1: '张三',
+    //       arr2: '热表分厂',
+    //       arr3: '2026-01-09',
+    //       arr4: '问题描述1',
+    //       arr5: '正常操作',
+    //       arr6: '下次注意',
+    //       arr7: '正常损耗',
+    //       arr8: '55',
+    //       arr10: '3',
+    //     },
+    //     {
+    //       arr1: '张三',
+    //       arr2: '热表分厂',
+    //       arr3: '2026-01-09',
+    //       arr4: '问题描述1',
+    //       arr5: '正常操作',
+    //       arr6: '下次注意',
+    //       arr7: '正常损耗',
+    //       arr8: '55',
+    //       arr10: '4',
+    //     },
+    //     {
+    //       arr1: '张三',
+    //       arr2: '热表分厂',
+    //       arr3: '2026-01-09',
+    //       arr4: '问题描述1',
+    //       arr5: '正常操作',
+    //       arr6: '下次注意',
+    //       arr7: '正常损耗',
+    //       arr8: '55',
+    //       arr10: '5',
+    //     },
+    //   ];
       // this.loading = true;
       // getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
       //   this.data = res.data.data.records;
@@ -424,9 +487,12 @@ export default {
       //   this.page.total = res.data.data.total;
       //   this.selectionClear();
       // });
-    },
+    // },
+  },
+  mounted() {
+    this.loadUserList(this.page);
+    console.log('组件已挂载，加载用户列表');
   },
-  mounted() {},
 };
 </script>
 d
\ No newline at end of file