Przeglądaj źródła

八爪鱼增加简易费用报销开关

Min 2 lat temu
rodzic
commit
4f4aa28b4a

+ 3 - 0
fhKeeper/formulahousekeeper/octopus/src/views/customer/list.vue

@@ -241,6 +241,7 @@
                     <el-form-item><el-checkbox v-model="dialogData.subProMustFill">子项目是否必填</el-checkbox></el-form-item>
                     <el-form-item><el-checkbox v-model="dialogData.projectManDay">是否开启项目人天字段</el-checkbox></el-form-item>
                     <el-form-item><el-checkbox v-model="dialogData.projectCustom">是否开启项目自定义表单</el-checkbox></el-form-item>
+                    <el-form-item><el-checkbox v-model="dialogData.easyExpense">是否开启简易费用报销</el-checkbox></el-form-item>
                 </el-form>
             </div>
             <!-- 是否开启审批流设置,是否启用主项目模式,是否秘薪模式,是否显示日报审批流程,是否CRO企业,是否仅使用导入日报审核(不要项目审核) reportAuditType-->
@@ -407,6 +408,7 @@
                             this.$set(this.dialogData,'restartTaskNeedReason',res.data.restartTaskNeedReason ? true : false)
                             this.$set(this.dialogData,'subProMustFill',res.data.subProMustFill ? true : false)
                             this.$set(this.dialogData,'projectManDay',res.data.projectManDay ? true : false)
+                            this.$set(this.dialogData,'easyExpense',res.data.easyExpense ? true : false)
                         }else{
                             this.$message({
                                 message: res.msg,
@@ -724,6 +726,7 @@
                     restartTaskNeedReason: this.dialogData.restartTaskNeedReason ? 1 : 0,
                     subProMustFill: this.dialogData.subProMustFill ? 1 : 0,
                     projectManDay: this.dialogData.projectManDay ? 1 : 0,
+                    easyExpense: this.dialogData.easyExpense ? 1 : 0,
                 },res => {
                     if(res.code == 'ok'){
                         this.editDialogG = false

+ 14 - 2
fhKeeper/formulahousekeeper/ops-platform/src/main/java/com/management/platform/entity/TimeType.java

@@ -17,7 +17,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author Seyason
- * @since 2023-03-21
+ * @since 2023-04-13
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -75,7 +75,7 @@ public class TimeType extends Model<TimeType> {
     private Boolean payOvertime;
 
     /**
-     * 提醒时间
+     * 填报提醒时间
      */
     @TableField("alert_time")
     private String alertTime;
@@ -443,6 +443,18 @@ public class TimeType extends Model<TimeType> {
     @TableField("project_custom")
     private Integer projectCustom;
 
+    /**
+     * 待审核提醒时间
+     */
+    @TableField("wait_check_alert_time")
+    private String waitCheckAlertTime;
+
+    /**
+     * 0-否 1-是  是否开启简易费用报销
+     */
+    @TableField("easy_expense")
+    private Integer easyExpense;
+
 
     @Override
     protected Serializable pkVal() {

Plik diff jest za duży
+ 3 - 1
fhKeeper/formulahousekeeper/ops-platform/src/main/resources/mapper/TimeTypeMapper.xml