Merge branch 'feat/production-safety' into 'dev'

feat:(安全责任落实) 修改安全责任落实模快

See merge request product-group-fe/sfy-safety-group/sfy-safety!322

src/components/Nav.vue

@@ -28,7 +28,7 @@
 </template>
 
 <script lang="ts" setup>
-  import { computed } from 'vue';
+  import { computed, ref, onMounted } from 'vue';
   import { useRouter, useRoute } from 'vue-router';
   import UpdatePwd from '@/components/UpdatePwd.vue';
   import UserInfo from '@/components/UserInfo.vue';
@@ -42,6 +42,10 @@
   import logo from 'assets/images/home/comac-logo@1X.png';
   import { ElMessage } from 'element-plus';
   import { storeToRefs } from 'pinia';
+  // import { generatorDynamicRouter } from '@/router/generator-routers';
+  import { useAsyncRouteStore } from '@/store/modules/asyncRoute';
+
+    const asyncRouteStore = useAsyncRouteStore();
   // import searchIcon from 'assets/svg/search.svg';
 
   const userStore = useUserStore();
@@ -60,8 +64,19 @@
 
   const currentRoute = useRoute();
   const { title } = useGlobSetting();
+// const accessedRouters = ref('')
+// const getRouter = async ()=>{
+//   console.log(asyncRouteStore, 'asyncRouteStore')
+//    console.log(asyncRouteStore.$state.menus[1], 'asyncRouteStore1')
+//   //  accessedRouters.value = asyncRouteStore.$state.menus[1].path
+// };
+
+// onMounted(()=>{
+//   getRouter()
+// })
+
 
-  const handleNavClick = (item: { name: string; path: string; meta?: any }) => {
+  const handleNavClick = async (item: { name: string; path: string; meta?: any }) => {
     if (item.meta?.isExternalLink) {
       if (item.path === '403') {
         router.replace(item.path);
@@ -70,6 +85,15 @@
       window.open(item.path, '_blank');
       return;
     }
+
+    // 生产安全路由跳转
+    // if(item.name==="WorkSafety"){
+
+    //  console.log('accessedRouters1111', asyncRouteStore.$state.menus);
+    //  console.log('accessedRouters1111', asyncRouteStore.$state.menus[1].children[0].redirect);
+    //   router.push(asyncRouteStore.$state.menus[1].children[0].redirect)
+    //   return 
+    // }
     router.push(item.path);
   };
 

src/constant/nav.ts

@@ -20,7 +20,7 @@ export const NAV_LIST: Array<RouteRecordString> = [
   },
   {
     name: 'WorkSafety',
-    path: '/work-safety',
+    path: '/work-safety/safetyAssessment/inventory',
     meta: {
       title: '生产安全',
     },

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

@@ -25,10 +25,10 @@
       >
       <div class="search-form">
         <el-form :inline="true">
-          <el-form-item label="安全责任通知">
+          <el-form-item label="责任通知">
             <el-input
               v-model="queryParams.queryParam.responsibilityName"
-              placeholder="搜索安全责任通知名称"
+              placeholder="搜索责任通知名称"
               style="width: 170px"
             />
           </el-form-item>
@@ -67,7 +67,7 @@
 
       <div class="table-content">
         <el-table :data="tableData.data">
-          <el-table-column label="责任书名称" prop="responsibilityName" width="180" />
+          <el-table-column label="责任通知名称" prop="responsibilityName" width="180" />
           <el-table-column label="状态" prop="statusName" width="100" />
           <!-- <el-table-column label="类型" prop="safetyAreaName" width="180" /> -->
           <el-table-column label="下发数" prop="issuedQuantity" width="120" />
@@ -90,7 +90,7 @@
                 <img
                   class="file-container--div__icon"
                   @click="previewOnline(item.fileUrl, item.fileType as keyof typeof FILE_TYPE_ICON)"
-                  :src="FILE_TYPE_ICON[item.fileType]"
+                  :src="FILE_TYPE_ICON[item.fileType]" style="width:28px"
                 />
                 <span
                   class="file-container--div__name"

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

@@ -64,7 +64,7 @@
 
       <div class="table-content">
         <el-table :data="tableData.data">
-          <el-table-column label="责任书名称" prop="responsibilityName" width="180" />
+          <el-table-column label="责任通知名称" prop="responsibilityName" width="180" />
           <el-table-column label="状态" prop="statusName" width="100" />
           <el-table-column label="类别名称" prop="safetyAreaTypeName" />
 

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

@@ -14,7 +14,7 @@
         <div class="detail-ct">
           <div class="row">
             <div class="col">
-              <div class="label">责任书名称：</div>
+              <div class="label">责任通知名称：</div>
               <div class="value">{{ formData.responsibilityName }}</div>
             </div>
             <div class="col">

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

@@ -14,10 +14,10 @@
     <main class="safety-platform-container__main">
       <div class="search-form">
         <el-form :inline="true">
-          <el-form-item label="安全责任书通知名称">
+          <el-form-item label="责任通知">
             <el-input
               v-model="queryParams.queryParam.responsibilityName"
-              placeholder="搜索安全责任书通知名称"
+              placeholder="搜索责任通知名称"
               style="width: 170px"
             />
           </el-form-item>
@@ -64,7 +64,7 @@
 
       <div class="table-content">
         <el-table :data="tableData.data">
-          <el-table-column label="责任书通知名称" prop="responsibilityName" />
+          <el-table-column label="责任通知名称" prop="responsibilityName" />
           <el-table-column label="状态" prop="statusName" width="100" />
           <!-- <el-table-column label="类型" prop="safetyAreaName" width="130" /> -->
           <!-- <el-table-column label="下发数" prop="issuedQuantity" width="120" />
@@ -73,7 +73,7 @@
           <!-- <el-table-column label="安全责任人" prop="responsibilityPersonName" /> -->
           <el-table-column label="计划开始时间" prop="planStartTime" />
           <el-table-column label="计划完成时间" prop="planEndTime" />
-          <el-table-column min-width="300" fixed="right" label="操作">
+          <el-table-column  fixed="right" label="操作">
             <template #default="scope">
               <el-button
                 type="primary"

src/views/production-safety/implement-safety-duty/view-recipients.vue

@@ -74,8 +74,10 @@
                   <el-button type="primary" link>删除</el-button>
                 </template>
               </el-popconfirm>
-              <el-popconfirm v-if="scope.row.status !== 6">
-                <el-button type="primary" link @click="handleScrap(scope)">作废</el-button>
+              <el-popconfirm  title="确定要作废吗?" v-if="scope.row.status !== 6" >
+                <template #reference>
+                  <el-button type="primary" link @click="handleScrap(scope)">作废</el-button>
+                </template>
               </el-popconfirm>
 
               <el-button

src/views/production-safety/safetyAssessment/receiptRecord/components/ReceiptRecordDetail.vue

@@ -396,7 +396,8 @@
         return;
       }
 
-      const selectedUser = recipientUserList.value.find((user) => user.id === ruleFormData.recipientUserId);
+      // const selectedUser = recipientUserList.value.find((user) => user.id === ruleFormData.recipientUserId);
+      // console.log(selectedUser,'selectedUser')
       // if (!selectedUser) {
       //   ElMessage.error('请选择有效的领取人');
       //   return;
@@ -408,10 +409,10 @@
         outStoreTime: ruleFormData.outboundDate ? new Date(ruleFormData.outboundDate).toISOString() : '',
         claimQty: ruleFormData.outboundQuantity,
         orderNumber: ruleFormData.receiptNumber,
-        deptName: ruleFormData.department,
-        deptId: ruleFormData.deptId ?? undefined,
-        userName: selectedUser.realname,
-        userId: selectedUser.id, // 领取人用户ID
+        // deptName: ruleFormData.department,
+        // deptId: ruleFormData.deptId ?? undefined,
+        // userName: selectedUser.realname,
+        // userId: selectedUser.id, // 领取人用户ID
         remark: '',
         // 审批流程ID在与后端交互时字段名为 templateId
         templateId: ruleFormData.approvalTemplateId ?? undefined,