LD 5 gadi atpakaļ
vecāks
revīzija
0c14f9500b

+ 1 - 1
app/Order.php

@@ -22,7 +22,7 @@ class Order extends Model
     ];
 
     public function logistic(){
-        return $this->belongsTo('App\logistic','logistic_id','id');
+        return $this->belongsTo('App\Logistic','logistic_id','id');
     }
 
     public function issue(){

+ 5 - 2
resources/sass/layout.scss

@@ -55,6 +55,9 @@ table{
         &.td-helpful{
             background: #aaeace;
         }
+        &.td-yellow{
+            background: #f8eea0;
+        }
     }
     td{
         &.td-warm{
@@ -67,7 +70,7 @@ table{
             background: #e7f5ee;
         }
         &.td-yellow{
-            background: #fdf7e9;
+            background: #fcfaec;
         }
     }
 
@@ -82,7 +85,7 @@ table{
             background:  #ecf3ef;
         }
         &.td-yellow{
-            background: #fdefe4;
+            background: #f8f5e4;
         }
     }
     tr:hover{

+ 1 - 1
resources/views/layouts/app.blade.php

@@ -10,7 +10,7 @@
     <title>@yield('title') {{ config('app.name', '宝时WAS') }}</title>
     @yield('head')
     <!-- Styles -->
-    <link href="{{ asset('css/app200721.css') }}" rel="stylesheet">
+    <link href="{{ asset('css/app200811.css') }}" rel="stylesheet">
 </head>
 <body>
 <div id="app">

+ 2 - 2
resources/views/order/issue/edit.blade.php

@@ -118,7 +118,7 @@
                         </select>
                     </div>
                 </div>
-{{--宝赔偿金额--}}
+{{--宝赔偿金额--}}
                 <div class="form-group row">
                     <label class="col-2 col-form-label text-right">宝时赔偿金额</label>
                     <div class="col-8">
@@ -126,7 +126,7 @@
                                v-model="orderIssues.baoshi_indemnity_money">
                     </div>
                 </div>
-{{--宝快递减免--}}
+{{--宝快递减免--}}
                 <div class="form-group row">
                     <label class="col-2 col-form-label text-right">宝时快递减免</label>
                     <div class="col-8">

+ 6 - 6
resources/views/order/issue/index.blade.php

@@ -77,13 +77,13 @@
                         <th class="bg-white text-center align-middle" rowspan="2">承运商赔偿金额</th>
                         @endcannot
                         <th class="bg-white text-center align-middle" rowspan="2">承运商快递减免</th>
-                        <th class="bg-white text-center align-middle" rowspan="2">宝赔偿金额</th>
-                        <th class="bg-white text-center align-middle" rowspan="2">宝快递减免</th>
+                        <th class="bg-white text-center align-middle" rowspan="2">宝赔偿金额</th>
+                        <th class="bg-white text-center align-middle" rowspan="2">宝快递减免</th>
                         <th class="bg-white text-center align-middle" rowspan="2">事故责任方</th>
                         <th class="text-center align-middle" rowspan="2">操作</th>
                     </tr>
                     <tr class="tr-yellow">
-                        <th>条码</th><th>商品名</th><th>数量</th>
+                        <th class="td-yellow">条码</th><th class="td-yellow">商品名</th><th class="td-yellow">数量</th>
                         <th class="">条码</th><th>商品名</th><th>数量</th><th>是否正品</th><th>备注</th>
                         <th>操作类型</th><th>说明</th><th>操作者</th>
                         <th>条码</th><th>商品名</th><th>数量</th>
@@ -408,7 +408,7 @@
 
     </style>
     <script type="text/javascript" src="{{asset('js/queryForm/queryForm200813b.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/export200813b.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/export200818.js')}}"></script>
     <script>
         let listVue = new Vue({
             el: '#issue_div ',
@@ -442,12 +442,12 @@
                 let _this = this;
                 let final_status = [{name:'0',value:'已解决'},{name:'1',value:'待退回'},{name:'2',value:'退回中'}];
                 let data = [[
-                    {name: 'created_at_start', type: 'dataTime', tip: '订单开始日期'},
+                    {name: 'created_at_start', type: 'dateTime', tip: '订单开始日期'},
                     {name: 'owner_id',type: 'select_multiple_select',tip: ['输入关键词快速定位下拉列表,回车确定','选择要显示的客户'], placeholder:['货主','定位或多选货主'],data: _this.owners},
                     {name: 'final_status', type: 'select', tip: '问题件的最终状态', placeholder: '最终状态', data: final_status},
                     {name: 'handle_status', type: 'checkbox', tip: '是否已完结', data: [{name: '2', value: '已完结'}]},
                 ], [
-                        {name: 'created_at_end', type: 'dataTime', tip: '订单结束日期'},
+                        {name: 'created_at_end', type: 'dateTime', tip: '订单结束日期'},
                         {name: 'logistic_indemnity_money', type: 'input', tip: '承运商赔偿金额', placeholder: '承运商赔偿金额'},
                         @can('客户不可见')
                         {name: 'baoshi_express_remission', type: 'input', tip: '宝时赔偿金额', placeholder: '宝时赔偿金额'},