From 5e43eb2940445c44ce59f06ffe3ab390848de3c4 Mon Sep 17 00:00:00 2001
From: jinna <jinna123>
Date: Mon, 9 Feb 2026 11:03:24 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/batchesDialog.vue                 | 16 +++++++++++-----
 .../components/productionMonitoringDialog.vue    | 15 +++++++++++----
 .../productionMonitoring.vue                     |  4 ++--
 .../sinTerWorkOrder/index.vue                    |  4 ++--
 4 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/src/views/productionManagement/components/batchesDialog.vue b/src/views/productionManagement/components/batchesDialog.vue
index ec76805..78e4f11 100644
--- a/src/views/productionManagement/components/batchesDialog.vue
+++ b/src/views/productionManagement/components/batchesDialog.vue
@@ -48,7 +48,7 @@
     <template #footer>
       <span class="dialog-footer">
         <el-button @click="closeDialog">取 消</el-button>
-        <el-button type="primary" @click="submit()">确 认</el-button>
+        <el-button type="primary" @click="submit()" :loading="saveLoading">确 认</el-button>
       </span>
     </template>
   </el-dialog>
@@ -69,6 +69,7 @@ export default {
   },
   data() {
     return {
+      saveLoading: false,
       isOpen: false,
       batchesForm: {},
       batchesRules: {
@@ -87,6 +88,7 @@ export default {
     submit() {
       this.$refs.batchesForm.validate(valid => {
         if (valid) {
+          this.saveLoading = true;
           let query = {
             id: this.itemData[0].woId,
             batchNo: this.itemData[0].batchNo,
@@ -95,13 +97,17 @@ export default {
             makeQty: this.batchesForm.makeQty,
             batchReason: this.batchesForm.batchReason,
           };
-          inBatches(query).then((res) => {
-            if (res.code == 200) {
+          inBatches(query)
+            .then(res => {
               this.$message.success('操作成功');
+              this.saveLoading = false;
               this.closeDialog();
-            }
-          });
+            })
+            .catch(err => {
+              this.saveLoading = false;
+            });
         } else {
+          this.saveLoading = false;
           console.log('error submit!!');
           return false;
         }
diff --git a/src/views/productionManagement/components/productionMonitoringDialog.vue b/src/views/productionManagement/components/productionMonitoringDialog.vue
index 839fe22..b1f4911 100644
--- a/src/views/productionManagement/components/productionMonitoringDialog.vue
+++ b/src/views/productionManagement/components/productionMonitoringDialog.vue
@@ -11,7 +11,7 @@
     <template #footer>
       <span class="dialog-footer">
         <el-button @click="closeDialog">取 消</el-button>
-        <el-button type="primary" @click="submit">确 定</el-button>
+        <el-button type="primary" @click="submit" :loading="loadingSave">确 定</el-button>
       </span>
     </template>
   </el-dialog>
@@ -31,6 +31,7 @@ export default {
   },
   data() {
     return {
+      loadingSave:false,
       openShow: false,
       form: {
         priority: '',
@@ -74,16 +75,22 @@ export default {
       //如果存在验证不通过，msg为错误信息
       this.$refs.form.validate((valid, done, msg) => {
         if (valid) {
+          this.loadingSave = true
           // this.$emit('submitPriority', this.form);
           updatePrioritye({
             demandDate: this.form.demandDate,
-            priority: this.form.priority,
-            id: this.itemData[0].woId,
+            priority:Number(this.form.priority),
+            woId: this.itemData[0].woId,
           }).then(res => {
+             this.loadingSave = false
             this.$message.success('操作成功');
             this.closeDialog();
-          });
+          }).catch(err=>{
+            this.loadingSave = false
+            done()
+          })
         } else {
+          this.loadingSave = false
           console.log('error submit!!');
           return false;
         }
diff --git a/src/views/productionManagement/productionMonitoring.vue b/src/views/productionManagement/productionMonitoring.vue
index 334a13d..142a056 100644
--- a/src/views/productionManagement/productionMonitoring.vue
+++ b/src/views/productionManagement/productionMonitoring.vue
@@ -703,9 +703,9 @@ export default {
       this.showClose = false;
       this.showAbnormal = false;
       this.isPriorityOpen = false;
-      if (type) {
+      // if (type) {
         this.onLoad(this.page, this.query);
-      }
+      // }
     },
     currentChange(currentPage) {
       this.page.currentPage = currentPage;
diff --git a/src/views/productionManagement/sinTerWorkOrder/index.vue b/src/views/productionManagement/sinTerWorkOrder/index.vue
index b824a5c..b6a4e31 100644
--- a/src/views/productionManagement/sinTerWorkOrder/index.vue
+++ b/src/views/productionManagement/sinTerWorkOrder/index.vue
@@ -582,9 +582,9 @@ export default {
       this.showClose = false;
       this.showAbnormal = false;
       this.isPriorityOpen = false;
-      if (type) {
+      // if (type) {
         this.onLoad(this.page, this.query);
-      }
+      // }
     },
     currentChange(currentPage) {
       this.page.currentPage = currentPage;

From ccdacaba9872ece3a168438992ed387742f18e9d Mon Sep 17 00:00:00 2001
From: jinna <jinna123>
Date: Mon, 9 Feb 2026 11:20:38 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionManagement/blbWorkOrder/components/glass.vue      | 2 +-
 .../productionManagement/blbWorkOrder/components/others.vue     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/productionManagement/blbWorkOrder/components/glass.vue b/src/views/productionManagement/blbWorkOrder/components/glass.vue
index d63da4d..83e5211 100644
--- a/src/views/productionManagement/blbWorkOrder/components/glass.vue
+++ b/src/views/productionManagement/blbWorkOrder/components/glass.vue
@@ -18,7 +18,7 @@
       @on-load="onLoad"
     >
       <template #menu-left>
-        <el-button type="primary" @click="handlePrintTags">过程记录打印</el-button>
+        <!-- <el-button type="primary" @click="handlePrintTags">过程记录打印</el-button> -->
         <!-- <el-button type="primary" @click="priorityFn">优先级调整</el-button> -->
       </template>
       <template #menu-right>
diff --git a/src/views/productionManagement/blbWorkOrder/components/others.vue b/src/views/productionManagement/blbWorkOrder/components/others.vue
index 2ac2893..b0626fe 100644
--- a/src/views/productionManagement/blbWorkOrder/components/others.vue
+++ b/src/views/productionManagement/blbWorkOrder/components/others.vue
@@ -18,7 +18,7 @@
       @on-load="onLoad"
     >
       <template #menu-left>
-        <el-button type="primary" @click="handlePrintTags">过程记录打印</el-button>
+        <!-- <el-button type="primary" @click="handlePrintTags">过程记录打印</el-button> -->
         <!-- <el-button type="primary" @click="priorityFn">优先级调整</el-button> -->
       </template>
       <template #menu-right>