From 6e7702f637f76a021b084d62a9fe571988ded742 Mon Sep 17 00:00:00 2001
From: zelian_wu <zelian.wu@xujiesoft.com>
Date: Thu, 25 Apr 2024 09:20:17 +0800
Subject: [PATCH] =?UTF-8?q?24-04-23=20=E5=87=BA=E5=BA=93=E6=89=AB=E6=8F=8F?=
 =?UTF-8?q?=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/production/reworkRecord.vue | 2 +-
 src/views/modules/production/scanForm.vue     | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/production/reworkRecord.vue b/src/views/modules/production/reworkRecord.vue
index 179b10b..1dc7331 100644
--- a/src/views/modules/production/reworkRecord.vue
+++ b/src/views/modules/production/reworkRecord.vue
@@ -517,7 +517,7 @@ export default {
     </el-row>
   </el-form>
   <div style="margin: 8px 0">
-    <el-button size="small" icon="el-icon-edit" type="primary" @click="startReworkRecordDialog = true"> 开 始 返 修</el-button>
+    <el-button size="small" icon="el-icon-edit" style="height: 24px" type="primary" @click="startReworkRecordDialog = true"> 开 始 返 修</el-button>
     <el-button size="small" type="primary" @click="seqNoReworkRecordDialog = true">返修报工</el-button>
   </div>
   <el-table
diff --git a/src/views/modules/production/scanForm.vue b/src/views/modules/production/scanForm.vue
index 9eaa517..200180b 100644
--- a/src/views/modules/production/scanForm.vue
+++ b/src/views/modules/production/scanForm.vue
@@ -186,7 +186,10 @@ export default {
         flag: '',
       }
       if (this.isReport === false && this.total < this.notifyQty){
-        this.$message.warning("出货书数量未达到通知单需求数量")
+        this.$message.warning("扫描数量未达到通知单数量")
+        // this.$alert("扫描数量未达到通知单数量", '提示', {
+        //   confirmButtonText: '确定',
+        // });
       }
       this.scanLabelDetailList = [];
     },