bug修复

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

@@ -292,7 +292,7 @@ export default {
         planType: [{ required: true, message: "请选择计划类型" }],
         planCycle: [{ required: true, message: "请选择履职周期" }],
         planStatus: [{ required: true, message: "请选择计划状态" }],
-        execOrgType: [{ required: true, message: "请选择履职角色" }],
+        execOrgType: [{ required: true, message: "请选择履职机构类型" }],
         roleList: [{ required: true, message: "请选择履职角色" }],
         planExec: [{ required: true, message: "请选择履职时间" }],
         count: [{ required: true, message: "请选择履职次数" }],

src/views/system/dept/extend.vue

@@ -1176,8 +1176,8 @@ export default {
       dutyMode: 0,
       remoteControl: null,
       selfServiceBank: null,
-      lobbyEquipment: 1,
-      wallPenetratingEquipment: 2,
+      lobbyEquipment: 0,
+      wallPenetratingEquipment: 0,
       platformBrand: null,
       platformSupplierBrand: null,
       constructionTime: null,

src/views/system/user/index.vue

@@ -30,6 +30,16 @@
                 @keyup.enter.native="handleQuery"
               />
             </el-form-item>
+            <el-form-item label="用户姓名" prop="name">
+              <el-input
+              :maxlength="20"
+                v-model="queryParams.name"
+                placeholder="请输入用户姓名"
+                clearable
+                style="width: 200px"
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
             <el-form-item label="手机号码" prop="phone">
               <el-input
                 v-model="queryParams.phone"
@@ -86,6 +96,13 @@
               <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
                 >重置</el-button
               >
+              <span style="margin-left: 50px;">只显示管理人员:</span>
+              <el-switch
+                v-model="queryParams.onlyManager"
+                active-text="是"
+              >
+              </el-switch>
+            
             </el-form-item>
           </el-form>
 
@@ -120,16 +137,26 @@
             <!--              v-hasPermi="['system:user:import']"-->
             <!--            >导入</el-button>-->
             <!--          </el-col>-->
-            <!--          <el-col :span="1.5">-->
-            <!--            <el-button-->
-            <!--              type="warning"-->
-            <!--              plain-->
-            <!--              icon="el-icon-download"-->
-            <!--              size="mini"-->
-            <!--              @click="handleExport"-->
-            <!--              v-hasPermi="['system:user:export']"-->
-            <!--            >导出</el-button>-->
-            <!--          </el-col>-->
+                     <el-col :span="1.5">
+                       <el-button
+                          type="warning"
+                          plain
+                          icon="el-icon-download"
+                         size="mini"
+                         @click="handleExport"
+                         v-hasPermi="['system:user:export']"
+                        >导出用户角色</el-button>
+                      </el-col>
+                      <el-col :span="1.5">
+                       <el-button
+                          type="warning"
+                          plain
+                          icon="el-icon-download"
+                         size="mini"
+                         @click="handleExportManager"
+                         v-hasPermi="['system:user:export']"
+                        >导出管理人员</el-button>
+                      </el-col>
             <right-toolbar
               :showSearch.sync="showSearch"
               @queryTable="getList"
@@ -189,6 +216,14 @@
               </template>
             </el-table-column>
             <el-table-column
+              label="手机号码"
+              align="left"
+              prop="phone"
+              width="200"
+              v-if="columns[3].visible"
+              :show-overflow-tooltip="true"
+            />
+            <el-table-column
               label="状态"
               align="center"
               key="isLock"
@@ -559,7 +594,9 @@ export default {
         phone: null,
         status: null,
         orgId: null,
-        checkSub: true
+        checkSub: true,
+        onlyManager:false,
+        name:null,
       },
       // 列信息
       columns: [
@@ -738,6 +775,7 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.queryParams.onlyManager=false;
       this.handleQuery();
     },
 
@@ -936,6 +974,15 @@ export default {
         `user_${new Date().getTime()}.xlsx`
       );
     },
+    handleExportManager() {
+      this.download(
+        "system/user/exportManager",
+        {
+          ...this.queryParams,
+        },
+        `manager_${new Date().getTime()}.xlsx`
+      );
+    },
     /** 导入按钮操作 */
     handleImport() {
       this.upload.title = "用户导入";