feat: 新增页面

src/api/production-safety/responsibility-implementation/index.ts

@@ -6,9 +6,10 @@ import type { QueryPageRequest, QueryPageResponse } from '@/types/basic-query';
  * @param params - 分页查询参数，通常包含 username、pageNum、pageSize 等
  * @returns Promise<QueryPageResponse>
  */
-export function queryUserPageByUsername(params) {
+queryAvailableUserList
+export function queryAvailableUserList(params) {
   return http.request({
-    url: `/admin/user/queryUserPageByUsername`,
+    url: `/admin/user/queryAvailableUserList`,
     method: 'post',
     params
   });
@@ -486,3 +487,4 @@ export function safetyNoticeAdminIssuedNotice(params) {
     params
   });
 }
+

src/views/production-safety/implement-safety-duty/non-public-area-responsibilities/add.vue

@@ -22,7 +22,7 @@
         </el-form-item>
 
         <el-form-item label="安全责任所/中心" prop="safetyResponsibleCenter">
-          <el-select
+          <!-- <el-select
             v-model="formValue.safetyResponsibleCenter"
             placeholder="请选择"
             size="large"
@@ -35,7 +35,18 @@
               :label="item.deptName"
               :value="item.deptName"
             />
-          </el-select>
+          </el-select> -->
+          <el-cascader
+            style="width: 50%"
+            size="large"
+            :ref="(el) => (cascaderRef['safetyResponsibleCenter'] = el)"
+            :options="firstLevelDepts"
+            :props="cascaderProp"
+            :show-all-levels="false"
+            placeholder="请选择安全责任部门"
+            filterable
+            @change="(val) => handleChangeDept(val, 'safetyResponsibleCenter')"
+          />
         </el-form-item>
 
         <el-form-item label="安全责任所/中心负责人" prop="safetyCenterManager">
@@ -45,9 +56,14 @@
             size="large"
             style="width: 50%"
             filterable
-            @change="(val) => syncUserName(val, 'safetyCenterManagerName')"
+            @change="(val) => syncUserName(val, safetyCenterManagerOptions, 'safetyCenterManagerName')"
           >
-            <el-option v-for="item in userOptions" :key="item.id" :label="item.name" :value="item.id" />
+            <el-option
+              v-for="item in safetyCenterManagerOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
           </el-select>
         </el-form-item>
 
@@ -69,9 +85,7 @@
           <el-cascader
             style="width: 50%"
             size="large"
-            ref="cascaderRef"
-            popper-class="cascader-popper--custom"
-            v-model="formValue.safetyResponsibleDepartment"
+            :ref="(el) => (cascaderRef['safetyResponsibleDepartment'] = el)"
             :options="firstLevelDepts"
             :props="cascaderProp"
             :show-all-levels="false"
@@ -88,11 +102,17 @@
             size="large"
             style="width: 50%"
             filterable
-            @change="(val) => syncUserName(val, 'safetyDepartmentManagerName')"
+            @change="(val) => syncUserName(val, safetyDepartmentUserOptions, 'safetyDepartmentManagerName')"
           >
-            <el-option v-for="item in userOptions" :key="item.id" :label="item.name" :value="item.id" />
+            <el-option
+              v-for="item in safetyDepartmentUserOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
           </el-select>
         </el-form-item>
+        <!-- @change="handleSpecificPersonChange" -->
 
         <el-form-item label="安全具体责任人" prop="safetySpecificPerson">
           <el-select
@@ -101,9 +121,14 @@
             size="large"
             style="width: 50%"
             filterable
-            @change="handleSpecificPersonChange"
+            @change="(val) => syncUserName(val, safetyDepartmentUserOptions, 'safetySpecificPersonName')"
           >
-            <el-option v-for="item in userOptions" :key="item.id" :label="item.name" :value="item.id" />
+            <el-option
+              v-for="item in safetyDepartmentUserOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
           </el-select>
         </el-form-item>
 
@@ -125,29 +150,26 @@
 </template>
 
 <script lang="ts" setup>
-  import { ref, reactive, onMounted } from 'vue';
+  import { ref, reactive, onMounted, nextTick } from 'vue';
   import { useRouter } from 'vue-router';
   import { ElMessage } from 'element-plus';
   import { getAllDepartments } from '@/api/auth/dept';
   import { formatDeptTree } from '@/views/disaster/utils/formatDeptTree';
-  import { getUserList } from '@/api/system/user-operate';
 
-  import {
-    queryUserPageByUsername,
-    areaCheckListSavaArea,
-  } from '@/api/production-safety/responsibility-implementation';
+  import { queryAvailableUserList, areaCheckListSavaArea } from '@/api/production-safety/responsibility-implementation';
 
   const router = useRouter();
   const formRef = ref<any>(null);
   const submiting = ref(false);
-  const cascaderRef = ref();
+  const cascaderRef = ref({});
 
-  const userOptions = ref<any[]>([]);
+  const safetyCenterManagerOptions = ref<any[]>([]);
+  const safetyDepartmentUserOptions = ref<any[]>([]);
   const firstLevelDepts = ref<any[]>([]);
   const cascaderProp = {
     expandTrigger: 'click',
     checkStrictly: true,
-    emitPath: false,
+    // emitPath: false,
     value: 'id',
     label: 'deptName',
   };
@@ -186,46 +208,84 @@
       { pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号码格式' },
     ],
   });
-
-  const handleChangeDept = (prop) => {
-    const deptInfo = cascaderRef.value?.getCheckedNodes();
-    formValue[prop] = deptInfo[0].label;
-    console.log(deptInfo);
+  const handleQueryAvailableUserList = (deptName, prop, realname = '') => {
+    queryAvailableUserList({
+      pageNumber: 1,
+      pageSize: 200,
+      queryParam: {
+        deptName,
+        realname,
+      },
+    }).then((res: any) => {
+      switch (prop) {
+        case 'safetyResponsibleCenter':
+          formValue.safetyCenterManager = null;
+          safetyCenterManagerOptions.value = (res.records || []).map((u: any) => ({
+            value: u.userId || u.id,
+            label: u.realname,
+          }));
+          break;
+        case 'safetyResponsibleDepartment':
+          alert('');
+          formValue.safetyDepartmentManager = null;
+          formValue.safetySpecificPerson = null;
+          safetyDepartmentUserOptions.value = (res.records || []).map((u: any) => ({
+            value: u.userId || u.id,
+            label: u.realname,
+          }));
+          break;
+        default:
+          break;
+      }
+    });
+  };
+  const handleChangeDept = (val, prop) => {
+    const cascader = cascaderRef.value?.[prop];
+    const deptInfo = cascader?.getCheckedNodes();
+    Object.assign(formValue, {
+      [prop]: deptInfo[0].label,
+    });
+    console.log('@val', val);
+    formRef.value.validateField(prop);
+    nextTick(() => {
+      handleQueryAvailableUserList(deptInfo[0].label, prop);
+    });
   };
 
-  // 获取部门数据
   const getDeptData = () => {
     getAllDepartments().then((res) => {
       firstLevelDepts.value = formatDeptTree(res);
-      console.log('@res:', firstLevelDepts.value);
     });
   };
 
-  const getUserData = () => {
-    getUserList({ pageNumber: 1, pageSize: 200, queryParam: {} }).then((res: any) => {
-      userOptions.value = (res.records || []).map((u: any) => ({
-        id: u.userId || u.id,
-        name: u.realName || u.username,
-      }));
-    });
-  };
+  // const getUserData = () => {
+  //   getUserList({ pageNumber: 1, pageSize: 200, queryParam: {} }).then((res: any) => {
+  //     userOptions.value = (res.records || []).map((u: any) => ({
+  //       id: u.userId || u.id,
+  //       name: u.realName || u.username,
+  //     }));
+  //   });
+  // };
 
-  const syncUserName = (id: number, nameField: string) => {
-    const user = userOptions.value.find((u) => u.id === id);
-    if (user) formValue[nameField] = user.name;
-  };
-
-  const handleSpecificPersonChange = (id: number) => {
-    const user = userOptions.value.find((u) => u.id === id);
+  const syncUserName = (id: number, options: any[], nameField: string) => {
+    const user = options.find((u) => u.value === id);
     if (user) {
-      formValue.safetySpecificPersonName = user.name;
-      formValue.safetyPersonContact = user.mobile;
+      formValue[nameField] = user.label;
+      console.log(formValue);
     }
   };
 
+  // const handleSpecificPersonChange = (id: number, options: any[], nameField) => {
+  //   const user = userOptions.value.find((u) => u.id === id);
+  //   if (user) {
+  //     formValue.safetySpecificPersonName = user.name;
+  //     formValue.safetyPersonContact = user.mobile;
+  //   }
+  // };
+
   onMounted(() => {
     getDeptData();
-    getUserData();
+    // getUserData();
   });
 
   const handleSubmit = () => {

src/views/production-safety/implement-safety-duty/non-public-area-responsibilities/edit.vue

@@ -22,20 +22,17 @@
         </el-form-item>
 
         <el-form-item label="安全责任所/中心" prop="safetyResponsibleCenter">
-          <el-select
-            v-model="formValue.safetyResponsibleCenter"
-            placeholder="请选择"
-            size="large"
+          <el-cascader
             style="width: 50%"
+            size="large"
+            :ref="(el) => (cascaderRef['safetyResponsibleCenter'] = el)"
+            :options="firstLevelDepts"
+            :props="cascaderProp"
+            :show-all-levels="false"
+            placeholder="请选择安全责任部门"
             filterable
-          >
-            <el-option
-              v-for="item in firstLevelDepts"
-              :key="item.hrIdtOrgId"
-              :label="item.deptName"
-              :value="item.deptName"
-            />
-          </el-select>
+            @change="handleChangeDept('safetyResponsibleCenter')"
+          />
         </el-form-item>
 
         <el-form-item label="安全责任所/中心负责人" prop="safetyCenterManager">
@@ -118,18 +115,18 @@
   import { getAllDepartments } from '@/api/auth/dept';
   import { formatDeptTree } from '@/views/disaster/utils/formatDeptTree';
   import {
-    queryUserPageByUsername,
-    areaCheckListSavaArea,
     areaCheckListQueryDetail,
+    queryAvailableUserList,
     areaCheckListUpdateArea,
   } from '@/api/production-safety/responsibility-implementation';
-  import { getUserList } from '@/api/system/user-operate';
 
   const router = useRouter();
   const route = useRoute();
   const formRef = ref<any>(null);
   const submiting = ref(false);
 
+  const cascaderRef = ref<any>({});
+
   const userOptions = ref<any[]>([]);
   const firstLevelDepts = ref<any[]>([]);
 
@@ -175,15 +172,6 @@
     });
   };
 
-  const getUserData = () => {
-    getUserList({ pageNumber: 1, pageSize: 200, queryParam: {} }).then((res: any) => {
-      userOptions.value = (res.records || []).map((u: any) => ({
-        id: u.userId || u.id,
-        name: u.realName || u.username,
-      }));
-    });
-  };
-
   const syncUserName = (id: number, nameField: string) => {
     const user = userOptions.value.find((u) => u.id === id);
     if (user) formValue[nameField] = user.name;
@@ -199,7 +187,6 @@
 
   onMounted(() => {
     getDeptData();
-    getUserData();
     handlAreaCheckListQueryDetail();
   });
 
@@ -207,7 +194,7 @@
     formRef.value?.validate((valid: boolean) => {
       if (valid) {
         submiting.value = true;
-        areaCheckListSavaArea({
+        areaCheckListUpdateArea({
           ...formValue,
           type: 2,
         })

src/views/production-safety/implement-safety-duty/responsibility-notice-manage-admin/components/NotifySend.vue

@@ -0,0 +1,262 @@
+<template>
+  <el-dialog
+    :model-value="props.modelValue"
+    @update:model-value="$emit('update:modelValue', $event)"
+    title="安全责任通知发送"
+    width="800"
+    @close="clearData"
+  >
+    <el-tabs v-model="activeTab">
+      <el-tab-pane :disabled="activeTab !== 1" label="公共区域" :name="1" />
+      <el-tab-pane :disabled="activeTab !== 2" label="非公共区域" :name="2" />
+    </el-tabs>
+    <div class="main">
+      <el-form ref="formRef" :rules="rules" :model="formValue">
+        <el-form-item label="计划开始日期" prop="planStartTime">
+          <el-date-picker v-model="formValue.planStartTime" placeholder="请选择日期" style="width: 200px" />
+        </el-form-item>
+
+        <el-form-item label="计划结束日期" prop="planEndTime">
+          <el-date-picker v-model="formValue.planEndTime" placeholder="请选择日期" style="width: 200px" />
+        </el-form-item>
+        <el-form-item label="通知区域" prop="safetyAreaData">
+          <el-button @click="handleAddArea" type="primary">添加</el-button>
+        </el-form-item>
+        <el-table :data="currentTableData" v-if="formValue.safetyAreaData.length" style="width: 100%; margin: 20px 0 0">
+          <!-- <el-table-column type="index" label="序号" width="80" /> -->
+          <el-table-column v-if="formValue.type === 2" label="楼号" prop="buildingCode" width="180" />
+          <el-table-column label="楼层" prop="buildingArea" width="100" />
+
+          <el-table-column label="楼宇/区域" prop="buildingCode" width="180" />
+          <el-table-column label="房间/区域" prop="floorRoomNo" width="180" />
+          <el-table-column label="功能名称" prop="nameFunction" width="120" />
+          <el-table-column label="安全责任所/中心" prop="safetyResponsibleCenter" width="200" />
+          <el-table-column label="安全责任所/中心负责人" prop="safetyCenterManagerName" width="200" />
+          <el-table-column label="安全责任部门" prop="safetyResponsibleDepartment" width="180" />
+          <el-table-column label="安全责任部门负责人" prop="safetyDepartmentManagerName" width="180" />
+          <el-table-column label="安全具体责任人" prop="safetySpecificPersonName" width="180" />
+          <el-table-column label="安全具体责任人联系方式" prop="safetyPersonContact;" width="230" />
+          <el-table-column label="状态" prop="statusName" width="100" />
+          <el-table-column label="操作" width="100" fixed="right">
+            <template #default="scope">
+              <el-button type="text" size="small" @click="handleDeleteArea(scope)">删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="pagination-container" v-if="formValue.safetyAreaData.length">
+          <el-pagination
+            background
+            :current-page="queryParams.pageNumber"
+            :page-size="queryParams.pageSize"
+            :total="formValue.safetyAreaData.length"
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div>
+      </el-form>
+    </div>
+    <SelectNotifyArea
+      v-if="selectNotifyAreaOpen"
+      v-model.visible="selectNotifyAreaOpen"
+      :type="activeTab"
+      :append-to-body="true"
+      @submit="handleSelectionTableData"
+    />
+
+    <template #footer>
+      <div>
+        <el-button type="primary" @click="submitForm" :loading="submitLoading"> 确定 </el-button>
+        <el-button @click="handleCancel">取消</el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup lang="ts">
+  import { ref, reactive, onMounted, watch } from 'vue';
+  import { ElButton } from 'element-plus';
+  import SelectNotifyArea from './SelectNotifyArea.vue';
+  import { uniqBy, omit } from 'lodash-es';
+  import dayjs from 'dayjs';
+  import { safetyNoticeAdminIssuedNotice } from '@/api/production-safety/responsibility-implementation';
+
+  const props = defineProps<{
+    type: number;
+    modelValue: boolean;
+  }>();
+
+  const formRef = ref<any>(null);
+  const emit = defineEmits(['close', 'submit', 'update:modelValue']);
+  const submitLoading = ref(false);
+  const activeTab = ref(props.type);
+  const selectionList = ref([]);
+  const selectNotifyAreaOpen = ref(false);
+  const currentTableData = ref([]);
+
+  const queryParams = reactive<any>({
+    pageNumber: 1,
+    pageSize: 3,
+    // queryParam: {
+    //   type: activeTab.value,
+    //   planStartTime: null,
+    //   planEndTime: null,
+    // },
+  });
+  const formValue = reactive({
+    type: props.type,
+    safetyAreaData: [], // 区域分组,多个用，分隔
+    planStartTime: null, // 计划开始日期
+    planEndTime: null, // 计划结束日期
+  });
+
+  const tableData = reactive<any>({
+    data: [],
+    total: 0,
+  });
+
+  const rules = reactive({
+    planStartTime: [
+      {
+        required: true,
+        message: '请选择计划开始时间',
+        trigger: 'change',
+      },
+      {
+        validator: (rule, value, callback) => {
+          if (value && formValue.planEndTime) {
+            if (dayjs(value).isAfter(formValue.planEndTime)) {
+              callback(new Error('开始日期不能大于结束日期'));
+              return;
+            }
+          }
+          callback();
+        },
+      },
+    ],
+    planEndTime: [
+      {
+        required: true,
+        message: '请选择计划结束时间',
+        trigger: 'change',
+      },
+      {
+        validator: (rule, value, callback) => {
+          if (value && formValue.planStartTime) {
+            if (dayjs(value).isBefore(formValue.planStartTime)) {
+              callback(new Error('结束日期不能小于开始日期'));
+              return;
+            }
+          }
+          callback();
+        },
+      },
+    ],
+    safetyAreaData: [
+      {
+        required: true,
+        message: '请选择区域',
+        trigger: 'change',
+      },
+      {
+        validator: (rule, value, callback) => {
+          if (value.length === 0) {
+            callback(new Error('区域不能为空'));
+          }
+          callback();
+        },
+      },
+    ],
+  });
+
+  function dialogShow() {}
+  function dialogHide() {
+    emit('close');
+  }
+  function clearData() {}
+
+  function submitForm() {
+    formRef.value.validate((valid) => {
+      if (!valid) {
+        return;
+      }
+      emit('submit', formValue, submitLoading);
+      // emit('update:modelValue', false);
+    });
+  }
+
+  const handleDeleteArea = (scope) => {
+    formValue.safetyAreaData = formValue.safetyAreaData.filter((item: any) => item.id !== scope.row.id);
+    const totalPages = Math.ceil(formValue.safetyAreaData.length / queryParams.pageSize);
+    if (queryParams.pageNumber > totalPages) {
+      queryParams.pageNumber = totalPages || 1;
+    }
+    displayData(queryParams.pageNumber);
+  };
+  const displayData = (page = 1) => {
+    const start = (page - 1) * queryParams.pageSize;
+    const end = start + queryParams.pageSize;
+    currentTableData.value = formValue.safetyAreaData.slice(start, end);
+  };
+  const handleCurrentChange = (page: number) => {
+    queryParams.pageNumber = page;
+    displayData(page);
+  };
+
+  const handleSizeChange = (size: number) => {
+    queryParams.pageSize = size;
+  };
+
+  const handleSelectionTableData = (data) => {
+    tableData.total = data.length;
+    tableData.data = [...tableData.data, ...data];
+    Object.assign(formValue, {
+      safetyAreaData: uniqBy(tableData.data, 'id'),
+    });
+    formRef.value?.validateField('safetyAreaData');
+    displayData();
+  };
+  const handleAddArea = () => {
+    selectNotifyAreaOpen.value = true;
+  };
+
+  const handleCloseAreaDialog = () => {
+    selectNotifyAreaOpen.value = false;
+  };
+
+  const handleCancel = () => {
+    selectionList.value = [];
+    emit('update:modelValue', false);
+  };
+
+  watch(
+    () => props.type,
+    (a, b) => {
+      activeTab.value = a;
+    },
+  );
+
+  defineExpose({
+    submitLoading,
+    dialogShow,
+    dialogHide,
+  });
+</script>
+
+<style scoped lang="scss">
+  @use '@/styles/page-details-layout.scss' as *;
+  @use '@/styles/page-main-layout.scss' as *;
+  @use '@/styles/basic-table-action.scss' as *;
+  .main {
+    display: flex;
+    flex-direction: column;
+    max-height: 400px;
+  }
+  .table-content {
+    flex: 1;
+    overflow: hidden;
+    overflow-y: auto;
+  }
+  .pagination-container {
+    margin-top: 20px;
+  }
+</style>

src/views/production-safety/implement-safety-duty/responsibility-notice-manage-admin/components/SelectNotifyArea.vue

@@ -1,6 +1,7 @@
 <template>
   <el-dialog
     :model-value="props.modelValue"
+    :append-to-body="appendToBody"
     @update:model-value="$emit('update:modelValue', $event)"
     title="安全责任通知区域选择"
     width="700"
@@ -101,6 +102,7 @@
   const props = defineProps<{
     type: number;
     modelValue: boolean;
+    appendToBody?: boolean;
   }>();
   const emit = defineEmits(['close', 'submit', 'update:modelValue']);
   const submitLoading = ref(false);

src/views/production-safety/implement-safety-duty/responsibility-notice-manage-admin/list.vue

@@ -114,7 +114,7 @@
                 "
                 >通知对象</el-button
               >
-              <el-button link type="primary">发送</el-button>
+              <el-button link type="primary" @click="handleSend(scope)">发送</el-button>
               <el-button
                 type="primary"
                 link
@@ -148,6 +148,12 @@
       </div>
     </main>
   </div>
+  <NotifySend
+    v-if="notifySendOpen"
+    :type="currentRow.type"
+    v-model.visible="notifySendOpen"
+    @submit="handleNotifySend"
+  />
 </template>
 <script lang="ts" setup>
   import { onMounted, ref, reactive, watch } from 'vue';
@@ -157,7 +163,7 @@
   import {
     safetyNoticeAdminQueryPage,
     safetyNoticeAdminDelete,
-    safetyNoticeAdminScrap,
+    safetyNoticeAdminIssuedNotice,
   } from '@/api/production-safety/responsibility-implementation';
   import { omit } from 'lodash-es';
   import { queryUserGroupPage } from '@/api/system/person-group';
@@ -165,9 +171,12 @@
   import { unformatAttachment } from '@/components/UploadFiles/utils';
   import { downloadFile } from '@/views/disaster/utils';
 
+  import NotifySend from './components/NotifySend.vue';
+
   const router = useRouter();
   const activeTab = ref<any>('');
   const groupList = ref<any[]>([]);
+  const currentRow = ref<any>(null);
   const queryParams = reactive<any>({
     pageNumber: 1,
     pageSize: 10,
@@ -178,6 +187,7 @@
       type: '',
     },
   });
+  const notifySendOpen = ref(false);
 
   const tableData = reactive({
     data: [],
@@ -197,11 +207,28 @@
     },
   );
 
-  const handleScrap = (scope) => {
-    safetyNoticeAdminScrap(scope.row.id).then(() => {
-      ElMessage.success('作废成功');
-      queryTableList();
-    });
+  const handleSend = (scope) => {
+    notifySendOpen.value = true;
+    currentRow.value = scope.row;
+  };
+
+  const handleNotifySend = (formValue, submitLoading) => {
+    submitLoading.value = true;
+    safetyNoticeAdminIssuedNotice({
+      id: currentRow.value.id,
+      safetyAreaId: formValue.safetyAreaData.map((item: any) => item.id).join(','),
+      planStartTime: dayjs(formValue.planStartTime).format('YYYY-MM-DD'),
+      planEndTime: dayjs(formValue.planEndTime).format('YYYY-MM-DD'),
+    })
+      .then(() => {
+        notifySendOpen.value = false;
+        currentRow.value = null;
+        ElMessage.success('发送成功');
+        queryTableList();
+      })
+      .finally(() => {
+        submitLoading.value = false;
+      });
   };
 
   const handleQueryUserGroupPage = () => {

src/views/production-safety/implement-safety-duty/responsibility-notice-manage-admin/notice-view.vue

@@ -21,7 +21,7 @@
     <main class="safety-platform-container__main">
       <div class="search-form">
         <el-form :inline="true">
-          <el-form-item label="状态" v-if="activeTab">
+          <!-- <el-form-item label="状态" v-if="activeTab">
             <el-select v-model="queryParams.queryParam.status" clearable placeholder="状态" style="width: 170px">
               <el-option :value="1" label="未下发" />
               <el-option :value="2" label="待签署" />
@@ -30,7 +30,7 @@
               <el-option :value="5" label="已完成" />
               <el-option :value="6" label="已作废" />
             </el-select>
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item label="区域类型">
             <el-select v-model="queryParams.queryParam.type" clearable placeholder="选择区域类型" style="width: 170px">
               <el-option :value="1" label="公共区域" />