Merge branch 'master' of http://119.23.210.103:3000/wy/lh_firm_former

src/views/platform/org/employee/edit/basic-info.vue

@@ -28,7 +28,7 @@
             <el-form ref="employeeForm" :rules="rules" :model="formData" label-width="130px" @submit.native.prevent>
                 <input type="password" style="width: 0; height: 0; line-height: 0; padding: 0; border-width: 0" />
                 <el-form-item label="账号" prop="account">
-                    <el-input v-if="!readonly && formData.groupID != '1041786072788369408'" v-model="formData.account" autocomplete="off" clearable />
+                    <el-input v-if="!readonly" v-model="formData.account" autocomplete="off" clearable />
                     <span v-else>{{ formData.account }}</span>
                 </el-form-item>
                 <el-form-item v-show="!formData.id" label="密码" :prop="!formData.id ? 'password' : ''">

src/views/platform/org/employee/edit/org-info.vue

@@ -1,6 +1,6 @@
 <template>
   <el-row :gutter="10">
-    <el-col v-if="!readonly && groupID != '1041786072788369408'" :span="8" border>
+    <el-col v-if="!readonly" :span="8" border>
       <div class="grid-content">
         <tree
           ref="elTree"
@@ -25,11 +25,11 @@
         />
       </div>
     </el-col>
-    <el-col v-if="!readonly && groupID != '1041786072788369408'" :span="3">
+    <el-col v-if="!readonly" :span="3">
       <el-button type="primary" icon="el-icon-d-arrow-right" class="ibps-ml-10" @click="handleBelongTo">属于</el-button>
       <el-button type="info" icon="el-icon-d-arrow-left" class="ibps-ml-10 ibps-mt-10" @click="handleClear">清空</el-button>
     </el-col>
-    <el-col :span="!readonly && groupID != '1041786072788369408' ? 11 : 24" border>
+    <el-col :span="!readonly? 11 : 24" border>
       <div class="grid-content">
         <el-form label-width="120px">
           <el-form-item>