Explorar o código

合并与未知错误的调整

LD %!s(int64=5) %!d(string=hai) anos
pai
achega
fea818652b

+ 1 - 1
app/Http/Controllers/OrderController.php

@@ -214,7 +214,7 @@ class OrderController extends Controller
             'erpcancelflag'=>'接口取消标记',
             'picking_print_flag'=>'拣货单打印标记',
             'edisendflag'=>'接口回传标记',
-            'releasestatus'=>'订单冻结标记',
+            'releasestatus'=>'订单冻结',
 
         ]];
         $list=[];

+ 1 - 1
resources/views/order/index/delivering.blade.php

@@ -156,7 +156,7 @@
                         <th>接口取消标记</th>
                         <th>拣货单打印标记</th>
                         <th>接口回传标记</th>
-                        <th>订单冻结标记</th>
+                        <th>订单冻结</th>
 
                     </tr>
                     <tr v-for="(order,i) in orders" @click="selectedColor(order.orderno)" :style="{'font-weight': order.orderno==selectedStyle?'bold':''}">