From ee3dea959c01301285b0721caacc29a6b3022882 Mon Sep 17 00:00:00 2001
From: rui_li <877258667@qq.com>
Date: Fri, 17 Jun 2022 10:21:11 +0800
Subject: [PATCH] =?UTF-8?q?2022-06-17=20=E4=B8=8A=E6=9D=90=E6=96=99=20?=
 =?UTF-8?q?=E6=B8=85=E6=8E=89=E6=89=AB=E6=8F=8F=E6=9D=90=E6=96=99=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=20=E6=B4=BE=E5=B7=A5=E5=8D=95=E6=8E=92=E4=BA=A7?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=B7=BB=E5=8A=A0=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/schedule/order_schedule.vue | 18 ++++++++---------
 .../yieldReport/com_produce_material.vue      | 20 ++++++++++++-------
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/src/views/modules/schedule/order_schedule.vue b/src/views/modules/schedule/order_schedule.vue
index 7e6ad1c..358ca40 100644
--- a/src/views/modules/schedule/order_schedule.vue
+++ b/src/views/modules/schedule/order_schedule.vue
@@ -1156,7 +1156,7 @@ export default {
           columnWidth: 80,
           columnHidden: false,
           columnImage: false,
-          columnSortable: false,
+          columnSortable: true,
           sortLv: 0,
           status: true,
           fixed: false
@@ -1174,7 +1174,7 @@ export default {
           columnWidth: 80,
           columnHidden: false,
           columnImage: false,
-          columnSortable: false,
+          columnSortable: true,
           sortLv: 0,
           status: true,
           fixed: false
@@ -1192,7 +1192,7 @@ export default {
           columnWidth: 80,
           columnHidden: false,
           columnImage: false,
-          columnSortable: false,
+          columnSortable: true,
           sortLv: 0,
           status: true,
           fixed: false
@@ -1228,7 +1228,7 @@ export default {
           columnWidth: 120,
           columnHidden: false,
           columnImage: false,
-          columnSortable: false,
+          columnSortable: true,
           sortLv: 0,
           status: true,
           fixed: false
@@ -1282,7 +1282,7 @@ export default {
           columnWidth: 80,
           columnHidden: false,
           columnImage: false,
-          columnSortable: false,
+          columnSortable: true,
           sortLv: 0,
           status: true,
           fixed: false
@@ -1300,7 +1300,7 @@ export default {
           columnWidth: 80,
           columnHidden: false,
           columnImage: false,
-          columnSortable: false,
+          columnSortable: true,
           sortLv: 0,
           status: true,
           fixed: false
@@ -1318,7 +1318,7 @@ export default {
           columnWidth: 80,
           columnHidden: false,
           columnImage: false,
-          columnSortable: false,
+          columnSortable: true,
           sortLv: 0,
           status: true,
           fixed: false
@@ -1372,7 +1372,7 @@ export default {
           columnWidth: 80,
           columnHidden: false,
           columnImage: false,
-          columnSortable: false,
+          columnSortable: true,
           sortLv: 0,
           status: true,
           fixed: false
@@ -1426,7 +1426,7 @@ export default {
           columnWidth: 80,
           columnHidden: false,
           columnImage: false,
-          columnSortable: false,
+          columnSortable: true,
           sortLv: 0,
           status: true,
           fixed: false
diff --git a/src/views/modules/yieldReport/com_produce_material.vue b/src/views/modules/yieldReport/com_produce_material.vue
index 5ab71e3..18f9004 100644
--- a/src/views/modules/yieldReport/com_produce_material.vue
+++ b/src/views/modules/yieldReport/com_produce_material.vue
@@ -8,9 +8,9 @@
             <el-row>
               <el-col :span="16">
                 <el-form-item :label="'材料卷号:'">
-                  <el-input ref="rmRollNo" @keyup.native="recordTime"
+                  <el-input ref="scanRmRollNo" @keyup.native="recordTime"
                             @keyup.enter.native="checkRmRollNo"
-                            v-model="pageData.rmRollNo"
+                            v-model="pageData.scanRmRollNo"
                             style="width: 120px">
                   </el-input>
                 </el-form-item>
@@ -84,6 +84,7 @@ export default {
         orderNo: '',
         itemNo: 0,
         rollNo: '',
+        scanRmRollNo: '',/*扫描的时候用的*/
         rmRollNo: '',
         bomItemNo: '',
         histSeqNo: -1,
@@ -115,13 +116,14 @@ export default {
       this.pageData.itemNo = scheduleData.itemNo;
       this.pageData.seqNo = scheduleData.seqNo;
       this.pageData.rollNo = scheduleData.rollNo;
+      this.pageData.scanRmRollNo = '';
       this.pageData.rmRollNo = '';
       this.pageData.bomItemNo = '';
       this.pageData.histSeqNo = -1;
       this.pageData.operatorId = operatorData.operatorId;
       //自动获取焦点
       this.$nextTick(() => {
-        this.$refs.rmRollNo.focus();
+        this.$refs.scanRmRollNo.focus();
       });
       //清空当前的时间数据
       this.timeArray = [];
@@ -138,7 +140,7 @@ export default {
     /*记录每一次录入字符串的时间*/
     recordTime(){
       //判断是否清掉所有的内容
-      if(this.pageData.rmRollNo.trim().length == 0){
+      if(this.pageData.scanRmRollNo.trim().length == 0){
         this.timeArray = [];
       }else{
         this.timeArray.push(new Date().getTime());
@@ -155,11 +157,11 @@ export default {
         this.$message.error('请扫码输入!');
       }
       //判断null和空字符串
-      if (this.pageData.rmRollNo == null || this.pageData.rmRollNo == '') {
+      if (this.pageData.scanRmRollNo == null || this.pageData.scanRmRollNo == '') {
         this.$message.error('材料卷号不能为空!');
         return false;
       }else{
-        this.pageData.rmRollNo = this.pageData.rmRollNo.trim();
+        this.pageData.rmRollNo = this.pageData.scanRmRollNo.trim();
       }
       //处理扫描材料卷号
       this.refreshSomItemNos();
@@ -190,7 +192,7 @@ export default {
     /*保存材料上机的记录*/
     feedingMaterialRollFun(){
       //判断卷号是否为空
-      if (this.pageData.rmRollNo == null || this.pageData.rmRollNo == ''){
+      if (this.pageData.scanRmRollNo == null || this.pageData.scanRmRollNo == ''){
         this.$message.error('请扫描材料卷号!')
         return false;
       }
@@ -199,6 +201,10 @@ export default {
         this.$message.error('请选择BOM行号!')
         return false;
       }
+      //把扫描卷的属性  赋值给rmRollNo
+      this.pageData.rmRollNo = this.pageData.scanRmRollNo;
+      //清空当前扫描卷属性值  防止重复点击确认
+      this.pageData.scanRmRollNo = '';
       //调用方法执行上材料
       feedingMaterialRoll(this.pageData).then(({data}) => {
         if(data.code == 500){