发展档案bug

ruoyi-ui/src/views/benyi/checkindetail/index.vue

@@ -456,7 +456,7 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.ids;
       this.$confirm(
-        '是否确认删除幼儿考勤编号为"' + ids + '"的数据项?',
+        '是否确认删除幼儿考勤的数据项?',
         "警告",
         {
           confirmButtonText: "确定",

ruoyi-ui/src/views/benyi/child_preserve/index.vue

@@ -509,7 +509,11 @@ export default {
         phone: undefined,
       },
       // 表单参数
-      form: {},
+      form: {
+        // csrq: [
+        //   { required: true, message: "出生日期不能为空", trigger: "blur" },
+        // ],
+      },
       // 监护人表单参数
       form_jhr: {},
     };

ruoyi-ui/src/views/benyi/themetermplanapproval/index.vue

@@ -87,7 +87,6 @@
         type="selection"
         width="55"
         align="center"
-        :selectable="isShow"
       />
       <el-table-column
         fixed
@@ -148,7 +147,7 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['benyi:themetermplan:edit']"
-            v-show="isShow(scope.row)"
+
             >审批</el-button
           >
           <el-button
@@ -305,14 +304,6 @@ export default {
     });
   },
   methods: {
-    isShow(row) {
-      // console.log(row.status);
-      if (row.status == "1") {
-        return true;
-      } else {
-        return false;
-      }
-    },
     // 字典翻译
     classFormat(row, column) {
       // return this.selectDictLabel(this.classOptions, row.classid);

ruoyi-ui/src/views/benyi/themeweekplanapproval/index.vue

@@ -43,7 +43,7 @@
             ></el-date-picker>
           </el-form-item>
         </el-col>
-        <el-col :xs="24" :ms="12" :md="5">
+        <el-col :xs="24" :ms="12" :md="4">
           <el-form-item label="所属周次" prop="zc">
             <el-input-number
               class="my-date-picker"

ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByAssessmentcontentController.java

@@ -224,10 +224,13 @@ public class ByAssessmentcontentController extends BaseController {
             int countChild = byAssessmentcontentService.selectCountElementByChild(byAssessmentcontent);
             if (scope.equals("1")) {
                 douArr.add((((double) 48 / count) * countChild));
+                System.out.println("48:"+count+"-"+countChild);
             } else if (scope.equals("2")) {
                 douArr.add((((double) 60 / count) * countChild));
+                System.out.println("60:"+count+"-"+countChild);
             } else if (scope.equals("3")) {
                 douArr.add((((double) 72 / count) * countChild));
+                System.out.println("72:"+count+"-"+countChild);
             }
         }
         ajaxResult.put("statistics", douArr);

ruoyi/src/main/java/com/ruoyi/project/system/controller/BySchoolController.java

@@ -143,6 +143,7 @@ public class BySchoolController extends BaseController
         //通过selectdeptlist来获取deptid
         dept.setDeptId(deptService.selectDeptList(dept).get(0).getDeptId());
         dept.setStatus(bySchool.getStatus());
+        dept.setDeptName(bySchool.getSchoolName());
         deptService.updateDept(dept);
         return toAjax(bySchoolService.updateBySchool(bySchool));
     }