界面调整

src/views/check/index.vue

@@ -15,150 +15,164 @@
 
       <el-col :span="20" :xs="24">
         <!--    搜索条件    -->
-        <el-form
-          :model="queryParams"
-          ref="search"
-          size="small"
-          :inline="true"
-          v-show="showSearch"
-          label-width="90px"
-        >
-          <el-row>
-            <el-form-item prop="checkType" label="任务类型">
-              <el-select
-                prop="checkType"
-                label="任务类型"
-                v-model="queryParams.checkType"
-                placeholder="请选择任务类型"
-                clearable
-              >
-                <el-option
-                  v-for="dict in dict.type.check_type"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item prop="execOrgType" label="检查机构类型" v-if="false">
-              <el-select
-                prop="execOrgType"
-                label="检查机构类型"
-                v-model="queryParams.execOrgType"
-                placeholder="请选择检查机构类型"
-                clearable
-              >
-                <el-option
-                  v-for="dict in dict.type.sys_org_type"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item prop="checkOrgType" label="受检机构类型" v-if="false">
-              <el-select
-                prop="checkOrgType"
-                label="受检机构类型"
-                v-model="queryParams.checkOrgType"
-                placeholder="请选择受检机构类型"
-                clearable
-              >
-                <el-option
-                  v-for="dict in dict.type.sys_org_type"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                />
-              </el-select>
-            </el-form-item>
-
-            <el-form-item prop="checkRole" label="检查人员">
-              <el-select
-                @visible-change="getRolesByOrg"
-                prop="checkRole"
-                label="检查人员"
-                v-model="queryParams.checkRole"
-                placeholder="请选择用户角色"
-                clearable
-              >
-                <el-option
-                  v-for="dict in resumptionRoles"
-                  :key="dict.index"
-                  :label="dict.roleName"
-                  :value="dict.id"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item prop="planCycle" label="任务周期">
-              <el-select
-                prop="planCycle"
-                label="任务周期"
-                v-model="queryParams.planCycle"
-                placeholder="请选择任务周期"
-                clearable
-              >
-                <el-option
-                  v-for="item in dict.type.check_cycle"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
+        <div class="main-right-box">
+          <div class="main-search-box">
+            <el-form
+              :model="queryParams"
+              ref="search"
+              size="small"
+              :inline="true"
+              v-show="showSearch"
+              label-width="90px"
+            >
+              <el-row>
+                <el-form-item prop="checkType" label="任务类型">
+                  <el-select
+                    prop="checkType"
+                    label="任务类型"
+                    v-model="queryParams.checkType"
+                    placeholder="请选择任务类型"
+                    clearable
+                  >
+                    <el-option
+                      v-for="dict in dict.type.check_type"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    />
+                  </el-select>
+                </el-form-item>
+                <el-form-item
+                  prop="execOrgType"
+                  label="检查机构类型"
+                  v-if="false"
                 >
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-row>
-          <el-row>
-            <el-form-item prop="planStatus" label="任务状态">
-              <el-select
-                prop="planStatus"
-                label="任务状态"
-                v-model="queryParams.planStatus"
-                placeholder="请选择任务状态"
-                clearable
-              >
-                <el-option
-                  v-for="item in dict.type.check_status"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
+                  <el-select
+                    prop="execOrgType"
+                    label="检查机构类型"
+                    v-model="queryParams.execOrgType"
+                    placeholder="请选择检查机构类型"
+                    clearable
+                  >
+                    <el-option
+                      v-for="dict in dict.type.sys_org_type"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    />
+                  </el-select>
+                </el-form-item>
+                <el-form-item
+                  prop="checkOrgType"
+                  label="受检机构类型"
+                  v-if="false"
                 >
-                </el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item prop="planName" label="任务名称">
-              <el-input
-                v-model="queryParams.planName"
-                :maxlength="50"
-                name="planName"
-                placeholder="请输入关键字"
-                clearable
-              />
-            </el-form-item>
-          </el-row>
-          <el-row>
-            <el-form-item>
-              <el-button
-                type="primary"
-                icon="el-icon-search"
-                size="mini"
-                @click="getList"
-                >搜索</el-button
-              >
-              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-                >重置</el-button
-              ><el-button
-                type="primary"
-                icon="el-icon-plus"
-                size="mini"
-                @click="handleAdd()"
-                v-hasPermi="['core:checkplan:add']"
-                >新增任务</el-button
-              >
-            </el-form-item>
-          </el-row>
-        </el-form>
+                  <el-select
+                    prop="checkOrgType"
+                    label="受检机构类型"
+                    v-model="queryParams.checkOrgType"
+                    placeholder="请选择受检机构类型"
+                    clearable
+                  >
+                    <el-option
+                      v-for="dict in dict.type.sys_org_type"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    />
+                  </el-select>
+                </el-form-item>
 
+                <el-form-item prop="checkRole" label="检查人员">
+                  <el-select
+                    @visible-change="getRolesByOrg"
+                    prop="checkRole"
+                    label="检查人员"
+                    v-model="queryParams.checkRole"
+                    placeholder="请选择用户角色"
+                    clearable
+                  >
+                    <el-option
+                      v-for="dict in resumptionRoles"
+                      :key="dict.index"
+                      :label="dict.roleName"
+                      :value="dict.id"
+                    />
+                  </el-select>
+                </el-form-item>
+                <el-form-item prop="planCycle" label="任务周期">
+                  <el-select
+                    prop="planCycle"
+                    label="任务周期"
+                    v-model="queryParams.planCycle"
+                    placeholder="请选择任务周期"
+                    clearable
+                  >
+                    <el-option
+                      v-for="item in dict.type.check_cycle"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-row>
+              <el-row>
+                <el-form-item prop="planStatus" label="任务状态">
+                  <el-select
+                    prop="planStatus"
+                    label="任务状态"
+                    v-model="queryParams.planStatus"
+                    placeholder="请选择任务状态"
+                    clearable
+                  >
+                    <el-option
+                      v-for="item in dict.type.check_status"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item prop="planName" label="任务名称">
+                  <el-input
+                    v-model="queryParams.planName"
+                    :maxlength="50"
+                    name="planName"
+                    placeholder="请输入关键字"
+                    clearable
+                  />
+                </el-form-item>
+              </el-row>
+              <el-row>
+                <el-form-item>
+                  <el-button
+                    type="primary"
+                    icon="el-icon-search"
+                    size="mini"
+                    @click="getList"
+                    >搜索</el-button
+                  >
+                  <el-button
+                    icon="el-icon-refresh"
+                    size="mini"
+                    @click="resetQuery"
+                    >重置</el-button
+                  ><el-button
+                    type="primary"
+                    icon="el-icon-plus"
+                    size="mini"
+                    @click="handleAdd()"
+                    v-hasPermi="['core:checkplan:add']"
+                    >新增任务</el-button
+                  >
+                </el-form-item>
+              </el-row>
+            </el-form>
+          </div>
+        </div>
         <!-- 按纽   
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5"> </el-col>

src/views/resumption/plan/index.vue

@@ -15,119 +15,124 @@
 
       <el-col :span="20" :xs="24">
         <!--    搜索条件    -->
-        <el-form
-          :model="queryParams"
-          ref="search"
-          size="small"
-          :inline="true"
-          v-show="showSearch"
-          label-width="90px"
-        >
-          <el-row>
-            <el-form-item prop="planType" label="任务类型">
-              <el-select
-                prop="planType"
-                label="任务类型"
-                v-model="queryParams.planType"
-                placeholder="请选择任务类型"
-                clearable
-              >
-                <el-option
-                  v-for="dict in dict.type.resumption_plan_type"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item prop="resumptionRole" label="履职人员">
-              <el-select
-                @visible-change="getRolesByOrg"
-                prop="resumptionRole"
-                label="履职人员"
-                v-model="queryParams.resumptionRole"
-                placeholder="请选择用户角色"
-                clearable
-              >
-                <el-option
-                  v-for="dict in resumptionRoles"
-                  :key="dict.index"
-                  :label="dict.roleName"
-                  :value="dict.id"
-                />
-              </el-select>
-            </el-form-item>
+        <div class="main-right-box">
+          <div class="main-search-box">
+            <el-form
+              :model="queryParams"
+              ref="search"
+              size="small"
+              :inline="true"
+              v-show="showSearch"
+              label-width="90px"
+            >
+              <el-row>
+                <el-form-item prop="planType" label="任务类型">
+                  <el-select
+                    prop="planType"
+                    label="任务类型"
+                    v-model="queryParams.planType"
+                    placeholder="请选择任务类型"
+                    clearable
+                  >
+                    <el-option
+                      v-for="dict in dict.type.resumption_plan_type"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    />
+                  </el-select>
+                </el-form-item>
+                <el-form-item prop="resumptionRole" label="履职人员">
+                  <el-select
+                    @visible-change="getRolesByOrg"
+                    prop="resumptionRole"
+                    label="履职人员"
+                    v-model="queryParams.resumptionRole"
+                    placeholder="请选择用户角色"
+                    clearable
+                  >
+                    <el-option
+                      v-for="dict in resumptionRoles"
+                      :key="dict.index"
+                      :label="dict.roleName"
+                      :value="dict.id"
+                    />
+                  </el-select>
+                </el-form-item>
 
-            <el-form-item prop="planCycle" label="任务周期">
-              <el-select
-                prop="planCycle"
-                label="任务周期"
-                v-model="queryParams.planCycle"
-                placeholder="请选择任务周期"
-                clearable
-              >
-                <el-option
-                  v-for="item in dict.type.resumption_plan_cycle"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-row>
-          <el-row>
-            <el-form-item prop="planStatus" label="任务状态">
-              <el-select
-                prop="planStatus"
-                label="任务状态"
-                v-model="queryParams.planStatus"
-                placeholder="请选择任务状态"
-                clearable
-              >
-                <el-option
-                  v-for="item in dict.type.resumption_plan_status"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                >
-                </el-option>
-              </el-select>
-              <!-- <el-switch v-model="queryParams.planStatus" active-value="1" inactive-value="0"></el-switch> -->
-            </el-form-item>
-            <el-form-item prop="planName" label="任务名称">
-              <el-input
-                v-model="queryParams.planName"
-                :maxlength="50"
-                name="planName"
-                placeholder="请输入任务名称"
-                clearable
-              />
-            </el-form-item>
-          </el-row>
-          <el-row>
-            <el-form-item>
-              <el-button
-                type="primary"
-                icon="el-icon-search"
-                size="mini"
-                @click="getList"
-                >搜索</el-button
-              >
-              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-                >重置</el-button
-              >
-              <el-button
-                type="primary"
-                icon="el-icon-plus"
-                size="mini"
-                @click="handleAdd()"
-                v-hasPermi="['system:user:add']"
-                >新增任务</el-button
-              >
-            </el-form-item>
-          </el-row>
-          <!-- <el-row :gutter="10" class="mb8">
+                <el-form-item prop="planCycle" label="任务周期">
+                  <el-select
+                    prop="planCycle"
+                    label="任务周期"
+                    v-model="queryParams.planCycle"
+                    placeholder="请选择任务周期"
+                    clearable
+                  >
+                    <el-option
+                      v-for="item in dict.type.resumption_plan_cycle"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-row>
+              <el-row>
+                <el-form-item prop="planStatus" label="任务状态">
+                  <el-select
+                    prop="planStatus"
+                    label="任务状态"
+                    v-model="queryParams.planStatus"
+                    placeholder="请选择任务状态"
+                    clearable
+                  >
+                    <el-option
+                      v-for="item in dict.type.resumption_plan_status"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    >
+                    </el-option>
+                  </el-select>
+                  <!-- <el-switch v-model="queryParams.planStatus" active-value="1" inactive-value="0"></el-switch> -->
+                </el-form-item>
+                <el-form-item prop="planName" label="任务名称">
+                  <el-input
+                    v-model="queryParams.planName"
+                    :maxlength="50"
+                    name="planName"
+                    placeholder="请输入任务名称"
+                    clearable
+                  />
+                </el-form-item>
+              </el-row>
+              <el-row>
+                <el-form-item>
+                  <el-button
+                    type="primary"
+                    icon="el-icon-search"
+                    size="mini"
+                    @click="getList"
+                    >搜索</el-button
+                  >
+                  <el-button
+                    icon="el-icon-refresh"
+                    size="mini"
+                    @click="resetQuery"
+                    >重置</el-button
+                  >
+                  <el-button
+                    type="primary"
+                    icon="el-icon-plus"
+                    size="mini"
+                    @click="handleAdd()"
+                    v-hasPermi="['system:user:add']"
+                    >新增任务</el-button
+                  >
+                </el-form-item>
+              </el-row>
+              <!-- <el-row :gutter="10" class="mb8">
             <el-col :span="1.5"> </el-col>
 
             <right-toolbar
@@ -136,8 +141,9 @@
               :columns="columns"
             ></right-toolbar>
           </el-row> -->
-        </el-form>
-
+            </el-form>
+          </div>
+        </div>
         <!--    按纽    -->
 
         <el-table
@@ -289,7 +295,7 @@
                 v-hasPermi="['system:user:remove']"
                 >下发</el-button
               >
-             
+
               <el-button
                 size="mini"
                 type="text"
@@ -299,7 +305,7 @@
                 v-hasPermi="['system:user:remove']"
                 >下发</el-button
               >
-            
+
               <el-button
                 size="mini"
                 type="text"