Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/ops-platform/src/main/java/com/management/platform/controller/ContractDetailController.java

@@ -177,9 +177,9 @@ public class ContractDetailController {
         ContractDetail contractDetail = contractDetailService.getById(companyId);
         if(contractDetail!=null){
             contractDetail.setFinalize(1);
-        }
-        if(!contractDetailService.updateById(contractDetail)){
-            httpRespMsg.setError("验证失败");
+            if(!contractDetailService.updateById(contractDetail)){
+                httpRespMsg.setError("验证失败");
+            }
         }
         return httpRespMsg;
     }

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-01-17
+ * @since 2023-02-10
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -254,6 +254,12 @@ public class TimeType extends Model<TimeType> {
     @TableField("is_secret_salary")
     private Integer isSecretSalary;
 
+    /**
+     * 0：节假日不提醒，1：节假日提醒
+     */
+    @TableField("alert_non_workday")
+    private Integer alertNonWorkday;
+
     /**
      * 0-每日提醒当天漏填 1-每日提醒昨天漏填
      */
@@ -413,6 +419,12 @@ public class TimeType extends Model<TimeType> {
     @TableField("restart_task_need_reason")
     private Integer restartTaskNeedReason;
 
+    /**
+     * 0-否 1-是  子项目是否必填
+     */
+    @TableField("sub_pro_must_fill")
+    private Integer subProMustFill;
+
 
     @Override
     protected Serializable pkVal() {

fhKeeper/formulahousekeeper/timesheet_h5/src/views/edit/index.vue

@@ -652,7 +652,29 @@ import timetoolVue from '../timetool/timetool.vue';
                     this.projectss = this.proads
                 }
             },
+
+            selectDegreeId(domain, index, domainItem, list) {
+                this.$axios.post("/report/defaultDegree", {
+                    projectId: domain.id
+                })
+                .then(res => {
+                    if(res.code == "ok") {
+                        var arr = domainItem.wuduList
+                        for(var i in arr) {
+                            if(arr[i].id == res.data.id) {
+                                domainItem.weiduName = arr[i].name
+                                domainItem.degreeId = res.data.id
+                            }
+                        }
+                        this.$forceUpdate();
+                    } else {
+                        this.$toast.fail('获取失败:'+res.msg);
+                    }
+                }).catch(err=> {this.$toast.clear();});
+            },
+
             fZr(item,index) {
+
                 var domainItem = this.form.domains[this.clickIndex];
                 domainItem.projectId = item.id;
                 domainItem.projectName = item.projectName;
@@ -693,6 +715,14 @@ import timetoolVue from '../timetool/timetool.vue';
                 if (curProject && this.user.timeType.reportAuditType == 0) {
                     this.getProjectAuditorList(domainItem, index);
                 }
+
+                console.log(item, '数据')
+                if(this.user.timeType.customDegreeActive == 1 && item) {
+                    var that = this
+                    setTimeout(()=>{
+                        that.selectDegreeId(item, index, that.form.domains[that.clickIndex])
+                    }, 500)
+                }
             },
             //获取项目下的任务分组
             getTaskGroups(domainItem, index) {