From 8b20f302e9d896367ad65acd579b7d418e936729 Mon Sep 17 00:00:00 2001
From: rui_li <877258667@qq.com>
Date: Wed, 6 Apr 2022 09:54:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=88=87=E6=8A=A5=E5=B7=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                        |  2 +-
 .../modules/schedule/com_schedule_order_expand.vue |  2 +-
 src/views/modules/schedule/order_schedule.vue      | 14 ++++++++++++--
 .../modules/schedule/order_schedule_expand.vue     |  7 +++----
 src/views/modules/yieldReport/com_merge_roll.vue   | 10 ++++++++--
 .../yieldReport/com_produce_report_normal.vue      |  7 ++++++-
 6 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index ba56e35..a763052 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -11,7 +11,7 @@
     data() {
       return {
         query: {},
-        version: '1.2'
+        version: '1.2.1'
       }
     },
     created() {
diff --git a/src/views/modules/schedule/com_schedule_order_expand.vue b/src/views/modules/schedule/com_schedule_order_expand.vue
index 69620c5..4b5991c 100644
--- a/src/views/modules/schedule/com_schedule_order_expand.vue
+++ b/src/views/modules/schedule/com_schedule_order_expand.vue
@@ -185,7 +185,7 @@ export default {
           columnProp: "shiftDate",
           headerAlign: "center",
           align: "center",
-          columnLabel: "日期字段",
+          columnLabel: "日期",
           columnWidth: 90,
           columnHidden: false,
           columnImage: false,
diff --git a/src/views/modules/schedule/order_schedule.vue b/src/views/modules/schedule/order_schedule.vue
index d4ec797..22daa27 100644
--- a/src/views/modules/schedule/order_schedule.vue
+++ b/src/views/modules/schedule/order_schedule.vue
@@ -371,7 +371,8 @@ export default {
         planStartTime: '',
         calendarId: '',
         calendarDesc: '',
-        status: 1
+        status: 1,
+        sortField: 'needDate',
       },
       resourceShiftList: [],
       shopOrderList: [],
@@ -2499,7 +2500,16 @@ export default {
     this.getShopOrderList();
     //查询派工的数据
     this.getOrderScheduleList();
-  }
+  },
+
+  watch:{
+    pageData: {
+      deep: true,
+      handler: function (newV, oldV) {
+        this.pageData.resourceId = this.pageData.resourceId.toUpperCase();
+      }
+    }
+  },
 }
 </script>
 
diff --git a/src/views/modules/schedule/order_schedule_expand.vue b/src/views/modules/schedule/order_schedule_expand.vue
index 5132ba4..a4bd590 100644
--- a/src/views/modules/schedule/order_schedule_expand.vue
+++ b/src/views/modules/schedule/order_schedule_expand.vue
@@ -41,7 +41,7 @@
         </el-form-item>
         <el-form-item>
           <span slot="label" style="" @click="getBaseList(88)"><a herf="#">机台编号:</a></span>
-          <el-input v-model="pageData.resourceId" @blur="getCurrentWorkCenterNoByResourceId" style="width: 120px"></el-input>
+          <el-input v-model="pageData.resourceId" style="width: 120px"></el-input>
         </el-form-item>
         <el-form-item>
           <span slot="label" style="" @click="getBaseList(24)"><a herf="#">加工中心:</a></span>
@@ -179,7 +179,8 @@ export default {
         planStartTime: '',
         calendarId: '',
         calendarDesc: '',
-        status: 1
+        status: 1,
+        sortField: 'needDate'
       },
       shopOrderList: [],
       dataListLoading: false,
@@ -784,8 +785,6 @@ export default {
     getBaseData(val){
       if (this.tagNo === 88){
         this.pageData.resourceId = val.ResourceID;
-        //调用方法获取加工中心
-        this.getCurrentWorkCenterNoByResourceId();
       }else if(this.tagNo == 24){
         this.pageData.workCenterNo = val.WorkCenterNo;
       }
diff --git a/src/views/modules/yieldReport/com_merge_roll.vue b/src/views/modules/yieldReport/com_merge_roll.vue
index 9e1172a..bfb4248 100644
--- a/src/views/modules/yieldReport/com_merge_roll.vue
+++ b/src/views/modules/yieldReport/com_merge_roll.vue
@@ -143,8 +143,14 @@ export default {
     /*刷新页面的参数*/
     refreshPageData() {
       getMergeRollPageData(this.pageData).then(({data}) => {
-        this.pageData.rollQty = data.row.resultQty;// 当前卷的数量
-        this.pageData.totalQty = data.row.resultQty;//总良品数量
+        //判断是否出现异常
+        if(data.code == 200){
+          this.pageData.rollQty = data.row.resultQty;// 当前卷的数量
+          this.pageData.totalQty = data.row.resultQty;//总良品数量
+        }else{
+          this.pageData.rollQty = 0;// 当前卷的数量
+          this.pageData.totalQty = 0;//总良品数量
+        }
       });
     },
 
diff --git a/src/views/modules/yieldReport/com_produce_report_normal.vue b/src/views/modules/yieldReport/com_produce_report_normal.vue
index 8797238..3fefd42 100644
--- a/src/views/modules/yieldReport/com_produce_report_normal.vue
+++ b/src/views/modules/yieldReport/com_produce_report_normal.vue
@@ -3265,7 +3265,6 @@ export default {
 
     /*不初始化操作员的方法*/
     notInitOperatorData() {
-      debugger;
       //关闭切换用户的组件
       this.showOperatorFlag = false;
       $(".controller-bun").addClass("disabled-bun");
@@ -3372,6 +3371,12 @@ export default {
     mergeRollModal() {
       //1.首先调用菜单判断方式 看看是否可以结束卷
       //checkProduceButton('mergeRollFlag');
+      //判断是否是暂无卷号
+      let currentRollNo = this.currentRollOps.rollNo;
+      if(currentRollNo === '暂无卷号'){
+        this.$message.error('暂无卷号参与无法合并卷!');
+        return false;
+      }
       //打开合并卷的页面
       this.$nextTick(() => {
         this.showMergeFlag = true;