function

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

@@ -334,8 +334,10 @@
                                             type="text"
                                             class="searchInput"
                                             style="width: 250px"
-                                            v-model="code"
-                                            @on-keyup.enter="scanOrder()"
+                                            v-model="code2"
+                                            @on-keyup.enter="
+                                                scanOrder(0, code2)
+                                            "
                                         />
                                         <Button
                                             type="primary"
@@ -472,6 +474,7 @@ export default {
             sectionid: 0,
             tabindex: "1",
             locationobj: {},
+            code2: "",
             loading1: false,
             loading2: false,
             loading3: false,
@@ -748,31 +751,50 @@ export default {
                 }
             });
         },
-        scanOrder(){
+        scanOrder(section, code) {
             // 上下料扫工单
-            let data ={
-                section:sectionid,
-                code:''
-            }
+            let data = {
+                section: section,
+                code: code,
+            };
             this.request(
-                "",
+                "acc/AutomationOperate/CurrentOrder",
                 data,
-                ""
+                "post"
             ).then((res) => {
                 if (res.data.ret == 1) {
                     this.$Message.success(this.$t(res.data.msg));
-                  
+                    this.orderDetail2 = res.data.data;
                 } else {
                     this.$Message.error(this.$t(res.data.msg));
-                    
                 }
             });
         },
         sameFeed() {
             // 同工单上料
+            this.scanOrder(this.sectionid, "");
         },
-        complexFeed(){
-            
+        complexFeed() {
+            // 复合操作上料
+            if (this.sectionid == 0) {
+                this.$Message.error("请选择生产线、工位");
+                return false;
+            }
+            let data = {
+                section: this.sectionid,
+            };
+            this.request(
+                " acc/AutomationOperate/DisassembleAndAssemble",
+                data,
+                "post"
+            ).then((res) => {
+                if (res.data.ret == 1) {
+                    this.$Message.success(this.$t(res.data.msg));
+                    this.orderDetail2 = res.data.data;
+                } else {
+                    this.$Message.error(this.$t(res.data.msg));
+                }
+            });
         },
         handleRowChange(currentRow, oldCurrentRow) {
             this.detailobj = currentRow;