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

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

@@ -116,7 +116,13 @@
                             <div class="flex">
                                 <p class="infoLabel">产品图片：</p>
                                 <div>
-                                    <img :src="axios.publicPath+orderDetail.url" alt="" style="width:100%" />
+                                    <img
+                                        :src="
+                                            axios.publicPath + orderDetail.url
+                                        "
+                                        alt=""
+                                        style="width: 100%"
+                                    />
                                 </div>
                             </div>
                             <div>
@@ -137,6 +143,8 @@
                                         :columns="columns2"
                                         :max-height="200"
                                         style="width: 500px"
+                                        highlight-row
+                                        @on-current-change="handleRowChange1"
                                     ></Table>
                                 </div>
                                 <div>
@@ -326,6 +334,7 @@ export default {
             detailobj: {},
             sectionid: 0,
             tabindex: "1",
+            locationobj:{}
         };
     },
     created() {
@@ -500,8 +509,13 @@ export default {
                 this.$Message.error("请选择工位");
                 return false;
             }
+            if (!this.locationobj.id) {
+               this.$Message.error("请选择储位");
+                return false; 
+            }
             let data = {
                 section: this.sectionid,
+                id:this.locationobj.id,
             };
             this.request("/acc/AutomationOperate/Unloading", data, "post").thne(
                 (res) => {
@@ -539,6 +553,12 @@ export default {
             this.orderDetail.fixtureGuid = this.detailobj.fixtureguid;
             this.orderDetail.location = this.detailobj.locationid;
         },
+        handleRowChange1(currentRow, oldCurrentRow) {
+            console.log(currentRow);
+            this.locationobj = currentRow;
+            this.orderDetail.fixtureGuid = this.detailobj.fixtureguid;
+            this.orderDetail.location = this.detailobj.locationid;
+        },
         request(url, data, type) {
             if (type == "get") {
                 return this.axios