From 65e2f9ed6a5a96796cded1fe07de4be2568ee251 Mon Sep 17 00:00:00 2001
From: juzi <819872918@qq.com>
Date: Tue, 27 Feb 2024 09:12:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/orderGroup/orderGroupDetailData.vue   |  4 ++--
 src/views/order/base/orderManage/index.vue     | 18 +++++++++---------
 .../order/base/orderManage/orderDetailData.vue |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/views/order/base/orderGroup/orderGroupDetailData.vue b/src/views/order/base/orderGroup/orderGroupDetailData.vue
index ae2dae38..33b9b60b 100644
--- a/src/views/order/base/orderGroup/orderGroupDetailData.vue
+++ b/src/views/order/base/orderGroup/orderGroupDetailData.vue
@@ -70,7 +70,7 @@
           </el-col>
           <el-col :span='4'>
             <div class="blodTip">废片数量</div>
-            <div class="lightTip">该字段未绑定</div>
+            <div class="lightTip">{{orderGroupMsg.nokQuantity}}</div>
           </el-col>
         </el-row>
       </div>
@@ -144,7 +144,7 @@
           </el-col>
           <el-col :span='4'>
             <div class="blodTip">废片数量</div>
-            <div class="lightTip">该字段未绑定</div>
+            <div class="lightTip">{{item.nokQuantity}}</div>
           </el-col>
         </el-row>
       </div>
diff --git a/src/views/order/base/orderManage/index.vue b/src/views/order/base/orderManage/index.vue
index 4b46ebd9..b3c722ed 100644
--- a/src/views/order/base/orderManage/index.vue
+++ b/src/views/order/base/orderManage/index.vue
@@ -401,9 +401,9 @@ export default {
     },
     // 完成,终止，作废
     handleEditStatus(val, tip, status) {
-      console.log(val)
+      let _this = this
       if (val.workOrderNum > 0) {//有下级工单
-        this.$confirm('是否将"'+tip+'"操作同步至下级工单?','确认信息', {
+        _this.$confirm('是否将"'+tip+'"操作同步至下级工单?','确认信息', {
           type: 'warning',
           distinguishCancelAndClose: true,
           confirmButtonText: '同步',
@@ -411,26 +411,26 @@ export default {
         }).then(function() {
           console.log('同步')
           orderStatusSet({ id: val.id, status: status, isSync: true}).then(() => {
-            this.getList();
-            this.$modal.msgSuccess("操作成功");
+            _this.getList();
+            _this.$modal.msgSuccess("操作成功");
           })
         }).catch(action => {
           if (action === 'cancel') {
             console.log('不同步')
             orderStatusSet({ id: val.id, status: status, isSync: false}).then(() => {
-              this.getList();
-              this.$modal.msgSuccess("操作成功");
+              _this.getList();
+              _this.$modal.msgSuccess("操作成功");
             })
           }else {
             return console.log('关闭')
           }
         })
       }else{// 无下级工单
-        this.$modal.confirm('是否确认"'+tip+'"厂务订单名称为"' + val.name + '"的数据项?').then(function() {
+        _this.$modal.confirm('是否确认"'+tip+'"厂务订单名称为"' + val.name + '"的数据项?').then(function() {
           return orderStatusSet({ id: val.id, status: status})
         }).then(() => {
-          this.getList();
-          this.$modal.msgSuccess("操作成功");
+          _this.getList();
+          _this.$modal.msgSuccess("操作成功");
         }).catch(() => {});
       }
     },
diff --git a/src/views/order/base/orderManage/orderDetailData.vue b/src/views/order/base/orderManage/orderDetailData.vue
index 93ec49cd..13616609 100644
--- a/src/views/order/base/orderManage/orderDetailData.vue
+++ b/src/views/order/base/orderManage/orderDetailData.vue
@@ -74,7 +74,7 @@
           </el-col>
           <el-col :span='4'>
             <div class="blodTip">废片数量</div>
-            <div class="lightTip">该字段未绑定</div>
+            <div class="lightTip">{{orderMsg.nokQuantity}}</div>
           </el-col>
         </el-row>
       </div>
-- 
2.24.3