fix: 职位级联

src/views/system/user/components/UserDrawer.vue

@@ -11,42 +11,68 @@
     </template>
 
     <el-form ref="ruleFormRef" label-width="100px" label-suffix=" :" :rules="rules" :model="drawerProps.row" @submit.enter.prevent="handleConfirm">
-      <el-form-item label="所属组织" prop="orgId">
-        <el-tree-select
-          v-model="drawerProps.row.orgId"
-          :data="treeData"
-          check-strictly
-          placeholder="请选择组织"
-          :render-after-expand="false"
-          clearable
-          :default-expand-all="true"
-          :props="treeProps"
-          @change="loadPosition" />
-      </el-form-item>
-      <el-form-item label="职位" prop="positionId">
-        <el-select v-model="drawerProps.row.positionId" placeholder="请选择职位">
-          <el-option v-for="item in positionData" :key="item.positionId" :label="item.name" :value="item.positionId" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="账号" prop="account">
-        <el-input v-model="drawerProps.row.account" :disabled="drawerProps.title == '编辑'" placeholder="请填写账号" clearable />
-      </el-form-item>
-      <el-form-item label="名称" prop="userName">
-        <el-input v-model="drawerProps.row.userName" placeholder="请填写名称" clearable />
-      </el-form-item>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="所属组织" prop="orgId">
+            <el-tree-select
+              v-model="drawerProps.row.orgId"
+              :data="treeData"
+              check-strictly
+              placeholder="请选择组织"
+              :render-after-expand="false"
+              clearable
+              :default-expand-all="true"
+              :props="treeProps"
+              @change="loadPosition" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="职位" prop="positionId">
+            <el-select v-model="drawerProps.row.positionId" placeholder="请选择职位">
+              <el-option v-for="item in positionData" :key="item.positionId" :label="item.name" :value="item.positionId" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="账号" prop="account">
+            <el-input v-model="drawerProps.row.account" :disabled="drawerProps.title == '编辑'" placeholder="请填写账号" clearable />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="姓名" prop="userName">
+            <el-input v-model="drawerProps.row.userName" placeholder="请填写姓名" clearable />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="20">
+        <el-col :span="12"></el-col>
+        <el-col :span="12"></el-col>
+      </el-row>
+
       <el-form-item label="昵称" prop="nickName">
         <el-input v-model="drawerProps.row.nickName" placeholder="请填写昵称" clearable />
       </el-form-item>
-      <el-form-item label="用户类型" prop="status">
-        <el-radio-group v-model="drawerProps.row.userType">
-          <el-radio-button :value="item.dictValue" v-for="(item, index) in userTypes" :key="index" :label="item.dictLabel" />
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="性别" prop="gender">
-        <el-radio-group v-model="drawerProps.row.gender">
-          <el-radio-button :value="item.dictValue" v-for="(item, index) in genders" :key="index" :label="item.dictLabel" />
-        </el-radio-group>
-      </el-form-item>
+
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="用户类型" prop="status">
+            <el-radio-group v-model="drawerProps.row.userType">
+              <el-radio-button :value="item.dictValue" v-for="(item, index) in userTypes" :key="index" :label="item.dictLabel" />
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="性别" prop="gender">
+            <el-radio-group v-model="drawerProps.row.gender">
+              <el-radio-button :value="item.dictValue" v-for="(item, index) in genders" :key="index" :label="item.dictLabel" />
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
       <el-form-item label="手机号" prop="phoneNumber">
         <el-input v-model="drawerProps.row.phoneNumber" placeholder="请填写手机号" clearable />
       </el-form-item>
@@ -123,7 +149,6 @@ const acceptParams = (params: EcoDrawerProps) => {
   drawerProps.value = params
   drawerVisible.value = true
   loadTree()
-  loadPosition()
   drawerProps.value.row.status = drawerProps.value.row.status || '1'
   drawerProps.value.row.userType = drawerProps.value.row.userType || 'pc_user'
 }
@@ -141,6 +166,9 @@ const loadTree = () => {
   })
 }
 const loadPosition = () => {
+  positionData.value = []
+  drawerProps.value.row.positionId = ''
+
   PositionApi.list({ orgId: drawerProps.value.row.orgId }).then(res => {
     positionData.value = res.data
   })