Merge branch 'zzd'

resources/views/client/base/index.blade.php

@@ -2,7 +2,7 @@
 
 @section('content')
     @component('client.base.menu')@endcomponent
-    <div class="card">
+    <div class="card" id="list">
         <form>
             <table class="table table-sm table-bordered  text-nowrap mb-0" style="background: #fff;min-width: 1500px">
                 <tr>
@@ -19,7 +19,7 @@
                 <tr >
                     <td >
                         <div class="form-inline">
-                            <select name="owner_id"    class="form-control form-control-sm tooltipTarget "   style="vertical-align: middle;max-width: 100px" :class="filterData.owner_id?'bg-warning':''">
+                            <select name="owner_id"    class="form-control form-control-sm tooltipTarget "   style="vertical-align: middle;max-width: 100px">
                                 <option value="" class="text-secondary">货主 </option>
                                 <option  class="font-weight-bold"></option>
                             </select>
@@ -160,4 +160,3 @@
         </table>
     </div>
 @endsection
-

resources/views/process/edit.blade.php

@@ -84,7 +84,7 @@
                 </div>
                 <div class="form-group row">
                     <label class="col-3 col-form-label text-right" >货主</label>
-                    <input readonly v-if="processContents.length>0" :value="processContents[processContents.length-1].owner_name??process.owner_name" class="form-control col-8" :class="error.owner_id && error.owner_id.length>0 ? 'is-invalid' :''">
+                    <input readonly v-if="processContents.length>0" :value="processContents[processContents.length-1].owner_name?process.owner_name:processContents[processContents.length-1].owner_name" class="form-control col-8" :class="error.owner_id && error.owner_id.length>0 ? 'is-invalid' :''">
                     <span v-if="error.owner_id && error.owner_id.length>0" class="invalid-feedback col-8 offset-3 mt-0" role="alert">
                         <strong>@{{ error.owner_id[0] }}</strong>
                     </span>
@@ -99,7 +99,7 @@
                     <label class="col-3 col-form-label text-right" >加工数量</label>
                     <input v-model="process.amount" type="text" class="form-control col-8" :class="error.amount && error.amount.length>0 ? 'is-invalid' :''">
                     <span v-if="error.amount && error.amount.length>0" class="invalid-feedback col-8 offset-3 mt-0" role="alert">
-                        <strong style="vertical-align: bo">@{{ error.amount[0] }}</strong>
+                        <strong >@{{ error.amount[0] }}</strong>
                     </span>
                 </div>
                 <div class="form-group row">
@@ -128,7 +128,7 @@
         let vueList=new Vue({
             el:'#list',
             data:{
-                process:{id:'{{$process->id}}',code:'{{$process->code}}',wms_code:'',owner_id:'{{$process->owner_id}}',amount:'{{$process->amount}}',owner_name:'{{$process->owner_name}}',owner_id:'{{$process->owner_id}}',
+                process:{id:'{{$process->id}}',code:'{{$process->code}}',wms_code:'',owner_id:'{{$process->owner_id}}',amount:'{{$process->amount}}',owner_name:'{{$process->owner_name}}',
                     process_method_id:'{{$process->process_method_id}}',unit_price:'{{$process->unit_price}}',remark:'{{$process->remark}}'},
                 error:{wms_code:[],owner_id:[],process_method_id:[],unit_price:[],amount:[]},
                 processContentError:[],