调整巡检工单的部门id，调整用户编辑校验是否责任人接口

src/views/pms/inspect/plan/IotInspectPlan.vue

@@ -306,16 +306,14 @@ const submitForm = async () => {
     if (formType.value === 'create') {
       //校验是否是已有计划
       const newitems = itemsWithIndex
-      debugger
       formData.value.deviceIds = JSON.stringify(newitems.value)
-      formData.value.deptId = user.user.deptId
+      if (!formData.value.deptId) {formData.value.deptId = user.user.deptId}
       await IotInspectPlanApi.createIotInspectPlan(data).then((res) => {
       })
       message.success(t('common.createSuccess'))
       close()
     } else {
       const newitems = itemsWithIndex
-      debugger
       formData.value.deviceIds = JSON.stringify(newitems.value)
       await IotInspectPlanApi.updateIotInspectPlan(data)
       message.success(t('common.updateSuccess'))
@@ -331,7 +329,12 @@ const submitForm = async () => {
 
 /** 重置表单 */
 onMounted(async () => {
+  const route = useRoute()
   const deptId = useUserStore().getUser.deptId
+  formData.value.deptId = Number(route.query.deptId)
+  if (route.query.deptName) {
+    formData.value.planTitle = `${route.query.deptName} - 巡检计划`
+  }
   deptUsers.value = await UserApi.getDeptUsersByDeptId(deptId)
   if (id) {
     formType.value = 'update'

src/views/pms/inspect/plan/index.vue

@@ -120,6 +120,7 @@
             width="150px"
           />
           <el-table-column :label="t('inspect.createName')" align="center" prop="createName" width="130"/>
+          <el-table-column :label="t('iotDevice.dept')" align="center" prop="deptName" width="130"/>
           <el-table-column :label="t('operationFill.operation')" align="center" width="180">
             <template #default="scope">
               <el-button
@@ -194,8 +195,10 @@ const exportLoading = ref(false);
 
 const isLeftContentCollapsed = ref(false);
 const hoverText = ref('');
+const selectedDept = ref<{ id: number; name: string }>()
 
 const handleDeptNodeClick = async (row) => {
+  selectedDept.value = { id: row.id, name: row.name }
   queryParams.deptId = row.id;
   await getList();
 };
@@ -229,6 +232,7 @@ const handleQuery = () => {
 
 const resetQuery = () => {
   queryFormRef.value.resetFields();
+  selectedDept.value = undefined
   handleQuery();
 };
 
@@ -237,7 +241,13 @@ const openForm = (type: string, id?: number) => {
     push({ name: 'InspectPlanEdit', params: { id } });
     return;
   }
-  push({ name: 'InspectPlanAdd', params: {} });
+  push({
+    name: 'InspectPlanAdd',
+    query: {
+      deptId: selectedDept.value?.id,
+      deptName: selectedDept.value?.name
+    }
+  })
 };
 
 const handleDelete = async (id: number) => {

src/views/system/user/UserForm.vue

@@ -21,7 +21,9 @@
               :data="deptList"
               :props="defaultProps"
               check-strictly
+              @change="validateDuty"
               node-key="id"
+              filterable
               placeholder="请选择归属部门"
             />
           </el-form-item>
@@ -157,6 +159,15 @@ const formRef = ref() // 表单 Ref
 const deptList = ref<Tree[]>([]) // 树形结构
 const postList = ref([] as PostApi.PostVO[]) // 岗位列表
 const userInfo = ref()
+const validateDuty = ()=>{
+  IotDevicePersonApi.ifDuty(formData.value.id).then((res) => {
+    debugger
+    if (res==1&&userInfo.value.deptId!==formData.value.deptId) {
+      message.error('该用户已分配责任人,无法编辑部门')
+      return;
+    }
+  })
+}
 /** 打开弹窗 */
 const open = async (type: string, id?: number) => {
   dialogVisible.value = true
@@ -192,17 +203,17 @@ const submitForm = async () => {
   formLoading.value = true
   try {
     const data = formData.value as unknown as UserApi.UserVO
+    debugger
     if (formType.value === 'create') {
       await UserApi.createUser(data)
       message.success(t('common.createSuccess'))
     } else {
-
       await IotDevicePersonApi.ifDuty(formData.value.id).then((res) => {
         debugger
-          if (res>0&&userInfo.value.deptId!==formData.value.deptId) {
+          if (res==1&&userInfo.value.deptId!==formData.value.deptId) {
             message.error('该用户已分配责任人,无法编辑部门')
             return;
-          } else {
+          } else{
             UserApi.updateUser(data)
             message.success(t('common.updateSuccess'))
             dialogVisible.value = false