no message

src/views/setting/account/index.vue

@@ -154,7 +154,6 @@
                   placeholder="请输入账号"
                 ></el-input>
               </el-form-item>
-              <h3 style="padding-bottom: 10px"></h3>
             </el-col>
             <el-col :md="6">
               <el-form-item label="用户名" prop="nickName">
@@ -165,13 +164,11 @@
                   placeholder="请输入用户名"
                 ></el-input>
               </el-form-item>
-              <h3 style="padding-bottom: 10px"></h3>
             </el-col>
             <el-col :md="6">
               <el-form-item label="手机号" prop="linkPhone">
                 <el-input v-model="addForm.linkPhone" autocomplete="off" placeholder="请输入手机号"></el-input>
               </el-form-item>
-              <h3 style="padding-bottom: 10px"></h3>
             </el-col>
             <el-col :md="6">
               <el-form-item label="密码" prop="newPassword">
@@ -186,71 +183,27 @@
                   <svg-icon :icon-class="passwordType1 === 'password' ? 'eye' : 'eye-open'" />
                 </span>
               </el-form-item>
-              <h3 style="padding-bottom: 10px"></h3>
             </el-col>
-            <div style="width: 100%">
-              <el-col :md="6">
-                <el-form-item label="确认密码" prop="confirmPassword">
-                  <el-input
-                    v-model="addForm.confirmPassword"
-                    ref="password2"
-                    autocomplete="off"
-                    placeholder="请再次输入密码"
-                    :type="passwordType2"
-                  ></el-input>
-                  <span class="show-pwd" @click="showPwd(2)">
-                    <svg-icon :icon-class="passwordType2 === 'password' ? 'eye' : 'eye-open'" />
-                  </span>
-                </el-form-item>
-                <h3 style="padding-bottom: 10px"></h3>
-              </el-col>
-              <el-col :md="6">
-                <el-form-item label="部门/网点" prop="rwaide">
-                  <el-cascader
-                    style="width: 100%"
-                    :options="departmentList"
-                    :props="{
-                      checkStrictly: true,
-                      emitPath: false,
-                      multiple: true,
-                      filterable: true,
-                      value: 'adminDeptId',
-                      label: 'deptName'
-                    }"
-                    filterable
-                    v-model="addForm.rwaide"
-                    clearable
-                    :disabled="addForm.adminUserId === userData.adminUserId"
-                  >
-                    <template slot-scope="{ node, data }">
-                      <span
-                        >{{ data.pid == '0' ? '' : data.pid == '1' ? '商户-' : data.isWebsit ? '网点-' : '部门-'
-                        }}{{ data.deptName }}</span
-                      >
-                    </template>
-                  </el-cascader>
-                </el-form-item>
-              </el-col>
-              <el-col :md="6" v-if="addForm.adminUserId !== userData.adminUserId">
-                <el-form-item label="角色组" prop="role">
-                  <el-select v-model="addForm.role" placeholder="请选择角色组" style="width: 100%">
-                    <el-option
-                      :label="item.name"
-                      :value="item.adminRoleId"
-                      v-for="(item, index) in roleList"
-                      :key="index"
-                    ></el-option>
-                  </el-select>
-                </el-form-item>
-                <h3 style="padding-bottom: 10px"></h3>
-              </el-col>
-              <el-col :md="6">
-                <el-form-item label="是否公众号通知" prop="pubNotice" label-width="120px">
-                  <el-switch v-model="addForm.pubNotice" active-color="#13ce66" inactive-color="#ff4949"> </el-switch>
-                </el-form-item>
-                <h3 style="padding-bottom: 10px"></h3>
-              </el-col>
-            </div>
+            <el-col :md="6">
+              <el-form-item label="确认密码" prop="confirmPassword">
+                <el-input
+                  v-model="addForm.confirmPassword"
+                  ref="password2"
+                  autocomplete="off"
+                  placeholder="请再次输入密码"
+                  :type="passwordType2"
+                ></el-input>
+                <span class="show-pwd" @click="showPwd(2)">
+                  <svg-icon :icon-class="passwordType2 === 'password' ? 'eye' : 'eye-open'" />
+                </span>
+              </el-form-item>
+            </el-col>
+
+            <el-col :md="6">
+              <el-form-item label="是否公众号通知" prop="pubNotice" label-width="120px">
+                <el-switch v-model="addForm.pubNotice" active-color="#13ce66" inactive-color="#ff4949"> </el-switch>
+              </el-form-item>
+            </el-col>
             <el-col :md="6" v-if="userInfoData.type != 0">
               <el-form-item label="是否供应商" prop="isVender" label-width="120px">
                 <el-switch v-model="addForm.isVender" active-color="#13ce66" inactive-color="#ff4949"> </el-switch>
@@ -269,6 +222,46 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :md="6" v-if="addForm.adminUserId !== userData.adminUserId">
+              <el-form-item label="角色组" prop="role">
+                <el-select v-model="addForm.role" placeholder="请选择角色组" style="width: 100%">
+                  <el-option
+                    :label="item.name"
+                    :value="item.adminRoleId"
+                    v-for="(item, index) in roleList"
+                    :key="index"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :md="6">
+              <el-form-item label="部门/网点" prop="rwaide">
+                <el-cascader
+                  collapse-tags
+                  style="width: 100%"
+                  :options="departmentList"
+                  :props="{
+                    checkStrictly: true,
+                    emitPath: false,
+                    multiple: true,
+                    filterable: true,
+                    value: 'adminDeptId',
+                    label: 'deptName'
+                  }"
+                  filterable
+                  v-model="addForm.rwaide"
+                  clearable
+                  :disabled="addForm.adminUserId === userData.adminUserId"
+                >
+                  <template slot-scope="{ node, data }">
+                    <span
+                      >{{ data.pid == '0' ? '' : data.pid == '1' ? '商户-' : data.isWebsit ? '网点-' : '部门-'
+                      }}{{ data.deptName }}</span
+                    >
+                  </template>
+                </el-cascader>
+              </el-form-item>
+            </el-col>
           </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer">