no message

src/views/setting/account/index.vue

@@ -160,18 +160,6 @@
                 <el-input v-model="addForm.linkPhone" autocomplete="off" placeholder="请输入手机号"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :md="6" v-if="addForm.adminUserId != userInfoData.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="newPassword">
                 <el-input
@@ -200,29 +188,6 @@
                 </span>
               </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>
-              </el-form-item>
-            </el-col>
-            <el-col :md="6" v-if="addForm.isVender && userInfoData.type != 0">
-              <el-form-item label="供应商" prop="venderId">
-                <el-select v-model="addForm.venderId" placeholder="请选择供应商" style="width: 100%" filterable>
-                  <el-option
-                    v-for="(item, index) in venderList"
-                    :key="index"
-                    :label="item.venderName"
-                    :value="item.venderId"
-                    :disabled="item.status !== 'ON'"
-                  />
-                </el-select>
-              </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">
               <el-form-item label="部门/网点" prop="rwaide">
                 <el-cascader
@@ -249,6 +214,41 @@
                 </el-cascader>
               </el-form-item>
             </el-col>
+            <el-col :md="6" v-if="addForm.adminUserId != userInfoData.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="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>
+              </el-form-item>
+            </el-col>
+            <el-col :md="6" v-if="addForm.isVender && userInfoData.type != 0">
+              <el-form-item label="供应商" prop="venderId">
+                <el-select v-model="addForm.venderId" placeholder="请选择供应商" style="width: 100%" filterable>
+                  <el-option
+                    v-for="(item, index) in venderList"
+                    :key="index"
+                    :label="item.venderName"
+                    :value="item.venderId"
+                    :disabled="item.status !== 'ON'"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
           </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer">