Просмотр исходного кода

安全检查和履职页面优化

luojun 2 лет назад
Родитель
Сommit
9519f4099d
2 измененных файлов с 32 добавлено и 17 удалено
  1. 13 8
      src/views/check/dialog.edit.vue
  2. 19 9
      src/views/resumption/plan/dialog.edit.vue

+ 13 - 8
src/views/check/dialog.edit.vue

@@ -71,14 +71,15 @@
                 prop="buildTaskNow"
                 label="立即生效:"
                 v-if="NowBuild()"
-              >
-                <el-checkbox
-                  :disabled="isChildren()"
-                  v-model="formData.buildTaskNow"
-                  size="medium"
-                  @change="handleCheckboxChange"
-                  >默认从下个周期生成任务,<br />勾选后从当前周期立即生成任务</el-checkbox
-                >
+                ><div class="checkbox-wrapper">
+                  <el-checkbox
+                    :disabled="isChildren()"
+                    v-model="formData.buildTaskNow"
+                    size="medium"
+                    @change="handleCheckboxChange"
+                    >默认从下个周期生成任务,<br />勾选后从当前周期立即生成任务</el-checkbox
+                  >
+                </div>
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -661,4 +662,8 @@ export default {
     padding-top: 40px;
   }
 }
+.checkbox-wrapper .el-checkbox {
+  display: flex;
+  align-items: center;
+}
 </style>

+ 19 - 9
src/views/resumption/plan/dialog.edit.vue

@@ -19,7 +19,7 @@
           <el-row>
             <el-col :span="6">
               <el-form-item prop="planName" label="计划名称:">
-                <el-input
+                <el-input :disabled="isChildren()"
                   v-model.trim="formData.planName"
                   :maxlength="50"
                   name="planName"
@@ -102,12 +102,14 @@
             <!-- </el-col> -->
             <el-col :span="6" v-if="id ? false : true">
               <el-form-item prop="tempBuildTaskNow" label="立即生效:">
-                <el-checkbox
-                  v-model="tempBuildTaskNow"
-                  size="medium"
-                  @change="handleCheckboxChange"
-                  >默认从下个周期生成任务,<br />勾选后从当前周期立即生成任务</el-checkbox
-                >
+                <div class="checkbox-wrapper">
+                  <el-checkbox
+                    v-model="tempBuildTaskNow"
+                    size="medium"
+                    @change="handleCheckboxChange"
+                    >默认从下个周期生成任务,<br />勾选后从当前周期立即生成任务</el-checkbox
+                  >
+                </div>
               </el-form-item>
             </el-col>
           </el-row>
@@ -425,17 +427,20 @@ export default {
           const month2 = String(dateObj.getMonth() + 1).padStart(2, "0"); // 获取月份,并补齐两位数
           const day2 = "01"; // 获取日期,并补齐两位数
           var month3 = month2;
+          var years = year2;
           month3++;
           for (var i = 0; i < 12; i++) {
             if (month3 == 1 || month3 == 4 || month3 == 7 || month3 == 10) {
-              continue;
+              break;
             }
             if (month3 == 13) {
               month3 = 1;
+              years++;
+              break;
             }
             month3++;
           }
-          this.buildTime = `${year2}-${month3}-${day2}`;
+          this.buildTime = `${years}-${month3}-${day2}`;
 
           break;
       }
@@ -578,6 +583,7 @@ export default {
           this.tableData = null;
           break;
       }
+      this.changeBuildTime();
     },
     //当时间为全天或者营业中才显示
     getPlanExec() {
@@ -779,4 +785,8 @@ export default {
   color: #999;
   height: 10px;
 }
+.checkbox-wrapper .el-checkbox {
+  display: flex;
+  align-items: center;
+}
 </style>