运输->发运 样式调整

resources/views/waybill/forwarding.blade.php

@@ -12,25 +12,25 @@
                     </div>
                 </div>
                 <div class="row mt-2 ml-2">
-                    <div class="col-md-5" style="max-width: 400px">
-                        <input type="date" name="created_at_start" class="form-control-sm tooltipTarget" title="选择显示指定日期的起始时间"
+                    <div class="col-md-6" style="max-width: 400px">
+                        <input type="date" name="created_at_start" class=" form-control-sm tooltipTarget" title="选择显示指定日期的起始时间"
                                v-model="filterData.created_at_start" :class="filterData.created_at_start?'bg-warning':''">
-                        <input type="date" class="form-control-sm tooltipTarget" name="created_at_end" title="选择显示指定日期的结束时间"
+                        <input type="date" class=" form-control-sm tooltipTarget" name="created_at_end" title="选择显示指定日期的结束时间"
                                v-model="filterData.created_at_end" :class="filterData.created_at_end?'bg-warning':''" >
                     </div>
-                    <div class=" col-md-3 mr-0" style="max-width: 180px">
+                    <div class=" col-md-2 mr-0 " style="max-width: 160px">
                         <input type="text" title="运单号：支持15内模糊搜索与15天外精确搜索" name="waybill_number" placeholder="运单号"
-                               class="form-control-sm  tooltipTarget" v-model="filterData.waybill_number" style="vertical-align: middle;" :class="filterData.waybill_number?'bg-warning':''">
+                               class=" form-control-sm tooltipTarget" v-model="filterData.waybill_number" style="vertical-align: middle;width: 153px" :class="filterData.waybill_number?'bg-warning':''">
                     </div>
-                    <div class=" col-md-3 m-0" style="max-width: 180px">
+                    <div class=" col-md-2 " style="max-width: 160px">
                         <input type="text" title="承运商单号：支持15内模糊搜索与15天外精确搜索"  name="carrier_bill" placeholder="承运商单号"
-                               class="form-control-sm tooltipTarget" v-model="filterData.carrier_bill" style="vertical-align: middle;" :class="filterData.carrier_bill?'bg-warning':''">
+                               class="form-control-sm tooltipTarget" v-model="filterData.carrier_bill" style="vertical-align: middle;width: 153px" :class="filterData.carrier_bill?'bg-warning':''">
                     </div>
                     <input type="submit" hidden>
                 </div>
                 <div class="ml-4 mt-2">
                     <span class="dropdown">
-                        <button type="button" class="btn  btn-sm form-control-sm dropdown-toggle tooltipTarget" :class="[checkData.length>0?'btn-dark text-light':'btn-outline-dark']"
+                        <button type="button" class="btn  btn-sm  form-control-sm dropdown-toggle tooltipTarget" :class="[checkData.length>0?'btn-dark text-light':'btn-outline-dark']"
                                 data-toggle="dropdown" title="导出所有页将会以搜索条件得到的过滤结果，将其全部记录（每一页）导出">
                             导出Excel
                         </button>
@@ -80,39 +80,42 @@
                     <td>@{{ waybill.warehouse_weight }}</td>
                     <td><span v-if="waybill.status=='已完结'">已完成</span><span v-else><span v-if="waybill.carrier_bill">已提交</span><span v-if="!waybill.carrier_bill">待提交</span></span></td>
                     <td>
-                        <span v-if="waybill.isBtn">
-                            <input :id="'carrier_bill'+waybill.id+'PC'" :class="errors['_'+waybill.id]&&errors['_'+waybill.id].carrier_bill?'is-invalid tooltipTargetError tooltipTargetError':''"
-                                   :title="errors['_'+waybill.id]&&errors['_'+waybill.id].carrier_bill?errors['_'+waybill.id].carrier_bill[0]:''" type="text" class="form-control-sm w-100" :value="waybill.carrier_bill">
+                        <span v-if="waybill.isBtn || !waybill.carrier_bill">
+                            <input :id="'carrier_bill'+waybill.id+'PC'" :class="errors['_'+waybill.id]&&errors['_'+waybill.id].carrier_bill?'is-invalid tooltipTargetError':''"
+                                   :title="errors['_'+waybill.id]&&errors['_'+waybill.id].carrier_bill?errors['_'+waybill.id].carrier_bill[0]:''" type="text" class="form-control form-control-sm w-100" :value="waybill.carrier_bill">
                         </span><span v-else>@{{ waybill.carrier_bill }}</span>
                     </td>
                     <td>
-                        <span v-if="waybill.isBtn">
+                        <span v-if="waybill.isBtn || !waybill.carrier_bill">
                             <input :id="'inquire_tel'+waybill.id+'PC'" :class="errors['_'+waybill.id]&&errors['_'+waybill.id].inquire_tel?'is-invalid tooltipTargetError':''"
-                                   :title="errors['_'+waybill.id]&&errors['_'+waybill.id].inquire_tel?errors['_'+waybill.id].inquire_tel[0]:''" type="text" class="form-control-sm w-100" :value="waybill.inquire_tel">
+                                   :title="errors['_'+waybill.id]&&errors['_'+waybill.id].inquire_tel?errors['_'+waybill.id].inquire_tel[0]:''" type="text" class="form-control form-control-sm w-100" :value="waybill.inquire_tel">
                         </span><span v-else>@{{ waybill.inquire_tel }}</span>
                     </td>
                     <td>
-                        <span v-if="waybill.isBtn">
+                        <span v-if="waybill.isBtn || !waybill.carrier_bill">
                             <input :id="'amount'+waybill.id+'PC'" :class="errors['_'+waybill.id]&&errors['_'+waybill.id].amount?'is-invalid tooltipTargetError':''"
-                                   :title="errors['_'+waybill.id]&&errors['_'+waybill.id].amount?errors['_'+waybill.id].amount[0]:''" type="text" class="form-control-sm w-100" :value="waybill.amount">
+                                   :title="errors['_'+waybill.id]&&errors['_'+waybill.id].amount?errors['_'+waybill.id].amount[0]:''" type="text" class="form-control form-control-sm w-100" :value="waybill.amount">
                         </span><span v-else>@{{ waybill.amount }}</span>
                     </td>
                     <td>
-                        <span v-if="waybill.isBtn">
+                        <span v-if="waybill.isBtn || !waybill.carrier_bill">
                             <input :id="'carrier_weight_other'+waybill.id+'PC'" :class="errors['_'+waybill.id]&&errors['_'+waybill.id].carrier_weight_other?'is-invalid tooltipTargetError':''"
-                                   :title="errors['_'+waybill.id]&&errors['_'+waybill.id].carrier_weight_other?errors['_'+waybill.id].carrier_weight_other[0]:''" type="text" class="form-control-sm w-100" :value="waybill.carrier_weight_other">
+                                   :title="errors['_'+waybill.id]&&errors['_'+waybill.id].carrier_weight_other?errors['_'+waybill.id].carrier_weight_other[0]:''" type="text" class="form-control form-control-sm w-100" :value="waybill.carrier_weight_other">
                         </span><span v-else>@{{ waybill.carrier_weight_other }}</span>
                     </td>
                     <td>
-                        <span v-if="waybill.isBtn">
+                        <span v-if="waybill.isBtn || !waybill.carrier_bill">
                             <input :id="'carrier_weight'+waybill.id+'PC'" :class="errors['_'+waybill.id]&&errors['_'+waybill.id].carrier_weight?'is-invalid tooltipTargetError':''"
-                                   :title="errors['_'+waybill.id]&&errors['_'+waybill.id].carrier_weight?errors['_'+waybill.id].carrier_weight[0]:''" type="text" class="form-control-sm w-100" :value="waybill.carrier_weight">
+                                   :title="errors['_'+waybill.id]&&errors['_'+waybill.id].carrier_weight?errors['_'+waybill.id].carrier_weight[0]:''" type="text" class="form-control form-control-sm w-100" :value="waybill.carrier_weight">
                         </span><span v-else>@{{ waybill.carrier_weight }}</span>
                     </td>
                     <td>
-                        <button @click="waybill.isBtn=true" v-if="!waybill.isBtn" class="btn btn-sm" :class="waybill.carrier_bill?'btn-outline-dark':'btn-outline-info'"><span v-if="waybill.carrier_bill">修改</span><span v-else>录入</span></button>
-                        <button v-if="waybill.isBtn" @click="submit(waybill.id+'PC',waybill.id);" class="btn btn-sm btn-outline-success">确定</button>
-                        <button @click="waybill.isBtn=false" v-if="waybill.isBtn" class="btn btn-sm btn-outline-danger">取消</button>
+                        <span v-if="waybill.status!='已完结'">
+                            <button v-if="!waybill.isBtn&&waybill.carrier_bill" @click="waybill.isBtn=true" class="btn btn-sm btn-outline-dark" >修改</button>
+                            <button v-if="!waybill.isBtn&& !waybill.carrier_bill" @click="submit(waybill.id+'PC',waybill.id);" class="btn btn-sm btn-outline-info" >录入</button>
+                            <button v-if="waybill.isBtn" @click="submit(waybill.id+'PC',waybill.id);" class="btn btn-sm btn-outline-success">确定</button>
+                            <button @click="waybill.isBtn=false" v-if="waybill.isBtn" class="btn btn-sm btn-outline-danger">取消</button>
+                        </span>
                     </td>
                 </tr>
             </table>
@@ -132,39 +135,41 @@
                             </div>
                         </div>
                         <div :style="waybill.status!='已完结'?'background-color:#e8eef6':''"  class="mb-3">
-                            <div style="transform:scale(0.9)" class="pl-0">
-                                <span class="mr-3 text-nowrap"><span style="color:#02346a">专线运单号：</span>
-                                    <span class="text-muted"><span v-if="waybill.carrier_bill" class="text-muted">@{{ waybill.carrier_bill }}</span>
-                                        <input :id="'carrier_bill'+waybill.id" :class="errors['_'+waybill.id]&&errors['_'+waybill.id].carrier_bill?'is-invalid tooltipTargetError':''"
-                                               :title="errors['_'+waybill.id]&&errors['_'+waybill.id].carrier_bill?errors['_'+waybill.id].carrier_bill[0]:''" v-else type="text" :value="waybill.carrier_bill"
-                                               class="form-control-sm " @click="enlarge($event)" @mouseleave="shrink($event)" style="width: 50px">
-                                    </span></span>
-                                <span class="mr-3 text-nowrap"><span style="color:#02346a">查件电话：</span>
-                                    <span class="text-muted"><span v-if="waybill.carrier_bill" class="text-muted">@{{ waybill.inquire_tel }}</span>
-                                        <input :id="'inquire_tel'+waybill.id" :class="errors['_'+waybill.id]&&errors['_'+waybill.id].inquire_tel?'is-invalid tooltipTargetError':''"
-                                               :title="errors['_'+waybill.id]&&errors['_'+waybill.id].inquire_tel?errors['_'+waybill.id].inquire_tel[0]:''" v-else type="text" :value="waybill.inquire_tel"
-                                               class="form-control-sm" @click="enlarge($event)" @mouseleave="shrink($event)" style="width:50px">
-                                    </span></span>
-                                <span class="mr-3 text-nowrap"><span style="color:#02346a">件数：</span>
-                                    <span class="text-muted"><span v-if="waybill.carrier_bill" class="text-muted">@{{ waybill.amount }}</span>
-                                        <input :id="'amount'+waybill.id" :class="errors['_'+waybill.id]&&errors['_'+waybill.id].amount?'is-invalid tooltipTargetError':''"
-                                               :title="errors['_'+waybill.id]&&errors['_'+waybill.id].amount?errors['_'+waybill.id].amount[0]:''" v-else type="text" :value="waybill.amount" class="form-control-sm"
-                                               @click="enlarge($event)" @mouseleave="shrink($event)" style="width:50px">
-                                    </span></span>
-                                <span class="mr-3 text-nowrap"><span style="color:#02346a">重量：</span>
-                                    <span class="text-muted"><span v-if="waybill.carrier_bill" class="text-muted">@{{ waybill.carrier_weight_other }}</span>
-                                        <input :id="'carrier_weight_other'+waybill.id" :class="errors['_'+waybill.id]&&errors['_'+waybill.id].carrier_weight_other?'is-invalid tooltipTargetError':''"
-                                               :title="errors['_'+waybill.id]&&errors['_'+waybill.id].carrier_weight_other?errors['_'+waybill.id].carrier_weight_other[0]:''" v-else type="text" :value="waybill.carrier_weight_other"
-                                               class="form-control-sm" @click="enlarge($event)" @mouseleave="shrink($event)" style="width:50px">
-                                    </span></span>
-                                <span class="mr-3 text-nowrap"><span style="color:#02346a">体积：</span>
-                                    <span class="text-muted"><span v-if="waybill.carrier_bill" class="text-muted">@{{ waybill.carrier_weight }}</span>
-                                        <input :id="'carrier_weight'+waybill.id" :class="errors['_'+waybill.id]&&errors['_'+waybill.id].carrier_weight?'is-invalid tooltipTargetError':''"
-                                               :title="errors['_'+waybill.id]&&errors['_'+waybill.id].carrier_weight?errors['_'+waybill.id].carrier_weight[0]:''" v-else type="text" :value="waybill.carrier_weight"
-                                               class="form-control-sm" @click="enlarge($event)" @mouseleave="shrink($event)" style="width:50px">
-                                    </span></span>
+                            <div style="transform:scale(0.9)" class="pl-0 form-inline">
+                                <span class="mr-3 text-nowrap form-inline"><span style="color:#02346a">专线运单号：</span>
+                                    <input :id="'carrier_bill'+waybill.id" :class="errors['_'+waybill.id]&&errors['_'+waybill.id].carrier_bill?'is-invalid tooltipTargetError':''"
+                                           :title="errors['_'+waybill.id]&&errors['_'+waybill.id].carrier_bill?errors['_'+waybill.id].carrier_bill[0]:''" v-if="waybill.isBtn || !waybill.carrier_bill" type="text" :value="waybill.carrier_bill"
+                                           class="form-control form-control-sm " @click="enlarge($event)"  style="width: 50px">
+                                    <span v-else  class="text-muted">@{{ waybill.carrier_bill }}</span>
+                                </span>
+                                <span class="mr-3 text-nowrap form-inline"><span style="color:#02346a">查&nbsp;件&nbsp;电&nbsp;话：</span>
+                                    <input :id="'inquire_tel'+waybill.id" :class="errors['_'+waybill.id]&&errors['_'+waybill.id].inquire_tel?'is-invalid tooltipTargetError':''"
+                                           :title="errors['_'+waybill.id]&&errors['_'+waybill.id].inquire_tel?errors['_'+waybill.id].inquire_tel[0]:''" v-if="waybill.isBtn || !waybill.carrier_bill" type="text" :value="waybill.inquire_tel"
+                                           class="form-control form-control-sm" @click="enlarge($event)"  style="width:50px">
+                                    <span v-else  class="text-muted">@{{ waybill.inquire_tel }}</span>
+                                </span>
+                                <span class="mr-3 text-nowrap form-inline"><span style="color:#02346a">件数：</span>
+                                    <input :id="'amount'+waybill.id" :class="errors['_'+waybill.id]&&errors['_'+waybill.id].amount?'is-invalid tooltipTargetError':''"
+                                           :title="errors['_'+waybill.id]&&errors['_'+waybill.id].amount?errors['_'+waybill.id].amount[0]:''" v-if="waybill.isBtn || !waybill.carrier_bill" type="text" :value="waybill.amount" class="form-control form-control-sm"
+                                           @click="enlarge($event)" style="width:50px">
+                                    <span v-else class="text-muted">@{{ waybill.amount }}</span>
+                                </span>
+                                <span class="mr-3 text-nowrap form-inline"><span style="color:#02346a">重量：</span>
+                                    <input :id="'carrier_weight_other'+waybill.id" :class="errors['_'+waybill.id]&&errors['_'+waybill.id].carrier_weight_other?'is-invalid tooltipTargetError':''"
+                                           :title="errors['_'+waybill.id]&&errors['_'+waybill.id].carrier_weight_other?errors['_'+waybill.id].carrier_weight_other[0]:''" v-if="waybill.isBtn || !waybill.carrier_bill" type="text" :value="waybill.carrier_weight_other"
+                                           class="form-control form-control-sm" @click="enlarge($event)" style="width:50px">
+                                    <span v-else class="text-muted">@{{ waybill.carrier_weight_other }}</span>
+                                </span>
+                                <span class="mr-3 text-nowrap form-inline"><span style="color:#02346a">体积：</span>
+                                    <input :id="'carrier_weight'+waybill.id" :class="errors['_'+waybill.id]&&errors['_'+waybill.id].carrier_weight?'is-invalid tooltipTargetError':''"
+                                           :title="errors['_'+waybill.id]&&errors['_'+waybill.id].carrier_weight?errors['_'+waybill.id].carrier_weight[0]:''" v-if="waybill.isBtn || !waybill.carrier_bill" type="text" :value="waybill.carrier_weight"
+                                           class="form-control form-control-sm" @click="enlarge($event)" {{--@mouseleave="shrink($event)"--}} style="width:50px">
+                                    <span v-else class="text-muted">@{{ waybill.carrier_weight }}</span>
+                                </span>
                                 <span class="mr-3 text-nowrap" v-if="waybill.status!='已完结'">
-                                    <button class="btn btn-sm btn-outline-success" @click="submit(waybill.id)" :class="waybill.carrier_bill?'btn-outline-dark':'btn-outline-success'"><span v-if="waybill.carrier_bill">修改</span><span v-else>提交</span></button></span></div>
+                                    <button v-if="waybill.isBtn==true || !waybill.carrier_bill" class="btn btn-sm btn-outline-success" @click="submit(waybill.id)">提交</button>
+                                    <button v-if="waybill.isBtn==true" class="btn btn-sm btn-outline-danger" @click="waybill.isBtn=false">取消</button>
+                                    <button v-if="waybill.isBtn==false && waybill.carrier_bill" class="btn btn-sm " @click="waybill.isBtn=true" :class="waybill.carrier_bill?'btn-outline-dark':'btn-outline-primary'">修改</button></span></div>
                         </div>
                     </td>
                 </tr>
@@ -271,6 +276,7 @@
                 e.target.style.width="50px";
             },
             submit(waybill_id,id=null){
+                if (!confirm('确定要提交吗？')){return;}
                 let _this=this;
                 let data={};
                 data['id'] = id??waybill_id;
@@ -301,6 +307,7 @@
                                 waybill.amount=response.data.amount;
                                 waybill.carrier_weight=response.data.carrier_weight;
                                 waybill.carrier_weight_other=response.data.carrier_weight_other;
+                                waybill.isBtn=false;
                                 tempTip.setDuration(2000);
                                 tempTip.showSuccess('录入成功!');
                                 return true;