Forráskód Böngészése

海柔站波次取出和条码恢复

LD 5 éve
szülő
commit
7e5cd76208
1 módosított fájl, 20 hozzáadás és 12 törlés
  1. 20 12
      resources/views/station/monitor/show.blade.php

+ 20 - 12
resources/views/station/monitor/show.blade.php

@@ -30,23 +30,36 @@
                                     <div class="col">选择执行波次:</div>
                                 </div>
                                 <div class="row" v-if="current_stationTaskBatch">
-                                    <div class="col font-weight-bold text-center text-info position-relative"
+                                    <div class="col font-weight-bold text-center position-relative"
                                          :style="[
                                                     {opacity:
                                                         current_stationTaskBatch.status==='完成'?'0.5':'1'
                                                     },
-                                                ]"runningStatus
+                                                ]"
                                          :class="[
-
+                                            current_stationTaskBatch.runningStatus===''?'text-info':'',
+                                            current_stationTaskBatch.runningStatus==='请求中'?'text-dark':'',
+                                            current_stationTaskBatch.runningStatus==='请求失败'?'text-danger':'',
+                                            current_stationTaskBatch.runningStatus==='请求成功'?'text-success':'',
+                                            current_stationTaskBatch.runningStatus==='请求异常'?'text-danger':'',
                                          ]"
                                     >
                                         <div class="text-center">@{{ current_stationTaskBatch.batch.code }}</div>
-                                            <div class="text-center" style="font-size: 12px;">
-                                                @{{ current_stationTaskBatch.batch.owner.name }}
-                                            </div>
+                                        <div class="text-center" style="font-size: 12px;">
+                                            @{{ current_stationTaskBatch.batch.owner.name }}
+                                        </div>
+                                        <div class="col py-3 text-muted text-center">
+                                            <img id="barcode" alt="" :data-refresh="current_stationTaskBatch.batch.code">
+                                        </div>
                                     </div>
                                     <div class="col">
-                                        <button class="btn btn-info" @click="runTheTaskBatch(current_stationTaskBatch)">执行</button>
+                                        <button class="btn btn-info" @click="runTheTaskBatch(current_stationTaskBatch)">
+                                            <span v-if="!current_stationTaskBatch.runningStatus">执行</span>
+                                            <span v-if="current_stationTaskBatch.runningStatus===请求中">请求中</span>
+                                            <span v-if="current_stationTaskBatch.runningStatus==='请求失败'">(失败)重新执行</span>
+                                            <span v-if="current_stationTaskBatch.runningStatus==='请求成功'">(请求成功)重新执行</span>
+                                            <span v-if="current_stationTaskBatch.runningStatus==='请求异常'">(请求异常)重新执行</span>
+                                        </button>
                                     </div>
                                 </div>
                                 <div class="text-center my-2" style="overflow-y: scroll;max-height:200px;">
@@ -68,11 +81,6 @@
                                 </div>
                             </div>
                         </div>
-{{--                        <div class="row">--}}
-{{--                            <div class="col py-3 text-muted text-center">--}}
-{{--                                <img id="barcode" alt="" :data-refresh="batchCode">--}}
-{{--                            </div>--}}
-{{--                        </div>--}}
                         <div class="row">
                             <div class="col py-3 h4">
                                 料箱号: