From f8d56e8c387cf059a5ceb92d3fe0fa87659cc057 Mon Sep 17 00:00:00 2001
From: rui_li <877258667@qq.com>
Date: Wed, 6 Apr 2022 10:21:12 +0800
Subject: [PATCH] =?UTF-8?q?0404BUG=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       |  2 +-
 .../modules/schedule/order_schedule_expand.vue      | 13 ++++++++++++-
 src/views/modules/yieldReport/com_switch_roll.vue   |  2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/schedule/order_schedule.vue b/src/views/modules/schedule/order_schedule.vue
index 22daa27..028a370 100644
--- a/src/views/modules/schedule/order_schedule.vue
+++ b/src/views/modules/schedule/order_schedule.vue
@@ -388,7 +388,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_expand.vue b/src/views/modules/schedule/order_schedule_expand.vue
index a4bd590..c86ab9c 100644
--- a/src/views/modules/schedule/order_schedule_expand.vue
+++ b/src/views/modules/schedule/order_schedule_expand.vue
@@ -915,7 +915,18 @@ export default {
   created() {
     //查询工单的数据
     this.getShopOrderList();
-  }
+  },
+
+  /*利用监听器处理大小写*/
+  watch:{
+    pageData: {
+      deep: true,
+      handler: function (newV, oldV) {
+        this.pageData.resourceId = this.pageData.resourceId.toUpperCase();
+        this.pageData.workCenterNo = this.pageData.workCenterNo.toUpperCase();
+      }
+    }
+  },
 }
 </script>
 
diff --git a/src/views/modules/yieldReport/com_switch_roll.vue b/src/views/modules/yieldReport/com_switch_roll.vue
index 627a31a..49cbb03 100644
--- a/src/views/modules/yieldReport/com_switch_roll.vue
+++ b/src/views/modules/yieldReport/com_switch_roll.vue
@@ -2,7 +2,7 @@
   <div class="customer-css">
     <el-dialog :title="titleCon" v-drag v-bind="$attrs" v-on="$listeners"
                width="210px" style="height: 680px;" class="customer-dialog">
-      <el-form :inline="true" label-position="top" style="height: 60px;"
+      <el-form :inline="true" label-position="top" @submit.native.prevent style="height: 60px;"
                label-width="80px">
         <!-- 半成品卷卷号 -->
         <el-row>