Преглед изворни кода

考勤功能-修复调班申请、审核显示排班修改记录

zhonghuizhen пре 1 година
родитељ
комит
aff7b13eef

+ 1 - 0
src/views/business/​scheduleManage/adjust.vue

@@ -150,6 +150,7 @@ export default {
             }
             const { first, second } = this.$store.getters.level || {}
             paramjson['Q^di_dian_^S'] = (second || first)
+            paramjson['Q^reason_^NE'] = '排班修改'
             return ActionUtils.formatParams(
                 // this.$refs['crud'] ? this.$refs['crud'].getSearcFormData() : {},
                 paramjson,

+ 2 - 1
src/views/business/​scheduleManage/adjustVerify.vue

@@ -219,7 +219,8 @@ export default {
                 }
             }
             const { first, second } = this.$store.getters.level || {}
-            parameters[0].parameters.push({'key': 'Q^di_dian_^S', 'value': (second || first) })
+            parameters[0].parameters.push({ 'key': 'Q^di_dian_^S', 'value': (second || first) })
+            parameters[0].parameters.push({ 'key': 'Q^reason_^NE', 'value': '排班修改' })
             const param = {
                 parameters: parameters,
                 ...ActionUtils.formatParams(null, this.pagination, this.sorts)

+ 1 - 1
src/views/business/​scheduleManage/components/config-list.vue

@@ -105,7 +105,7 @@ export default {
                     { prop: 'name', label: '配置名称', width: 150 },
                     { prop: 'scheduleType', label: '排班类型', tags: scheduleType, width: 100, sortable: 'custom' },
                     { prop: 'isEffective', label: '是否生效', slotName: 'isEffective', width: 85, align: 'center' },
-                    { prop: 'approver', label: '调班审批人', tags: userOption, dataType: 'stringArray', minWidth: 140 },
+                    { prop: 'approver', label: '调班/补卡审批人', tags: userOption, dataType: 'stringArray', minWidth: 140 },
                     { prop: 'createBy', label: '创建人', tags: userOption, width: 90 },
                     { prop: 'createTime', label: '创建时间', dateFormat: 'yyyy-MM-dd HH:mm', sortable: 'custom', width: 120 }
                 ],

+ 1 - 1
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">
                                 <el-select
                                     v-model="formData.approver"
                                     :disabled="readonly"

+ 2 - 1
src/views/business/​scheduleManage/edit.vue

@@ -147,7 +147,7 @@
             </el-form-item>
             <el-row :gutter="20" class="form-row">
                 <el-col :span="24">
-                    <el-form-item label="调班审批人" prop="approver" :show-message="false">
+                    <el-form-item label="调班/补卡审批人" prop="approver" :show-message="false">
                         <el-select
                             v-model="formData.approver"
                             :disabled="(readonly || ifFaBu)"
@@ -1197,6 +1197,7 @@ export default {
                 type: scheduleType,
                 config: JSON.stringify(configData),
                 overview: JSON.stringify(overview),
+                updateType: '排班修改',
                 staffScheduleDetailPoList
             }
             console.log(submitData)