基础信息：升级表单

src/components/EcsFormSearch.vue

@@ -7,7 +7,7 @@
       :model="model"
       :advance-search="advanceSearch"
       :label-position="labelPosition"
-      :label-width="advanceSearch ? formLabelWidth : 'auto'"
+      :label-width="advanceSearch ? labelWidth : 'auto'"
     >
       <slot />
     </el-form>
@@ -30,7 +30,7 @@ export default {
       type: String,
       default: "left"
     },
-    formLabelWidth: {
+    labelWidth: {
       type: String,
       default: "100px"
     }

src/modules/basic/view/campus.vue

@@ -7,56 +7,54 @@
         element-loading-text="机构上传中,请稍后..."
       >
         <!-- 表单 -->
-        <ecs-form-search :advance-search="true" :model="formSearch">
-          <el-row>
-            <el-form-item label="顶级机构">
-              <el-select
-                v-model="formSearch.parentId"
-                placeholder="请选择"
-                :disabled="!isSuperAdmin"
-              >
-                <el-option
-                  v-for="item in rootOrgList"
-                  :label="item.name"
-                  :value="item.id"
-                  :key="item.id"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="中心代码">
-              <el-input
-                placeholder="请输入学习中心代码"
-                v-model="formSearch.code"
-              />
-            </el-form-item>
-            <el-form-item label="中心名称">
-              <el-input
-                placeholder="请输入学习中心名称"
-                v-model="formSearch.name"
+        <ecs-form-search :model="formSearch">
+          <el-form-item label="顶级机构">
+            <el-select
+              v-model="formSearch.parentId"
+              placeholder="请选择"
+              :disabled="!isSuperAdmin"
+            >
+              <el-option
+                v-for="item in rootOrgList"
+                :label="item.name"
+                :value="item.id"
+                :key="item.id"
               />
-            </el-form-item>
-            <el-form-item>
-              <el-button
-                size="small"
-                type="primary"
-                icon="search"
-                @click="searchForm"
-              >
-                查询
-              </el-button>
-              <el-button size="small" @click="resetEcsFormSearch">
-                重置
-              </el-button>
-              <el-button
-                size="small"
-                type="primary"
-                icon="plus"
-                @click="insert"
-              >
-                新增
-              </el-button>
-            </el-form-item>
-          </el-row>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="中心代码">
+            <el-input
+              placeholder="请输入学习中心代码"
+              v-model="formSearch.code"
+            />
+          </el-form-item>
+          <el-form-item label="中心名称">
+            <el-input
+              placeholder="请输入学习中心名称"
+              v-model="formSearch.name"
+            />
+          </el-form-item>
+          <el-form-item>
+            <el-button
+              size="small"
+              type="primary"
+              icon="el-icon-search"
+              @click="searchForm"
+            >
+              查询
+            </el-button>
+            <el-button size="small" @click="resetEcsFormSearch">
+              重置
+            </el-button>
+            <el-button
+              size="small"
+              type="primary"
+              icon="el-icon-plus"
+              @click="insert"
+            >
+              新增
+            </el-button>
+          </el-form-item>
         </ecs-form-search>
 
         <span>批量操作：</span>

src/modules/basic/view/school.vue

@@ -2,69 +2,35 @@
   <section class="content">
     <div class="box-body">
       <!-- 表单 -->
-      <el-form
-        ref="ttt"
-        :model="formSearch"
-        :inline="true"
-        label-position="left"
-        label-width="100px"
-      >
-        <el-row>
-          <el-form-item label="学校名称">
-            <el-input placeholder="请输入学校名称" v-model="formSearch.name" />
-          </el-form-item>
-          <el-form-item label="学校代码">
-            <el-input placeholder="请输入学校代码" v-model="formSearch.code" />
-          </el-form-item>
-          <el-form-item label="学校域名">
-            <el-input
-              placeholder="请输入学校域名"
-              v-model="formSearch.domainName"
-            />
-          </el-form-item>
-          <el-form-item label="学校域名xxxsdfs">
-            <el-input
-              placeholder="请输入学校域名"
-              v-model="formSearch.domainName"
-            />
-          </el-form-item>
-          <el-form-item label="学校域名">
-            <el-input
-              placeholder="请输入学校域名"
-              v-model="formSearch.domainName"
-            />
-          </el-form-item>
-          <el-form-item label="学校域名">
-            <el-input
-              placeholder="请输入学校域名"
-              v-model="formSearch.domainName"
-            />
-          </el-form-item>
-          <el-form-item label="学校域名">
-            <el-input
-              placeholder="请输入学校域名"
-              v-model="formSearch.domainName"
-            />
-          </el-form-item>
-        </el-row>
-        <el-row>
-          <el-form-item>
-            <el-button
-              size="small"
-              type="primary"
-              icon="search"
-              @click="searchForm"
-            >
-              查询
-            </el-button>
-            <el-button size="small" type="primary" icon="plus" @click="insert">
-              新增
-            </el-button>
-            <el-button size="small" icon="plus" @click="resetSearchForm">
-              重置
-            </el-button>
-          </el-form-item>
-        </el-row>
+      <el-form :inline="true" :model="formSearch">
+        <el-form-item label="学校名称">
+          <el-input placeholder="请输入学校名称" v-model="formSearch.name" />
+        </el-form-item>
+        <el-form-item label="学校代码">
+          <el-input placeholder="请输入学校代码" v-model="formSearch.code" />
+        </el-form-item>
+        <el-form-item label="学校域名">
+          <el-input
+            placeholder="请输入学校域名"
+            v-model="formSearch.domainName"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button
+            size="small"
+            type="primary"
+            icon="search"
+            @click="searchForm"
+          >
+            查询
+          </el-button>
+          <el-button size="small" icon="plus" @click="resetSearchForm">
+            重置
+          </el-button>
+          <el-button size="small" type="primary" icon="plus" @click="insert">
+            新增
+          </el-button>
+        </el-form-item>
       </el-form>
 
       <div

src/modules/basic/view/user.vue

@@ -3,82 +3,68 @@
     <div class="box box-info">
       <div class="box-body">
         <!-- 搜索 -->
-        <el-form
-          :inline="true"
-          :model="searchForm"
-          label-position="right"
-          label-width="80px"
-        >
-          <el-row>
-            <el-form-item label="顶级机构" class="pull-left">
-              <el-select
-                style="width: 180px"
-                class="input_width_lg"
-                v-model="searchForm.rootOrgId"
-                placeholder="请选择"
-                :disabled="!isSuperAdmin"
-                @change="rootOrgChanged4Search"
-              >
-                <el-option
-                  v-for="item in rootOrgList"
-                  :label="item.name"
-                  :value="item.id"
-                  :key="item.id"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="角色" class="pull-left">
-              <el-select
-                style="width: 180px"
-                class="input_width_lg"
-                clearable
-                v-model="searchForm.roleId"
-                placeholder="请选择"
-              >
-                <el-option
-                  v-for="item in roleList4Search"
-                  :label="item.roleName"
-                  :value="item.roleId"
-                  :key="item.roleId"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="登录名" class="pull-left">
-              <el-input
-                style="width: 180px"
-                class="input_width_lg"
-                placeholder="请输入登录名"
-                v-model="searchForm.loginName"
+        <ecs-form-search :model="searchForm">
+          <el-form-item label="顶级机构">
+            <el-select
+              v-model="searchForm.rootOrgId"
+              placeholder="请选择"
+              :disabled="!isSuperAdmin"
+              @change="rootOrgChanged4Search"
+            >
+              <el-option
+                v-for="item in rootOrgList"
+                :label="item.name"
+                :value="item.id"
+                :key="item.id"
               />
-            </el-form-item>
-            <el-form-item label="姓名" class="pull-left">
-              <el-input
-                style="width: 180px"
-                class="input_width_lg"
-                placeholder="请输入姓名"
-                v-model="searchForm.name"
+            </el-select>
+          </el-form-item>
+          <el-form-item label="角色">
+            <el-select
+              clearable
+              v-model="searchForm.roleId"
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in roleList4Search"
+                :label="item.roleName"
+                :value="item.roleId"
+                :key="item.roleId"
               />
-            </el-form-item>
-            <el-form-item class="pull-right">
-              <el-button
-                size="small"
-                type="primary"
-                icon="search"
-                @click="search"
-              >
-                查询
-              </el-button>
-              <el-button
-                size="small"
-                type="primary"
-                icon="plus"
-                @click="openAddingDialog"
-              >
-                新增
-              </el-button>
-            </el-form-item>
-          </el-row>
-        </el-form>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="登录名">
+            <el-input
+              placeholder="请输入登录名"
+              v-model="searchForm.loginName"
+            />
+          </el-form-item>
+          <el-form-item label="姓名">
+            <el-input placeholder="请输入姓名" v-model="searchForm.name" />
+          </el-form-item>
+          <div></div>
+          <el-form-item>
+            <el-button
+              size="small"
+              type="primary"
+              icon="el-icon-search"
+              @click="search"
+            >
+              查询
+            </el-button>
+            <el-button size="small" @click="resetEcsFormSearch">
+              重置
+            </el-button>
+            <el-button
+              size="small"
+              type="primary"
+              icon="el-icon-plus"
+              @click="openAddingDialog"
+            >
+              新增
+            </el-button>
+          </el-form-item>
+        </ecs-form-search>
 
         <!-- 添加用户信息弹出框 -->
         <el-dialog title="用户信息" :visible.sync="addingDialog">
@@ -344,71 +330,81 @@
         <el-table
           :data="tableData"
           border
+          resizable
           style="width: 100%;"
           @selection-change="selectChange"
         >
-          <el-table-column type="selection" width="35" />
           <el-table-column prop="id" width="80" label="ID" />
           <el-table-column prop="name" width="120" label="姓名" />
           <el-table-column prop="loginName" width="100" label="登录名" />
           <el-table-column prop="rootOrgName" width="150" label="顶级机构" />
-          <el-table-column prop="roleNamesStr" width="250" label="角色" />
+          <!-- <el-table-column prop="roleNamesStr" width="110" label="角色" /> -->
+          <el-table-column width="120" label="角色">
+            <span
+              slot-scope="scope"
+              v-html="scope.row.roleNamesStr.replace(/,/g, '<br />')"
+            >
+            </span>
+          </el-table-column>
           <el-table-column prop="updateTime" width="160" label="更新时间" />
           <el-table-column width="70" label="状态">
-            <span slot-scope="scope">
-              <el-tag :type="getTag(scope.row.enable)">
-                {{ getEnable(scope.row.enable) }}
-              </el-tag>
-            </span>
+            <span slot-scope="scope"> {{ getEnable(scope.row.enable) }} </span>
           </el-table-column>
           <el-table-column label="操作">
             <div slot-scope="scope">
-              <span>
-                <el-button
-                  size="mini"
-                  type="primary"
-                  @click="openUpdateDialog(scope.row)"
-                >
-                  <i class="el-icon-edit"></i> 修改
-                </el-button>
-              </span>
-              <span>
-                <el-button
-                  v-if="false"
-                  size="mini"
-                  type="danger"
-                  @click="deleteById(scope.row)"
-                >
-                  <i class="el-icon-delete"></i> 删除
-                </el-button>
-              </span>
-              <span>
-                <el-button
-                  size="mini"
-                  type="primary"
-                  @click="resetPass(scope.row)"
-                >
-                  <i class="el-icon-reset"></i>重置密码
-                </el-button>
-              </span>
-              <span v-if="!scope.row.enable">
-                <el-button
-                  size="mini"
-                  type="success"
-                  @click="enableById(scope.row)"
-                >
-                  <i class="fa fa-check" aria-hidden="true"></i>启用
-                </el-button>
-              </span>
-              <span v-if="scope.row.enable">
-                <el-button
-                  size="mini"
-                  type="warning"
-                  @click="disableById(scope.row)"
-                >
-                  <i class="fa fa-close" aria-hidden="true"></i>禁用
+              <el-button
+                v-if="!scope.row.enable"
+                size="mini"
+                type="danger"
+                @click="enableById(scope.row)"
+              >
+                <i class="fa fa-check" aria-hidden="true"></i>启用
+              </el-button>
+              <el-button
+                v-if="scope.row.enable"
+                size="mini"
+                type="danger"
+                @click="disableById(scope.row)"
+              >
+                <i class="fa fa-close" aria-hidden="true"></i>禁用
+              </el-button>
+              &nbsp;
+              <el-dropdown>
+                <el-button type="primary" plain size="mini">
+                  更多<i class="el-icon-arrow-down el-icon--right"></i>
                 </el-button>
-              </span>
+                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item>
+                    <el-button
+                      size="mini"
+                      type="primary"
+                      plain
+                      @click="openUpdateDialog(scope.row)"
+                    >
+                      <i class="el-icon-edit"></i> 编辑
+                    </el-button>
+                  </el-dropdown-item>
+                  <el-dropdown-item>
+                    <el-button
+                      v-if="false"
+                      size="mini"
+                      type="danger"
+                      @click="deleteById(scope.row)"
+                    >
+                      <i class="el-icon-delete"></i> 删除
+                    </el-button>
+                  </el-dropdown-item>
+                  <el-dropdown-item>
+                    <el-button
+                      size="mini"
+                      type="danger"
+                      @click="resetPass(scope.row)"
+                    >
+                      <i class="el-icon-reset"></i>重置密码
+                    </el-button>
+                  </el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
             </div>
           </el-table-column>
         </el-table>
@@ -550,6 +546,13 @@ export default {
     }
   },
   methods: {
+    resetEcsFormSearch() {
+      this.searchForm = Object.assign(this.searchForm, {
+        roleId: "",
+        loginName: "",
+        name: ""
+      });
+    },
     validateOrg(rule, value, callback) {
       if (0 != value && !value) {
         callback(new Error("请选择子机构"));
@@ -562,7 +565,7 @@ export default {
       for (let cur of this.roleList4InsertOrUpdate) {
         if (
           cur.roleCode == "LC_USER" &&
-          this.userForm.roleIds.contains(cur.roleId)
+          this.userForm.roleIds.includes(cur.roleId)
         ) {
           isLC = true;
           break;