整体样式调整和一些BUG修复

app/Http/Controllers/api/thirdPart/flux/WaybillController.php

@@ -58,7 +58,7 @@ class WaybillController extends Controller
                 'origination'=>"",
                 'destination'=>$receiveInputting['C_Address1']??'',
                 'recipient'=>$receiveInputting['ConsigneeName']??'',
-                'recipient_mobile'=>$receiveInputting['C_Tel']??'',
+                'recipient_mobile'=>$receiveInputting['C_Tel1']??'',
                 'destination_city_id'=>$city['id'],
             ]);
             $waybill->save();
@@ -86,7 +86,7 @@ class WaybillController extends Controller
             'request.*.CustomerID' => ['required', 'string', 'max:191'],
             'request.*.CarrierID' => ['required', 'string', 'max:191'],
             'request.*.ConsigneeName' => ['nullable', 'string', 'max:191'],
-            'request.*.C_Tel' => ['nullable', 'string', 'max:191'],
+            'request.*.C_Tel1' => ['nullable', 'string', 'max:191'],
             'request.*.C_Address1' => ['required', 'string', 'max:191'],
             'request.*.C_Province' => ['required', 'string', 'max:191'],
             'request.*.C_City' => ['nullable', 'string', 'max:191'],

app/User.php

@@ -116,4 +116,6 @@ class User extends Authenticatable
         });
         return array_unique($ownerIds);
     }
+
+
 }

app/WMSWaybill.php

@@ -10,6 +10,6 @@ class WMSWaybill extends Model
     use ModelTimeFormat;
     //
     protected $fillable=['OrderNo','CustomerID','CarrierID','ConsigneeName',
-        'C_Tel','C_Address1','C_Province','C_City','C_District'];
+        'C_Tel1','C_Address1','C_Province','C_City','C_District'];
 
 }

database/migrations/2020_04_28_141248_create_w_m_s_waybills_table.php

@@ -18,7 +18,7 @@ class CreateWMSWaybillsTable extends Migration
             $table->string('CustomerID')->nullable()->comment('客户');
             $table->string('CarrierID')->nullable()->comment('承运人');
             $table->string('ConsigneeName')->nullable()->comment('收货人姓名');
-            $table->string('C_Tel')->nullable()->comment('收货人电话');
+            $table->string('C_Tel1')->nullable()->comment('收货人电话');
             $table->string('C_Address1')->nullable()->comment('收货地址');
             $table->string('C_Province')->nullable()->comment('省');
             $table->string('C_City')->nullable()->comment('市');

public/js/app.js

@@ -2259,7 +2259,7 @@ function fromByteArray (uint8) {
 var BlobBuilder = typeof BlobBuilder !== 'undefined' ? BlobBuilder :
   typeof WebKitBlobBuilder !== 'undefined' ? WebKitBlobBuilder :
   typeof MSBlobBuilder !== 'undefined' ? MSBlobBuilder :
-  typeof MozBlobBuilder !== 'undefined' ? MozBlobBuilder : 
+  typeof MozBlobBuilder !== 'undefined' ? MozBlobBuilder :
   false;
 
 /**
@@ -61401,4 +61401,4 @@ module.exports = __webpack_require__(/*! D:\Reald\desktop\BsWAS\src\resources\sa
 
 /***/ })
 
-/******/ });
+/******/ });

resources/views/layouts/app.blade.php

@@ -7,7 +7,7 @@
     <!-- CSRF Token -->
     <meta name="csrf-token" content="{{ csrf_token() }}">
 
-    <title>@yield('title') {{ config('app.name', 'BsWAS') }}</title>
+    <title>@yield('title') {{ config('app.name', '宝时WAS') }}</title>
     @yield('head')
     <!-- Styles -->
     <link href="{{ asset('css/app200513.css') }}" rel="stylesheet">

resources/views/waybill/index.blade.php

@@ -37,58 +37,65 @@
                         </td>
                     </tr>
                     <tr >
-                        <td> <label style="margin-left: 2%">页显示条数：</label>
+                        <td>
                             <select name="paginate" v-model="filterData.paginate" @change="setPaginate" class="form-control-sm" style="vertical-align: middle">
-                                <option value="50">50行</option>
-                                <option value="100">100行</option>
-                                <option value="200">200行</option>
-                                <option value="500">500行</option>
-                                <option value="1000">1000行</option>
+                                <option value="50">每页显示50行</option>
+                                <option value="100">每页显示100行</option>
+                                <option value="200">每页显示200行</option>
+                                <option value="500">每页显示500行</option>
+                                <option value="1000">每页显示1000行</option>
                             </select></td>
-                        <td ><label style="margin-left: 2%">货主：&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label>
+                        <td >
                             <select name="owner_id" v-model="filterData.owner_id" class="form-control-sm  "  @change="setOwner" style="vertical-align: middle">
-                                <option>    </option>
+                                <option value="" selected>货主</option>
                                 @foreach($owners as $owner)
                                     <option value="{{$owner->id}}">{{$owner->name}}</option>
                                 @endforeach
                             </select></td>
-                        <td ><label style="margin-left: 2%">承运商：&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label>
+                        <td >
                             <select name="carrier_id" v-model="filterData.carrier_id" class="form-control-sm  " @change="setCarrier" style="vertical-align: middle">
-                                <option >    </option>
+                                <option value="" selected>承运商</option>
                                 @foreach($carriers as $carrier)
                                     <option value="{{$carrier->id}}">{{$carrier->name}}</option>
                                 @endforeach
                             </select></td>
+                        <td  >
+                            <input type="text" title="运单号：支持15内模糊搜索与15天外精确搜索" name="waybill_number" placeholder="运单号"
+                                   class="form-control-sm  tooltipTarget" v-model="filterData.waybill_number" style="vertical-align: middle"></td>
+                        <td  >
+                            <input type="text" title="承运商单号：支持15内模糊搜索与15天外精确搜索"  name="carrier_bill" placeholder="承运商单号"
+                                   class="form-control-sm  tooltipTarget" v-model="filterData.carrier_bill" style="vertical-align: middle"></td>
+                        <td width="50%"></td>
                     </tr>
                     <tr>
-                        <td  ><label style="margin-left: 2%">运单号：&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label>
-                            <input type="text" title="支持15内模糊搜索与15天外精确搜索" name="waybill_number" class="form-control-sm  tooltipTarget" v-model="filterData.waybill_number" style="vertical-align: middle"></td>
-                        <td  ><label style="margin-left: 2%">承运商单号：</label>
-                            <input type="text" title="支持15内模糊搜索与15天外精确搜索"  name="carrier_bill" class="form-control-sm  tooltipTarget" v-model="filterData.carrier_bill" style="vertical-align: middle"></td>
-                        <td  ><label style="margin-left: 2%"> WMS单号：&nbsp;&nbsp;</label>
-                            <input type="text" title="支持15内模糊搜索与15天外精确搜索" name="wms_bill_number" class="form-control-sm  tooltipTarget" v-model="filterData.wms_bill_number" style="vertical-align: middle"></td>
-                    </tr>
-                    <tr>
-                        <td  style="width: 500px"><div><label style="margin-left: 2%"> 始发地：&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label>
-                                <input type="text" title="支持15内模糊搜索与15天外精确搜索" name="origination" class="form-control-sm  tooltipTarget" v-model="filterData.origination" style="vertical-align: middle">
-                                <label style="margin-left: 2%"> 目的地：&nbsp;&nbsp;</label>
-                                <input type="text" title="支持15内模糊搜索与15天外精确搜索" style="vertical-align: middle"  name="destination" class="form-control-sm  tooltipTarget" v-model="filterData.destination"></div></td>
-                        <td  style="width: 500px"><div><label style="margin-left: 2%"> 开始日期：&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label><input type="date" name="created_at_start" class="form-control-sm"  v-model="filterData.created_at_start">
-                                <label style="margin-left: 1%"> 截至日期：&nbsp;&nbsp;</label><input type="date" class="form-control-sm" name="created_at_end" v-model="filterData.created_at_end"></div></td>
+                        <td  >
+                            <input type="text" title="WMS单号：支持15内模糊搜索与15天外精确搜索" name="wms_bill_number" placeholder="WMS单号"
+                                   class="form-control-sm  tooltipTarget" v-model="filterData.wms_bill_number" style="vertical-align: middle"></td>
+                        <td  style="width: 500px"><div>
+                                <input type="text" title="始发地：支持15内模糊搜索与15天外精确搜索" name="origination" placeholder="始发地"
+                                       class="form-control-sm  tooltipTarget" v-model="filterData.origination" style="vertical-align: middle">
+                                <input type="text" title="目的地：支持15内模糊搜索与15天外精确搜索" style="vertical-align: middle" placeholder="目的地"
+                                       name="destination" class="form-control-sm  tooltipTarget" v-model="filterData.destination"></div></td>
+                        <td  style="width: 500px"><div>
+                                <input type="date" name="created_at_start" class="form-control-sm tooltipTarget" title="开始日期"
+                                       v-model="filterData.created_at_start">
+                                <input type="date" class="form-control-sm tooltipTarget" name="created_at_end" title="截至日期"
+                                       v-model="filterData.created_at_end"></div></td>
                         <td>
-                            <label style="margin-left: 2%">运单状态：&nbsp;&nbsp;&nbsp;&nbsp;</label>
                             <select name="status" v-model="filterData.status" @change="setState" class="form-control-sm" style="vertical-align: middle">
+                                <option value="" selected>运单状态</option>
                                 <option value="待审核">待审核</option>
                                 <option value="已审核">待调度</option>
                                 <option value="待终审">待终审</option>
                                 <option value="已完结">已完结</option>
-                            </select></td>
+                            </select>
                             <input hidden type="submit">
                         </td>
+                        <td></td>
+                        <td></td>
                     </tr>
                     <tr>
                         <td colspan="5">
-                            <label style="margin-left: 5px"> 操作选定记录：</label>
                             <span class="dropdown">
                                 <button class="btn btn-outline-dark btn-sm form-control-sm dropdown-toggle tooltipTarget" :class="[checkData>0?'btn-dark text-light':'']"
                                         data-toggle="dropdown" title="导出所有页将会以搜索条件得到的过滤结果，将其全部记录（每一页）导出">
@@ -165,13 +172,13 @@
                     <td>@{{waybill.destination}}</td>
                     <td>@{{waybill.carrier}}</td>
                     <td>@{{waybill.carrier_bill}}</td>
-                    <td><p v-if="waybill.carType">@{{ waybill.carType.name }}<i v-if="waybill.carType.length">(@{{waybill.carType.length}}米)</i></p></td>
+                    <td><span v-if="waybill.carType">@{{ waybill.carType.name }}<i v-if="waybill.carType.length">(@{{waybill.carType.length}}米)</i></span></td>
                     <td>@{{waybill.warehouse_weight}}  @{{waybill.warehouse_weight_unit}}</td>
                     <td>@{{waybill.carrier_weight}}  @{{waybill.carrier_weight_unit}}</td>
                     <td>@{{waybill.warehouse_weight_other}}  @{{waybill.warehouse_weight_unit_other}}</td>
                     <td>@{{waybill.carrier_weight_other}}  @{{waybill.carrier_weight_unit_other}}</td>
                     @can('运输管理-可见费用项')
-                        <td><p v-if="waybill.type=='专线'"></p><p v-else>@{{waybill.fee}}</p></td>
+                        <td><span v-if="waybill.type=='专线'"></span><span v-else>@{{waybill.fee}}</span></td>
                         <td>@{{waybill.pick_up_fee}}</td>
                         <td>@{{waybill.other_fee}}</td>
                     @endcan
@@ -184,7 +191,7 @@
                     <td>@{{waybill.charge}}</td>
                     <td>@{{waybill.collect_fee}}</td>
                     <td>@{{waybill.ordering_remark}}</td>
-                    <td><p v-for="waybillAuditLog in waybill.waybillAuditLogs" v-if=waybillAuditLog.audit_stage==="运单阶段">@{{waybillAuditLog.user.name}}</p></td>
+                    <td><span v-for="waybillAuditLog in waybill.waybillAuditLogs" v-if=waybillAuditLog.audit_stage==="运单阶段">@{{waybillAuditLog.user.name}}</span></td>
                     <td ><u style="user-select: none;cursor:pointer" class="text-primary" v-if="!waybill.isBtn && waybill.wmsCommodities && waybill.wmsCommodities.length>0" @click="showWMSCommodities(waybill.id,waybill.wmsCommodities,waybill.isBtn)">
                             该单有 @{{waybill.wmsCommodities.length}} 件商品，点击展开</u>
                         <u style="user-select: none;cursor:pointer" class="text-secondary" v-if="waybill.isBtn" @click="showWMSCommodities(waybill.id,waybill.wmsCommodities,waybill.isBtn)">
@@ -193,31 +200,31 @@
                     <td>
                         <div v-if=waybill.status==="未审核"||waybill.status==="待重审">
                             @can('运输管理-运单审核')
-                                <button class="btn btn-outline-success" @click="waybillAudit(waybill.id,waybill.waybill_number)">审核</button>
+                                <button class="btn btn-outline-success btn-sm" @click="waybillAudit(waybill.id,waybill.waybill_number)">审核</button>
                             @endcan
                             @can('运输管理-运单编辑')
-                                <button class="btn btn-outline-secondary" @click="waybillUpdate(waybill.id)">修改</button>
+                                <button class="btn btn-outline-secondary btn-sm" @click="waybillUpdate(waybill.id)">修改</button>
                             @endcan
                         </div>
                         <div v-if=waybill.status==="已审核">
                             @can('运输管理-调度')
-                                <button class="btn btn-outline-secondary" @click="waybillRetreatAudit(waybill.id,waybill.waybill_number)">取消审核</button>
-                                <button class="btn btn-outline-secondary" @click="job(waybill.id)">调度</button>
+                                <button class="btn btn-outline-secondary btn-sm" @click="waybillRetreatAudit(waybill.id,waybill.waybill_number)">取消审核</button>
+                                <button class="btn btn-outline-secondary btn-sm" @click="job(waybill.id)">调度</button>
                             @endcan
                         </div>
                         <div v-if=waybill.status==="待终审">
                             @can('运输管理-调度审核')
-                                <button class="btn btn-outline-success" @click="waybillEndAudit(waybill.id,waybill.waybill_number)">完结</button>
+                                <button class="btn btn-outline-success btn-sm" @click="waybillEndAudit(waybill.id,waybill.waybill_number)">完结</button>
                             @endcan
                             @can('运输管理-调度')
-                                <button class="btn btn-outline-secondary" @click="job(waybill.id)">改调度</button>
+                                <button class="btn btn-outline-secondary btn-sm" @click="job(waybill.id)">改调度</button>
                             @endcan
                         </div>
                     </td>
                     <td>@{{waybill.origination_city}}</td>
                     <td>@{{waybill.destination_city}}</td>
                     <td>@{{waybill.car_owner_info}}</td>
-                    <td><p v-for="waybillAuditLog in waybill.waybillAuditLogs" v-if=waybillAuditLog.audit_stage==="调度阶段">@{{waybillAuditLog.user.name}}</p></td>
+                    <td><span v-for="waybillAuditLog in waybill.waybillAuditLogs" v-if=waybillAuditLog.audit_stage==="调度阶段">@{{waybillAuditLog.user.name}}</span></td>
                 </tr>
                 <tr v-show="wmsCommodities&&wmsCommodities.length>0" id="wmsCommodities">
                     <td colspan="15"></td>