修改bug

mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/ErrorCodeConstants.java

@@ -164,6 +164,6 @@ public interface ErrorCodeConstants {
     ErrorCode TRACK_NOT_EXISTS = new ErrorCode(1_013_002, "生产进度跟踪不存在");
     ErrorCode MAT_REQ_NOT_EXISTS = new ErrorCode(1_013_003, "领料单不存在");
     ErrorCode MAT_REQ_DETAIL_NOT_EXISTS = new ErrorCode(1_013_004, "领料单明细不存在");
-    ErrorCode TASK_IN_REPORT_NOT_EXISTS = new ErrorCode(1_013_005 , "下料报工不存在");
+    ErrorCode TASK_IN_REPORT_NOT_EXISTS = new ErrorCode(1_013_005 , "该报工信息不存在，请退出刷新界面");
 
 }

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskinreport/TaskInReportServiceImpl.java

@@ -73,10 +73,13 @@ public class TaskInReportServiceImpl implements TaskInReportService {
     @Transactional
     public void deleteTaskInReport(Long id) {
         TaskInReportDO taskInReportDO = taskInReportMapper.selectById(id);
+        if (taskInReportDO == null) {
+            throw exception(TASK_IN_REPORT_NOT_EXISTS);
+        }
         TaskDispatchDetailDO taskDispatchDetailDO = taskDispatchDetailMapper.selectById(taskInReportDO.getDispatchDetailId());
         if (taskDispatchDetailDO != null) {
             if (taskDispatchDetailDO.getInReportProcess() == 2) {
-                throw new RuntimeException("当前报工状态不允许删除");
+                throw new RuntimeException("该报工已完成，不允许删除，请确认");
             } else {
                 taskDispatchDetailDO.setInReportProcess(0);
                 taskDispatchDetailMapper.updateById(taskDispatchDetailDO);

mes-ui/mes-ui-admin-vue3/src/views/heli/taskinreport/TaskInReportForm.vue

@@ -96,7 +96,7 @@
       <el-row>
         <el-col :span="24">
           <el-form-item label="计算公式" prop="calFormal">
-            <el-input type="textarea" :rows="3" v-model="formData.calFormal"
+            <el-input type="textarea" :rows="3" v-model="formData.calFormal" disabled
                       placeholder="请输入计算公式"/>
           </el-form-item>
         </el-col>

mes-ui/mes-ui-admin-vue3/src/views/heli/taskinreport/index.vue

@@ -179,13 +179,14 @@ import {formatAmount} from '@/utils/formatter'
 import download from '@/utils/download'
 import * as TaskInReportApi from '@/api/heli/taskinreport'
 import TaskInReportForm from './TaskInReportForm.vue'
+import reworkForm from './reworkForm.vue'
 import dayjs from "dayjs";
 
 import {Setting} from "@element-plus/icons-vue";
 import ElTooltip from "element-plus/es/components/tooltip";
 import {method} from "lodash-es";
 
-defineOptions({name: 'TaskReport'})
+defineOptions({name: 'TaskInReport'})
 
 const message = useMessage() // 消息弹窗
 const {t} = useI18n() // 国际化
@@ -317,12 +318,29 @@ const handleExport = async () => {
 }
 
 /** 初始化 **/
-onMounted(() => {
+const route = useRoute()
+const routeValue = ref('')
+onMounted(async () => {
+  let params = routeParamsCache.get(route.path);
+  routeValue.value = route.path
+  if (params ) {
+    Object.assign(queryParams, params);
+  }
   setDefaultDate()
   getList()
 })
+onActivated(() => {
+  getList()
+})
+onBeforeUnmount(() => {
+  const plainParams = JSON.parse(JSON.stringify(queryParams));
+  routeParamsCache.set(routeValue.value, plainParams);
+});
 
-
+window.addEventListener('beforeunload', () => {
+  const plainParams = JSON.parse(JSON.stringify(queryParams));
+  routeParamsCache.set(routeValue.value, plainParams);
+});
 </script>
 <style scoped>
 /* 固定搜索栏样式 */

mes-ui/mes-ui-admin-vue3/src/views/heli/taskinreport/reworkForm.vue

@@ -1,7 +1,7 @@
 <template>
   <Dialog :title="dialogTitle" v-model="dialogVisible" width="600px" @close="emits">
     <el-form
-        ref="formRef"
+        ref="reworkRef"
         :model="formData"
         label-width="100px"
         v-loading="formLoading"
@@ -46,7 +46,7 @@ const emits = async () => {
 }
 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
 
-const formRef = ref() // 表单 Ref
+const reworkRef = ref() // 表单 Ref
 
 /** 打开弹窗 */
 const open = async (type: string, id?: number) => {
@@ -55,10 +55,7 @@ const open = async (type: string, id?: number) => {
   formType.value = type
     // 修改时，设置数据
     if (id) {
-        try {
+        formData.value.id=  id
-            formData.value.id = id; // 现在类型匹配，不会报错
-        } finally {
-        }
     }
 }
 defineExpose({open}) // 提供 open 方法，用于打开弹窗