From a8a1006292260df8104141303e7d88ad30b399f9 Mon Sep 17 00:00:00 2001
From: hdka <823267011@qq.com>
Date: Tue, 11 Mar 2025 14:11:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=89=E6=9C=9F=E5=86=85=E5=AE=B9=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oa/peoples/date/components/SalaryForm.vue | 20 ++++++++++++------
 .../peoples/date/components/SalaryTable.vue   |  5 ++---
 ruoyi-ui/src/views/oa/peoples/date/index.vue  | 21 +++++++------------
 3 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/ruoyi-ui/src/views/oa/peoples/date/components/SalaryForm.vue b/ruoyi-ui/src/views/oa/peoples/date/components/SalaryForm.vue
index 1b5da2f..aa8384d 100644
--- a/ruoyi-ui/src/views/oa/peoples/date/components/SalaryForm.vue
+++ b/ruoyi-ui/src/views/oa/peoples/date/components/SalaryForm.vue
@@ -1,9 +1,17 @@
 <template>
   <el-form ref="form" :model="formData" label-width="80px">
     <el-form-item label="类型">
-      <el-input v-model="formData.type" />
+      <el-select v-model="formData.type">
+        <el-option label="其他" :value="0" />
+        <el-option label="旷工" :value="3" />
+        <el-option label="请假" :value="1" />
+        <el-option label="迟到" :value="4" />
+        <el-option label="早退" :value="6" />
+        <el-option label="未打卡" :value="5" />
+        <el-option label="出差" :value="2" />
+      </el-select>
     </el-form-item>
-    
+
     <el-form-item label="奖惩标记">
       <el-select v-model="formData.flag">
         <el-option label="奖励" :value="1" />
@@ -18,11 +26,11 @@
     <el-form-item label="日期" prop="signTime">
       <el-date-picker v-model="formData.signTime" type="date" format="yyyy-MM-DD" placeholder="选择日期" />
     </el-form-item>
-    
+
     <el-form-item label="备注" prop="reason">
       <el-input v-model="formData.reason" type="textarea" />
     </el-form-item>
-    
+
     <div class="dialog-footer">
       <el-button @click="handleCancel">取消</el-button>
       <el-button type="primary" @click="submit">确认创建</el-button>
@@ -49,7 +57,7 @@ export default {
         if (valid) {
           this.$emit('submit', this.formData)
           this.resetForm();
-        } 
+        }
       })
     },
 
@@ -69,4 +77,4 @@ export default {
     }
   }
 }
-</script>
\ No newline at end of file
+</script>
diff --git a/ruoyi-ui/src/views/oa/peoples/date/components/SalaryTable.vue b/ruoyi-ui/src/views/oa/peoples/date/components/SalaryTable.vue
index f308ca6..ae092c2 100644
--- a/ruoyi-ui/src/views/oa/peoples/date/components/SalaryTable.vue
+++ b/ruoyi-ui/src/views/oa/peoples/date/components/SalaryTable.vue
@@ -4,12 +4,11 @@
       :data="tableData"
       v-loading="loading"
       @selection-change="$emit('selection-change', $event)"
-
     >
       <el-table-column type="selection" width="55" />
       <el-table-column prop="nickName" label="姓名" />
       <el-table-column prop="realSalary" label="实发工资" />
-      <el-table-column prop="baseSalary" label="基本工资" /> 
+      <el-table-column prop="baseSalary" label="基本工资" />
       <el-table-column prop="payTime" label="发薪日期" />
       <el-table-column label="操作" width="180">
         <template slot-scope="{ row }">
@@ -49,4 +48,4 @@ export default {
     }
   }
 }
-</script>
\ No newline at end of file
+</script>
diff --git a/ruoyi-ui/src/views/oa/peoples/date/index.vue b/ruoyi-ui/src/views/oa/peoples/date/index.vue
index 5446b7f..b23ed0b 100644
--- a/ruoyi-ui/src/views/oa/peoples/date/index.vue
+++ b/ruoyi-ui/src/views/oa/peoples/date/index.vue
@@ -2,11 +2,6 @@
   <div class="salary-container">
     <!-- 操作工具栏 -->
     <el-row class="operation-bar">
-      <el-col :span="12">
-        <!-- <el-button type="primary" @click="openDialog('add')">新增</el-button> -->
-        <!-- <el-button :disabled="selectedRows.length === 0" @click="handleBatchDelete">批量删除</el-button> -->
-        <!-- <el-button @click="handleExport">导出</el-button> -->
-      </el-col>
       <el-col :span="12" class="text-right">
         <el-date-picker
           v-model="currentMonth"
@@ -29,12 +24,12 @@
           @page-change="handlePageChange"
         />
       </el-tab-pane>
-       
+
       <el-tab-pane label="工人工资" name="worker">
         <salary-table
           :data="tableData"
           :loading="loading"
-          :pagination="pagination" 
+          :pagination="pagination"
           @selection-change="handleSelection"
           @delete="handleDelete"
           @page-change="handlePageChange"
@@ -52,7 +47,7 @@
       <el-table :data="salaryDetails">
         <el-table-column label="奖惩标记" prop="flag">
           <template slot-scope="scope">
-            <el-tag 
+            <el-tag
               :type="scope.row.flag === 1 ? 'success' : 'danger'"
               disable-transitions
             >
@@ -112,12 +107,12 @@ export default {
     this.fetchData()
   },
   methods: {
-    getDefaultMonth() { 
+    getDefaultMonth() {
       const d = new Date()
       return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}`
     },
 
-    async fetchData() { 
+    async fetchData() {
       this.loading = true
       try {
         const params = {
@@ -171,10 +166,10 @@ export default {
       getSalaryItemDetail(id).then(res => {
         this.salaryDetails = res.rows;
       })
-    }, 
+    },
 
     async handleSubmit(formData) {
-      console.log(formData); 
+      console.log(formData);
       const result = await createSalaryItem({
         ...formData,
         salaryId: this.currentEditData.salaryId
@@ -206,4 +201,4 @@ export default {
 .text-right {
   text-align: right;
 }
-</style>
\ No newline at end of file
+</style>