网页端：参培记录新增可自行添加参培记录，不走流程；

移动端：新增工作填报列表

oa-ui-app/pages.json

@@ -167,6 +167,14 @@
 				"navigationBarTitleText" : "仪器设备管理"
 			}
 		},
+		{
+			"path" : "pages/oa/declare/declareList",
+			"style" : 
+			{
+				"navigationBarTitleText" : "工作填报列表",
+				"enablePullDownRefresh": true
+			}
+		},
 		{
 			"path" : "pages/components/formInfo",
 			"style" : 

oa-ui-app/pages/components/formInfo.vue

@@ -2,22 +2,27 @@
  * @Author: ysh
  * @Date: 2025-06-16 16:26:24
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-06-16 17:09:31
+ * @LastEditTime: 2025-08-04 14:47:18
 -->
 <template>
   <view>
     <borrow :taskForm="taskForm" :taskName="''" v-if="types == 'borrow'"></borrow>
+    <declare :taskForm="taskForm" :taskName="''" v-if="types == 'declare'"></declare>
   </view>
 </template>
 
 <script>
 import borrow from '@/pages/form/borrow/borrow.vue'
+import declare from '@/pages/form/declare/declare.vue'
 export default {
-  components: { borrow },
+  components: { borrow, declare },
   created() {
     if (this.$route.query.formType == 'borrow') {
       this.taskForm.formId = this.$route.query.formId
       this.types = 'borrow'
+    }else if (this.$route.query.formType == 'declare') {
+      this.taskForm.formId = this.$route.query.formId
+      this.types = 'declare'
     }
   },
   data() {

oa-ui-app/pages/oa/declare/declareList.vue

@@ -0,0 +1,459 @@
+<!--
+ * @Author: ysh
+ * @Date: 2025-08-04 11:04:25
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2025-08-04 14:50:13
+-->
+<template>
+  <view class="container">
+    <mescroll-uni ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback" :down="downOption"
+      :up="upOption" :fixed="false" :top="10" style="padding: 30rpx;">
+      <view>
+        <view v-for="(item, index) in declareList" :key="index" class="modern-card">
+          <view class="modern-card-header">
+            <view class="modern-card-title">
+              <text class="project-number">{{ formatterProjectNumber(item) }}</text>
+              <text class="project-name">{{ formatterProjectName(item) }}</text>
+            </view>
+          </view>
+
+          <view class="modern-card-body">
+            <view class="avatar-section">
+              <view class="avatar">
+                <text>{{ item.user && item.user.nickName ? item.user.nickName[0] : '' }}</text>
+              </view>
+              <view>
+                <text class="applier-name">{{ item.user ? item.user.nickName : '' }}</text>
+                <text class="dept-name">填报人</text>
+              </view>
+            </view>
+
+            <view class="info-row">
+              <text class="info-label">工作类别：</text>
+              <text class="info-value">{{ item.workType }}</text>
+            </view>
+            <view class="info-row">
+              <text class="info-label">工作项目：</text>
+              <text class="info-value">{{ item.workItem }}</text>
+            </view>
+            <view class="info-row">
+              <text class="info-label">工作内容：</text>
+              <text class="info-value">{{ item.workContent }}</text>
+            </view>
+            <view class="info-row">
+              <text class="info-label">工作时间：</text>
+              <text class="info-value">{{ item.beginDate }} ~ {{ item.endDate }}</text>
+            </view>
+            <view class="info-row">
+              <text class="info-label">工天数量：</text>
+              <text class="info-value">{{ item.workLoad }}天</text>
+            </view>
+            <view class="info-row">
+              <text class="info-label">工天单价：</text>
+              <text>{{ item.price }}</text>
+            </view>
+            <view class="info-row">
+              <text class="info-label">系数：</text>
+              <text class="info-value">{{ item.coefficient }}</text>
+            </view>
+            <view class="info-row">
+              <text class="info-label">预估绩效：</text>
+              <text class="amount-highlight">￥{{ predictMoney(item) }}</text>
+            </view>
+            <view class="info-row">
+              <text class="info-label">填报时间：</text>
+              <text class="info-value">{{ parseTime(item.submitTime, '{y}-{m}-{d}') }}</text>
+            </view>
+
+            <!-- 审核状态 -->
+            <view class="status-section">
+              <view class="status-item">
+                <text class="status-label">一审：</text>
+                <view class="status-tag" :class="formatFn(item, 'checkStatus') ? 'success' : 'warning'">
+                  <text>{{ formatFn(item, 'checkStatus') ? '已通过' : '待审核' }}</text>
+                </view>
+              </view>
+              <view class="status-item">
+                <text class="status-label">二审：</text>
+                <view class="status-tag" :class="formatFn(item, 'auditStatus') ? 'success' : 'warning'">
+                  <text>{{ formatFn(item, 'auditStatus') ? '已通过' : '待审核' }}</text>
+                </view>
+              </view>
+              <view class="status-item">
+                <text class="status-label">确认：</text>
+                <view class="status-tag" :class="formatFn(item, 'confirmStatus') ? 'success' : 'warning'">
+                  <text>{{ formatFn(item, 'confirmStatus') ? '已确认' : '待确认' }}</text>
+                </view>
+              </view>
+            </view>
+          </view>
+
+          <view class="modern-card-footer">
+            <button class="footer-btn detail-btn" @click="openFormInfo(item)">表单信息</button>
+            <button class="footer-btn form-btn" @click="handleUpdate(item)">修改</button>
+          </view>
+        </view>
+      </view>
+    </mescroll-uni>
+  </view>
+</template>
+
+<script>
+import { listDeclare, getDeclare, updateDeclare } from '@/api/oa/declare/declare';
+import MescrollMixin from '@/uni_modules/mescroll/components/mescroll-uni/mescroll-mixins.js'
+
+export default {
+  mixins: [MescrollMixin],
+  data() {
+    return {
+      mescroll: null, // mescroll实例
+      downOption: {
+        auto: true,
+        textOutOffset: '下拉刷新',
+        textLoading: '加载中...'
+      },
+      upOption: {
+        auto: false,
+        page: { num: 1, size: 10 },
+        noMoreSize: 5,
+        empty: { tip: '暂无工作填报数据' },
+        textNoMore: '~ 没有更多数据了 ~'
+      },
+      declareList: [],
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        projectId: null,
+        userId: null,
+        submitTime: null
+      }
+    }
+  },
+
+  onLoad: function (options) {
+    uni.startPullDownRefresh();
+  },
+
+  methods: {
+    // 加载数据
+    async loadData() {
+      try {
+        // 权限控制逻辑
+        if (this.$store.getters.deptId > 103) {
+          this.queryParams.deptId = this.$store.getters.deptId;
+        }
+        if (this.$store.getters.roles.includes('projectLeader')) {
+          this.queryParams.projectLeader = this.$store.getters.userId
+        }
+        if (this.$store.getters.roles.includes('dept')) {
+          this.queryParams.projectLeader = null
+        }
+        if (this.$store.getters.userId == 1) {
+          this.queryParams.deptId = null
+          this.queryParams.projectLeader = null
+        }
+
+        const res = await listDeclare(this.queryParams)
+        return { data: res.rows, total: res.total }
+      } catch (e) {
+        return { data: [], error: true }
+      }
+    },
+
+    mescrollInit(mescroll) {
+      this.mescroll = mescroll;
+    },
+
+    // mescroll下拉刷新回调
+    async downCallback() {
+      this.declareList = []; // 清空列表
+      this.queryParams.pageNum = 1
+      const res = await this.loadData()
+      if (res.error) {
+        this.mescroll.endErr();
+      } else {
+        this.declareList = res.data;
+        this.mescroll.endSuccess(res.data.length, res.total);
+      }
+      uni.stopPullDownRefresh();
+    },
+
+    // mescroll上拉加载回调
+    async upCallback(page) {
+      this.queryParams.pageNum = page.num
+      const res = await this.loadData()
+      if (res.error) {
+        this.mescroll.endErr();
+      } else {
+        this.declareList = this.declareList.concat(res.data)
+        this.mescroll.endSuccess(res.data.length, res.total);
+      }
+    },
+
+    // 格式化项目编号
+    formatterProjectNumber(row) {
+      if (!row.projectId) {
+        return '无'
+      } else {
+        return row.project.projectNumber
+      }
+    },
+
+    // 格式化项目名称
+    formatterProjectName(row) {
+      if (!row.projectId) {
+        let year = row.submitTime.substring(0, 4)
+        return year + '年借调、零星项目'
+      } else {
+        return row.project.projectName
+      }
+    },
+
+    // 格式化状态
+    formatFn(row, type) {
+      if (row[type] && row[type] == '1') {
+        return true
+      } else {
+        return false
+      }
+    },
+
+    // 计算预估绩效
+    predictMoney(row) {
+      let result = parseFloat(row.price * row.workLoad * row.coefficient)
+      return result.toFixed(2)
+    },
+
+    // 时间解析函数
+    parseTime(time, cFormat) {
+      if (!time) return ''
+
+      const format = cFormat || '{y}-{m}-{d} {h}:{i}:{s}'
+      let date
+      if (typeof time === 'object') {
+        date = time
+      } else {
+        if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
+          time = parseInt(time)
+        }
+        date = new Date(time)
+      }
+      const formatObj = {
+        y: date.getFullYear(),
+        m: date.getMonth() + 1,
+        d: date.getDate(),
+        h: date.getHours(),
+        i: date.getMinutes(),
+        s: date.getSeconds(),
+        a: date.getDay()
+      }
+      const time_str = format.replace(/{([ymdhisa])+}/g, (result, key) => {
+        const value = formatObj[key]
+        if (key === 'a') {
+          return ['日', '一', '二', '三', '四', '五', '六'][value]
+        }
+        return value.toString().padStart(2, '0')
+      })
+      return time_str
+    },
+
+    // 打开表单信息
+    openFormInfo(item) {
+      console.log(item)
+      uni.navigateTo({
+        url: `/pages/components/formInfo?formId=${item.formId}&formType=declare`
+      });
+    },
+
+    // 修改操作
+    handleUpdate(item) {
+      
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.container {
+  padding: 20rpx;
+  background-color: #f5f5f5;
+  height: 100vh;
+  display: flex;
+  flex-direction: column;
+}
+
+.modern-card {
+  background: #fff;
+  border-radius: 18rpx;
+  margin-bottom: 32rpx;
+  box-shadow: 0 6rpx 16rpx rgba(0, 0, 0, 0.08);
+  overflow: hidden;
+  transition: box-shadow 0.2s;
+  border: 1rpx solid #f0f0f0;
+}
+
+.modern-card-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  background: linear-gradient(90deg, #e0e7ff 0%, #f8fafc 100%);
+  padding: 24rpx 28rpx 16rpx 28rpx;
+}
+
+.modern-card-title {
+  display: flex;
+  flex-direction: column;
+}
+
+.project-number {
+  font-size: 26rpx;
+  color: #6366f1;
+  font-weight: 600;
+}
+
+.project-name {
+  font-size: 28rpx;
+  color: #22223b;
+  font-weight: bold;
+  margin-top: 4rpx;
+}
+
+.amount-highlight {
+  background: #fef3c7;
+  color: #d97706;
+  font-size: 28rpx;
+  font-weight: bold;
+  border-radius: 10rpx;
+  padding: 8rpx 20rpx;
+  min-width: 120rpx;
+  text-align: center;
+}
+
+.amount-highlight-detail {
+  background: #fef3c7;
+  color: #d97706;
+  font-size: 28rpx;
+  font-weight: bold;
+  border-radius: 10rpx;
+  padding: 4rpx 18rpx;
+  margin-left: 8rpx;
+}
+
+.modern-card-body {
+  padding: 20rpx 28rpx 24rpx 28rpx;
+}
+
+.avatar-section {
+  display: flex;
+  align-items: center;
+  margin-bottom: 18rpx;
+}
+
+.avatar {
+  width: 56rpx;
+  height: 56rpx;
+  border-radius: 50%;
+  background: #a5b4fc;
+  color: #fff;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 28rpx;
+  font-weight: bold;
+  margin-right: 18rpx;
+}
+
+.applier-name {
+  font-size: 28rpx;
+  color: #22223b;
+  font-weight: 500;
+}
+
+.dept-name {
+  font-size: 24rpx;
+  color: #64748b;
+  margin-left: 8rpx;
+}
+
+.info-row {
+  display: flex;
+  margin-bottom: 10rpx;
+}
+
+.info-label {
+  color: #64748b;
+  font-size: 24rpx;
+  min-width: 120rpx;
+}
+
+.info-value {
+  color: #22223b;
+  font-size: 24rpx;
+  flex: 1;
+  word-break: break-all;
+}
+
+// 审核状态样式
+.status-section {
+  margin-top: 16rpx;
+  padding-top: 16rpx;
+  border-top: 1px solid #f0f0f0;
+}
+
+.status-item {
+  display: flex;
+  align-items: center;
+  margin-bottom: 8rpx;
+}
+
+.status-label {
+  color: #64748b;
+  font-size: 24rpx;
+  min-width: 80rpx;
+}
+
+.status-tag {
+  padding: 4rpx 12rpx;
+  border-radius: 6rpx;
+  font-size: 22rpx;
+  margin-left: 8rpx;
+}
+
+.status-tag.success {
+  background: #dcfce7;
+  color: #16a34a;
+}
+
+.status-tag.warning {
+  background: #fef3c7;
+  color: #d97706;
+}
+
+.modern-card-footer {
+  display: flex;
+  justify-content: flex-end;
+  gap: 20rpx;
+  padding: 16rpx 28rpx 20rpx 28rpx;
+  border-top: 1px solid #f0f0f0;
+  background: #fafbfc;
+}
+
+.footer-btn {
+  font-size: 26rpx;
+  border-radius: 8rpx;
+  border: none;
+  outline: none;
+  background: #e0e7ff;
+  color: #3b3b4f;
+}
+
+.detail-btn {
+  background: #6366f1;
+  color: #fff;
+}
+
+.form-btn {
+  background: #f4c542;
+  color: #fff;
+}
+</style>

oa-ui-app/pages/oa/device/instrumentsList.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2025-07-08 14:00:47
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-07-16 15:22:13
+ * @LastEditTime: 2025-08-04 10:15:13
 -->
 <template>
   <view class="device-container">
@@ -27,17 +27,32 @@
           </view>
           <view class="filter-item">
             <text class="filter-label">设备品牌</text>
-            <input v-model="queryParams.brand" placeholder="品牌筛选" @confirm="handleQuery" />
+            <uni-easyinput v-model="queryParams.brand" placeholder="品牌筛选" @confirm="handleQuery" @blur="handleQuery"
+              :inputBorder="false" :styles="{
+                backgroundColor: '#fff',
+                borderRadius: '8px',
+                border: '1px solid #e0e0e0'
+              }" />
           </view>
         </view>
         <view class="filter-row">
           <view class="filter-item">
             <text class="filter-label">出厂编号</text>
-            <input v-model="queryParams.code" placeholder="编号筛选" @confirm="handleQuery" />
+            <uni-easyinput v-model="queryParams.code" placeholder="编号筛选" @confirm="handleQuery" @blur="handleQuery"
+              :inputBorder="false" :styles="{
+                backgroundColor: '#fff',
+                borderRadius: '8px',
+                border: '1px solid #e0e0e0'
+              }" />
           </view>
           <view class="filter-item">
             <text class="filter-label">规格型号</text>
-            <input v-model="queryParams.series" placeholder="型号筛选" @confirm="handleQuery" />
+            <uni-easyinput v-model="queryParams.series" placeholder="型号筛选" @confirm="handleQuery" @blur="handleQuery"
+              :inputBorder="false" :styles="{
+                backgroundColor: '#fff',
+                borderRadius: '8px',
+                border: '1px solid #e0e0e0'
+              }" />
           </view>
         </view>
       </view>
@@ -210,11 +225,11 @@
         <scroll-view scroll-y="true" class="popup-body">
           <view class="form-item">
             <text class="label">设备品牌 *</text>
-            <input v-model="form.brand" placeholder="请输入设备品牌" />
+            <uni-easyinput v-model="form.brand" placeholder="请输入设备品牌" />
           </view>
           <view class="form-item">
             <text class="label">设备名称 *</text>
-            <input v-model="form.name" placeholder="请输入设备名称" />
+            <uni-easyinput v-model="form.name" placeholder="请输入设备名称" />
           </view>
           <view class="form-item">
             <text class="label">设备类别</text>
@@ -222,7 +237,7 @@
           </view>
           <view class="form-item">
             <text class="label">规格型号</text>
-            <input v-model="form.series" placeholder="请输入规格型号" />
+            <uni-easyinput v-model="form.series" placeholder="请输入规格型号" />
           </view>
           <view class="form-item">
             <text class="label">购置时间</text>
@@ -233,23 +248,23 @@
           </view>
           <view class="form-item">
             <text class="label">存放地点</text>
-            <input v-model="form.place" placeholder="请输入存放地点" />
+            <uni-easyinput v-model="form.place" placeholder="请输入存放地点" />
           </view>
           <view class="form-item">
             <text class="label">购买价格（元）</text>
-            <input v-model="form.cost" type="number" placeholder="请输入购买价格" />
+            <uni-easyinput v-model="form.cost" type="number" placeholder="请输入购买价格" />
           </view>
           <view class="form-item">
             <text class="label">预计使用年限（年）</text>
-            <input v-model="form.expectLife" type="number" placeholder="请输入使用年限" />
+            <uni-easyinput v-model="form.expectLife" type="number" placeholder="请输入使用年限" />
           </view>
           <view class="form-item">
             <text class="label">出厂编号</text>
-            <textarea v-model="form.code" placeholder="请输入出厂编号" />
+            <uni-easyinput v-model="form.code" type="textarea" placeholder="请输入出厂编号" :autoHeight="true" />
           </view>
           <view class="form-item">
             <text class="label">单日成本（元）</text>
-            <input v-model="form.dayCost" type="number" placeholder="请输入单日成本" />
+            <uni-easyinput v-model="form.dayCost" type="number" placeholder="请输入单日成本" />
           </view>
           <view class="form-item">
             <text class="label">管理部门</text>
@@ -261,11 +276,11 @@
           </view>
           <view class="form-item">
             <text class="label">设备编号</text>
-            <input v-model="form.deviceNumber" placeholder="请输入设备编号" />
+            <uni-easyinput v-model="form.deviceNumber" placeholder="请输入设备编号" />
           </view>
           <view class="form-item">
             <text class="label">备注</text>
-            <textarea v-model="form.remark" placeholder="请输入备注信息" />
+            <uni-easyinput v-model="form.remark" type="textarea" placeholder="请输入备注信息" :autoHeight="true" />
           </view>
         </scroll-view>
         <view class="popup-footer">
@@ -427,7 +442,7 @@ export default {
 
     handleViewLogs() {
       this.closeDetailPopup();
-      
+
     },
 
     handleAdd() {
@@ -634,18 +649,41 @@ export default {
   flex: 1;
 
   .filter-label {
-    font-size: 12px;
+    font-size: 13px;
     color: #666;
-    margin-bottom: 5px;
+    margin-bottom: 8px;
     display: block;
+    font-weight: 500;
   }
 
-  input {
-    width: 100%;
-    padding: 6px 10px;
-    border: 1px solid #ddd;
-    border-radius: 4px;
-    font-size: 12px;
+  // uni-easyinput 样式
+  :deep(.uni-easyinput) {
+    height: 40px !important;
+    border-radius: 8px !important;
+
+    .uni-easyinput__content {
+      height: 100% !important;
+      border-radius: 8px !important;
+      border: 1px solid #e0e0e0 !important;
+      background: #fff !important;
+      transition: all 0.3s ease;
+
+      &:focus-within {
+        border-color: #6366f1 !important;
+        box-shadow: 0 0 0 2px rgba(99, 102, 241, 0.1) !important;
+      }
+    }
+
+    .uni-easyinput__content-input {
+      padding: 0 12px !important;
+      font-size: 14px !important;
+      color: #333 !important;
+
+      &::placeholder {
+        color: #a0a0a0 !important;
+        font-size: 13px !important;
+      }
+    }
   }
 }
 
@@ -879,24 +917,50 @@ export default {
     display: block;
   }
 
-  input,
-  textarea {
-    width: 100%;
-    padding: 12px;
-    border: 1px solid #ddd;
-    border-radius: 8px;
-    font-size: 14px;
-    background: #f8f8f8;
-
-    &:focus {
-      border-color: #667eea;
-      background: #fff;
+  // uni-easyinput 样式
+  :deep(.uni-easyinput) {
+    .uni-easyinput__content {
+      height: 45px !important;
+      border: 1px solid #ddd !important;
+      border-radius: 8px !important;
+      background: #f8f8f8 !important;
+      transition: all 0.3s ease;
+      
+      &:focus-within {
+        border-color: #667eea !important;
+        background: #fff !important;
+        box-shadow: 0 0 0 2px rgba(102, 126, 234, 0.1) !important;
+      }
+    }
+    
+    .uni-easyinput__content-input {
+      padding: 0 12px !important;
+      font-size: 14px !important;
+      color: #333 !important;
+      
+      &::placeholder {
+        color: #999 !important;
+      }
+    }
+    
+    // textarea 样式
+    &.uni-easyinput--textarea {
+      .uni-easyinput__content {
+        height: auto !important;
+        min-height: 80px !important;
+      }
+      
+      .uni-easyinput__content-textarea {
+        padding: 12px !important;
+        font-size: 14px !important;
+        color: #333 !important;
+        min-height: 60px !important;
+        
+        &::placeholder {
+          color: #999 !important;
+        }
+      }
     }
-  }
-
-  textarea {
-    min-height: 80px;
-    resize: none;
   }
 
   .date-picker {

oa-ui-app/pages/work/index.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2025-01-16 11:17:08
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-07-08 14:42:51
+ * @LastEditTime: 2025-08-04 11:12:27
 -->
 <template>
   <view class="work-container">
@@ -90,6 +90,12 @@ export default {
           icon: '/static/images/work/workDay.png',
           url: 'deviceLog',
           hasPermi: checkPermi(['oa:deviceLog:list'])
+        },
+        {
+          name: '工作填报',
+          icon: '/static/images/work/declare.png',
+          url: 'declare',
+          hasPermi: checkPermi(['oa:declare:list'])
         }
       ],
       flowList: ['借款审批', '用车审批', '设备审批', '工作填报'],
@@ -142,6 +148,10 @@ export default {
         uni.navigateTo({
           url: '/pages/oa/device/instrumentsList'
         })
+      } else if (type == 'declare') {
+        uni.navigateTo({
+          url: '/pages/oa/declare/declareList'
+        })
       }
       else {
         this.$modal.showToast('模块建设中~')

oa-ui/src/views/oa/study/approval.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="上报人" prop="userId">
+      <el-form-item label="参会人" prop="userId">
         <el-select v-model="queryParams.userId" filterable clearable @change="handleQuery">
           <el-option v-for="item in $store.state.user.userList" :key="item.userId" :label="item.nickName"
             :value="item.userId">
@@ -15,9 +15,9 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="上报日期" prop="reportTime">
+      <el-form-item label="参会日期" prop="reportTime">
         <el-date-picker clearable v-model="queryParams.reportTime" type="date" value-format="yyyy-MM-dd"
-          placeholder="请选择上报日期">
+          placeholder="请选择参会日期">
         </el-date-picker>
       </el-form-item>
       <el-form-item>
@@ -27,9 +27,13 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['oa:trainApproval:add']">新增</el-button>
+      </el-col>
       <el-col :span="1.5">
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
-          v-hasPermi="['oa:study:export']">导出</el-button>
+          v-hasPermi="['oa:trainApproval:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -37,9 +41,9 @@
     <el-table v-loading="loading" :data="trainApprovalList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="参培id" align="center" prop="participateId" /> -->
-      <el-table-column label="上报人" align="center" prop="reportUser.nickName" />
+      <el-table-column label="参会人" align="center" prop="reportUser.nickName" />
       <el-table-column label="部门" align="center" prop="dept.deptName" />
-      <el-table-column label="上报日期" align="center" prop="reportTime" width="180">
+      <el-table-column label="参会日期" align="center" prop="reportTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.reportTime, '{y}-{m}-{d}') }}</span>
         </template>
@@ -47,19 +51,21 @@
       <el-table-column label="培训名称" align="center" prop="trainName" />
       <el-table-column label="主要内容" align="center" prop="content" />
       <el-table-column label="学时" align="center" prop="hours" />
-      <el-table-column label="部门审核人" align="center" prop="deptUser.nickName" />
-      <el-table-column label="部门审核时间" align="center" prop="deptTime" width="180">
+      <el-table-column label="审核人" align="center" prop="deptUser.nickName" />
+      <el-table-column label="审核时间" align="center" prop="deptTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.deptTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="部门审核意见" align="center" prop="deptComment" />
+      <el-table-column label="审核意见" align="center" prop="deptComment" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-            v-hasPermi="['oa:study:edit']">修改</el-button>
+            v-hasPermi="['oa:trainApproval:edit']"
+            :disabled="scope.row.deptUserId !== $store.state.user.id">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-            v-hasPermi="['oa:study:remove']">删除</el-button>
+            v-hasPermi="['oa:trainApproval:remove']"
+            :disabled="scope.row.deptUserId !== $store.state.user.id">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -70,33 +76,32 @@
     <!-- 添加或修改参培审核对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="上报人" prop="userId">
-          <el-input v-model="form.userId" placeholder="请输入上报人" />
+        <el-form-item label="参会人" prop="userId">
+          {{ getUserName(form.userId) }}
         </el-form-item>
-        <el-form-item label="上报日期" prop="reportTime">
+        <el-form-item label="参会日期" prop="reportTime">
           <el-date-picker clearable v-model="form.reportTime" type="date" value-format="yyyy-MM-dd"
-            placeholder="请选择上报日期">
+            placeholder="请选择参会日期">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="培训名称" prop="trainName">
           <el-input v-model="form.trainName" placeholder="请输入培训名称" />
         </el-form-item>
-        <el-form-item label="主要内容">
-          <editor v-model="form.content" :min-height="192" />
+        <el-form-item label="主要内容" prop="content">
+          <el-input type="textarea" v-model="form.content" placeholder="请输入主要内容" />
         </el-form-item>
-        <el-form-item label="时长" prop="hours">
-          <el-input v-model="form.hours" placeholder="请输入时长" />
+        <el-form-item label="学时" prop="hours">
+          <el-input-number v-model="form.hours" :min="0" :max="100" :precision="2" :step="0.1" placeholder="请输入学时" />
         </el-form-item>
-        <el-form-item label="部门审核人" prop="deptUserId">
-          <el-input v-model="form.deptUserId" placeholder="请输入部门审核人" />
+        <el-form-item label="审核人" prop="deptUserId">
+          {{ getUserName(form.deptUserId) }}
         </el-form-item>
-        <el-form-item label="部门审核时间" prop="deptTime">
-          <el-date-picker clearable v-model="form.deptTime" type="date" value-format="yyyy-MM-dd"
-            placeholder="请选择部门审核时间">
+        <el-form-item label="审核时间" prop="deptTime">
+          <el-date-picker clearable v-model="form.deptTime" type="date" value-format="yyyy-MM-dd" placeholder="请选择审核时间">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="部门审核意见" prop="deptComment">
-          <el-input v-model="form.deptComment" placeholder="请输入部门审核意见" />
+        <el-form-item label="审核意见" prop="deptComment">
+          <el-input type="textarea" v-model="form.deptComment" placeholder="请输入审核意见" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -104,12 +109,56 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    <el-dialog :title="title" :visible.sync="addOpen" width="500px" append-to-body>
+      <el-form ref="addForm" :model="addForm" :rules="addRules" label-width="80px">
+        <el-form-item label="培训名称" prop="trainName">
+          <el-input v-model="addForm.trainName" placeholder="请输入培训名称" />
+        </el-form-item>
+        <el-form-item label="主要内容" prop="content">
+          <el-input type="textarea" v-model="addForm.content" placeholder="请输入主要内容" />
+        </el-form-item>
+        <el-form-item label="参会人" prop="userIdList">
+          <el-select v-model="addForm.userIdList" multiple filterable clearable placeholder="请选择参会人"
+            style="width: 100%;">
+            <el-option v-for="item in $store.state.user.userList" :key="item.userId" :label="item.nickName"
+              :value="item.userId">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="参会日期" prop="reportTime">
+          <el-date-picker clearable v-model="addForm.reportTime" type="date" value-format="yyyy-MM-dd"
+            placeholder="请选择参会日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="学时" prop="hours">
+          <el-input-number v-model="addForm.hours" :min="0" :max="100" :precision="2" :step="0.1" placeholder="请输入学时" />
+        </el-form-item>
+        <el-form-item label="审核人" prop="deptUserId">
+          {{ addForm.deptUserName }}
+        </el-form-item>
+        <el-form-item label="审核时间" prop="deptTime">
+          <el-date-picker clearable v-model="addForm.deptTime" type="date" value-format="yyyy-MM-dd"
+            placeholder="请选择审核时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="审核意见" prop="deptComment">
+          <el-input type="textarea" v-model="addForm.deptComment" placeholder="请输入审核意见" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitAddForm">确 定</el-button>
+        <el-button @click="cancelAdd">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import { listTrainApproval, getTrainApproval, delTrainApproval, addTrainApproval, updateTrainApproval } from "@/api/oa/study/trainApproval";
 
+import { Snowflake } from '@/utils/snowFlake.js'
+
 export default {
   name: "TrainApproval",
   data() {
@@ -149,7 +198,63 @@ export default {
       form: {},
       // 表单校验
       rules: {
-      }
+        reportTime: [
+          { required: true, message: "参会日期不能为空", trigger: "change" }
+        ],
+        trainName: [
+          { required: true, message: "培训名称不能为空", trigger: "blur" }
+        ],
+        content: [
+          { required: true, message: "主要内容不能为空", trigger: "blur" }
+        ],
+        hours: [
+          { required: true, message: "学时不能为空", trigger: "blur" },
+          { type: 'number', min: 0.1, message: "学时必须大于0", trigger: "blur" }
+        ],
+        deptTime: [
+          { required: true, message: "审核时间不能为空", trigger: "change" }
+        ],
+        deptComment: [
+          { required: true, message: "审核意见不能为空", trigger: "blur" }
+        ]
+      },
+      // 新增表单验证规则
+      addRules: {
+        userIdList: [
+          { required: true, type: 'array', min: 1, message: "请至少选择一位参会人", trigger: "change" }
+        ],
+        reportTime: [
+          { required: true, message: "参会日期不能为空", trigger: "change" }
+        ],
+        trainName: [
+          { required: true, message: "培训名称不能为空", trigger: "blur" }
+        ],
+        content: [
+          { required: true, message: "主要内容不能为空", trigger: "blur" }
+        ],
+        hours: [
+          { required: true, message: "学时不能为空", trigger: "blur" },
+          { type: 'number', min: 0.1, message: "学时必须大于0", trigger: "blur" }
+        ],
+        deptTime: [
+          { required: true, message: "审核时间不能为空", trigger: "change" }
+        ],
+        deptComment: [
+          { required: true, message: "审核意见不能为空", trigger: "blur" }
+        ]
+      },
+      addOpen: false,
+      addForm: {
+        userIdList: [],
+        reportTime: null,
+        trainName: null,
+        content: null,
+        hours: 0,
+        deptUserId: null,
+        deptUserName: null,
+        deptTime: null,
+        deptComment: null
+      },
     };
   },
   created() {
@@ -203,9 +308,12 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加参培审核";
+      this.resetAddForm("addForm");
+      // 设置当前登录用户为审核人
+      this.addForm.deptUserId = this.$store.state.user.id;
+      this.addForm.deptUserName = this.$store.state.user.name;
+      this.addOpen = true;
+      this.title = "添加参培记录";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -252,6 +360,77 @@ export default {
       this.download('oa/trainApproval/export', {
         ...this.queryParams
       }, `trainApproval_${new Date().getTime()}.xlsx`)
+    },
+    submitAddForm() {
+      this.$refs["addForm"].validate(valid => {
+        if (valid) {
+          // 检查是否选择了参会人员
+          if (!this.addForm.userIdList || this.addForm.userIdList.length === 0) {
+            this.$modal.msgError("请选择至少一位参会人员");
+            return;
+          }
+          // 获取当前登录用户ID作为审核人
+          const currentUserId = this.$store.state.user.id;
+          const userList = this.$store.state.user.userList;
+          // 为每个参会人员创建一条记录
+          const promises = this.addForm.userIdList.map((userId, index) => {
+            // 为每个记录使用不同的workerId确保ID唯一性
+            const workerId = BigInt((index % 31) + 1); // workerId范围: 1-31
+            const snowflake = new Snowflake(workerId, 1n, 0n);
+            // 从userList中获取用户的deptId
+            const user = userList.find(u => u.userId === userId);
+            const deptId = user ? user.deptId : null;
+            const recordData = {
+              participateId: snowflake.nextId().toString(),
+              userId: userId, // 参会人员ID
+              deptId: deptId, // 用户的部门ID
+              reportTime: this.addForm.reportTime, // 当前日期作为参会日期
+              trainName: this.addForm.trainName,
+              content: this.addForm.content,
+              hours: this.addForm.hours,
+              deptUserId: currentUserId, // 当前登录用户作为审核人
+              deptTime: this.addForm.deptTime,
+              deptComment: this.addForm.deptComment
+            };
+            return addTrainApproval(recordData);
+          });
+
+          // 执行所有新增操作
+          Promise.all(promises).then(() => {
+            this.$modal.msgSuccess(`成功为 ${this.addForm.userIdList.length} 位参会人员添加培训记录`);
+            this.addOpen = false;
+            this.resetAddForm("addForm");
+            this.getList(); // 刷新列表
+          }).catch(error => {
+            console.error('添加培训记录失败:', error);
+            this.$modal.msgError("添加培训记录失败，请检查网络连接或联系管理员");
+          });
+        }
+      });
+    },
+    cancelAdd() {
+      this.addOpen = false;
+      this.resetAddForm("addForm");
+    },
+    resetAddForm(formName) {
+      if (this.$refs[formName]) {
+        this.$refs[formName].resetFields();
+      }
+      this.addForm = {
+        userIdList: [],
+        reportTime: null,
+        trainName: null,
+        content: null,
+        hours: 0,
+        deptUserId: this.$store.state.user.id,
+        deptUserName: this.$store.state.user.name,
+        deptTime: null,
+        deptComment: null
+      };
+    },
+    getUserName(userId) {
+      const user = this.$store.state.user.userList.find(item => item.userId === userId);
+      return user ? user.nickName : '';
     }
   }
 };