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

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

@@ -88,12 +88,12 @@
                                     <span class="infoLabel">状态：</span>
                                     <span class="info">{{
                                         orderDetail.status == 1
-                                                    ? "待上料"
-                                                    : orderDetail.status == 2
-                                                    ? "运行中"
-                                                    : orderDetail.status == 3
-                                                    ? "待下料"
-                                                    : ""
+                                            ? "待上料"
+                                            : orderDetail.status == 2
+                                            ? "运行中"
+                                            : orderDetail.status == 3
+                                            ? "待下料"
+                                            : ""
                                     }}</span>
                                 </p>
                                 <p class="flex">
@@ -108,11 +108,17 @@
                                         orderDetail.fixtureGuid
                                     }}</span>
                                 </p>
+
                                 <Button type="primary" @click="modal = true"
                                     >储位选择</Button
                                 >
                             </div>
-
+                            <div class="flex">
+                                <p>产品图片：</p>
+                                <div>
+                                    <img :src="orderDetail.imgurl" alt="" />
+                                </div>
+                            </div>
                             <div>
                                 <Button type="primary" @click="feedReady()"
                                     >准备上料</Button
@@ -373,7 +379,7 @@ export default {
             // if (status == 3) {
             //     this.attr1 = true;
             //     this.tabindex = "2";
-                this.getRunningDetail(index);
+            this.getRunningDetail(index);
             // }
             // else {
             //     this.attr2 = true;