feat开发

src/api/production-safety/personal-protective-equipment-receive.ts

@@ -20,7 +20,7 @@ export interface PersonalProtectiveEquipmentReceive {
   receiverCode?: string; // 领用人CODE
   receiverName?: string; // 领用人名称
   remark?: string; // 领用备注
-  status?: boolean; // 用品状态：true-启用，false-禁用
+  status?: number | string; // 用品状态：1-启用，0-禁用
   isDeleted?: string | number;
   createdAt?: string;
   updatedAt?: string;
@@ -29,7 +29,7 @@ export interface PersonalProtectiveEquipmentReceive {
 /** 分页查询请求 - 查询条件 */
 export interface QueryPersonalProtectiveEquipmentReceivePageReq {
   name?: string; // 标题
-  status?: boolean; // 状态：true-启用，false-禁用
+  status?: number | string; // 状态：1-启用，0-禁用
 }
 
 /** 分页查询劳防用品领用列表 */

src/api/production-safety/personal-protective-equipment.ts

@@ -13,7 +13,7 @@ export interface PersonalProtectiveEquipment {
   ppeCategory?: string; // 物品分类
   ppeName?: string; // 物品名称
   serviceMonths?: string; // 使用期限（月）
-  status?: boolean; // 用品状态：true-启用，false-禁用
+  status?: number | string; // 用品状态：1-启用，0-禁用
   remark?: string; // 备注
   isDeleted?: string | number; // 0-未删除，大于0(时间戳)-已删除
   createdAt?: string; // 创建时间
@@ -23,7 +23,7 @@ export interface PersonalProtectiveEquipment {
 /** 分页查询请求体 - 查询条件 */
 export interface QueryPersonalProtectiveEquipmentCommonPageReq {
   name?: string; // 标题
-  status?: boolean; // 状态：true-启用，false-禁用
+  status?: number | string; // 状态：1-启用，0-禁用
   applyDeptCode?: string; // 申请人部门CODE/申请部门编码
   applyDeptName?: string; // 申请人部门名称
 }
@@ -60,9 +60,8 @@ export function updatePersonalProtectiveEquipment(data: PersonalProtectiveEquipm
 /** 查询劳防用品详情（id 必传，RequestParam） */
 export function queryPersonalProtectiveEquipmentDetail(id: number) {
   return http.request<PersonalProtectiveEquipment>({
-    url: '/personalProtectiveEquipment/queryPersonalProtectiveEquipmentDetail',
+    url: `/personalProtectiveEquipment/queryPersonalProtectiveEquipmentDetail?id=${id}`,
     method: 'post',
-    params: { id },
   });
 }
 

src/views/production-safety/risk-identification-and-control/labor-products-manage/add.vue

@@ -34,8 +34,8 @@
         </el-form-item>
         <el-form-item label="用品状态" prop="status">
           <el-radio-group v-model="form.status">
-            <el-radio :label="true">启用</el-radio>
-            <el-radio :label="false">禁用</el-radio>
+            <el-radio :label="1">启用</el-radio>
+            <el-radio :label="0">禁用</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
@@ -72,7 +72,7 @@
     ppeCategory: '',
     ppeName: '',
     serviceMonths: undefined as number | undefined, // 1-9999 整数
-    status: true as boolean, // true-启用，false-禁用，默认启用
+    status: 1 as number, // 1-启用，0-禁用，默认启用
     remark: '',
   });
 

src/views/production-safety/risk-identification-and-control/labor-products-manage/edit.vue

@@ -35,8 +35,8 @@
         </el-form-item>
         <el-form-item label="用品状态" prop="status">
           <el-radio-group v-model="form.status">
-            <el-radio :label="true">启用</el-radio>
-            <el-radio :label="false">禁用</el-radio>
+            <el-radio :label="1">启用</el-radio>
+            <el-radio :label="0">禁用</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
@@ -81,7 +81,7 @@
     ppeCategory: '',
     ppeName: '',
     serviceMonths: undefined as number | undefined, // 1-9999 整数
-    status: true as boolean, // true-启用，false-禁用
+    status: 1 as number, // 1-启用，0-禁用
     remark: '',
   });
 
@@ -103,7 +103,7 @@
         const sm = res.serviceMonths;
         form.serviceMonths =
           sm !== '' && sm != null && !Number.isNaN(Number(sm)) ? Number(sm) : undefined;
-        form.status = res.status === true || res.status === 'true';
+        form.status = res.status === 1 || res.status === '1' ? 1 : 0;
         form.remark = res.remark ?? '';
       }
     } catch (e) {

src/views/production-safety/risk-identification-and-control/labor-products-manage/list.vue

@@ -21,8 +21,8 @@
               clearable
               style="width: 170px"
             >
-              <el-option label="启用" :value="true" />
-              <el-option label="禁用" :value="false" />
+              <el-option label="启用" :value="1" />
+              <el-option label="禁用" :value="0" />
             </el-select>
           </el-form-item>
           <!-- <el-form-item label="申请部门编码">
@@ -59,7 +59,14 @@
           <el-table-column label="使用期限(月)" prop="serviceMonths" width="120" />
           <el-table-column label="用品状态" prop="status" width="100">
             <template #default="{ row }">
-              {{ row.status === true || row.status === 'true' ? '启用' : row.status === false || row.status === 'false' ? '禁用' : '-' }}
+              {{
+                row.status === 1 ||
+                row.status === '1'
+                  ? '启用'
+                  : row.status === 0 || row.status === '0'
+                    ? '禁用'
+                    : '-'
+              }}
             </template>
           </el-table-column>
           <el-table-column label="备注" prop="remark" min-width="150" show-overflow-tooltip />
@@ -117,7 +124,7 @@
     pageSize: 10,
     queryParam: {
       name: '',
-      status: undefined as boolean | undefined,
+      status: undefined as number | undefined,
       applyDeptCode: '',
       applyDeptName: '',
     },

src/views/production-safety/risk-identification-and-control/labor-products-requisition-manage/add.vue

@@ -76,8 +76,8 @@
         </el-form-item>
         <el-form-item label="用品状态" prop="status">
           <el-radio-group v-model="form.status">
-            <el-radio :label="true">启用</el-radio>
-            <el-radio :label="false">禁用</el-radio>
+            <el-radio :label="1">启用</el-radio>
+            <el-radio :label="0">禁用</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="领用备注" prop="remark">
@@ -156,7 +156,7 @@
     receiveNum: undefined as number | undefined,
     receiverCode: '',
     receiverName: '',
-    status: true as boolean,
+    status: 1 as number,
     remark: '',
   });
 

src/views/production-safety/risk-identification-and-control/labor-products-requisition-manage/edit.vue

@@ -77,8 +77,8 @@
         </el-form-item>
         <el-form-item label="用品状态" prop="status">
           <el-radio-group v-model="form.status">
-            <el-radio :label="true">启用</el-radio>
-            <el-radio :label="false">禁用</el-radio>
+            <el-radio :label="1">启用</el-radio>
+            <el-radio :label="0">禁用</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="领用备注" prop="remark">
@@ -180,7 +180,7 @@
     receiveNum: undefined as number | undefined,
     receiverCode: '',
     receiverName: '',
-    status: true as boolean,
+    status: 1 as number,
     remark: '',
   });
 
@@ -208,7 +208,7 @@
           rn !== '' && rn != null && !Number.isNaN(Number(rn)) ? Number(rn) : undefined;
         form.receiverCode = res.receiverCode ?? '';
         form.receiverName = res.receiverName ?? '';
-        form.status = res.status === true || res.status === 'true';
+        form.status = res.status === 1 || res.status === '1' ? 1 : 0;
         form.remark = res.remark ?? '';
       }
     } catch (e) {

src/views/production-safety/risk-identification-and-control/labor-products-requisition-manage/list.vue

@@ -21,8 +21,8 @@
               clearable
               style="width: 170px"
             >
-              <el-option label="启用" :value="true" />
-              <el-option label="禁用" :value="false" />
+              <el-option label="启用" :value="1" />
+              <el-option label="禁用" :value="0" />
             </el-select>
           </el-form-item>
         </el-form>
@@ -49,7 +49,14 @@
           <el-table-column label="领用人" prop="receiverName" width="100" />
           <el-table-column label="用品状态" width="90">
             <template #default="{ row }">
-              {{ row.status === true || row.status === 'true' ? '启用' : row.status === false || row.status === 'false' ? '禁用' : '-' }}
+              {{
+                row.status === 1 ||
+                row.status === '1'
+                  ? '启用'
+                  : row.status === 0 || row.status === '0'
+                    ? '禁用'
+                    : '-'
+              }}
             </template>
           </el-table-column>
           <el-table-column label="领用备注" prop="remark" min-width="120" show-overflow-tooltip />
@@ -109,7 +116,7 @@
     pageSize: 10,
     queryParam: {
       name: '',
-      status: undefined,
+      status: undefined as number | undefined,
     },
   });
 

src/views/production-safety/safetyAssessment/evaluationSystem/components/EvaluationSystemFeedback.vue

@@ -571,7 +571,7 @@
           ElMessage.success('复核同意操作成功');
         } else {
           // isSelfApproveButton 为 false，调用提交接口
-          await updateSecurityExamineIssueReviewSubmit(submitData);
+          await updateSecurityExamineIssueReviewAgree(submitData);
           ElMessage.success('复核提交成功');
         }
       }