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

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/ContractServiceImpl.java

@@ -1679,6 +1679,12 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> i
     public HttpRespMsg getContractDetail(HttpServletRequest request, Integer id) {
         HttpRespMsg respMsg = new HttpRespMsg();
         Contract contract = contractMapper.selectById(id);
+        if (contract.getTypeId()!=null){
+            ContractType contractType = contractTypeMapper.selectById(contract.getTypeId());
+            if (contractType!=null){
+                contract.setTypeName(contractType.getTypeName());
+            }
+        }
         List<ContractCustom> selectedList = contractCustomMapper.selectList(new QueryWrapper<ContractCustom>().eq("contract_id", contract.getId()));
         if (selectedList != null && !selectedList.isEmpty()) {
             contract.setCustomData(selectedList.get(0));

fhKeeper/formulahousekeeper/octopus/src/views/customer/list.vue

@@ -262,6 +262,7 @@
                     <el-form-item><el-checkbox v-model="dialogData.importReportAuditNormal">导入的日报正常审批</el-checkbox></el-form-item>
                     <el-form-item><el-checkbox v-model="dialogData.onlyShowPercent">工时报告页面，工时仅显示比例</el-checkbox></el-form-item>
                     <el-form-item><el-checkbox v-model="dialogData.taskFileCharge">任务文件支持审核</el-checkbox></el-form-item>
+                    <el-form-item><el-checkbox v-model="dialogData.projectProgressCheck">项目进度依据任务工时</el-checkbox></el-form-item>
                     
                 </el-form>
             </div>
@@ -489,7 +490,8 @@ import App from '../../App.vue';
                             this.$set(this.dialogData,'enableNewWeeklyfill',res.data.enableNewWeeklyfill ? true : false)
                             this.$set(this.dialogData,'hideSubproject',res.data.hideSubproject ? true : false)
                             this.$set(this.dialogData,'userWithMultiDept',res.data.userWithMultiDept ? true : false)
-                            this.$set(this.dialogData,'taskFileCharge',res.data.taskFileCharge ? true : false)
+                            this.$set(this.dialogData,'taskFileCharge',res.data.taskFileCharge ? true : false) 
+                            this.$set(this.dialogData,'projectProgressCheck',res.data.projectProgressCheck ? true : false)
                         }else{
                             this.$message({
                                 message: res.msg,
@@ -835,6 +837,7 @@ import App from '../../App.vue';
                     hideSubproject:this.dialogData.hideSubproject ? 1: 0, 
                     userWithMultiDept:this.dialogData.userWithMultiDept ? 1: 0, 
                     taskFileCharge:this.dialogData.taskFileCharge ? 1: 0, 
+                    projectProgressCheck:this.dialogData.projectProgressCheck ? 1: 0
                 },res => {
                     if(res.code == 'ok'){
                         this.editDialogG = false

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

@@ -15,7 +15,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author Seyason
- * @since 2025-01-02
+ * @since 2025-01-08
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -624,6 +624,18 @@ public class TimeType extends Model<TimeType> {
     @TableField("task_file_charge")
     private Integer taskFileCharge;
 
+    /**
+     * 任务预估成本功能是否开启，0-不启用，1-启用
+     */
+    @TableField("task_plan_cost")
+    private Integer taskPlanCost;
+
+    /**
+     * 项目进度判断依据，0-默认字段，1-根据任务工时
+     */
+    @TableField("project_progress_check")
+    private Integer projectProgressCheck;
+
 
     @Override
     protected Serializable pkVal() {