From 1125499e3fc0983f094f227fc46d1d25ea72304d Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Fri, 29 Mar 2024 11:37:49 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/reportWork/index.vue           | 1 +
 src/views/plan/workorderBP/index.vue         | 6 +++---
 src/views/quality/checkTypeProject/index.vue | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue
index 2dd3da8c..028378d3 100644
--- a/src/views/mes/reportWork/index.vue
+++ b/src/views/mes/reportWork/index.vue
@@ -122,6 +122,7 @@
 			<el-table-column label="产品名称" align="center" prop="productName" width="220" :show-overflow-tooltip="true" />
 			<el-table-column label="排产数量" align="center" prop="quantity" width="100" />
 			<el-table-column label="单位" align="center" prop="unit" />
+      <el-table-column label="班次" align="center" prop="shiftName" />
 			<el-table-column label="累计报工数量" align="center" prop="quantityFeedback" width="100" />
 			<!--<el-table-column label="用人数" align="center" prop="useMan" width="100"/>-->
 			<el-table-column label="累计工时" align="center" prop="workTime" />
diff --git a/src/views/plan/workorderBP/index.vue b/src/views/plan/workorderBP/index.vue
index 479b93b4..36b9efc0 100644
--- a/src/views/plan/workorderBP/index.vue
+++ b/src/views/plan/workorderBP/index.vue
@@ -822,7 +822,7 @@ export default {
       }else{
         return cellValue;  //返回值
       }
-		
+
 		},
 
     // 新增-物料搜索
@@ -1322,8 +1322,8 @@ export default {
 
       var statusesArray = this.statuses;
       for (var i = 0; i < statusesArray.length; i++) {
-        if (statusesArray[i] == 'w1') {//已经下达的不允许操作
-          this.$modal.msgError("已经下达的订单不允许操作");
+        if (statusesArray[i] != 'w0') {//已经下达的不允许操作
+          this.$modal.msgError("已经派发的订单不允许操作");
           return
         }
       }
diff --git a/src/views/quality/checkTypeProject/index.vue b/src/views/quality/checkTypeProject/index.vue
index 3c8b1e33..f0ec4192 100644
--- a/src/views/quality/checkTypeProject/index.vue
+++ b/src/views/quality/checkTypeProject/index.vue
@@ -114,7 +114,7 @@
                   <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
               </template>
           </el-table-column>
-          <el-table-column label="检验规则编码" width="100" align="center" prop="projectNo" />
+          <el-table-column label="检验规则编码" width="110" align="center" prop="projectNo" />
           <el-table-column label="检验规则名称" align="left" prop="ruleName" :show-overflow-tooltip="true" width="250"/>
           <el-table-column label="标准值" align="left" prop="standardValue" :show-overflow-tooltip="true" width="250"/>
           <el-table-column label="上差值" align="left" prop="upperDiff" />