界面优化

src/views/check/index.vue

@@ -171,9 +171,8 @@
                 </el-form-item>
               </el-row>
             </el-form>
-          </div>
-        </div>
-        <!-- 按纽   
+
+            <!-- 按纽   
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5"> </el-col>
           <right-toolbar
@@ -182,179 +181,182 @@
             :columns="columns"
           ></right-toolbar>
         </el-row> -->
-
-        <el-table
-          border
-          height="646"
-          size="small"
-          v-loading="loading"
-          :data="pageData"
-          @selection-change="handleSelectionChange"
-          row-key="id"
-          :tree-props="{ children: 'children' }"
-        >
-          <el-table-column
-            align="center"
-            type="index"
-            label="序号"
-            width="80px"
-            v-if="columns[0].visible"
-          ></el-table-column>
-          <el-table-column
-            prop="planName"
-            label="任务名称"
-            v-if="columns[1].visible"
-          ></el-table-column>
-
-          <el-table-column
-            prop="checkType"
-            label="任务类型"
-            v-if="columns[2].visible"
-          >
-            <template slot-scope="r"
-              >{{ getLabel(dict.type.check_type, `${r.row.checkType}`) }}
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="planCreateOrgName"
-            label="创建机构"
-            v-if="columns[3].visible"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="planOfOrgName"
-            label="行社名称"
-            v-if="columns[4].visible"
+          </div>
+          <el-table
+            border
+            height="646"
+            size="small"
+            v-loading="loading"
+            :data="pageData"
+            @selection-change="handleSelectionChange"
+            row-key="id"
+            :tree-props="{ children: 'children' }"
           >
-          </el-table-column>
+            <el-table-column
+              align="center"
+              type="index"
+              label="序号"
+              width="80px"
+              v-if="columns[0].visible"
+            ></el-table-column>
+            <el-table-column
+              prop="planName"
+              label="任务名称"
+              v-if="columns[1].visible"
+            ></el-table-column>
 
-          <el-table-column prop="execOrgType" label="检查主体">
-            <template slot-scope="r"
-              >{{ getLabel(dict.type.sys_org_type, `${r.row.execOrgType}`) }}
-            </template>
-          </el-table-column>
+            <el-table-column
+              prop="checkType"
+              label="任务类型"
+              v-if="columns[2].visible"
+            >
+              <template slot-scope="r"
+                >{{ getLabel(dict.type.check_type, `${r.row.checkType}`) }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="planCreateOrgName"
+              label="创建机构"
+              v-if="columns[3].visible"
+            >
+            </el-table-column>
+            <el-table-column
+              prop="planOfOrgName"
+              label="行社名称"
+              v-if="columns[4].visible"
+            >
+            </el-table-column>
 
-          <el-table-column prop="checkOrgType" label="受检机构" width="120px">
-            <template slot-scope="r"
-              >{{ getLabel(dict.type.sys_org_type, `${r.row.checkOrgType}`) }}
-            </template>
-          </el-table-column>
+            <el-table-column prop="execOrgType" label="检查主体">
+              <template slot-scope="r"
+                >{{ getLabel(dict.type.sys_org_type, `${r.row.execOrgType}`) }}
+              </template>
+            </el-table-column>
 
-          <el-table-column
-            prop="roleNames"
-            label="检查人员"
-            v-if="columns[6].visible"
-          >
-            <template slot-scope="scope">
-              <template v-for="item in splitRoleNames(scope.row.roleNames)">
-                {{ item }}
-                <br />
-              </template> </template
-          ></el-table-column>
-          <el-table-column
-            prop="planCycle"
-            label="任务周期"
-            width="80px"
-            v-if="columns[6].visible"
-          >
-            <template slot-scope="r"
-              >{{ getLabel(dict.type.check_cycle, `${r.row.planCycle}`) }}
-            </template>
-          </el-table-column>
+            <el-table-column prop="checkOrgType" label="受检机构" width="120px">
+              <template slot-scope="r"
+                >{{ getLabel(dict.type.sys_org_type, `${r.row.checkOrgType}`) }}
+              </template>
+            </el-table-column>
 
-          <el-table-column
-            align="center"
-            prop="count"
-            label="任务次数"
-            v-if="columns[6].visible"
-          ></el-table-column>
+            <el-table-column
+              prop="roleNames"
+              label="检查人员"
+              v-if="columns[6].visible"
+            >
+              <template slot-scope="scope">
+                <template v-for="item in splitRoleNames(scope.row.roleNames)">
+                  {{ item }}
+                  <br />
+                </template> </template
+            ></el-table-column>
+            <el-table-column
+              prop="planCycle"
+              label="任务周期"
+              width="80px"
+              v-if="columns[6].visible"
+            >
+              <template slot-scope="r"
+                >{{ getLabel(dict.type.check_cycle, `${r.row.planCycle}`) }}
+              </template>
+            </el-table-column>
 
-          <el-table-column
-            prop="planStatus"
-            label="任务状态"
-            width="80px"
-            v-if="columns[6].visible"
-          >
-            <template slot-scope="r"
-              >{{ getLabel(dict.type.check_status, `${r.row.planStatus}`) }}
-            </template>
-          </el-table-column>
+            <el-table-column
+              align="center"
+              prop="count"
+              label="任务次数"
+              v-if="columns[6].visible"
+            ></el-table-column>
 
-          <el-table-column
-            prop="modifiedName"
-            label="修改人"
-            v-if="false"
-          ></el-table-column>
+            <el-table-column
+              prop="planStatus"
+              label="任务状态"
+              width="80px"
+              v-if="columns[6].visible"
+            >
+              <template slot-scope="r"
+                >{{ getLabel(dict.type.check_status, `${r.row.planStatus}`) }}
+              </template>
+            </el-table-column>
 
-          <el-table-column
-            prop="updateTime"
-            label="修改时间"
-            width="80px"
-            v-if="false"
-          >
-            <template slot-scope="scope">
-              <span>{{ formatTime(scope.row.updateTime, "YYYY-MM-DD") }}</span>
-            </template>
-          </el-table-column>
+            <el-table-column
+              prop="modifiedName"
+              label="修改人"
+              v-if="false"
+            ></el-table-column>
 
-          <el-table-column label="操作" min-width="200">
-            <template slot-scope="r">
-              <el-button
-                v-if="eqOrg(r.row)"
-                size="mini"
-                type="text"
-                icon="el-icon-edit-outline"
-                @click="onEdit(r.row.id)"
-                v-hasPermi="['core:checkplan:edit']"
-                >编辑</el-button
-              >
-              <el-button
-                v-if="eqOrg2(r.row)"
-                size="mini"
-                type="text"
-                icon="el-icon-delete"
-                @click="onDel(r.row.id, r.row.planName)"
-                v-hasPermi="['core:checkplan:remove']"
-                >删除</el-button
-              >
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-arrow-down"
-                v-if="checkCanPublish(r.row)"
-                @click="showDialogDistribute(r.row)"
-                v-hasPermi="['core:checkplan:distribute']"
-                >下发</el-button
-              >
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-arrow-down"
-                v-if="newcheckCanPublish(r.row)"
-                @click="newshowDialogDistribute(r.row)"
-                v-hasPermi="['core:checkplan:distribute']"
-                >下发</el-button
-              >
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-top-left"
-                v-if="chehui(r.row)"
-                @click="chhuile(r.row)"
-                v-hasPermi="['core:checkplan:distribute']"
-                >撤回</el-button
-              >
-            </template>
-          </el-table-column>
-        </el-table>
+            <el-table-column
+              prop="updateTime"
+              label="修改时间"
+              width="80px"
+              v-if="false"
+            >
+              <template slot-scope="scope">
+                <span>{{
+                  formatTime(scope.row.updateTime, "YYYY-MM-DD")
+                }}</span>
+              </template>
+            </el-table-column>
 
-        <pagination
-          v-show="total > 0"
-          :total="total"
-          :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize"
-          @pagination="getList"
-        />
+            <el-table-column label="操作" min-width="200">
+              <template slot-scope="r">
+                <el-button
+                  v-if="eqOrg(r.row)"
+                  size="mini"
+                  type="text"
+                  icon="el-icon-edit-outline"
+                  @click="onEdit(r.row.id)"
+                  v-hasPermi="['core:checkplan:edit']"
+                  >编辑</el-button
+                >
+                <el-button
+                  v-if="eqOrg2(r.row)"
+                  size="mini"
+                  type="text"
+                  icon="el-icon-delete"
+                  @click="onDel(r.row.id, r.row.planName)"
+                  v-hasPermi="['core:checkplan:remove']"
+                  >删除</el-button
+                >
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-arrow-down"
+                  v-if="checkCanPublish(r.row)"
+                  @click="showDialogDistribute(r.row)"
+                  v-hasPermi="['core:checkplan:distribute']"
+                  >下发</el-button
+                >
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-arrow-down"
+                  v-if="newcheckCanPublish(r.row)"
+                  @click="newshowDialogDistribute(r.row)"
+                  v-hasPermi="['core:checkplan:distribute']"
+                  >下发</el-button
+                >
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-top-left"
+                  v-if="chehui(r.row)"
+                  @click="chhuile(r.row)"
+                  v-hasPermi="['core:checkplan:distribute']"
+                  >撤回</el-button
+                >
+              </template>
+            </el-table-column>
+          </el-table>
+
+          <pagination
+            v-show="total > 0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getList"
+          />
+        </div>
       </el-col>
     </el-row>
     <dialog-edit

src/views/resumption/plan/index.vue

@@ -14,8 +14,8 @@
       </el-col>
 
       <el-col :span="20" :xs="24">
-        <!--    搜索条件    -->
         <div class="main-right-box">
+          <!--    搜索条件    -->
           <div class="main-search-box">
             <el-form
               :model="queryParams"
@@ -143,189 +143,192 @@
           </el-row> -->
             </el-form>
           </div>
-        </div>
-        <!--    按纽    -->
+          <!--    按纽    -->
 
-        <el-table
-          border
-          height="646"
-          size="small"
-          v-loading="loading"
-          :data="pageData"
-          @selection-change="handleSelectionChange"
-          row-key="id"
-        >
-          <el-table-column
-            align="center"
-            fixed
-            type="index"
-            label="序号"
-            width="80"
-            v-if="columns[0].visible"
-          ></el-table-column>
-          <el-table-column
-            prop="planName"
-            label="任务名称"
-            v-if="columns[1].visible"
-          ></el-table-column>
-          <el-table-column
-            prop="planType"
-            label="任务类型"
-            width="120"
-            v-if="columns[2].visible"
-          >
-            <template slot-scope="r"
-              >{{
-                getLabel(dict.type.resumption_plan_type, `${r.row.planType}`)
-              }}
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="planCreateOrgName"
-            label="创建机构"
-            width="120"
-            v-if="columns[3].visible"
+          <el-table
+            border
+            height="646"
+            size="small"
+            v-loading="loading"
+            :data="pageData"
+            @selection-change="handleSelectionChange"
+            row-key="id"
           >
-            <!-- <template slot-scope="r"
+            <el-table-column
+              align="center"
+              fixed
+              type="index"
+              label="序号"
+              width="80"
+              v-if="columns[0].visible"
+            ></el-table-column>
+            <el-table-column
+              prop="planName"
+              label="任务名称"
+              v-if="columns[1].visible"
+            ></el-table-column>
+            <el-table-column
+              prop="planType"
+              label="任务类型"
+              width="120"
+              v-if="columns[2].visible"
+            >
+              <template slot-scope="r"
+                >{{
+                  getLabel(dict.type.resumption_plan_type, `${r.row.planType}`)
+                }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="planCreateOrgName"
+              label="创建机构"
+              width="120"
+              v-if="columns[3].visible"
+            >
+              <!-- <template slot-scope="r"
               >{{ getLabel(dict.type.sys_org_type, r.row.execOrgType) }}
             </template> -->
-          </el-table-column>
-          <el-table-column
-            prop="planOfOrgName"
-            label="行社名称"
-            width="120"
-            v-if="columns[4].visible"
-          ></el-table-column>
+            </el-table-column>
+            <el-table-column
+              prop="planOfOrgName"
+              label="行社名称"
+              width="120"
+              v-if="columns[4].visible"
+            ></el-table-column>
 
-          <el-table-column
-            prop="execOrgType"
-            label="机构类型"
-            width="100px"
-            v-if="columns[5].visible"
-          >
-            <template slot-scope="r"
-              >{{ getLabel(dict.type.sys_org_type, `${r.row.execOrgType}`) }}
-            </template>
-          </el-table-column>
+            <el-table-column
+              prop="execOrgType"
+              label="机构类型"
+              width="100px"
+              v-if="columns[5].visible"
+            >
+              <template slot-scope="r"
+                >{{ getLabel(dict.type.sys_org_type, `${r.row.execOrgType}`) }}
+              </template>
+            </el-table-column>
 
-          <el-table-column
-            prop="roleNames"
-            label="履职人员"
-            v-if="columns[6].visible"
-          ></el-table-column>
-          <el-table-column
-            prop="planCycle"
-            label="任务周期"
-            width="80px"
-            v-if="columns[7].visible"
-          >
-            <template slot-scope="r"
-              >{{
-                getLabel(dict.type.resumption_plan_cycle, `${r.row.planCycle}`)
-              }}
-            </template>
-          </el-table-column>
+            <el-table-column
+              prop="roleNames"
+              label="履职人员"
+              v-if="columns[6].visible"
+            ></el-table-column>
+            <el-table-column
+              prop="planCycle"
+              label="任务周期"
+              width="80px"
+              v-if="columns[7].visible"
+            >
+              <template slot-scope="r"
+                >{{
+                  getLabel(
+                    dict.type.resumption_plan_cycle,
+                    `${r.row.planCycle}`
+                  )
+                }}
+              </template>
+            </el-table-column>
 
-          <el-table-column
-            prop="planExec"
-            label="任务时间"
-            width="80px"
-            v-if="columns[8].visible"
-          >
-            <template slot-scope="r"
-              >{{
-                getLabel(dict.type.resumption_plan_exec, `${r.row.planExec}`)
-              }}
-            </template>
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="count"
-            label="任务次数"
-            v-if="columns[7].visible"
-          ></el-table-column>
-          <el-table-column
-            prop="planStatus"
-            label="任务状态"
-            width="80px"
-            v-if="columns[10].visible"
-          >
-            <template slot-scope="r"
-              >{{
-                getLabel(
-                  dict.type.resumption_plan_status,
-                  `${r.row.planStatus}`
-                )
-              }}
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="updateName"
-            label="修改人"
-            width="100px"
-            v-if="false"
-          ></el-table-column>
+            <el-table-column
+              prop="planExec"
+              label="任务时间"
+              width="80px"
+              v-if="columns[8].visible"
+            >
+              <template slot-scope="r"
+                >{{
+                  getLabel(dict.type.resumption_plan_exec, `${r.row.planExec}`)
+                }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              align="center"
+              prop="count"
+              label="任务次数"
+              v-if="columns[7].visible"
+            ></el-table-column>
+            <el-table-column
+              prop="planStatus"
+              label="任务状态"
+              width="80px"
+              v-if="columns[10].visible"
+            >
+              <template slot-scope="r"
+                >{{
+                  getLabel(
+                    dict.type.resumption_plan_status,
+                    `${r.row.planStatus}`
+                  )
+                }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="updateName"
+              label="修改人"
+              width="100px"
+              v-if="false"
+            ></el-table-column>
 
-          <el-table-column fixed="right" width="200" label="操作">
-            <template slot-scope="r">
-              <el-button
-                v-if="eqOrg(r.row)"
-                size="mini"
-                type="text"
-                icon="el-icon-edit-outline"
-                @click="onEdit(r.row.id)"
-                v-hasPermi="['system:user:edit']"
-                >编辑</el-button
-              >
-              <el-button
-                v-if="eqOrg2(r.row)"
-                size="mini"
-                type="text"
-                icon="el-icon-delete"
-                @click="onDel(r.row.id, r.row.planName)"
-                v-hasPermi="['system:user:remove']"
-                >删除</el-button
-              >
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-arrow-down"
-                v-if="checkCanPublish(r.row)"
-                @click="showDialogDistribute(r.row)"
-                v-hasPermi="['system:user:remove']"
-                >下发</el-button
-              >
+            <el-table-column fixed="right" width="200" label="操作">
+              <template slot-scope="r">
+                <el-button
+                  v-if="eqOrg(r.row)"
+                  size="mini"
+                  type="text"
+                  icon="el-icon-edit-outline"
+                  @click="onEdit(r.row.id)"
+                  v-hasPermi="['system:user:edit']"
+                  >编辑</el-button
+                >
+                <el-button
+                  v-if="eqOrg2(r.row)"
+                  size="mini"
+                  type="text"
+                  icon="el-icon-delete"
+                  @click="onDel(r.row.id, r.row.planName)"
+                  v-hasPermi="['system:user:remove']"
+                  >删除</el-button
+                >
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-arrow-down"
+                  v-if="checkCanPublish(r.row)"
+                  @click="showDialogDistribute(r.row)"
+                  v-hasPermi="['system:user:remove']"
+                  >下发</el-button
+                >
 
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-arrow-down"
-                v-if="newcheckCanPublish(r.row)"
-                @click="newshowDialogDistribute(r.row)"
-                v-hasPermi="['system:user:remove']"
-                >下发</el-button
-              >
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-arrow-down"
+                  v-if="newcheckCanPublish(r.row)"
+                  @click="newshowDialogDistribute(r.row)"
+                  v-hasPermi="['system:user:remove']"
+                  >下发</el-button
+                >
 
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-top-left"
-                v-if="chehui(r.row)"
-                @click="chhuile(r.row)"
-                v-hasPermi="['system:user:remove']"
-                >撤回</el-button
-              >
-            </template>
-          </el-table-column>
-        </el-table>
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-top-left"
+                  v-if="chehui(r.row)"
+                  @click="chhuile(r.row)"
+                  v-hasPermi="['system:user:remove']"
+                  >撤回</el-button
+                >
+              </template>
+            </el-table-column>
+          </el-table>
 
-        <pagination
-          v-show="total > 0"
-          :total="total"
-          :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize"
-          @pagination="getList"
-        />
+          <pagination
+            v-show="total > 0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getList"
+          />
+        </div>
       </el-col>
     </el-row>
     <dialog-edit