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

src/views/saleOrder/components/order-search.vue

@@ -245,10 +245,14 @@
 				 return this.$message.warning('产品编码不一致！')
 			 }
 		 }
+		 const list = []
+		 this.selection.map((item) => {
+		   list.push(item.id);
+		 });
 		 this.$router.push({
 		    path: '/saleOrder/salesToProduction',
 			query:{
-				selection:JSON.stringify(this.selection)
+				selection:JSON.stringify(list)
 			}
 		 });
 	  },

src/views/saleOrder/index.vue

@@ -284,10 +284,10 @@
 	  },
 	  remove(row){
 		 deleteOrder([row.id]).then(res=>{
-		 	this.$message.success(res)
-		 	this.reload()
-		 }) 
-	  }
+				this.$message.success(res)
+				this.reload()
+			 }) 
+		}
     }
   };
 </script>

src/views/saleOrder/salesToProduction.vue

@@ -316,7 +316,8 @@
       return {
         form: {
           produceVersionId: '',
-          salesOrders: []
+          salesOrders: [],
+		  produceVersionName:''
         },
         // 表单验证规则
         rules: {
@@ -324,7 +325,7 @@
             { required: true, message: '请选择生产版本', trigger: 'change' }
           ]
         },
-        selection: [],
+        // selection: [],
         loading: false
       };
     },
@@ -341,11 +342,7 @@
       if (this.$route.query.type == 'edit') {
         this.getPlanInfo(this.$route.query.id);
       } else {
-        this.selection = JSON.parse(this.$route.query.selection);
-        const list = [];
-        this.selection.map((item) => {
-          list.push(item.id);
-        });
+        const list = JSON.parse(this.$route.query.selection);
         this.getSaleInfo(list);
       }
     },