Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-aps into dengfei

src/views/saleOrder/salesToProductionNewTwo.vue

@@ -622,8 +622,10 @@ export default {
 
                     if (res.length) {
                         this.$nextTick(() => {
-                            
-                            this.$set(this.form, 'produceRoutingId', res[0].id)
+                            let arr=this.routingList.filter(item=>{ return item.id==this.$route.query.produceRoutingId})
+                            if(arr.length>0){
+                               this.$set(this.form, 'produceRoutingId', this.$route.query.produceRoutingId)
+                            }
                         })
 
                         console.log(this.form.produceRoutingId, '222222222');