From 9c44d9b3b2144f7d80957e1747a95296c2cb5fbe Mon Sep 17 00:00:00 2001
From: Rui_Li <877258667@qq.com>
Date: Thu, 10 Mar 2022 16:00:33 +0800
Subject: [PATCH] =?UTF-8?q?BUG=20=E4=BF=AE=E6=94=B9=20=E6=B4=BE=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/schedule/order_schedule.vue      | 6 ++++--
 src/views/modules/yieldReport/com_replace_tool.vue | 4 ++--
 src/views/modules/yieldReport/produce_order.vue    | 4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/views/modules/schedule/order_schedule.vue b/src/views/modules/schedule/order_schedule.vue
index 0bd00e4..ea7f8dc 100644
--- a/src/views/modules/schedule/order_schedule.vue
+++ b/src/views/modules/schedule/order_schedule.vue
@@ -95,7 +95,7 @@
           <el-input v-model="pageData.resourceId" style="width: 120px"></el-input>
         </el-form-item>
         <el-form-item :label="'加工中心编码:'">
-          <el-input v-model="pageData.workCenterNo" style="width: 120px"></el-input>
+          <el-input v-model="pageData.workCenterNo" readonly="readonly" style="width: 120px"></el-input>
         </el-form-item>
       </el-form>
       <!--  记录示意图  -->
@@ -1947,7 +1947,9 @@ export default {
 
     /*分批排产*/
     initAddSplitSchedule(scheduledQty){
-      //发送请求
+      //设置工单和工序
+      this.pageData.orderNo = this.currentRoutingRow.orderNo;
+      this.pageData.itemNo = this.currentRoutingRow.itemNo;
       //判断排产的加工中心和机台是否为空
       if(this.pageData.workCenterNo == null || '' == this.pageData.workCenterNo){
         this.$message.error('加工中心不能为空!')
diff --git a/src/views/modules/yieldReport/com_replace_tool.vue b/src/views/modules/yieldReport/com_replace_tool.vue
index c6f06ee..8baa2e3 100644
--- a/src/views/modules/yieldReport/com_replace_tool.vue
+++ b/src/views/modules/yieldReport/com_replace_tool.vue
@@ -229,7 +229,7 @@ export default {
     /*数量失去焦点的事件*/
     changeToolQty(){
       let consumeQty = parseFloat(this.pageData.consumeQty);
-      if(consumeQty <= 0){
+      if(consumeQty < 0){
         this.$message.error('本卷生产数量不能小于0!');
         return false;
       }
@@ -292,7 +292,7 @@ export default {
       }
       /*耗用的参数*/
       let consumeQty = parseFloat(this.pageData.consumeQty);
-      if(consumeQty <= 0){
+      if(consumeQty < 0){
         this.$message.error('本卷生产数量不能小于0!');
         return false;
       }
diff --git a/src/views/modules/yieldReport/produce_order.vue b/src/views/modules/yieldReport/produce_order.vue
index 82288d9..b367f28 100644
--- a/src/views/modules/yieldReport/produce_order.vue
+++ b/src/views/modules/yieldReport/produce_order.vue
@@ -64,10 +64,10 @@
         </el-date-picker>
       </el-form-item>
       <el-form-item :label="'生产订单号:'">
-        <el-input v-model="searchData.orderNo" style="width: 120px"></el-input>
+        <el-input v-model="searchData.orderNo" style="width: 120px" @keyup.enter.native="refreshPageTables" @blur="refreshPageTables"></el-input>
       </el-form-item>
       <el-form-item :label="'派工单号:'">
-        <el-input v-model="searchData.seqNo" style="width: 120px"></el-input>
+        <el-input v-model="searchData.seqNo" style="width: 120px"  @keyup.enter.native="refreshPageTables" @blur="refreshPageTables"></el-input>
       </el-form-item>
       <el-form-item :label="''" style="margin-left: -5px;">
         <el-checkbox style="margin-top: 20px;" true-label="Y" false-label="N" v-model="searchData.closedFlag">显示已结束派工单