Эх сурвалжийг харах

考勤功能:加入补卡撤销逻辑、补卡编辑页面样式调整

zhonghuizhen 1 жил өмнө
parent
commit
0e2f19174e

+ 13 - 7
src/views/business/attendance/makeUpEdit.vue

@@ -24,11 +24,11 @@
         >
 
             <!-- 补卡日期 -->
-            <el-form-item label="补卡日期" prop="buKaRiQi">
+            <el-form-item label="补卡日期" prop="buKaRiQi" class="form-item-uniform">
                 <el-date-picker
                     v-model="formData.buKaRiQi"
                     type="date"
-                    placeholder="选择日期"
+                    :placeholder="readonly? '' : 选择日期"
                     value-format="yyyy-MM-dd"
                     :picker-options="buKaRiQiPickerOptions"
                     :disabled="readonly"
@@ -36,10 +36,10 @@
                 />
             </el-form-item>
             <!-- 补卡班次 -->
-            <el-form-item label="补卡班次" prop="buKaBanCi">
+            <el-form-item label="补卡班次" prop="buKaBanCi" class="form-item-uniform">
                 <el-select
                     v-model="formData.buKaBanCi"
-                    placeholder="请选择班次"
+                    :placeholder="readonly? '' : 请选择班次"
                     :disabled="readonly"
                     @focus="loadBuKaBanCiOptions"
                 >
@@ -52,11 +52,11 @@
                 </el-select>
             </el-form-item>
             <!-- 补卡时间 -->
-            <el-form-item label="补卡时间" prop="buKaShiJian">
+            <el-form-item label="补卡时间" prop="buKaShiJian" class="form-item-uniform">
                 <el-time-picker
                     v-model="formData.buKaShiJian"
                     value-format="HH:mm"
-                    placeholder="选择时间"
+                    :placeholder="readonly? '' : 请选择时间"
                     :disabled="readonly"
                 />
             </el-form-item>
@@ -66,7 +66,7 @@
                     v-model="formData.buKaShiYou"
                     type="textarea"
                     :rows="3"
-                    placeholder="请输入补卡原因"
+                    :placeholder="readonly? '' : 请输入补卡原因"
                     maxlength="200"
                     :disabled="readonly"
                     show-word-limit
@@ -79,6 +79,7 @@
                     :download="true"
                     multiple
                     accept="*"
+                    :placeholder="readonly? '' : 请上传附件"
                     :disabled="readonly"
                     style="width:100%"
                 />
@@ -324,4 +325,9 @@ export default {
             }
         }
     }
+    .form-item-uniform .el-date-editor,
+    .form-item-uniform .el-select,
+    .form-item-uniform .el-time-picker {
+        width: 220px; /* 设置统一的宽度 */
+    }
 </style>

+ 29 - 1
src/views/business/attendance/makeUpRecords.vue

@@ -70,7 +70,7 @@ export default {
                     forms: [
                         { prop: 'Q^bian_zhi_ren_^S', label: '申请人', fieldType: 'select', options: userOption },
                         { prop: ['Q^bian_zhi_shi_jian^DL', 'Q^bian_zhi_shi_jian^DG'], label: '申请时间', fieldType: 'daterange' },
-                        { prop: 'Q^zhuang_tai_^SL', label: '状态', fieldType: 'select', options: [{ value: '待审核', label: '待审核' }, { value: '未通过', label: '未通过' }, { value: '已通过', label: '已通过' }] },
+                        { prop: 'Q^zhuang_tai_^SL', label: '状态', fieldType: 'select', options: [{ value: '待审核', label: '待审核' }, { value: '未通过', label: '未通过' }, { value: '已通过', label: '已通过' }, { value: '已撤销', label: '已撤销' }] },
                         { prop: ['Q^bu_ka_ri_qi_^DL', 'Q^bu_ka_ri_qi_^DG'], label: '补卡日期', fieldType: 'daterange' },
                         { prop: 'Q^bu_ka_ban_ci_^SL', label: '补卡班次' },
                         { prop: 'Q^bu_ka_shi_you_^SL', label: '补卡事由' }
@@ -92,6 +92,8 @@ export default {
                     effect: 'default',
                     // effect: 'display',
                     actions: [
+                        { key: 'cancel', label: '撤销', type: 'danger', icon: 'ibps-icon-cancel', hidden: function (row) { return (row.zhuang_tai_ !== '待审核') } },
+                        { key: 'edit', label: '编辑', type: 'primary', icon: 'ibps-icon-edit', hidden: function (row) { return (row.zhuang_tai_ !== '已撤销') } },
                         { key: 'detail', label: '详情', type: 'primary', icon: 'ibps-icon-list-alt' }
                     ]
                 }
@@ -204,6 +206,9 @@ export default {
                 case 'detail':
                     this.handleEdit(command, data)
                     break
+                case 'cancel':
+                    this.handleCancel(data)
+                    break
             }
         },
         /**
@@ -221,6 +226,29 @@ export default {
         closeBuKaDialog () {
             this.showMakeUpEdit = false
             this.loadData()
+        },
+        /**
+         * 处理取消
+         */
+        async handleCancel (data) {
+            data.zhuang_tai_ = '已撤销'
+            // 改为通用接口
+            const tableName = 't_attendance_reissue'
+            const updateParams = {
+                tableName,
+                updList: [
+                    {
+                        where: {
+                            id_: data.id_
+                        },
+                        param: {
+                            zhuang_tai_: data.zhuang_tai_
+                        }
+                    }]
+            }
+            this.$common.request('update', updateParams).then(async () => {
+                this.$message.success('撤销成功')
+            }).catch((e) => { console.error(e) })
         }
     }
 }