Merge branch 'master' of http://test.siger-data.com:9000/jiawei.su/Laisi_AutoMES2

Html/src/view/fml/operation_manage/feedingBlanking.vue

@@ -335,7 +335,7 @@
                                             class="searchInput"
                                             style="width: 250px"
                                             v-model="code"
-                                            @on-keyup.enter="getWorkOrderInfo()"
+                                            @on-keyup.enter="scanOrder()"
                                         />
                                         <Button
                                             type="primary"
@@ -346,7 +346,7 @@
                                     </div>
                                     <Button
                                         type="primary"
-                                        @click="sameFeed()"
+                                        @click="complexFeed()"
                                         :loading="loading3"
                                         >上料</Button
                                     >
@@ -748,9 +748,32 @@ export default {
                 }
             });
         },
+        scanOrder(){
+            // 上下料扫工单
+            let data ={
+                section:sectionid,
+                code:''
+            }
+            this.request(
+                "",
+                data,
+                ""
+            ).then((res) => {
+                if (res.data.ret == 1) {
+                    this.$Message.success(this.$t(res.data.msg));
+                  
+                } else {
+                    this.$Message.error(this.$t(res.data.msg));
+                    
+                }
+            });
+        },
         sameFeed() {
             // 同工单上料
         },
+        complexFeed(){
+            
+        },
         handleRowChange(currentRow, oldCurrentRow) {
             this.detailobj = currentRow;
             this.orderDetail.fixtureGuid = this.detailobj.fixtureguid;