0308

src/views/business/department/index.vue

@@ -159,7 +159,7 @@ function getList() {
     })
     if (deptList.value.length > 0) {
       currentDept.value = deptList.value[0]
-      getUserList()
+      proxy.$refs.departmentTable.setCurrentRow(deptList.value[0])
     }
     else {
       userList.value = []
@@ -228,9 +228,12 @@ function handleUpdate(row) {
 function handleGetUser(row) {
   if (row) {
     currentDept.value = row
-    console.log(row)
+    getUserList()
+  }
+  else {
+    userList.value = []
+      total.value = 0
   }
-  getUserList()
 }
 
 /** 获取员工列表 */
@@ -246,7 +249,6 @@ function getUsers() {
 
 function getUserList() {
   queryParams.value.deptId = currentDept.value.id
-
   getDeptUser(queryParams.value).then((response) => {
     if (response.code == 200) {
       userList.value = response.rows

src/views/business/workshop/index.vue

@@ -95,6 +95,7 @@ const queryDeptParams = ref({
 /** 查询车间管理列表 */
 function getList() {
   loading.value = true
+  currentWorkshop.value = {}
   listWorkshop(queryParams.value).then((res) => {
     if (res.code == 200) {
       workshopList.value = res.rows
@@ -102,12 +103,10 @@ function getList() {
       console.log(workshopList.value.length)
       if (workshopList.value.length >0) {
         currentWorkshop.value = workshopList.value[0]
-        getdeptList()
+        proxy.$refs.workshopTable.setCurrentRow(workshopList.value[0])
       } else {
-        console.log("888")
         deptList.value = []
         total.value = 0
-        console.log(deptList.value.length)
       }
     }
   })
@@ -179,14 +178,16 @@ function getdeptList() {
   deptLoading.value = true
   queryDeptParams.value.workshopId = currentWorkshop.value.id
   console.log(total.value)
+  if(currentWorkshop.value.id) {
   listDept(queryDeptParams.value).then((res) => {
     if (res.code == 200) {
       deptList.value = res.rows
       total.value = res.total
-      deptLoading.value = false
     }
   })
 }
+deptLoading.value = false
+}
 
 /** 删除按钮操作 */
 function handleDeleteWorkshop(row) {