0125

src/api/business/resourceGroupDetail.js

@@ -52,3 +52,11 @@ export function delGroupDetail(id) {
     method: 'delete'
   })
 }
+// 删除工段资源组明细(当从部门管理删除人员时)
+export function deleteGroupDetail(data) {
+  return request({
+   url: baseUrl + '/business/detail/deleteGroupDetail' ,
+    method: 'post',
+    data: data
+  })
+}

src/layout/components/Navbar.vue

@@ -146,6 +146,7 @@ const handleChangeTenant = (row) => {
         path: '/redirect' + path,
         query: query
       })
+      location.reload()
     })
     .catch(() => {})
 }

src/views/business/department/index.vue

@@ -109,6 +109,7 @@
 <script setup name="Process">
 import { getUsersByDeptId, saveDeptUser, deptTreeSelect, delDeptUser, getDeptUser, getUsersItemByDeptId } from '@/api/system/user'
 import { delDept, getDept } from '@/api/system/dept'
+import {deleteGroupDetail } from '@/api/business/resourceGroupDetail'
 import deptForm from './form'
 import userForm from './formUser'
 import person from '@/views/dialog/person.vue'
@@ -206,6 +207,7 @@ function handleSelectionChange(selection) {
   ids.value = selection.map((item) => {
     return { userId: item.userId, deptId: currentDept.value.id }
   })
+  console.log(ids.value)
   single.value = selection.length != 1
   multiple.value = !selection.length
 }
@@ -280,10 +282,13 @@ function handleDelete(row) {
 function handleUserDelete(row) {
   console.log(ids.value)
   proxy.$modal
-    .confirm('是否确认删除选中的数据项？')
+    .confirm('是否确认删除选中的人员,资源组明细也将同步删除该人员？')
     .then(function () {
       return delDeptUser(ids.value)
     })
+    .then(function () {
+      deleteGroupDetail(ids.value)
+    })
     .then(() => {
       handleGetUser(currentDept.value)
       proxy.$modal.msgSuccess('删除成功！')

src/views/business/deptEquipment/index.vue

@@ -223,6 +223,9 @@ function getWorkSections() {
 }
 /**工段点击事件 */
 const handleWorkSectionChange = (row) => {
+  queryParams.value.code = ''
+  queryResourceGroupDetailParams.value.commonCode = ''
+  queryDeptProcessParams.value.processAlias = ''
   if (row) {
     currentWorkSection.value = row
     queryParams.value.deptId = row.id
@@ -258,6 +261,7 @@ function handleQueryResourceGroup() {
 }
 /**资源组点击事件 */
 function handleGroupChange(row) {
+  queryResourceGroupDetailParams.value.commonCode = ''
   if (row) {
     currentGroup.value = row
     getResourceGroupDetail()

src/views/business/equipment/index.vue

@@ -382,6 +382,7 @@ watch(name, (val) => {
   proxy.$refs["categoryTable"].filter(val);
 });
 const filterNode = (value, data) => {
+  queryParams.value.equipmentCode = ''
   if (!value) {
     return true;
   }

src/views/business/reject/index.vue

@@ -8,9 +8,6 @@
         <el-form-item label="类别名称：">
           <el-input placeholder="请输入类别名称" clearable style="width: 150px" v-model.trim="name" @keydown.enter.prevent @keyup.enter="filterNode" />
         </el-form-item>
-        <el-form-item style="margin-right: 0px">
-          <el-button type="info" icon="Search" @click="filterNode">搜索</el-button>
-        </el-form-item>
       </el-form>
       <!-- 列表区 -->
       <div class="el-table-container">
@@ -163,6 +160,8 @@ const filterNode = (value, data) => {
   if (!value) {
     return true
   }
+  carrierRejectParams.value.code = ''
+  carrierRejectParams.value.isAbandoned = null
   return data.name.indexOf(value) !== -1
 }
 function getNodeIndex(data) {