update&add 增加了选房及片区service

Web/src/pages/system/menu/form.vue

@@ -8,7 +8,7 @@
       <br />
       <div class="yo-form-group">
         <!-- 表单控件 -->
-        <h3>基本信息</h3>
+        <h3 class="h3">基本信息</h3>
         <div class="yo-form-group">
           <a-form-model-item label="菜单类型" prop="type">
             <template slot="help">
@@ -50,7 +50,7 @@
           </a-form-model-item>
         </div>
 
-        <h3>扩展信息</h3>
+        <h3 class="h3">扩展信息</h3>
         <div class="yo-form-group">
           <a-form-model-item label="打开方式" prop="openType" v-if="form.type == 1">
             <a-radio-group @change="onOpenTypeChange" v-model="form.openType">

Web/src/pages/system/user/index.vue

@@ -5,7 +5,12 @@
     2021-04-30
     Lufthafen
   -->
-  <yo-tree-layout :load-data="loadTreeData" @select="onSelect" default-expanded-keys ref="tree-layout">
+  <yo-tree-layout
+    :load-data="loadTreeData"
+    @select="onSelect"
+    default-expanded-keys
+    ref="tree-layout"
+  >
     <container>
       <a-card :bordered="false">
         <Auth auth="sysUser:page">
@@ -15,8 +20,17 @@
                 <a-input allow-clear placeholder="请输入姓名、账号、手机号" v-model="query.searchValue" />
               </a-form-model-item>
               <a-form-model-item label="状态">
-                <a-select :style="{ width: '170px' }" allow-clear placeholder="请选择状态" v-model="query.searchStatus">
-                  <a-select-option :key="i" :value="item.code" v-for="(item, i) in codes.common_status">{{ item.value }}</a-select-option>
+                <a-select
+                  :style="{ width: '170px' }"
+                  allow-clear
+                  placeholder="请选择状态"
+                  v-model="query.searchStatus"
+                >
+                  <a-select-option
+                    :key="i"
+                    :value="item.code"
+                    v-for="(item, i) in codes.common_status"
+                  >{{ item.value }}</a-select-option>
                 </a-select>
               </a-form-model-item>
               <a-form-model-item>
@@ -65,24 +79,30 @@
             <a-list-item-meta>
               <div slot="title">{{ record.nickName || record.name }}</div>
               <div slot="description">{{ record.account }}</div>
-              <yo-image :id="record.avatar" :size="48" icon="user" shape="square" slot="avatar" type="avatar" />
+              <yo-image
+                :id="record.avatar"
+                :size="48"
+                icon="user"
+                shape="square"
+                slot="avatar"
+                type="avatar"
+              />
             </a-list-item-meta>
+            <a-descriptions :column="2" class="flex-1">
+              <a-descriptions-item label="性别">{{ bindCodeValue(record.sex, 'sex') }}</a-descriptions-item>
+              <a-descriptions-item label="手机">{{ record.phone || '未设置' }}</a-descriptions-item>
+              <a-descriptions-item :span="2" label="邮箱">{{ record.email || '未设置' }}</a-descriptions-item>
+            </a-descriptions>
             <div class="yo-list-content--h">
-              <div class="yo-list-content--h--item">
-                <span>性别</span>
-                <p>{{ bindCodeValue(record.sex, 'sex') }}</p>
-              </div>
-              <div class="yo-list-content--h--item">
-                <span>手机</span>
-                <p>{{ record.phone || '未设置' }}</p>
-              </div>
-              <div class="yo-list-content--h--item">
-                <span>邮箱</span>
-                <p>{{ record.email || '未设置' }}</p>
-              </div>
               <Auth auth="sysUser:changeStatus">
                 <div class="yo-list-content--h--item text-center">
-                  <a-switch :checked="!record.status" :checked-children="bindCodeValue(0, 'common_status')" :loading="record.statusChanging" :un-checked-children="bindCodeValue(1, 'common_status')" @change="(checked) => onSetUserStatus(record, checked)" />
+                  <a-switch
+                    :checked="!record.status"
+                    :checked-children="bindCodeValue(0, 'common_status')"
+                    :loading="record.statusChanging"
+                    :un-checked-children="bindCodeValue(1, 'common_status')"
+                    @change="(checked) => onSetUserStatus(record, checked)"
+                  />
                 </div>
               </Auth>
             </div>
@@ -92,12 +112,24 @@
     </container>
 
     <!-- 新增表单 -->
-    <yo-modal-form :action="$api[api.add]" :title="'新增' + name" :width="1024" @ok="onReloadData" ref="add-form">
+    <yo-modal-form
+      :action="$api[api.add]"
+      :title="'新增' + name"
+      :width="1024"
+      @ok="onReloadData"
+      ref="add-form"
+    >
       <form-body mode="add" />
     </yo-modal-form>
 
     <!-- 编辑表单 -->
-    <yo-modal-form :action="$api[api.edit]" :title="'编辑' + name" :width="1024" @ok="onReloadData" ref="edit-form">
+    <yo-modal-form
+      :action="$api[api.edit]"
+      :title="'编辑' + name"
+      :width="1024"
+      @ok="onReloadData"
+      ref="edit-form"
+    >
       <form-body mode="edit" />
     </yo-modal-form>
 
@@ -140,7 +172,9 @@ export default {
       name: '用户',
 
       /* 查询条件 */
-      query: {},
+      query: {
+        sysEmpParam: {},
+      },
 
       /* 表格字段 */
       columns: [],