新增人员自动赋予普通角色，核算天数可计半天

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -305,6 +305,9 @@ public class SysUserController extends BaseController
             user.setPoliticalAffiliation("13");
         String pinyin = Pinyin4jUtil.getPinyin(user.getNickName());
         user.setPinyin(pinyin.contains(",") ? pinyin.split(",")[0] : pinyin);
+        Long[] roleIds = new Long[1];
+        roleIds[0] = 2L;
+        user.setRoleIds(roleIds);
         user.setPassword(SecurityUtils.encryptPassword(user.getIdCard().substring(12,18)));
         if (user.getBirthday() != null)
             user.setAge(DateUtils.getAgeByBirth(user.getBirthday()));

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcBudgetStaff.java

@@ -34,7 +34,7 @@ public class CmcBudgetStaff extends BaseEntity
 
     /** 天数 */
     @Excel(name = "天数")
-    private Integer days;
+    private Double days;
 
     private CmcPostSalary salary;
 
@@ -48,7 +48,7 @@ public class CmcBudgetStaff extends BaseEntity
 
     /** 核算天数 */
     @Excel(name = "核算天数")
-    private Long daysAdjust;
+    private Double daysAdjust;
 
     /** 预算绩效 */
     @Excel(name = "预算绩效")
@@ -114,12 +114,12 @@ public class CmcBudgetStaff extends BaseEntity
     {
         return user;
     }
-    public void setDays(Integer days) 
+    public void setDays(Double days)
     {
         this.days = days;
     }
 
-    public Integer getDays() 
+    public Double getDays()
     {
         return days;
     }
@@ -150,12 +150,12 @@ public class CmcBudgetStaff extends BaseEntity
     {
         return type;
     }
-    public void setDaysAdjust(Long daysAdjust)
+    public void setDaysAdjust(Double daysAdjust)
     {
         this.daysAdjust = daysAdjust;
     }
 
-    public Long getDaysAdjust()
+    public Double getDaysAdjust()
     {
         return daysAdjust;
     }

oa-ui/src/views/flowable/form/budget/adjust/budgetAdjust.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2025-05-07 11:01:39
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-07-09 17:04:27
+ * @LastEditors: wrh
+ * @LastEditTime: 2025-09-10 13:58:29
 -->
 <template>
   <div class="main">
@@ -410,20 +410,13 @@ export default {
   },
   watch: {
     'taskForm.formId'() {
-      if (!this.row.projectId) {
-        getCheck(this.taskForm.formId).then(res => {
-          this.row.projectId = res.data.projectId;
-          this.initBudgetForm();
-          this.initCheckForm();
-          this.getContractInfo();
-          this.getSubContractInfo();
-        });
-      } else {
+      getCheck(this.taskForm.formId).then(res => {
+        this.row.projectId = res.data.projectId;
         this.initBudgetForm();
         this.initCheckForm();
         this.getContractInfo();
         this.getSubContractInfo();
-      }
+      });
 
     }
   },

oa-ui/src/views/oa/check/index.vue

@@ -187,9 +187,10 @@ export default {
     },
     /** 查看按钮操作 */
     handleView(row) {
-      this.$set(this.taskForm, 'formId', row.checkId)
       this.open = true;
       this.title = "查看cmc项目核算";
+      this.form = row;
+      this.$set(this.taskForm, 'formId', row.checkId)
     },
     /** 重置按钮操作 */
     resetQuery() {