1、优化添加员工必填；

2、优化superadmin空间机构相关优化

languages/en.js

@@ -303,6 +303,7 @@ module.exports = {
     sureDelete: 'Sure to delete',
     allBad: 'And all the beds in it?',
     sureDeleteBed: 'Make sure to delete the bed',
+    deleteBedFirst: 'Please delete the bed first',
     part: 'Department',
     room: 'Room',
     room2: 'Room',

languages/es.js

@@ -303,6 +303,7 @@ module.exports = {
     sureDelete: 'Seguro de eliminar',
     allBad: '¿Y todas las camas en él?',
     sureDeleteBed: 'Asegúrese de eliminar la cama',
+    deleteBedFirst: 'Por favor, elimine la cama primero',
     part: 'Departamento',
     room: 'Habitación',
     room2: 'Habitación',

languages/ru-RU.js

@@ -303,6 +303,7 @@ module.exports = {
     sureDelete: 'Конечно удалить',
     allBad: 'И все кровати в нем?',
     sureDeleteBed: 'Обязательно удалите кровать',
+    deleteBedFirst: 'Пожалуйста, удалите кровать',
     part: 'Отдел',
     room: 'Комната',
     room2: 'Комната',

languages/zh-CN.js

@@ -303,6 +303,7 @@ module.exports = {
     sureDelete: '确定要删除',
     allBad: '及其中的所有床位吗?',
     sureDeleteBed: '确定删除床位',
+    deleteBedFirst: '请先删除床位',
     part: '科室',
     room: '房',
     room2: '房间',

src/utils/mixin.js

@@ -70,7 +70,6 @@ export default {
   },
   methods: {
     windowResize() {
-      console.log('clientHeight',document.documentElement.clientHeight)
         this.$set(this, 'mainAreaHeight', Number(document.documentElement.clientHeight) - 84)
     },
 

src/views/hospitalFrame/frameTreeView-admin.vue

@@ -26,7 +26,6 @@
           :expand-on-click-node="false"
           :highlight-current="true"
           :current-node-key="selectedNodeId"
-          draggable
           :accordion="true"
           :filter-node-method="filterNode"
           @node-drag-start="nodeDragStart"
@@ -42,35 +41,15 @@
                 effect="dark"
             >
             <!--            <span><svg-icon :icon-class="data.type===4?'sickroom':data.type===5?'bed':'area'" />{{ data.full_name }}</span>-->
-              <span @mouseover="mouseOver($event)"
-                    class="over-ellipsis"
-              ><svg-icon :style="data.customer_id ? 'color: #0a901c' : ''"
-                         :icon-class="data.type===4?'sickroom':data.type===5?'bed':'area'"
-              />{{ data.full_name }}</span>
+              <span @mouseover="mouseOver($event)" class="over-ellipsis">
+                <svg-icon :style="data.customer_id ? 'color: #0a901c' : ''" :icon-class="data.type===4?'sickroom':data.type===5?'bed':'area'"/>
+                {{ data.full_name }}
+              </span>
             </el-tooltip>
             <span class="top-right">
-              <el-button
-                v-if="data.type!==5"
-                :disabled="data.type===1"
-                type="text"
-                size="mini"
-                icon="el-icon-plus"
-                @click.stop="() => append(data)"
-              />
-              <el-button
-                type="text"
-                :disabled="data.type===1 || data.type===3"
-                size="mini"
-                icon="el-icon-edit"
-                @click.stop="() => edit(data)"
-              />
-              <el-button
-                type="text"
-                :disabled="data.type===1"
-                size="mini"
-                icon="el-icon-delete"
-                @click.stop="() => remove(data)"
-              />
+              <el-button v-if="data.type!==5" :disabled="data.type===1" type="text" size="mini" icon="el-icon-plus" @click.stop="() => append(data)"/>
+              <el-button type="text" :disabled="data.type===1 || data.type===3" size="mini" icon="el-icon-edit" @click.stop="() => edit(data)"/>
+              <el-button type="text" :disabled="data.type===1 || data.type ===3" size="mini" icon="el-icon-delete" @click.stop="() => remove(data)"/>
             </span>
           </span>
         </el-tree>
@@ -340,6 +319,13 @@ export default {
     },
     remove(data) {
       let warning = ''
+      if (data.children.length > 0) {
+          this.$message({
+            type: 'info',
+            message: this.$t('frameManage.deleteBedFirst')
+          })
+        return
+      }
       if (data.type === FRAME_TYPE.ROOM) {
         warning = this.$t('frameManage.sureDelete') + '【' + data.full_name + '】' + this.$t('frameManage.allBad')
       } else {

src/views/ncs-clerk/components/clerkList.vue

@@ -47,34 +47,21 @@
         <el-row>
           <el-col :span="12">
 
-            <el-form-item :label="this.$t('member.mobile')" prop="mobile">
-<!--              <el-select v-model="addMemberForm.mobile" style="width: 100%;" @change="userSelected"  filterable-->
-<!--                         remote-->
-<!--                         :remote-method="remoteMethod"-->
-<!--                         :loading="loading" placeholder="输入用户名或手机号搜索" clearable>-->
-<!--                <el-option-->
-<!--                        v-for="(item,index) in searchUser"-->
-<!--                        :key="index"-->
-<!--                        :label="item.name"-->
-<!--                        :value="item.name">-->
-<!--                  <span style="float: left">{{ item.name }}</span>-->
-<!--                  <span style="float: right; color: #8492a6; font-size: 13px">{{ item.mobile }}</span>-->
-<!--                </el-option>-->
-<!--              </el-select>-->
-<!--              <el-input v-model.number="addMemberForm.mobile" :maxlength="11" />-->
+            <el-form-item :label="this.$t('member.uname')" prop="uname">
+
               <el-autocomplete
-                      class="inline-input"
-                      popper-class="my-autocomplete"
-                      v-model="addMemberForm.mobile"
-                      :fetch-suggestions="querySearch"
-                      value-key="mobile"
-                      :placeholder="this.$t('action.inputMsg')"
-                      @select="handleSelect"
-                      :disabled="autoCompleteDisabled"
+                  class="inline-input"
+                  popper-class="my-autocomplete"
+                  v-model="addMemberForm.uname"
+                  :fetch-suggestions="querySearch"
+                  value-key="mobile"
+                  :placeholder="this.$t('action.inputMsg')"
+                  @select="handleSelect"
+                  :disabled="autoCompleteDisabled"
               >
                 <template slot-scope="{ item }" class="abc">
-                  <div class="name">{{ item.mobile }}</div>
-                  <span class="addr">{{ item.uname }}</span>
+                  <div class="name">{{ item.uname }}</div>
+                  <span class="addr">{{ item.mobile }}</span>
                 </template>
 
               </el-autocomplete>
@@ -82,23 +69,21 @@
           </el-col>
 
           <el-col :span="12">
-            <el-form-item :label="this.$t('member.uname')" prop="uname">
-
+            <el-form-item :label="this.$t('member.mobile')">
               <el-autocomplete
-                      class="inline-input"
-                      popper-class="my-autocomplete"
-                      v-model="addMemberForm.uname"
-                      :fetch-suggestions="querySearch"
-                      value-key="mobile"
-                      :placeholder="this.$t('action.inputMsg')"
-                      @select="handleSelect"
-                      :disabled="autoCompleteDisabled"
+                  class="inline-input"
+                  popper-class="my-autocomplete"
+                  v-model="addMemberForm.mobile"
+                  :fetch-suggestions="querySearch"
+                  value-key="mobile"
+                  :placeholder="this.$t('action.inputMsg')"
+                  @select="handleSelect"
+                  :disabled="autoCompleteDisabled"
               >
                 <template slot-scope="{ item }" class="abc">
-                  <div class="name">{{ item.uname }}</div>
-                  <span class="addr">{{ item.mobile }}</span>
+                  <div class="name">{{ item.mobile }}</div>
+                  <span class="addr">{{ item.uname }}</span>
                 </template>
-
               </el-autocomplete>
             </el-form-item>
 
@@ -274,8 +259,8 @@ export default {
         page_size: 20,
         page_no: 1,
         fixedCondition: 'user_state=0 and member_id is not NULL',
-        sort: 'shop_id,member_id',
-        dir: 'asc'
+        sort: 'create_time',
+        dir: 'desc'
       },
 
       /** 列表参数 */
@@ -403,7 +388,7 @@ export default {
       //     }
       //   }
       // },
-      { headerName: 'id', field: 'member_id', sortable: true, width: 50 },
+      { headerName: 'id', field: 'member_id', sortable: true, width: 90 },
       { headerName: this.$t('member.uname'), field: 'uname', sortable: true, filter: true, width: 180 },
       { headerName: this.$t('member.nickname'), field: 'clerk_name', sortable: true, filter: true, width: 180 },
       { headerName: this.$t('member.sex'), field: 'sex', sortable: true, valueFormatter: this.formatterSex, width: 180, filterFramework: 'RadioFilter',