Przeglądaj źródła

零头价显示 页面优化
BUG:路由丢失

Zhouzhendong 5 lat temu
rodzic
commit
812a7fc31c

+ 1 - 0
resources/views/customer/project/part/_three.blade.php

@@ -98,6 +98,7 @@
                                         <div class="col-10">
                                             <label>@{{ item.strategy }} <span v-if="item.strategy!='起步'">续费</span></label>:
                                             <b>@{{ item.amount }}</b>&nbsp;@{{ poolMapping.units ? poolMapping.units[item.unit_id] : '' }} / <b>@{{ item.unit_price }}</b>元
+                                            <span class="badge badge-secondary" v-if="item.odd_price">零头价:@{{ item.odd_price }}元</span>
                                             <span v-if="operation.isDiscount">&nbsp;(满减单价:<b>@{{ item.discount_price }}元</b>)</span>
                                         </div>
                                         <div class="col-1">

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

@@ -479,7 +479,6 @@
                             tempTip.show('标记勾选内容取消分配失败,错误:'+response.data.fail_info);
                         }
                     }).catch(function (e) {
-                        alert('网络连接错误:'+e);
                         tempTip.setDuration(2500);
                         tempTip.show('标记勾选内容取消分配失败,网络连接错误:'+e);
                     })

+ 0 - 2
resources/views/rejected/recycle.blade.php

@@ -428,7 +428,6 @@
                             tempTip.show('修改勾选记录的入库状态失败,错误:'+response.data.fail_info);
                         }
                     }).catch(function (e) {
-                        alert('网络连接错误:'+e);
                         tempTip.setDuration(2500);
                         tempTip.show('审核勾选内容失败,网络连接错误:'+e);
                     });
@@ -472,7 +471,6 @@
                             tempTip.show('恢复勾选内容失败,错误:'+response.data.fail_info);
                         }
                     }).catch(function (e) {
-                        alert('网络连接错误:'+e);
                         tempTip.setDuration(2500);
                         tempTip.show('恢复勾选内容失败,网络连接错误:'+e);
                     })

+ 0 - 2
resources/views/rejected/search/general.blade.php

@@ -413,7 +413,6 @@
                             tempTip.show('修改勾选记录的入库状态失败,错误:'+response.data.fail_info);
                         }
                     }).catch(function (e) {
-                        alert('网络连接错误:'+e);
                         tempTip.setDuration(2500);
                         tempTip.show('审核勾选内容失败,网络连接错误:'+e);
 
@@ -444,7 +443,6 @@
                             tempTip.show('审核勾选内容失败,错误:'+response.data.fail_info);
                         }
                     }).catch(function (e) {
-                        alert('网络连接错误:'+e);
                         tempTip.setDuration(2500);
                         tempTip.show('审核勾选内容失败,网络连接错误:'+e);
                     })

+ 2 - 4
resources/views/store/fast/index.blade.php

@@ -15,8 +15,8 @@
                     </td>
                     <td><span>@{{ i+1  }}</span></td>
                     <td class="text-muted"><span>@{{store.asn_code}}</span></td>
-                    <td><span>@{{store.warehouse.name}}</span></td>
-                    <td class="text-muted"><span>@{{store.owner.name}}</span></td>
+                    <td><span>@{{store.warehouse ? store.warehouse.name : ''}}</span></td>
+                    <td class="text-muted"><span>@{{store.owner ? store.owner.name : ''}}</span></td>
                     <td class="text-muted"><span>@{{store.stored_method}}</span></td>
                     <td class="text-muted"><span>@{{store.status}}</span></td>
                     <td><span>@{{store.remark}}</span></td>
@@ -45,8 +45,6 @@
             mounted:function(){
                 $('#fast').removeClass('d-none');
                 let column = [
-                    {name:'cloneCheckAll',customization:true,type:'checkAll',column:'id',
-                        dom:$('#cloneCheckAll').removeClass('d-none'), neglect: true},
                     {name:'index',value: '序号', neglect: true},
                     {name:'asn_code',value: 'ASN编号'},
                     {name:'warehouse_name',value: '仓库'},

+ 1 - 1
routes/web.php

@@ -404,7 +404,7 @@ Route::group(['prefix'=>'store'],function(){
         Route::get('index','StoreController@storage');
     });
     Route::group(['prefix'=>'fast'],function() {
-        Route::resource('storeItem','StoreItemsController');
+        Route::resource('storeItem','StoreItemController');
     });
     Route::resource('fast',"StoreController");