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

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

@@ -602,8 +602,8 @@ export default {
         handleRowChange1(currentRow, oldCurrentRow) {
             // console.log(currentRow);
             this.locationobj = currentRow;
-            this.orderDetail.fixtureGuid = this.detailobj.fixtureguid;
-            this.orderDetail.location = this.detailobj.locationid;
+            this.orderDetail2.fixtureGuid = this.locationobj.fixtureguid;
+            this.orderDetail2.location = this.locationobj.locationid;
             if (this.locationobj.id) {
                 // this.getRunningDetail();
                 this.request(