mes-server/src/main/resources/application.yaml

@@ -68,7 +68,6 @@ flowable:
 mybatis-plus:
   configuration:
     map-underscore-to-camel-case: true # 虽然默认为 true ，但是还是显示去指定下。
-#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
   global-config:
     db-config:
       id-type: NONE # “智能”模式，基于 IdTypeEnvironmentPostProcessor + 数据源的类型，自动适配成 AUTO、INPUT 模式。

mes-ui/mes-ui-admin-vue3/src/views/heli/taskreport/TaskReportForm.vue

@@ -1,5 +1,5 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible" @close="emits">
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
     <el-form
       ref="formRef"
       :model="formData"
@@ -19,7 +19,7 @@
     </el-form>
     <template #footer>
       <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
-      <el-button @click="emits">取 消</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
     </template>
   </Dialog>
 </template>
@@ -70,11 +70,6 @@ const open = async (type: string, id?: number) => {
     }
   }
 }
-const emits = async () => {
-  dialogVisible.value = false
-  emit('success')
-}
-
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
 /** 提交表单 */

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

@@ -105,6 +105,10 @@
       <el-table-column label="零件名称" align="center" prop="materialName" width="180" />
 <!--      <el-table-column label="规格型号" align="center" prop="spec" width="160" />-->
       <el-table-column label="报工人" align="center" prop="ownerName" />
+      <el-table-column label="报工工序" align="center" prop="procedureName" width="160" />
+      <el-table-column label="报工工时" align="center" prop="workTime" width="160" />
+      <el-table-column label="报工数量" align="center" prop="amount" width="120" />
+
       <el-table-column label="报工进度" align="center" prop="reportProcess" width="160">
         <template #default="scope">
           <el-tag v-if="scope.row.procedureStatus === '1'" type="warning">已报工</el-tag>
@@ -112,9 +116,6 @@
           <el-tag v-else>未报工</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="报工工序" align="center" prop="procedureName" width="160" />
-      <el-table-column label="报工工时" align="center" prop="workTime" width="160" />
-      <el-table-column label="报工数量" align="center" prop="amount" width="120" />
       <!--      <el-table-column-->
 <!--        label="生产起止时间"-->
 <!--        align="center"-->