From 23e73716efde88f9c8a22f1bdc09943fd7f6c435 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Tue, 15 Jul 2025 09:10:53 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E7=94=9F=E4=BA=A7=E6=8A=95=E5=85=A5?=
 =?UTF-8?q?=E6=89=AB=E6=8F=8F=E4=BF=A1=E6=81=AF=E5=8A=A0=E6=8A=95=E6=96=99?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/planInfo/index.vue          |  2 +-
 src/views/mes/prodInputScanInfo/index.vue | 35 +++++++++++++++--------
 2 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/views/mes/planInfo/index.vue b/src/views/mes/planInfo/index.vue
index 1543906..7704228 100644
--- a/src/views/mes/planInfo/index.vue
+++ b/src/views/mes/planInfo/index.vue
@@ -189,7 +189,7 @@
         <el-table-column label='优先级' align='center' prop='priority' v-if='columns[27].visible' />
         <el-table-column label='班次' align='center' prop='shiftName' v-if='columns[28].visible' />
         <el-table-column label='班组' align='center' prop='teamName' v-if='columns[29].visible' />
-        <el-table-column label='模号' align='center' prop='modelCode' v-if='columns[30].visible'>
+        <el-table-column label='模号' align='center' prop='modelCode' v-if='workshopId == "4" '>
           <template #default='scope'>
             <dict-tag :options='mes_model_code' :value='scope.row.modelCode' />
           </template>
diff --git a/src/views/mes/prodInputScanInfo/index.vue b/src/views/mes/prodInputScanInfo/index.vue
index 3823997..b8257f8 100644
--- a/src/views/mes/prodInputScanInfo/index.vue
+++ b/src/views/mes/prodInputScanInfo/index.vue
@@ -74,21 +74,31 @@
         <el-table-column label="投入条码" align="center" prop="inputBarcode" v-if="columns[4].visible"/>
         <el-table-column label="生产条码" align="center" prop="productionBarcode" v-if="columns[5].visible"/>
         <el-table-column label="生产工具" align="center" prop="toolId" v-if="columns[6].visible"/>
-        <el-table-column label="物料" align="center" prop="materielName" v-if="columns[7].visible"/>
+        <el-table-column label="物料名称" align="center" prop="materialName" v-if="columns[7].visible"/>
         <el-table-column label="投料工位" align="center" prop="stationName" v-if="columns[8].visible"/>
         <el-table-column label="扫描结果" align="center" prop="scanResult" v-if="columns[9].visible"/>
-        <el-table-column label="记录人名称" align="center" prop="userName" v-if="columns[10].visible"/>
-        <el-table-column label="备注" align="center" prop="remark" v-if="columns[11].visible"/>
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-          <template #default="scope">
-            <el-tooltip content="修改" placement="top">
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['mes:prodInputScanInfo:edit']"></el-button>
-            </el-tooltip>
-            <el-tooltip content="删除" placement="top">
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['mes:prodInputScanInfo:remove']"></el-button>
-            </el-tooltip>
+        <el-table-column label="投料时间" align="center" prop="feedingTime" width='180' v-if="columns[17].visible">
+          <template #default='scope'>
+            <span>{{ parseTime(scope.row.feedingTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
           </template>
         </el-table-column>
+        <el-table-column label="记录时间" align="center" prop="createTime" width='180' v-if="columns[14].visible">
+        <template #default='scope'>
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+        </el-table-column>
+        <el-table-column label="记录人名称" align="center" prop="userName" v-if="columns[10].visible"/>
+        <el-table-column label="备注" align="center" prop="remark" v-if="columns[11].visible"/>
+<!--        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+<!--          <template #default="scope">-->
+<!--            <el-tooltip content="修改" placement="top">-->
+<!--              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['mes:prodInputScanInfo:edit']"></el-button>-->
+<!--            </el-tooltip>-->
+<!--            <el-tooltip content="删除" placement="top">-->
+<!--              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['mes:prodInputScanInfo:remove']"></el-button>-->
+<!--            </el-tooltip>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
       </el-table>
 
       <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
@@ -209,9 +219,10 @@ const columns = ref<FieldOption[]>([
         { key: 11, label: `备注`, visible: true },
         { key: 12, label: `创建部门`, visible: false },
         { key: 13, label: `记录人`, visible: false },
-        { key: 14, label: `记录时间`, visible: false },
+        { key: 14, label: `记录时间`, visible: true },
         { key: 15, label: `更新人`, visible: false },
         { key: 16, label: `更新时间`, visible: false },
+        { key: 17, label: `投料时间`, visible: true },
 ]);
 
 const initFormData: ProdInputScanInfoForm = {