From 92982901b495d4e66121d8a5ac0a3362a0acd595 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Mon, 18 Sep 2023 14:38:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E5=8F=AF=E7=94=A8=E6=9C=BA?=
 =?UTF-8?q?=E5=8F=B0=E6=9F=A5=E8=AF=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shopOrder/shopOrder/common/routingAddAndEdit.vue  | 11 ++++++++++-
 src/views/modules/shopOrder/shopOrder/shopOrder.vue   |  4 ++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/shopOrder/shopOrder/common/routingAddAndEdit.vue b/src/views/modules/shopOrder/shopOrder/common/routingAddAndEdit.vue
index 810805a..797cbbb 100644
--- a/src/views/modules/shopOrder/shopOrder/common/routingAddAndEdit.vue
+++ b/src/views/modules/shopOrder/shopOrder/common/routingAddAndEdit.vue
@@ -145,7 +145,7 @@
           crewsize: 1,
           efficiency: 80,
           factorUnit: '单位/小时',
-          factorUnit_DB: null,
+          factorUnit_DB: 1,
           itemNo: null,
           machRunFactor: 0,
           machSetupTime: 0.0,
@@ -206,6 +206,15 @@
         deep: true,
         handler: function (newV, oldV) {
           this.getTimeRequired()
+          if(this.selectRow.factorUnit=='单位/小时'){
+            this.selectRow.factorUnit_DB=1
+          }
+          if(this.selectRow.factorUnit=='小时'){
+            this.selectRow.factorUnit_DB=3
+          }
+          if(this.selectRow.factorUnit=='小时/单位'){
+            this.selectRow.factorUnit_DB=2
+          }
         }
       }
     },
diff --git a/src/views/modules/shopOrder/shopOrder/shopOrder.vue b/src/views/modules/shopOrder/shopOrder/shopOrder.vue
index eec3bb3..2ca6262 100644
--- a/src/views/modules/shopOrder/shopOrder/shopOrder.vue
+++ b/src/views/modules/shopOrder/shopOrder/shopOrder.vue
@@ -2163,7 +2163,7 @@ export default {
         return
       }
       this.$nextTick(() => {
-        this.$refs.routing.init(this.modelData)
+        this.$refs.routing.init(JSON.parse(JSON.stringify(this.modelData)))
       })
     },
 
@@ -2175,7 +2175,7 @@ export default {
         return
       }
       this.$nextTick(() => {
-        this.$refs.shopOrderTool.init(this.modelData)
+        this.$refs.shopOrderTool.init(JSON.parse(JSON.stringify(this.modelData)))
       })
     },