fix: 修改 bug

apps/web-ele/src/api/system/user/user.ts

@@ -18,6 +18,7 @@ import { commonExport, ContentTypeEnum } from '#/api/helper';
 import { requestClient } from '#/api/request';
 
 enum Api {
+  allUserList = '/system/user/stationList',
   baseUser = '/system/user',
   downLoadTemplate = '/system/user/importTemplate',
   exportUser = '/system/user/export',
@@ -27,10 +28,26 @@ enum Api {
   updateAvatar = '/system/user/profile/avatar',
   updateProfilePwd = '/system/user/profile/updatePwd',
   updateUser = '/system/user/changeStatus',
+  userCount = '/system/user/getStationUserCount/{stationId}',
   userImport = '/system/user/importData',
   userInfo = 'system/user/profile',
 }
 
+export function getStationUserCount(stationId: number) {
+  return requestClient.get<BaseDataResult<number>>(
+    Api.userCount.replace('{stationId}', stationId.toString()),
+    {
+      isTransformResponse: false,
+    },
+  );
+}
+
+export function getAllUserList(params?: any) {
+  return requestClient.get<BaseResult<User[]>>(Api.allUserList, {
+    params,
+  });
+}
+
 // 用户列表接口
 export function getUserList(params?: UserQuery) {
   return requestClient.get<BaseResult<User[]>>(Api.menuList, { params });

apps/web-ele/src/components/selectUsers/src/index.vue

@@ -25,19 +25,21 @@ import { getRoleList } from '#/api/system/role/role';
 // API导入 - 按模块分组
 // 用户相关API
 // @ts-ignore
-import { getUserList, selectUserList } from '#/api/system/user/user';
+import { getAllUserList, selectUserList } from '#/api/system/user/user';
 
 // 定义组件属性
 interface Props {
   // 用户ID数组，用于默认选中
   modelValue?: number[];
-  params?: any;
+  userParams?: any;
+  onlyUsers?: boolean;
+  maxSelectCount?: number;
 }
 
 // 组件属性默认值
 const props = withDefaults(defineProps<Props>(), {
   modelValue: () => [],
-  params: () => {},
+  userParams: () => {},
 });
 
 // 定义组件事件
@@ -238,12 +240,12 @@ async function loadAllUsers() {
   try {
     loading.value = true;
     let params: any = {};
-    if (props.params) {
-      params = { ...params, ...props.params };
+    if (props.userParams) {
+      params = { ...params, ...props.userParams };
     }
 
-    const res = await getUserList(params);
-    allUserList.value = res.rows || [];
+    const res: any = await getAllUserList(params);
+    allUserList.value = res || [];
   } catch (error_) {
     error.value = '加载用户列表失败';
     console.error('加载用户列表失败:', error_);
@@ -556,15 +558,15 @@ async function confirmSelection() {
     );
 
     const roleIds = selectedItems.value.filter((item) => item.type === 'role');
-    let params = {
+    const params = {
       postIds: postIds.map((item) => item.id),
       deptIds: deptIds.map((item) => item.id),
       stationIds: stationIds.map((item) => item.id),
       roleIds: roleIds.map((item) => item.id),
     };
-    if (props.params) {
-      params = { ...params, ...props.params };
-    }
+    // if (props.params) {
+    //   params = { ...params, ...props.params };
+    // }
 
     const res: any = await selectUserList(params);
     if (res?.length) {
@@ -623,13 +625,13 @@ defineExpose({
         </div>
 
         <!-- 标签页 -->
-        <div class="tabs">
+        <div class="tabs" v-if="!onlyUsers">
           <ElRadioGroup v-model="activeTab" size="small">
             <ElRadioButton label="byList">用户</ElRadioButton>
             <ElRadioButton label="byDept">部门</ElRadioButton>
             <ElRadioButton label="byPost">岗位</ElRadioButton>
             <ElRadioButton label="byRole">角色</ElRadioButton>
-            <ElRadioButton label="byStation">场站</ElRadioButton>
+            <ElRadioButton label="byStation"> 场站 </ElRadioButton>
           </ElRadioGroup>
         </div>
 
@@ -740,7 +742,9 @@ defineExpose({
       <!-- 右侧已选择区域 -->
       <div class="right-panel">
         <div class="selected-header">
-          <span class="selected-title">已选择 ({{ totalSelected }}/1000)</span>
+          <span class="selected-title">
+            已选择 ({{ totalSelected }}/{{ maxSelectCount || 1000 }})
+          </span>
           <ElButton
             v-if="totalSelected > 0"
             type="text"

apps/web-ele/src/views/schedule/detail/components/emergency.vue

@@ -131,19 +131,16 @@ const formatDateTime = (dateTime: string) => {
       </div>
       <ElDescriptions :column="4" class="mb-6">
         <ElDescriptionsItem
-          v-if="
-            emergencyData.imagesPaths && emergencyData.imagesPaths.length > 0
-          "
+          v-if="emergencyData.imagesUrl && emergencyData.imagesUrl.length > 0"
           label="演练现场图片:"
           :span="4"
         >
           <div class="task-images">
             <ElImage
-              v-for="(image, index) in emergencyData.imagesPaths"
+              v-for="(image, index) in emergencyData.imagesUrl"
               :key="index"
               :src="image"
-              :preview-src-list="emergencyData.imagesPaths"
-              :initial-index="index"
+              :preview-src-list="emergencyData.imagesUrl"
               fit="cover"
               alt="演练照片"
               class="task-image"

apps/web-ele/src/views/schedule/detail/components/meeting.vue

@@ -132,17 +132,16 @@ const formatDateTime = (dateTime: string) => {
       </div>
       <ElDescriptions :column="4" class="mb-6">
         <ElDescriptionsItem
-          v-if="meetingData.meetingImagesUrl.length > 0"
+          v-if="meetingData?.meetingImagesUrl?.length > 0"
           label="会议记录和现场照片:"
           :span="4"
         >
           <div class="task-images">
             <ElImage
-              v-for="(image, index) in meetingData.meetingImagesUrl"
+              v-for="(image, index) in meetingData?.meetingImagesUrl || []"
               :key="index"
               :src="image"
-              :preview-src-list="meetingData.meetingImagesUrl"
-              :initial-index="index"
+              :preview-src-list="meetingData?.meetingImagesUrl || []"
               fit="cover"
               alt="会议照片"
               class="task-image"

apps/web-ele/src/views/schedule/detail/components/plan.vue

@@ -145,7 +145,7 @@ const init = () => {
   basicTableApi.setGridOptions(gridOptions);
 
   const tableData: any = [];
-  props.taskDetail.evaluationRecords.forEach((item: any) => {
+  props.taskDetail?.evaluationRecords.forEach((item: any) => {
     const index = tableData.findIndex(
       (item2: any) => item2.employeeId === item.employeeId,
     );

apps/web-ele/src/views/schedule/detail/drawer/emergency/index.vue

@@ -7,6 +7,8 @@ import { ref } from 'vue';
 import { useVbenDrawer, useVbenForm } from '@vben/common-ui';
 
 // @ts-ignore
+import { getStationUserCount } from '#/api/system/user/user';
+// @ts-ignore
 import { submitEmergencyWy, submitEmergencyWyReport } from '#/api/task';
 
 // @ts-ignore
@@ -42,10 +44,14 @@ const [Drawer, drawerApi] = useVbenDrawer({
     }
     try {
       drawerApi.drawerLoading(true);
-      const { taskId, taskName, taskList } = drawerApi.getData();
+      const { taskId, taskName, taskList, stationId } = drawerApi.getData();
       taskParams.value.taskId = taskId;
       taskParams.value.taskName = taskName;
       taskParams.value.taskList = taskList;
+      // 获取 stationId 下的用户数量
+      const { data }: any = await getStationUserCount(stationId);
+      planFormApi.setFieldValue('totalCount', data);
+
       // 填充计划表单
       planFormApi.setValues(taskList[0]);
       // 填充报告表单

apps/web-ele/src/views/schedule/detail/drawer/groupLog/config-data.tsx

@@ -81,28 +81,28 @@ export const drawerFormSchema: any | FormSchemaGetter = (
       disabled: true,
     },
     rules: 'required',
-    renderComponentContent: (row: any, formApi: any) => {
-      return {
-        suffix: () => {
-          return (
-            <ElButton
-              onClick={() =>
-                handleClick(1, (users: any) => {
-                  if (users?.length) {
-                    formApi.setFieldValue('shiftLeaderName', users[0].name);
-                    formApi.setFieldValue('shiftLeaderId', users[0].id);
-                  }
-                })
-              }
-              size="small"
-              type="primary"
-            >
-              选择
-            </ElButton>
-          );
-        },
-      };
-    },
+    // renderComponentContent: (row: any, formApi: any) => {
+    //   return {
+    //     suffix: () => {
+    //       return (
+    //         <ElButton
+    //           onClick={() =>
+    //             handleClick(1, (users: any) => {
+    //               if (users?.length) {
+    //                 formApi.setFieldValue('shiftLeaderName', users[0].name);
+    //                 formApi.setFieldValue('shiftLeaderId', users[0].id);
+    //               }
+    //             })
+    //           }
+    //           size="small"
+    //           type="primary"
+    //         >
+    //           选择
+    //         </ElButton>
+    //       );
+    //     },
+    //   };
+    // },
   },
   {
     component: 'Select',

apps/web-ele/src/views/schedule/detail/drawer/groupLog/index.vue

@@ -29,6 +29,12 @@ import { defautTableColumns, drawerFormSchema } from './config-data';
 const emit = defineEmits<{ reload: [] }>();
 
 const executorRef: any = ref(null);
+const selectParams = ref({
+  types: ['users'],
+  userParams: {
+    stationId: 0,
+  },
+});
 const [ExecutorModal, executorModalApi] = useVbenModal({
   title: '选择负责人',
   width: 1000,
@@ -87,9 +93,12 @@ const [Drawer, drawerApi] = useVbenDrawer({
     }
     try {
       drawerApi.drawerLoading(true);
-      const { taskId, taskName } = drawerApi.getData();
+      const { taskId, taskName, stationId, taskList } = drawerApi.getData();
       taskParams.value.taskId = taskId;
       taskParams.value.taskName = taskName;
+      formApi.setFieldValue('shiftLeaderId', taskList[0].executorId);
+      formApi.setFieldValue('shiftLeaderName', taskList[0].executorIdName);
+      selectParams.value.userParams.stationId = stationId;
     } catch (error) {
       console.error(error);
     } finally {
@@ -208,7 +217,7 @@ const [BasicTable, basicTableApi] = useVbenVxeGrid({
 });
 
 // 其他分工列表
-const otherDivisionList = ref<any[]>([{ id: '', name: '未选择', content: '' }]);
+const otherDivisionList = ref<any[]>([]);
 
 // 添加其他分工
 const addOtherDivision = () => {
@@ -265,38 +274,13 @@ onMounted(async () => {
   await init();
   // gridOptions.columns = await tableColumns();
 });
-
-const confirmEvent = (row: any) => {
-  //
-  // console.log('row', row);
-};
 </script>
 
 <template>
   <Drawer :title="taskParams.taskName">
     <Form>
       <template #evaluationComments>
-        <BasicTable table-title="" class="w-full">
-          <template #action="{ row }">
-            <ElSpace>
-              <ElPopconfirm
-                :title="$t('common.confirm-delete')"
-                @confirm="confirmEvent(row)"
-              >
-                <template #reference>
-                  <ElButton
-                    size="small"
-                    type="danger"
-                    plain
-                    v-access:code="['system:dict:remove']"
-                  >
-                    删除
-                  </ElButton>
-                </template>
-              </ElPopconfirm>
-            </ElSpace>
-          </template>
-        </BasicTable>
+        <BasicTable table-title="" class="w-full" />
       </template>
 
       <template #otherDivision>
@@ -304,12 +288,12 @@ const confirmEvent = (row: any) => {
           <div
             v-for="(item, index) in otherDivisionList"
             :key="index"
-            class="mb-2 flex items-center gap-2"
+            class="mb-2 flex w-full items-center gap-2"
           >
             <ElInput
               v-model="item.content"
               placeholder="请输入分工内容"
-              class="flex-1"
+              class="w-full flex-1"
             >
               <template #append>
                 <div class="flex items-center gap-1">
@@ -357,7 +341,11 @@ const confirmEvent = (row: any) => {
       </template>
     </Form>
     <ExecutorModal class="w-[700px]">
-      <SelectUsers ref="executorRef" :params="{}" />
+      <SelectUsers
+        ref="executorRef"
+        :user-params="selectParams.userParams"
+        :only-users="true"
+      />
     </ExecutorModal>
   </Drawer>
 </template>

apps/web-ele/src/views/schedule/detail/drawer/meeting/config-data.tsx

@@ -3,6 +3,8 @@
 import type { FormSchemaGetter } from '#/adapter/form';
 // @ts-ignore: 忽略
 
+import { ElMessage } from 'element-plus';
+
 // @ts-ignore: 忽略
 import { getMultipleImageUploadConfig } from '#/components/upload';
 
@@ -35,16 +37,38 @@ export const drawerFormSchema: any | FormSchemaGetter = () => [
   },
   {
     component: 'InputNumber',
-    componentProps: {
-      placeholder: '请输入参会人数',
-      min: 0,
-      max: undefined,
+    componentProps: (data: any) => {
+      return {
+        placeholder: '请输入参会人数',
+        min: 0,
+        max: undefined,
+        onChange(val: number) {
+          if (val && val > data.totalCount) {
+            ElMessage({
+              message: '参会人数不能大于总人数',
+              type: 'warning',
+            });
+            data.attendeesCount = 0;
+          }
+        },
+      };
     },
     fieldName: 'attendeesCount',
     label: '参会人数',
     rules: 'required',
   },
   {
+    component: 'InputNumber',
+    componentProps: {
+      placeholder: '请输入总人数',
+      min: 0,
+      max: undefined,
+      disabled: true,
+    },
+    fieldName: 'totalCount',
+    label: '总人数',
+  },
+  {
     component: 'DatePicker',
     componentProps: {
       type: 'daterange',

apps/web-ele/src/views/schedule/detail/drawer/meeting/index.vue

@@ -8,6 +8,8 @@ import { useVbenDrawer, useVbenForm } from '@vben/common-ui';
 import { ElMessage } from 'element-plus';
 
 // @ts-ignore
+import { getStationUserCount } from '#/api/system/user/user';
+// @ts-ignore
 import { handleMeeting } from '#/api/task/index';
 
 // @ts-ignore
@@ -70,12 +72,16 @@ const [Drawer, drawerApi] = useVbenDrawer({
     }
     try {
       drawerApi.drawerLoading(true);
-      const { taskId, taskName } = drawerApi.getData();
+      const { taskId, taskName, stationId } = drawerApi.getData();
       meetingParams.value.taskId = taskId;
       meetingParams.value.taskName = taskName;
+      // 获取站点用户数量
+      const { data } = await getStationUserCount(stationId);
 
-      // 重置表单
       formApi.resetForm(initialFormData.value);
+      initialFormData.value.totalCount = data;
+      formApi.setFieldValue('totalCount', data);
+      // 重置表单
     } catch (error) {
       console.error(error);
       ElMessage.error('加载会议数据失败');

apps/web-ele/src/views/schedule/detail/drawer/upload/config-data.tsx

@@ -71,4 +71,14 @@ export const drawerFormSchema: FormSchemaGetter = () => [
       triggerFields: [''],
     },
   },
+  {
+    component: 'Input',
+    fieldName: 'remark',
+    label: '备注',
+    componentProps: {
+      type: 'textarea',
+      rows: 3,
+      maxlength: 200,
+    },
+  },
 ];

apps/web-ele/src/views/schedule/detail/drawer/upload/index.vue

@@ -55,6 +55,7 @@ const [Drawer, drawerApi] = useVbenDrawer({
         id: taskParams.value.taskId,
         attachment: values.attachment,
         attachmentName: values.attachmentName,
+        remark: values.remark,
       };
       await dealTask(params);
       emit('reload');

apps/web-ele/src/views/schedule/detail/index.vue

@@ -70,9 +70,8 @@ import SalesSurveyComponent from './components/sales-survey.vue';
 import TankWaterComponent from './components/tank-water.vue';
 // @ts-ignore
 import WeeklyEvaluationComponent from './components/weekly-evaluation.vue';
-import WeeklyReportComponent from './components/weekly-report.vue';
 // @ts-ignore
-import WeeklyComponent from './components/weekly.vue';
+import WeeklyReportComponent from './components/weekly-report.vue';
 import { mobileTaskTypes } from './config-data';
 import {
   AdditiveDrawer,
@@ -416,6 +415,7 @@ const dealEvent = async () => {
         taskName: taskInfo.value.taskName,
         taskList: taskInfo.value.taskList || [],
         remark: taskResult.value.content,
+        stationId: taskInfo.value.stationId || 0,
         subFormType: taskInfo.value.subFormType,
         attachmentUrl: taskResult.value.images,
       };
@@ -698,24 +698,6 @@ onMounted(async () => {
           <BiddingComponent />
         </ElCard>
 
-        <!-- 周报信息 -->
-        <ElCard v-if="taskInfo.formType === 'weekly'">
-          <template #header>
-            <div class="flex items-center gap-4">
-              <div
-                style="width: 4px; height: 12px; background-color: #215acd"
-              ></div>
-              <span
-                class="text-lg font-bold text-gray-800"
-                style="font-size: 14px; font-weight: 600"
-              >
-                周报信息
-              </span>
-            </div>
-          </template>
-          <WeeklyComponent />
-        </ElCard>
-
         <!-- 检查项组件 -->
         <ElCard v-if="taskInfo.formType === 'inspection'">
           <template #header>
@@ -855,6 +837,7 @@ onMounted(async () => {
           "
         />
 
+        <!-- 周报信息 -->
         <WeeklyReportComponent
           :task-detail="taskInfo.taskList[0]"
           v-if="
@@ -862,62 +845,9 @@ onMounted(async () => {
             taskInfo.subFormType === 'operating_weekly_report'
           "
         />
-
-        <!-- 处理信息组件 -->
-        <!-- <ElCard v-if="taskInfo.status === 3">
-          <template #header>
-            <div class="flex items-center gap-4">
-              <div
-                style="width: 4px; height: 12px; background-color: #215acd"
-              ></div>
-              <span
-                class="text-lg font-bold text-gray-800"
-                style="font-size: 14px; font-weight: 600"
-              >
-                处理信息
-              </span>
-            </div>
-          </template>
-          <ElDescriptions class="task-info" :column="4">
-            <ElDescriptionsItem
-              v-if="taskResult.handleContent || taskInfo.cancelReason"
-              label="处理情况:"
-              :span="4"
-            >
-              {{ taskResult.handleContent || taskInfo.cancelReason || '' }}
-            </ElDescriptionsItem>
-            <ElDescriptionsItem label="处理时间:" :span="4">
-              {{ taskInfo.completeTime || taskInfo.cancelTime || '-' }}
-            </ElDescriptionsItem>
-            <ElDescriptionsItem
-              v-if="taskResult.files && taskResult.files.length > 0"
-              label="处理附件:"
-              :span="4"
-            >
-              <div class="attachment-list">
-                <div
-                  v-for="(file, index) in taskResult.files"
-                  :key="index"
-                  class="attachment-item"
-                  @click="
-                    () =>
-                      downloadFile(
-                        file,
-                        taskResult.fileNames[index] || `附件${+index + 1}`,
-                      )
-                  "
-                >
-                  <span class="attachment-name">{{
-                    taskResult.fileNames[index] || `附件${+index + 1}`
-                  }}</span>
-                </div>
-              </div>
-            </ElDescriptionsItem>
-          </ElDescriptions>
-        </ElCard> -->
       </div>
 
-      <div style="width: 412px">
+      <div style="width: 412px" v-if="taskInfo.status === 3">
         <!-- 评论组件 -->
         <ElCard>
           <template #header>