lex-xin 3 rokov pred
rodič
commit
52484daec1

+ 8 - 0
src/api/system/dept.js

@@ -58,6 +58,14 @@ export function updateDept(data) {
   })
 }
 
+export function queryEmployeeOrgan(data) {
+  return request({
+    url: '/api-web/organization/queryEmployeeOrgan',
+    method: 'get',
+    params: data
+  })
+}
+
 // 删除部门
 export function delDept(deptId) {
   return request({

+ 26 - 1
src/views/system/dept/index.vue

@@ -120,6 +120,19 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
+            <el-form-item label="所属分部" prop="organId">
+              <!-- <el-input v-model="form.organId" placeholder="请输入所属分部" /> -->
+              <el-select v-model="form.organId" clearable filterable placeholder="请选择所属分部">
+                <el-option
+                  v-for="item in organList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
             <el-form-item label="联系电话" prop="phone">
               <el-input v-model="form.phone" placeholder="请输入联系电话" maxlength="11" />
             </el-form-item>
@@ -152,7 +165,7 @@
 
 <script>
 import { listUser } from '@/api/system/sysuser'
-import { getDeptList, getDept, delDept, addDept, updateDept } from '@/api/system/dept'
+import { getDeptList, getDept, delDept, addDept, updateDept, queryEmployeeOrgan } from '@/api/system/dept'
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 
@@ -167,6 +180,8 @@ export default {
       deptList: [],
       // 部门树选项
       deptOptions: [],
+      // 分部列表
+      organList: [],
       // 弹出层标题
       title: '',
       isEdit: false,
@@ -217,6 +232,7 @@ export default {
   },
   created() {
     this.getList()
+    this.getOrganList()
   },
   methods: {
     /** 查询部门列表 */
@@ -235,6 +251,11 @@ export default {
         this.users = response.data.list
       })
     },
+    getOrganList() {
+      queryEmployeeOrgan().then(res => {
+        this.organList = res.data || []
+      })
+    },
     /** 转换部门数据结构 */
     normalizer(node) {
       if (node.children && !node.children.length) {
@@ -277,6 +298,7 @@ export default {
         leader: undefined,
         phone: undefined,
         email: undefined,
+        organId: null,
         status: '0'
       }
     },
@@ -307,6 +329,9 @@ export default {
         if (this.form.leader === 0) {
           this.form.leader = ''
         }
+        if (this.form.organId === 0) {
+          this.form.organId = null
+        }
         this.open = true
         this.title = '修改部门'
         this.isEdit = true

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
web/index.html


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
web/static/web/js/chunk-6c199d3c.5aec4397.js


Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov