fix bug

src/api/mes/machine/index.ts

@@ -16,6 +16,13 @@ export interface MachineComponentVO {
   status: number // 状态
   componentType: number // 组织类型
   machineType: string // 机台类型
+  maintainTime: number // 建议维保时间
+  maintainType: string // 建议维保类型(按使用时间，距离上次维保时间)
+  maintainTimeUnit: string // 建议维保时间单位
+  trueMaintainTime: number // 实际维保时间
+  trueMaintainTimeUnit: string // 实际维保时间单位
+  trueMaintainTimeType: string // 实际维保类型
+  lastMaitainTime: Date // 上次维保时间
 }
 
 // 机台 API

src/views/erp/sale/out/components/SaleOutReceiptEnableList.vue

@@ -155,7 +155,7 @@ const open = async (customerId: number) => {
   queryParams.customerId = customerId
   await resetQuery()
   // 加载产品列表
-  productList.value = await ProductApi.getProductSimpleList()
+  productList.value = await ProductApi.getMesProductSimpleList()
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 

src/views/erp/stock/record/index.vue

@@ -113,7 +113,7 @@
     </el-tabs>
 
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="产品名称" align="center" prop="productName" />
+      <el-table-column label="产品名称" align="center" prop="productName" width="180px"/>
       <el-table-column label="产品分类" align="center" prop="categoryName" />
       <el-table-column label="产品单位" align="center" prop="unitName" />
       <el-table-column label="仓库编号" align="center" prop="warehouseName" />
@@ -135,13 +135,13 @@
         prop="totalCount"
         :formatter="erpCountTableColumnFormatter"
       />
-<!--      <el-table-column-->
-<!--        label="出入库日期"-->
-<!--        align="center"-->
-<!--        prop="createTime"-->
-<!--        :formatter="dateFormatter"-->
-<!--        width="180px"-->
-<!--      />-->
+      <el-table-column
+        label="出入库日期"
+        align="center"
+        prop="recordTime"
+        :formatter="dateFormatter2"
+        width="180px"
+      />
       <el-table-column
         label="创建日期"
         align="center"
@@ -163,7 +163,7 @@
 
 <script setup lang="ts">
 import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
-import { dateFormatter } from '@/utils/formatTime'
+import {dateFormatter, dateFormatter2} from '@/utils/formatTime'
 import download from '@/utils/download'
 import { StockRecordApi, StockRecordVO } from '@/api/erp/stock/record'
 import { ProductApi, ProductVO } from '@/api/erp/product/product'

src/views/mes/energydevice/index.vue

@@ -217,7 +217,7 @@ const openForm = (type: string, id?: number) => {
 /** 添加/修改操作 */
 const resetFormRef = ref()
 const resetForm = (type: string, id?: number) => {
-  formRef.value.open(type, id)
+  resetFormRef.value.open(type, id)
 }
 /** 删除按钮操作 */
 const handleDelete = async (id: number) => {

src/views/mes/plan/index.vue

@@ -151,7 +151,12 @@
       </el-table-column>
       <el-table-column label="计划编码" align="center" prop="code" min-width="150px" />
       <el-table-column label="产品" align="center" prop="productName"  min-width="200px" sortable/>
-      <el-table-column label="任务单" align="center" prop="taskCode" min-width="150px" />
+<!--      <el-table-column label="任务单" align="center" prop="taskCode" min-width="150px" />-->
+      <el-table-column label="班别" align="center" prop="groupType" sortable>
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.MES_GROUP_TYPE" :value="scope.row.groupType" />
+        </template>
+      </el-table-column>
       <el-table-column label="成型数量" align="center" prop="planNumber" />
       <el-table-column label="热压数量" align="center" prop="reyaNumber" />
       <el-table-column label="状态" align="center" prop="status" sortable>