From 96c12066699a50280c8a7fd913aebaeb097c15aa Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Mon, 9 Sep 2024 17:37:45 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E7=94=9F=E4=BA=A7=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E8=AF=A6=E6=83=85=E8=B7=B3=E8=BD=AC=E3=80=81=E7=94=9F?=
 =?UTF-8?q?=E4=BA=A7=E5=B7=A5=E5=8D=95=E8=AF=A6=E6=83=85=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js                           | 29 ++++++-
 src/views/ems/report/energyPreview/index.vue  |  2 +-
 src/views/mes/base/baseDeviceLedger/index.vue | 32 +++----
 src/views/mes/prod/prodOrderDetail/index.vue  |  4 +
 src/views/mes/prod/prodOrderInfo/index.vue    | 19 ++++-
 src/views/mes/prod/prodPlanErpInfo/index.vue  |  6 +-
 src/views/mes/prod/prodPlanInfo/index.vue     | 85 +++++++++++--------
 7 files changed, 119 insertions(+), 58 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index 5cdad45..f28c12d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -241,7 +241,34 @@ export const dynamicRoutes = [
       }
     ]
   },
-
+  {
+    path: '/mes/prodOrder-detail',
+    component: Layout,
+    hidden: true,
+    permissions: ['mes/prod:prodOrderDetail:list'],
+    children: [
+      {
+        path: 'index/:orderCode',
+        component: () => import('@/views/mes/prod/prodOrderDetail/index'),
+        name: 'prodOrderDetail',
+        meta: { title: '订单明细', activeMenu: '/mes/prodOrderDetail' }
+      }
+    ]
+  },
+  {
+    path: '/mes/prodPlan-erpInfo',
+    component: Layout,
+    hidden: true,
+    permissions: ['mes/prod:prodPlanErpInfo:list'],
+    children: [
+      {
+        path: 'index/:planCode',
+        component: () => import('@/views/mes/prod/prodPlanErpInfo/index'),
+        name: 'prodPlanErpInfo',
+        meta: { title: '生产计划', activeMenu: '/mes/prodPlanErpInfo' }
+      }
+    ]
+  },
 ]
 
 // 防止连续点击多次路由报错
diff --git a/src/views/ems/report/energyPreview/index.vue b/src/views/ems/report/energyPreview/index.vue
index 5f6aa0a..6d25b8e 100644
--- a/src/views/ems/report/energyPreview/index.vue
+++ b/src/views/ems/report/energyPreview/index.vue
@@ -75,7 +75,7 @@
             class="centered-image"
             src="@/assets/images/electricityIcon.svg"
           />
-          <div class="centered-text total-consumption-label">
+          <div class="centered-text total-consumption-label" style="margin-bottom: 20px;">
             总耗量
           </div>
           <div class="centered-text total-consumption-value">
diff --git a/src/views/mes/base/baseDeviceLedger/index.vue b/src/views/mes/base/baseDeviceLedger/index.vue
index 40f477f..87470a3 100644
--- a/src/views/mes/base/baseDeviceLedger/index.vue
+++ b/src/views/mes/base/baseDeviceLedger/index.vue
@@ -9,8 +9,8 @@
       <!--          @keyup.enter.native="handleQuery"-->
       <!--        />-->
       <!--      </el-form-item>-->
-      <el-form-item label="所属产线" prop="productLineCode">
-        <el-select v-model="queryParams.productLineCode" placeholder="请选择所属产线" clearable>
+      <el-form-item label="所属工位" prop="productLineCode">
+        <el-select v-model="queryParams.productLineCode" placeholder="请选择所属工位" clearable>
           <el-option
             v-for="item in productLineList"
             :key="item.productLineCode"
@@ -55,10 +55,10 @@
           />
         </el-select>
       </el-form-item>
-      <!--      <el-form-item label="班组编号" prop="teamCode">-->
+      <!--      <el-form-item label="班组名称" prop="teamCode">-->
       <!--        <el-input-->
       <!--          v-model="queryParams.teamCode"-->
-      <!--          placeholder="请输入班组编号"-->
+      <!--          placeholder="请输入班组名称"-->
       <!--          clearable-->
       <!--          @keyup.enter.native="handleQuery"-->
       <!--        />-->
@@ -131,7 +131,7 @@
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="主键标识" align="center" prop="objId" v-if="columns[0].visible"/>
       <el-table-column label="设备编号" align="center" prop="deviceCode" v-if="columns[1].visible"/>
-      <el-table-column label="设备名称" align="center" prop="deviceName" v-if="columns[2].visible"/>
+      <el-table-column label="设备名称" align="center" prop="deviceName" v-if="columns[2].visible" width="180"/>
       <el-table-column label="设备型号" align="center" prop="deviceModel" v-if="columns[3].visible"/>
       <el-table-column label="设备类型" align="center" prop="deviceType" v-if="columns[4].visible">
         <template slot-scope="scope">
@@ -152,14 +152,14 @@
           <span>{{ parseTime(scope.row.enableDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="所属产线" align="center" prop="productLineName" v-if="columns[11].visible"/>
+      <el-table-column label="所属工位" align="center" prop="productLineName" v-if="columns[11].visible"/>
       <el-table-column label="启用标识" align="center" prop="isFlag" v-if="columns[12].visible">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>
         </template>
       </el-table-column>
       <el-table-column label="工厂编号" align="center" prop="factoryCode" v-if="columns[17].visible"/>
-      <el-table-column label="班组编号" align="center" prop="teamCode" v-if="columns[18].visible"/>
+      <el-table-column label="班组名称" align="center" prop="teamCode" v-if="columns[18].visible"/>
       <el-table-column label="资产编号" align="center" prop="assetCode" v-if="columns[19].visible"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
         <template slot-scope="scope">
@@ -244,8 +244,8 @@
           >
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="所属产线" prop="productLineCode">
-          <el-select v-model="form.productLineCode" placeholder="请选择所属产线">
+        <el-form-item label="所属工位" prop="productLineCode">
+          <el-select v-model="form.productLineCode" placeholder="请选择所属工位">
             <el-option
               v-for="item in productLineList"
               :key="item.productLineCode"
@@ -267,8 +267,8 @@
         <!--        <el-form-item label="工厂编号" prop="factoryCode">-->
         <!--          <el-input v-model="form.factoryCode" placeholder="请输入工厂编号"/>-->
         <!--        </el-form-item>-->
-        <el-form-item label="班组编号" prop="teamCode">
-          <el-input v-model="form.teamCode" placeholder="请输入班组编号"/>
+        <el-form-item label="班组名称" prop="teamCode">
+          <el-input v-model="form.teamCode" placeholder="请输入班组名称"/>
         </el-form-item>
 <!--        <el-form-item label="资产编号" prop="assetCode">-->
 <!--          <el-input v-model="form.assetCode" placeholder="请输入资产编号"/>-->
@@ -358,14 +358,14 @@ export default {
         { key: 8, label: `成本中心`, visible: false },
         { key: 9, label: `生产厂商`, visible: true },
         { key: 10, label: `启用日期`, visible: true },
-        { key: 11, label: `所属产线`, visible: true },
-        { key: 12, label: `启用标识`, visible: true },
+        { key: 11, label: `所属工位`, visible: true },
+        { key: 12, label: `启用标识`, visible: false },
         { key: 13, label: `创建人`, visible: false },
         { key: 14, label: `创建时间`, visible: false },
         { key: 15, label: `更新人`, visible: false },
         { key: 16, label: `更新时间`, visible: false },
-        { key: 17, label: `工厂编号`, visible: true },
-        { key: 18, label: `班组编号`, visible: true },
+        { key: 17, label: `工厂编号`, visible: false },
+        { key: 18, label: `班组名称`, visible: false },
         { key: 19, label: `资产编号`, visible: false }
       ],
       // 产线选项
@@ -373,7 +373,7 @@ export default {
     }
   },
   created() {
-    getBaseProductLineList({ productLineType: 1 }).then(response => {
+    getBaseProductLineList({ productLineType: 2 }).then(response => {
       this.productLineList = response.data
     })
     this.getList()
diff --git a/src/views/mes/prod/prodOrderDetail/index.vue b/src/views/mes/prod/prodOrderDetail/index.vue
index 6b19431..546cdca 100644
--- a/src/views/mes/prod/prodOrderDetail/index.vue
+++ b/src/views/mes/prod/prodOrderDetail/index.vue
@@ -751,6 +751,10 @@ export default {
     }
   },
   created() {
+    const orderCode = this.$route.params && this.$route.params.orderCode;
+    if (orderCode != null){
+      this.queryParams.SeqNo = orderCode;
+    }
     this.getList()
   },
   methods: {
diff --git a/src/views/mes/prod/prodOrderInfo/index.vue b/src/views/mes/prod/prodOrderInfo/index.vue
index a8e8398..ce4cab8 100644
--- a/src/views/mes/prod/prodOrderInfo/index.vue
+++ b/src/views/mes/prod/prodOrderInfo/index.vue
@@ -205,12 +205,19 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100" fixed="right">
         <template slot-scope="scope">
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-bottom"-->
+<!--            @click="handleReleasePlan(scope.row)"-->
+<!--          >订单下达-->
+<!--          </el-button>-->
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-bottom"
-            @click="handleReleasePlan(scope.row)"
-          >订单下达
+            icon="el-icon-right"
+            @click="handlePlanDetails(scope.row)"
+          >查看明细
           </el-button>
           <!--          <el-button-->
           <!--            size="mini"-->
@@ -535,6 +542,12 @@ export default {
       this.$tab.closeOpenPage(router.currentRoute);
       this.$tab.openPage("订单[" + orderCode + "]下达", '/mes/release-order/index/' + objId, {});
     },
+    /** 查看明细 */
+    handlePlanDetails(row) {
+      const params = {orderCode: row.orderCode};
+      // this.$tab.closeOpenPage(router.currentRoute);
+      this.$tab.openPage("任务[" + row.orderCode + "]订单明细", '/mes/prodOrder-detail/index/' + row.orderCode, {});
+    },
     // 取消按钮
     cancel() {
       this.open = false
diff --git a/src/views/mes/prod/prodPlanErpInfo/index.vue b/src/views/mes/prod/prodPlanErpInfo/index.vue
index b2f9eec..cec8add 100644
--- a/src/views/mes/prod/prodPlanErpInfo/index.vue
+++ b/src/views/mes/prod/prodPlanErpInfo/index.vue
@@ -117,6 +117,7 @@
       <el-table-column label="硬件" align="center" prop="hardware" v-if="columns[1].visible"/>
       <el-table-column label="软件" align="center" prop="software" v-if="columns[2].visible"/>
       <el-table-column label="阶段文字" align="center" prop="stageText" v-if="columns[3].visible"/>
+      <el-table-column label="任务编号" align="center" prop="taskCode" v-if="columns[25].visible" width="140"/>
       <el-table-column label="计划流水号" align="center" prop="seqNo" v-if="columns[4].visible" width="240"/>
       <el-table-column label="计划开始时间" align="center" prop="planStartTime" width="180" v-if="columns[5].visible">
         <template slot-scope="scope">
@@ -146,7 +147,6 @@
       <el-table-column label="工艺阶段" align="center" prop="processStage" v-if="columns[22].visible"/>
       <el-table-column label="前置工艺" align="center" prop="preProcess" v-if="columns[23].visible"/>
       <el-table-column label="发布订单" align="center" prop="releaseOrder" v-if="columns[24].visible"/>
-      <el-table-column label="任务编号" align="center" prop="taskCode" v-if="columns[25].visible"/>
       <el-table-column label="输送带长度规格" align="center" prop="conveyorLengthSpecification" v-if="columns[26].visible"/>
       <el-table-column label="上胶厚度" align="center" prop="upGlueThickness" v-if="columns[27].visible"/>
       <el-table-column label="上缓冲胶厚度" align="center" prop="upBufferGlueThickness" v-if="columns[28].visible"/>
@@ -640,6 +640,10 @@ export default {
     }
   },
   created() {
+    const planCode = this.$route.params && this.$route.params.planCode;
+    if (planCode != null){
+      this.queryParams.seqNo = planCode;
+    }
     this.getList()
   },
   methods: {
diff --git a/src/views/mes/prod/prodPlanInfo/index.vue b/src/views/mes/prod/prodPlanInfo/index.vue
index 9572517..b7ffbbc 100644
--- a/src/views/mes/prod/prodPlanInfo/index.vue
+++ b/src/views/mes/prod/prodPlanInfo/index.vue
@@ -17,30 +17,30 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="物料编号" prop="materialCode">
-        <el-input
-          v-model="queryParams.materialCode"
-          placeholder="请输入物料编号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="物料名称" prop="materialName">
-        <el-input
-          v-model="queryParams.materialName"
-          placeholder="请输入物料名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="计划工位" prop="stationCode">
-        <el-input
-          v-model="queryParams.stationCode"
-          placeholder="请输入计划工位"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+<!--      <el-form-item label="物料编号" prop="materialCode">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.materialCode"-->
+<!--          placeholder="请输入物料编号"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="物料名称" prop="materialName">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.materialName"-->
+<!--          placeholder="请输入物料名称"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="计划工位" prop="stationCode">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.stationCode"-->
+<!--          placeholder="请输入计划工位"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
 <!--      <el-form-item label="设备编号" prop="deviceCode">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.deviceCode"-->
@@ -49,14 +49,14 @@
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-      <el-form-item label="计划班组" prop="teamCode">
-        <el-input
-          v-model="queryParams.teamCode"
-          placeholder="请输入计划班组"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+<!--      <el-form-item label="计划班组" prop="teamCode">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.teamCode"-->
+<!--          placeholder="请输入计划班组"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
       <el-form-item label="实际开始时间">
         <el-date-picker
           v-model="daterangeBeginTime"
@@ -182,8 +182,15 @@
           <span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
-<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">-->
-<!--        <template slot-scope="scope">-->
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100" fixed="right">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-right"
+            @click="handlePlanDetails(scope.row)"
+          >查看明细
+          </el-button>
 <!--          <el-button-->
 <!--            size="mini"-->
 <!--            type="text"-->
@@ -200,8 +207,8 @@
 <!--            v-hasPermi="['mes/prod:prodPlanInfo:remove']"-->
 <!--          >删除-->
 <!--          </el-button>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
+        </template>
+      </el-table-column>
     </el-table>
 
     <pagination
@@ -453,6 +460,12 @@ export default {
       this.single = selection.length !== 1
       this.multiple = !selection.length
     },
+    /** 查看明细 */
+    handlePlanDetails(row) {
+      // const params = {planCode: row.planCode};
+      // this.$tab.closeOpenPage(router.currentRoute);
+      this.$tab.openPage("计划[" + row.planCode + "]生产计划", '/mes/prodPlan-erpInfo/index/' + row.planCode, {});
+    },
     /** 新增按钮操作 */
     handleAdd() {
       this.reset()