From 23b544f0dbdd07c8b91aec8b938f37112f45e2da Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Fri, 19 Jul 2024 16:35:07 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Navbar.vue   | 4 ++--
 src/views/mes/reportWork/index.vue | 2 ++
 src/views/plan/order/index.vue     | 9 +++++++--
 src/views/wms/equipment/index.vue  | 8 ++++++++
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index a438160..ef12da5 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -313,14 +313,14 @@ export default {
     setInterval(() => this.getAlarmData(), 1000 * 60);
     this.poolNameList = JSON.parse(localStorage.getItem("POOL_NAME_LIST"));
     this.poolName = localStorage.getItem("USER_POOL_NAME_CURRENT");
-    /**
+    
     //先执行一次
     this.getUnReadList();
     // 实现轮询
     this.timer = setInterval(() => {
       setTimeout(this.getUnReadList(), 30000);
     }, 30000);
-    **/
+    
   },
   components: {
     Breadcrumb,
diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue
index 35db624..4cca208 100644
--- a/src/views/mes/reportWork/index.vue
+++ b/src/views/mes/reportWork/index.vue
@@ -448,6 +448,8 @@
 						</el-table-column>
 						<el-table-column label="单位" width="50" align="center" prop="unit" />
 						<el-table-column label="反冲标识" align="center" prop="recoil" />
+            <el-table-column label="单位数量" align="center" prop="erfmg" />
+            <el-table-column label="条目单位" align="center" prop="erfme" />
             <el-table-column label="sap项目编码" align="center" prop="rspos" />
 						<el-table-column label="仓库" width="150" align="center" prop="warehouseCode">
 							<template slot-scope="scope">
diff --git a/src/views/plan/order/index.vue b/src/views/plan/order/index.vue
index 00c1a80..3bc9171 100644
--- a/src/views/plan/order/index.vue
+++ b/src/views/plan/order/index.vue
@@ -520,7 +520,7 @@
                   </el-date-picker>
               </el-form-item>
             </el-col>
-            
+
             <!-- 选择班次 -->
             <el-col :span="12">
               <el-form-item size="small" label="选择班次" class="my-select my-first">
@@ -1531,6 +1531,11 @@ export default {
     //排产优先级
 		handleAutoSplit(row) {
       this.autoSplitList = this.orderCodes;
+      if(this.orderCodes[0].prodDesc.includes("出口")){
+        this.$modal.msgError("物料描述有包含‘出口’信息,请手工折单！");
+          return
+      }
+
       if(this.autoSplitList[0].status != 'o0'){
           this.$modal.msgError("请选择完全未拆分的订单！");
           return
@@ -1650,7 +1655,7 @@ export default {
           this.activeSplit = 0;
         });
       },
-      handleClose() { 
+      handleClose() {
         this.cancel();
       },
        shiftFormat(row,column){
diff --git a/src/views/wms/equipment/index.vue b/src/views/wms/equipment/index.vue
index 1aa81de..27e31bb 100644
--- a/src/views/wms/equipment/index.vue
+++ b/src/views/wms/equipment/index.vue
@@ -655,6 +655,14 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="8">
+              <el-form-item label="电表编号" prop="attr2">
+                <el-input
+                  v-model="form.attr2"
+                  placeholder="请输入电表编号"
+                />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="10" class="mb8">
             <el-col :span="24">