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))) }) },