From 505429393045b2454b64b2e5477ce67a19b82bd0 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Fri, 25 Oct 2024 11:14:51 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E8=AE=A2=E5=8D=95=E3=80=81?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ems/report/energyPreview/index.vue           |  1 -
 src/views/ems/report/energyStatisticalReport/index.vue |  4 +---
 src/views/mes/prod/planExecuteUser/index.vue           |  4 +++-
 src/views/mes/prod/prodPlanInfo/index.vue              | 10 ++++++++--
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/views/ems/report/energyPreview/index.vue b/src/views/ems/report/energyPreview/index.vue
index 6d25b8e..6912902 100644
--- a/src/views/ems/report/energyPreview/index.vue
+++ b/src/views/ems/report/energyPreview/index.vue
@@ -15,7 +15,6 @@
               <el-select v-model="queryParams.energyType" style="width: 100px" placeholder="请选择能源类型">
                 <el-option
                   v-for="item in energyTypeList"
-
                   :key="item.value"
                   :label="item.label"
                   :value="item.value"
diff --git a/src/views/ems/report/energyStatisticalReport/index.vue b/src/views/ems/report/energyStatisticalReport/index.vue
index 59db612..867deeb 100644
--- a/src/views/ems/report/energyStatisticalReport/index.vue
+++ b/src/views/ems/report/energyStatisticalReport/index.vue
@@ -30,13 +30,11 @@
 
       <el-col :span="19" :xs="24">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
-                 label-width="100px"
-        >
+                 label-width="100px">
           <el-form-item label="能源类型" prop="energyType">
             <el-select v-model="queryParams.energyType" style="width: 100px" placeholder="请选择能源类型">
               <el-option
                 v-for="item in energyTypeList"
-
                 :key="item.value"
                 :label="item.label"
                 :value="item.value"
diff --git a/src/views/mes/prod/planExecuteUser/index.vue b/src/views/mes/prod/planExecuteUser/index.vue
index 27fcee1..a4f4cf0 100644
--- a/src/views/mes/prod/planExecuteUser/index.vue
+++ b/src/views/mes/prod/planExecuteUser/index.vue
@@ -108,6 +108,7 @@
           <span>{{ parseTime(scope.row.planEndDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="生产次数（锅数）" align="center" prop="batchNumber" v-if="columns[14].visible"/>
       <el-table-column label="启用标识" align="center" prop="isFlag" v-if="columns[9].visible">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>
@@ -309,7 +310,8 @@ export default {
         { key: 10, label: `创建人`, visible: false },
         { key: 11, label: `创建时间`, visible: false },
         { key: 12, label: `更新人`, visible: false },
-        { key: 13, label: `更新时间`, visible: false }
+        { key: 13, label: `更新时间`, visible: false },
+        { key: 14, label: `生产次数（锅数）`, visible: true }
       ]
     }
   },
diff --git a/src/views/mes/prod/prodPlanInfo/index.vue b/src/views/mes/prod/prodPlanInfo/index.vue
index ec5428b..926c3a5 100644
--- a/src/views/mes/prod/prodPlanInfo/index.vue
+++ b/src/views/mes/prod/prodPlanInfo/index.vue
@@ -153,6 +153,11 @@
       <el-table-column label="计划工位" align="center" prop="stationName" v-if="columns[5].visible" width="130"/>
       <el-table-column label="设备编号" align="center" prop="deviceCode" v-if="columns[6].visible"/>
       <el-table-column label="计划班组" align="center" prop="teamName" v-if="columns[7].visible"/>
+      <el-table-column label="工单状态" align="center" prop="planStatus" v-if="columns[17].visible">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.plan_status" :value="scope.row.planStatus"/>
+        </template>
+      </el-table-column>
       <el-table-column label="计划数量" align="center" prop="planAmount" v-if="columns[8].visible"/>
       <el-table-column label="完成数量" align="center" prop="completeAmount" v-if="columns[9].visible"/>
       <el-table-column label="实际开始时间" align="center" prop="beginTime" width="180" v-if="columns[10].visible">
@@ -322,7 +327,7 @@ import {
 
 export default {
   name: 'ProdPlanInfo',
-  dicts: ['finish_flag'],
+  dicts: ['finish_flag','plan_status'],
   data() {
     return {
       // 遮罩层
@@ -395,7 +400,8 @@ export default {
         { key: 13, label: `创建人`, visible: false },
         { key: 14, label: `创建时间`, visible: false },
         { key: 15, label: `更新人`, visible: false },
-        { key: 16, label: `更新时间`, visible: false }
+        { key: 16, label: `更新时间`, visible: false },
+        { key: 17, label: `工单状态`, visible: true },
       ]
     }
   },