Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_web into V0.0.2

src/components/Pagination/index.vue

@@ -36,7 +36,7 @@ export default {
     pageSizes: {
       type: Array,
       default() {
-        return [20, 30, 50]
+        return [10,20, 30, 50]
       }
     },
     // 移动端页码按钮的数量端默认值5

src/views/check/index.vue

@@ -15,151 +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>
 
-        <!-- 按纽   
+            <!-- 按纽   
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5"> </el-col>
           <right-toolbar
@@ -168,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"
+          </div>
+          <el-table
+            border
+            height="700"
+            size="small"
+            v-loading="loading"
+            :data="pageData"
+            @selection-change="handleSelectionChange"
+            row-key="id"
+            :tree-props="{ children: 'children' }"
           >
-            <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
+              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>
+
+            <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"
-        />
+          <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/check/task/index.vue

@@ -12,6 +12,8 @@
         ></org-tree>
       </el-col>
       <el-col :span="20" :xs="24">
+        <div class="main-right-box">
+        <div class="main-search-box">
         <!--    搜索条件    -->
         <el-form
           :model="queryParams"
@@ -146,10 +148,10 @@
           </el-row>
         </el-form>
         <!--    按纽    -->
-       
+      </div>
         <el-table
           border
-          height="646"
+          height="700"
           size="small"
           v-loading="loading"
           :data="pageData"
@@ -306,6 +308,7 @@
           :limit.sync="queryParams.pageSize"
           @pagination="getList"
         />
+        </div>
       </el-col>
     </el-row>
     <!-- 详情 -->

src/views/resumption/plan/index.vue

@@ -14,120 +14,125 @@
       </el-col>
 
       <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,201 +141,194 @@
               :columns="columns"
             ></right-toolbar>
           </el-row> -->
-        </el-form>
+            </el-form>
+          </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="700"
+            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-divider direction="vertical" v-if="eqOrg(r.row)"></el-divider>
-              <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-divider
-                direction="vertical"
-                v-if="eqOrg2(r.row)"
-              ></el-divider>
-              <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-divider
-                direction="vertical"
-                v-if="checkCanPublish(r.row)"
-              ></el-divider>
-              <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-divider
-                direction="vertical"
-                v-if="newcheckCanPublish(r.row)"
-              ></el-divider>
-              <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-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-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

src/views/system/area/index.vue

@@ -30,16 +30,33 @@
       </el-form-item>
 
 
-      <el-form-item>
+      <!-- <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
+      </el-form-item> -->
     </el-form>
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+        >搜索</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-refresh"
+          size="mini"
+          @click="resetQuery"
+        >重置</el-button>
+      </el-col>
+
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"

src/views/system/bind/index.vue

@@ -24,9 +24,9 @@
           @click="clickTreeNode" businessTree></org-tree>
       </el-col>
       <el-col :span="20" :xs="24">
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
           <el-form-item label="区域名称" prop="areaName">
-            <el-input v-model="queryParams.areaName" placeholder="请输入区域" clearable @keyup.enter.native="handleQuery" />
+            <el-input v-model="queryParams.areaName" placeholder="请输入区域名称" clearable @keyup.enter.native="handleQuery" />
           </el-form-item>
 
           <el-form-item label="标签编号" prop="code">
@@ -44,14 +44,23 @@
 
 
 
-          <el-form-item>
+          <!-- <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-          </el-form-item>
+          </el-form-item> -->
         </el-form>
 
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"
+           >搜索</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery"
+           >重置</el-button>
+          </el-col>
+
+          <el-col :span="1.5">
             <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
               v-hasPermi="['system:bind:add']">新增</el-button>
           </el-col>
@@ -109,12 +118,12 @@
           </el-select>
         </el-form-item>
         <el-form-item label="NFC点位" v-if="form.orgId != null" prop="checkId">
-          <el-select style="width: 100%;" v-model="form.checkId" :popper-append-to-body="false" placeholder="请选择NFC点位名称">
+          <el-select style="width: 100%;" v-model="form.checkId" :popper-append-to-body="false" placeholder="请选择NFC点位">
             <el-option v-for="item in checkList" :key="item.id" :label="item.checkName" :value="item.id"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="标签编号" prop="code">
-          <el-input maxlength="50" v-model="form.code" placeholder="请输入标签" />
+          <el-input maxlength="50" v-model="form.code" placeholder="请输入标签编号" />
         </el-form-item>
         <el-form-item label="标签名称" prop="labelName">
           <el-input v-model="form.labelName" placeholder="请输入标签名称" maxlength="50" />

src/views/system/check/index.vue

@@ -46,14 +46,26 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item>
+          <!-- <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-          </el-form-item>
+          </el-form-item> -->
         </el-form>
 
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"
+                      >搜索
+            </el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery"
+                      >重置
+            </el-button>
+          </el-col>
+
+
+          <el-col :span="1.5">
             <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
                        v-hasPermi="['system:check:add']">新增
             </el-button>

src/views/system/dept/index.vue

@@ -39,34 +39,35 @@
                    @keyup.enter.native="handleQuery"
                  />
                </el-form-item>
-               <el-form-item label="机构状态" prop="isLock">
+               <el-form-item label="机构类型" prop="type">
                  <el-select
-                   v-model="queryParams.isLock"
-                   placeholder="请选择机构状态"
+                   v-model="queryParams.type"
+                   placeholder="请选择机构类型"
                    clearable
                  >
                    <el-option
-                     v-for="dict in dict.type.sys_normal_disable"
+                     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 label="机构类型" prop="type">
+               <el-form-item label="机构状态" prop="isLock">
                  <el-select
-                   v-model="queryParams.type"
-                   placeholder="请选择机构类型"
+                   v-model="queryParams.isLock"
+                   placeholder="请选择机构状态"
                    clearable
                  >
                    <el-option
-                     v-for="dict in dict.type.sys_org_type"
+                     v-for="dict in dict.type.sys_normal_disable"
                      :key="dict.value"
                      :label="dict.label"
                      :value="dict.value"
                    />
                  </el-select>
                </el-form-item>
+ 
 <!--               <el-form-item>-->
 <!--                 <el-button-->
 <!--                   type="primary"-->

src/views/system/menu/index.vue

@@ -33,7 +33,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item>
+      <!-- <el-form-item>
         <el-button
           type="primary"
           icon="el-icon-search"
@@ -44,13 +44,32 @@
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
           >重置</el-button
         >
-      </el-form-item>
+      </el-form-item> -->
     </el-form>
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-refresh"
+          size="mini"
+          @click="resetQuery"
+          >重置</el-button
+        >
+      </el-col>
+
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
@@ -60,7 +79,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="info"
+          type="primary"
           plain
           icon="el-icon-sort"
           size="mini"

src/views/system/role/index.vue

@@ -16,14 +16,23 @@
         <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
           range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
       </el-form-item> -->
-      <el-form-item>
+      <!-- <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
+      </el-form-item> -->
     </el-form>
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"
+        >搜索</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery"
+        >重置</el-button>
+      </el-col>
+
+      <el-col :span="1.5">
         <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
           v-hasPermi="['system:role:add']">新增</el-button>
       </el-col>

src/views/system/user/index.vue

@@ -480,7 +480,7 @@
             <el-form-item label="账号状态">
               <el-radio-group v-model="form.isLock">
                 <el-radio
-                  v-for="dict in dict.type.sys_user_is_lock"
+                  v-for="dict in dict.type.sys_normal_disable"
                   :key="`${dict.value}`"
                   :label="dict.value"
                   :disabled="form.source == 1"
@@ -932,7 +932,7 @@ export default {
         this.postOptions = response.posts;
         this.roleOptions = response.roles;
         this.open = true;
-        this.title = "新增";
+        this.title = "新增人员信息";
         this.form.password = this.initPassword;
       });
     },
@@ -952,7 +952,7 @@ export default {
         // this.$set(this.form, "roleIds", response.roleIds);
         this.form.roleIds = response.roleIds;
         this.open = true;
-        this.title = "编辑";
+        this.title = "编辑人员信息";
         console.log(response.roleIds, "roleIds");
         this.form.password = "";
       });