安全检查编辑界面布局调整

src/views/safetycheck/plan/dialog.edit.vue

@@ -25,7 +25,7 @@
                   name="planName"
                   placeholder="请输入任务名称"
                   clearable
-                  style="width: 217px;max-height:33px"
+                  style="width: 217px; max-height: 33px"
                 />
               </el-form-item>
             </el-col>
@@ -70,6 +70,19 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
+              <el-form-item prop="count" label="任务次数:">
+                <el-input-number
+                  :disabled="cannotEdit()"
+                  v-model="formData.count"
+                  controls-position="right"
+                  @change="handleChange"
+                  :min="parentCount"
+                  :max="9"
+                  style="width: 217px"
+                ></el-input-number>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
               <el-form-item
                 prop="startDate"
                 label="开始时间:"
@@ -127,18 +140,32 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item :span="6" prop="execOrgIds" label="检查主体">
+                <org-tree-select
+                  :disabled="cannotEdit()"
+                  v-model="formData.execOrgIds"
+                  class="org-selector"
+                  :queryData="parseInt(formData.execOrgType)"
+                  ref="execorgTreeSelect"
+                  :enabledCheckOrgTypes="parseInt(formData.execOrgType)"
+                  :disable="true"
+                >
+                </org-tree-select>
+              </el-form-item>
+            </el-col>
             <!-- </el-row> -->
             <!-- <el-row> -->
-            <el-col :span="6">
+            <el-col :span="12">
               <el-form-item prop="roleIds" label="检查人员:">
                 <el-select
                   :disabled="cannotEdit()"
                   v-model="formData.roleIds"
                   placeholder="请选择检查人员"
-                  multiple   
-                  clearable     
-
+                  multiple
+                  clearable
                   @change="handleRolesChange"
+                  style="width: calc(100% - 17px)"
                 >
                   <el-option
                     v-for="item in planRoles"
@@ -150,7 +177,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col :span="12">
               <el-form-item prop="checkOrgTypes" label="受检机构类型:">
                 <el-select
                   :disabled="cannotEdit()"
@@ -161,6 +188,7 @@
                   placeholder="请选择受检机构类型"
                   clearable
                   multiple
+                  style="width: calc(100% - 17px)"
                 >
                   <el-option
                     v-for="item in orgTypeOptions"
@@ -172,32 +200,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
-              <el-form-item prop="count" label="任务次数:">
-                <el-input-number
-                  :disabled="cannotEdit()"
-                  v-model="formData.count"
-                  controls-position="right"
-                  @change="handleChange"
-                  :min="parentCount"
-                  :max="9"
-                ></el-input-number>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item :span="6" prop="execOrgIds" label="检查主体">
-                <org-tree-select
-                  :disabled="cannotEdit()"
-                  v-model="formData.execOrgIds"
-                  class="org-selector"
-                  :queryData="parseInt(formData.execOrgType)"
-                  ref="execorgTreeSelect"
-                  :enabledCheckOrgTypes="parseInt(formData.execOrgType)"
-                  :disable="true"
-                >
-                </org-tree-select>
-              </el-form-item>
-            </el-col>
+
             <el-col :span="6">
               <el-form-item :span="6" prop="checkOrgIds" label="受检机构">
                 <org-tree-select
@@ -242,15 +245,18 @@
                 ></el-switch> -->
             <!-- </el-form-item> -->
             <!-- </el-col> -->
+            <el-col :span="6">
+              <el-form-item :span="6" prop="description" label="备注">
+                <el-input
+                  :disabled="cannotEdit()"
+                  v-model="formData.description"
+                  :maxlength="255"
+                  clearable
+                  style="width: 217px"
+                />
+              </el-form-item>
+            </el-col>
           </el-row>
-          <el-form-item :span="6" prop="description" label="备注">
-            <el-input
-              :disabled="cannotEdit()"
-              v-model="formData.description"
-              :maxlength="255"
-              clearable
-            />
-          </el-form-item>
         </el-form>
         <el-button
           @click="openSelect"
@@ -696,7 +702,7 @@ export default {
         checkType: null,
         startDate: null,
         endDate: null,
-        taskHasCompleted:null,
+        taskHasCompleted: null,
       };
     },
     getRolesByOrg() {
@@ -773,9 +779,9 @@ export default {
         this.formData.execOrgIds = null;
         this.formData.rulePointIds = null;
         this.formData.distributePlanStatus = null;
-        this.formData.taskHasCompleted=null;
-        this.formData.startDate=null;
-        this.formData.endDate=null;
+        this.formData.taskHasCompleted = null;
+        this.formData.startDate = null;
+        this.formData.endDate = null;
       }
     },
     onSelect(selectList) {
@@ -857,7 +863,6 @@ export default {
         if (!isValidate) return;
 
         // console.log(this.formData.hasEdit,"this.formData.hasEdit")
-     
 
         this.formData.rulePointList =
           this.tableData == null ? [] : this.tableData;
@@ -869,7 +874,7 @@ export default {
           return;
         }
 
-        if(this.formData.rulePointList.length==0){
+        if (this.formData.rulePointList.length == 0) {
           this.$message.info("请选择检查内容");
           return;
         }
@@ -886,7 +891,7 @@ export default {
             if (!this.formData.hasTaskCurrentCycle) {
               this.update(this.formData, imme);
               return;
-            }            
+            }
             msg = "因不存在已完成任务，本次修改内容将立即生成。";
           }
 
@@ -942,9 +947,19 @@ export default {
   display: flex;
   align-items: center;
 }
+
 .org-selector {
+  ::v-deep .el-popover__reference-wrapper {
+    display: flex;
+    width: 100%;
+  }
   ::v-deep .tags-box {
-    width: calc(100% - 13px) !important;
+    width: calc(100% - 18px) !important;
+    min-height: 33px;
+    max-height: 33px !important;
   }
 }
+.el-input-number--small {
+  line-height: 32px;
+}
 </style>

src/views/safetycheck/plan/index.vue

@@ -274,6 +274,7 @@
               align="center"
               width="150px"
               label="受检机构"
+              show-overflow-tooltip
               v-if="columns[6].visible"
             >
               <!-- <template slot-scope="r"