考勤功能-列表样式调整

src/views/business/attendance/attendanceDetails.vue

@@ -12,6 +12,7 @@
             :row-handle="listConfig.rowHandle"
             :pagination="pagination"
             :loading="loading"
+            :index-row="false"
             @action-event="handleAction"
             @sort-change="handleSortChange"
             @pagination-change="handlePaginationChange"
@@ -112,16 +113,17 @@ export default {
                     { key: 'export', icon: 'ibps-icon-download', label: '导出', type: 'primary' }
                 ],
                 searchForm: {
-                    labelWidth: 100,
+                    labelWidth: 80,
+                    itemWidth: 200,
                     forms: [
                         { prop: 'Q^kao_qin_zhuang_ta^SL', label: '考勤状态', fieldType: 'select', options: [{ value: '正常', label: '正常' }, { value: '异常', label: '异常' }] },
-                        { prop: ['Q^ri_qi_^DL', 'Q^ri_qi_^DG'], label: '日期范围', fieldType: 'daterange' },
+                        { prop: 'Q^yong_hu_id_^S', label: '姓名', fieldType: 'select', options: userOption },
+                        { prop: 'Q^gong_hao_^S', label: '工号' },
+                        { prop: 'Q^bu_men_^SL', label: '部门', fieldType: 'select', options: deptOption },
                         { prop: 'Q^pai_ban_ming_chen^SL', label: '排班名称' },
                         { prop: 'Q^ban_ci_ming_^SL', label: '班次名称' },
                         { prop: 'Q^ban_ci_bie_ming_^SL', label: '班次别名' },
-                        { prop: 'Q^yong_hu_id_^S', label: '姓名', fieldType: 'select', options: userOption },
-                        { prop: 'Q^gong_hao_^S', label: '工号' },
-                        { prop: 'Q^bu_men_^SL', label: '部门', fieldType: 'select', options: deptOption }
+                        { prop: ['Q^ri_qi_^DL', 'Q^ri_qi_^DG'], label: '日期范围', fieldType: 'daterange' }
                     ]
                 },
                 columns: []

src/views/business/attendance/attendanceOverview.vue

@@ -12,6 +12,7 @@
             :row-handle="listConfig.rowHandle"
             :pagination="pagination"
             :loading="loading"
+            :index-row="false"
             @action-event="handleAction"
             @sort-change="handleSortChange"
             @pagination-change="handlePaginationChange"

src/views/business/attendance/attendanceStatistics.vue

@@ -12,6 +12,7 @@
             :row-handle="listConfig.rowHandle"
             :pagination="pagination"
             :loading="loading"
+            :index-row="false"
             @action-event="handleAction"
             @sort-change="handleSortChange"
             @pagination-change="handlePaginationChange"

src/views/business/attendance/makeUPVerify.vue

@@ -12,6 +12,7 @@
             :row-handle="listConfig.rowHandle"
             :pagination="pagination"
             :loading="loading"
+            :index-row="false"
             @action-event="handleAction"
             @sort-change="handleSortChange"
             @pagination-change="handlePaginationChange"
@@ -61,7 +62,7 @@ export default {
                     { key: 'search', icon: 'ibps-icon-search', label: '查询', type: 'primary' }
                 ],
                 searchForm: {
-                    labelWidth: 100,
+                    labelWidth: 60,
                     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' },
@@ -72,15 +73,15 @@ export default {
                     ]
                 },
                 columns: [
-                    { prop: 'bian_zhi_ren_', label: '申请人', tags: userOption, width: 80 },
+                    { prop: 'bian_zhi_ren_', label: '申请人', tags: userOption, width: 100 },
                     { prop: 'bian_zhi_shi_jian', label: '申请时间', dateFormat: 'yyyy-MM-dd HH:mm', sortable: 'custom', width: 140 },
-                    // { prop: 'shenHeRen', label: '审核人', tags: userOption, dataType: 'stringArray', separator: ',', minWidth: 100 },
-                    // { prop: 'shenHeShiJian', label: '审核时间', dateFormat: 'yyyy-MM-dd HH:mm', sortable: 'custom', width: 140 },
+                    { prop: 'shen_he_ren_', label: '审批人', tags: userOption, dataType: 'stringArray', separator: ',', width: 200 },
+                    { prop: 'shen_he_shi_jian_', label: '审批时间', dateFormat: 'yyyy-MM-dd HH:mm', sortable: 'custom', width: 140 },
                     { prop: 'zhuang_tai_', label: '状态', width: 90 },
-                    { prop: 'bu_ka_ri_qi_', label: '补卡日期', dateFormat: 'yyyy-MM-dd', sortable: 'custom', width: 80 },
-                    { prop: 'bu_ka_shi_jian_', label: '补卡时间', dateFormat: 'HH:mm', sortable: 'custom', width: 80 },
-                    { prop: 'bu_ka_ban_ci_', label: '补卡班次', width: 80 },
-                    { prop: 'bu_ka_shi_you_', label: '补卡事由', width: 300 },
+                    { prop: 'bu_ka_ri_qi_', label: '补卡日期', dateFormat: 'yyyy-MM-dd', sortable: 'custom', width: 100 },
+                    { prop: 'bu_ka_shi_jian_', label: '补卡时间', dateFormat: 'HH:mm', sortable: 'custom', width: 100 },
+                    { prop: 'bu_ka_ban_ci_', label: '补卡班次', width: 100 },
+                    { prop: 'bu_ka_shi_you_', label: '补卡事由', minWidth: 300 }
                     // { prop: 'fu_jian_', label: '说明附件', width: 150 }
                 ],
                 rowHandle: {
@@ -132,7 +133,7 @@ export default {
             const { first, second } = this.$store.getters.level || {}
             const searchParam = this.$refs['crud'] ? this.$refs['crud'].getSearcFormData() : {}
             searchParam['Q^di_dian_^S'] = second || first
-            searchParam['Q^shen_he_ren_^S'] = this.$store.getters.userId
+            searchParam['Q^shen_he_ren_^SL'] = this.$store.getters.userId
             return ActionUtils.formatParams(searchParam, this.pagination, this.sorts)
         },
         getSearchSql () {
@@ -212,6 +213,7 @@ export default {
             if (key === 'agree') {
                 status = '已通过'
             }
+            const time = self.$common.getFormatDate()
             const submitData = {
                 banCiZhuangTai: data.ban_ci_zhuang_tai || '',
                 bianZhiRen: data.bian_zhi_ren_ || '',
@@ -230,7 +232,7 @@ export default {
                 paiBanId: data.pai_ban_id_ || '',
                 paiBanJiLuId: data.pai_ban_ji_lu_id_ || '',
                 shenHeRen: data.shen_he_ren_ || '',
-                shenHeShiJian: data.shen_he_shi_jian_ || '',
+                shenHeShiJian: time || '',
                 shenHeYiJian: data.shen_he_yi_jian_ || '',
                 tenantId: data.tenant_id_ || '',
                 updateBy: data.update_by_ || '',

src/views/business/attendance/makeUpEdit.vue

@@ -245,15 +245,22 @@ export default {
                 const updateObj = self.buKaBanCiOptions.filter(obj => obj.value === self.formData.buKaBanCi)
                 const updateId = updateObj[0].id
                 const updateData = self.yichangdata.filter(obj => obj.id === updateId)
-
                 // 获得补卡审批人
-                const sql = `select USER_ID_ FROM t_schedule_detail WHERE id_ = '${updateData[0].paiBanJiLuId}'`
+                const sql = `select config_ FROM t_schedule WHERE id_ = '${updateData[0].paiBanId}'`
                 self.$common.request('sql', sql).then((res) => {
+                    const str = res.variables.data[0].config_ || ''
+                    let shenHeRen = ''
+                    if (str) {
+                        const obj = JSON.parse(str)
+                        const shenHeRenArr = obj.approver
+                        shenHeRen = shenHeRenArr.join(',')
+                    }
+                    const time = self.$common.getFormatDate()
                     const submitData =
                     {
                         banCiZhuangTai: '',
                         bianZhiRen: self.$store.getters.userId,
-                        bianZhiShiJian: self.$common.getDateNow(),
+                        bianZhiShiJian: time,
                         buKaBanCi: buKaBanCi,
                         buKaRiQi: buKaRiQi,
                         buKaShiJian: buKaShiJian,
@@ -273,7 +280,7 @@ export default {
                         paiBanId: updateData.paiBanId,
                         paiBanJiLuId: updateData.paiBanJiLuId,
                         pk: self.params.pk,
-                        shenHeRen: res.variables.data[0].USER_ID_ || '',
+                        shenHeRen: shenHeRen,
                         shenHeShiJian: '',
                         shenHeYiJian: '',
                         tenantId: '',

src/views/business/attendance/makeUpRecords.vue

@@ -12,6 +12,7 @@
             :row-handle="listConfig.rowHandle"
             :pagination="pagination"
             :loading="loading"
+            :index-row="false"
             @action-event="handleAction"
             @sort-change="handleSortChange"
             @pagination-change="handlePaginationChange"
@@ -64,7 +65,7 @@ export default {
                     { key: 'add', icon: 'ibps-icon-plus', label: '申请', type: 'success' }
                 ],
                 searchForm: {
-                    labelWidth: 100,
+                    labelWidth: 60,
                     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' },
@@ -75,15 +76,15 @@ export default {
                     ]
                 },
                 columns: [
-                    { prop: 'bian_zhi_ren_', label: '申请人', tags: userOption, width: 80 },
+                    { prop: 'bian_zhi_ren_', label: '申请人', tags: userOption, width: 100 },
                     { prop: 'bian_zhi_shi_jian', label: '申请时间', dateFormat: 'yyyy-MM-dd HH:mm', sortable: 'custom', width: 140 },
-                    // { prop: 'shenHeRen', label: '审核人', tags: userOption, dataType: 'stringArray', separator: ',', minWidth: 100 },
-                    // { prop: 'shenHeShiJian', label: '审核时间', dateFormat: 'yyyy-MM-dd HH:mm', sortable: 'custom', width: 140 },
+                    { prop: 'shen_he_ren_', label: '审批人', tags: userOption, dataType: 'stringArray', separator: ',', width: 200 },
+                    { prop: 'shen_he_shi_jian_', label: '审批时间', dateFormat: 'yyyy-MM-dd HH:mm', sortable: 'custom', width: 140 },
                     { prop: 'zhuang_tai_', label: '状态', width: 90 },
-                    { prop: 'bu_ka_ri_qi_', label: '补卡日期', dateFormat: 'yyyy-MM-dd', sortable: 'custom', width: 80 },
-                    { prop: 'bu_ka_shi_jian_', label: '补卡时间', dateFormat: 'HH:mm', sortable: 'custom', width: 80 },
-                    { prop: 'bu_ka_ban_ci_', label: '补卡班次', width: 80 },
-                    { prop: 'bu_ka_shi_you_', label: '补卡事由', width: 300 }
+                    { prop: 'bu_ka_ri_qi_', label: '补卡日期', dateFormat: 'yyyy-MM-dd', sortable: 'custom', width: 100 },
+                    { prop: 'bu_ka_shi_jian_', label: '补卡时间', dateFormat: 'HH:mm', sortable: 'custom', width: 100 },
+                    { prop: 'bu_ka_ban_ci_', label: '补卡班次', width: 120 },
+                    { prop: 'bu_ka_shi_you_', label: '补卡事由', minWidth: 300 }
                     // { prop: 'fu_jian_', label: '说明附件', width: 150 }
                 ],
                 rowHandle: {
@@ -135,6 +136,7 @@ export default {
             const { first, second } = this.$store.getters.level || {}
             const searchParam = this.$refs['crud'] ? this.$refs['crud'].getSearcFormData() : {}
             searchParam['Q^di_dian_^S'] = second || first
+            searchParam['Q^bian_zhi_ren_^S'] = this.$store.getters.userId
             return ActionUtils.formatParams(searchParam, this.pagination, this.sorts)
         },
         getSearchSql () {

src/views/business/attendance/personAttendanceDetails.vue

@@ -12,6 +12,7 @@
             :row-handle="listConfig.rowHandle"
             :pagination="pagination"
             :loading="loading"
+            :index-row="false"
             @action-event="handleAction"
             @sort-change="handleSortChange"
             @pagination-change="handlePaginationChange"
@@ -112,7 +113,7 @@ export default {
                     { key: 'export', icon: 'ibps-icon-download', label: '导出', type: 'primary' }
                 ],
                 searchForm: {
-                    labelWidth: 100,
+                    labelWidth: 80,
                     forms: [
                         { prop: 'Q^kao_qin_zhuang_ta^SL', label: '考勤状态', fieldType: 'select', options: [{ value: '正常', label: '正常' }, { value: '异常', label: '异常' }] },
                         { prop: ['Q^ri_qi_^DL', 'Q^ri_qi_^DG'], label: '日期范围', fieldType: 'daterange' },

src/views/business/​scheduleManage/components/config.vue

@@ -120,7 +120,7 @@
                             </el-form-item>
                         </el-col>
                         <el-col v-if="formData.isApproval === 'Y'" :span="12">
-                            <el-form-item label="调班/补卡审批人" prop="approver" required :show-message="false">
+                            <el-form-item label="调班/补卡审批人" prop="approver" required :show-message="false" label-width="120px">
                                 <el-select
                                     v-model="formData.approver"
                                     :disabled="readonly"