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

feat: 替换

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

src/views/production-safety/implement-safety-duty/components/IssueSafetyResponsibility.vue

@@ -8,8 +8,9 @@
   >
     <el-form label-width="auto" :model="formData" ref="ruleFormRef" :rules="rules">
       <el-form-item label="下发部门名称" prop="deptId">
+        <!-- :disabled="currentDepartmentKey === 'A'" -->
+
         <el-cascader
-          :disabled="currentDepartmentKey === 'A'"
           ref="cascaderRef"
           style="width: 100%"
           size="large"
@@ -247,7 +248,6 @@
     label: 'deptName',
     multiple: !/A|B/.test(props.currentDepartmentKey),
     disabled: (data, node) => {
-      // node.pathValues 是当前节点的完整路径数组，例如 ['zhinan', 'sheji']
       return originDeptId.value.some((path) => isEqual(path, node.pathValues));
     },
   };
@@ -257,10 +257,11 @@
     ([currentDepartmentKey, departmentOptions]) => {
       if (!currentDepartmentKey) return;
       // 针对院领导的特殊处理
-      if (currentDepartmentKey === 'A' && Array.isArray(departmentOptions) && departmentOptions.length) {
-        const id = departmentOptions.find((d) => d.deptName === '院领导')?.id;
-        formData.deptId = [id];
-      }
+      // if (currentDepartmentKey === 'A' && Array.isArray(departmentOptions) && departmentOptions.length) {
+      //   const id = departmentOptions.find((d) => d.deptName === '院领导')?.id;
+      //   formData.deptId = [id];
+      // }
+      console.log('departmentOptions:', departmentOptions);
       formData.leader1 = null;
       formData.leader2 = null;
       formData.signPerson = [];

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

@@ -116,7 +116,7 @@
               <el-button
                 link
                 type="primary"
-                v-if="scope.row.creatBy === id"
+                v-if="scope.row.creatBy === id && scope.row.status === 2"
                 @click="handleAreaCheckListApprove(scope, 0)"
               >
                 撤回

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

@@ -140,7 +140,7 @@
               <el-button
                 link
                 type="primary"
-                v-if="scope.row.creatBy === id"
+                v-if="scope.row.creatBy === id && scope.row.status === 2"
                 @click="handleAreaCheckListApprove(scope, 0)"
               >
                 撤回

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

@@ -101,7 +101,7 @@
               <el-button
                 link
                 type="primary"
-                v-if="scope.row.creatBy === id"
+                v-if="scope.row.creatBy === id && scope.row.status === 2"
                 @click="handleAreaCheckListApprove(scope, 0)"
               >
                 撤回

src/views/production-safety/implement-safety-duty/public-list-responsibilities/list.vue

@@ -139,7 +139,7 @@
               <el-button
                 link
                 type="primary"
-                v-if="scope.row.creatBy === id"
+                v-if="scope.row.creatBy === id && scope.row.status === 2"
                 @click="handleAreaCheckListApprove(scope, 0)"
               >
                 撤回

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>

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

@@ -397,10 +397,10 @@
       }
 
       const selectedUser = recipientUserList.value.find((user) => user.id === ruleFormData.recipientUserId);
-      if (!selectedUser) {
-        ElMessage.error('请选择有效的领取人');
-        return;
-      }
+      // if (!selectedUser) {
+      //   ElMessage.error('请选择有效的领取人');
+      //   return;
+      // }
 
       const basePayload = {
         stuffName: selectedInventory.stuffName,