Merge branch 'zzd' of ssh://was.baoshi56.com:10022/var/git/bswas into zzd

app/Http/Controllers/ProcessController.php

@@ -623,13 +623,18 @@ class ProcessController extends Controller
         }
         if (isset($signMap['财务确认'])){
             $signUnitPrice=$process->signUnitPrice;
+            DB::beginTransaction();
             if ($signUnitPrice){
                 $process->update(['unit_price' => $signUnitPrice->mark]);
                 $result = $this->statistic($process);
-                if (!$result['success'])return $result['data'];
+                if (!$result['success']){
+                    DB::rollBack();
+                    return $result['data'];
+                }
             }
             $process->createSign('二次加工组确认');
             $process->destroySign();
+            DB::commit();
             return ['success'=>true,'data'=>false];
         }
         $sign = $process->createSign($msg);

app/Http/Controllers/WaybillsController.php → app/Http/Controllers/WaybillController.php

@@ -32,7 +32,7 @@ use Intervention\Image\Facades\Image;
 use Maatwebsite\Excel\Facades\Excel;
 use Ramsey\Uuid\Uuid;
 
-class WaybillsController extends Controller
+class WaybillController extends Controller
 {
     public function __construct()
     {
@@ -93,7 +93,7 @@ class WaybillsController extends Controller
         return view('waybill/edit',['waybill'=>$waybill,'carriers'=>$carrierService->getSelection(),'cities'=>$cities,'units'=>$units,'carTypes'=>$carTypes]);
     }
 
-    public function update(Request $request, $id)
+    public function update(Request $request, $id , CityService $cityService)
     {
         if(!Gate::allows('运输管理-调度')){ return redirect(url('/'));  }
         $waybill=app('waybillService')->find($id);
@@ -116,7 +116,7 @@ class WaybillsController extends Controller
         }
         if (!$request->destination)$request->destination = $waybill->destination;
         if ($request->destination_city_id && $waybill->destination_city_id != $request->destination_city_id){
-            $city=City::find($request->destination_city_id);
+            $city=$cityService->find($request->destination_city_id);
             if ($city && (mb_strpos($request->destination,$city->name)===false || mb_strpos($request->destination,$city->province_name)===false)){
                 if (mb_strpos($request->destination,$city->name)===false && mb_strpos($request->destination,$city->province_name)===false){
                     $request->destination=$city->province_name.$city->name.$request->destination;

app/Services/CityService.php

@@ -17,4 +17,8 @@ Class CityService
         return City::query()->select($column)->get();
     }
 
+    public function find($id){
+        return City::query()->find($id);
+    }
+
 }

database/seeds/WaybillsCalculatesSeeder.php → database/seeds/WaybillCalculatesSeeder.php

@@ -2,7 +2,7 @@
 
 use Illuminate\Database\Seeder;
 
-class WaybillsCalculatesSeeder extends Seeder
+class WaybillCalculatesSeeder extends Seeder
 {
     /**
      * Run the database seeds.

database/seeds/WaybillsSeeder.php → database/seeds/WaybillSeeder.php

@@ -2,7 +2,7 @@
 
 use Illuminate\Database\Seeder;
 
-class WaybillsSeeder extends Seeder
+class WaybillSeeder extends Seeder
 {
     /**
      * Run the database seeds.

resources/js/queryForm/queryForm.js

@@ -35,7 +35,6 @@ const query = function getQueryForm(data) {
                 } else if ('array' === fetchJsType(map.value)) {
                     let string = map.value.join(',');
                     form.append("<input  name='" + key + "' value='" + string + "'>")
-                    console.log("string:"+string);
                 }
             }
             for (let key in this.param){
@@ -656,7 +655,7 @@ const query = function getQueryForm(data) {
         let label = $('#' + name + '_lab');
         let select = $('#' + name + '_sel');
         let dom_data = _data[name].value;
-        if (dom_data.length === 1 ) {
+        if (dom_data && dom_data.length === 1 ) {
             select.show();
             select.val(dom_data[0]);
             label.hide();
@@ -684,7 +683,6 @@ const query = function getQueryForm(data) {
         for (const key in _data) {
             if (!['', null, undefined].includes(_data[key].value)) {
                 if (controlJsType(_data[key].value, 'array') && _data[key].value.length === 0) {
-                    //console.log(key);
                     continue;
                 }
                 saveData[key] = {
@@ -789,7 +787,6 @@ const query = function getQueryForm(data) {
             }
         } else {
             $(_form).find("select[name='" + key + "']").val(value);
-            //console.log(value === _this.paginations[0]);
             if (key === 'paginate' && value == _this.paginations[0]) {
                 return;
             }
@@ -947,6 +944,9 @@ const query = function getQueryForm(data) {
                     if (condition.type === 'search_select') {
                         data.mold = 'select';
                     }
+                    if(condition.type === 'select_multiple_select'){
+                        data.value = [];
+                    }
                     _data[condition.name] = data;
                 } else if (['dataTime_dataTime', 'input_input', 'input_select', 'dataTime_select'].includes(condition.type)) {
                     let types = condition.type.split("_");
@@ -983,7 +983,6 @@ const query = function getQueryForm(data) {
     }
 
     function rendererOptionOnCookie() {
-        //console.log('rendererSearchFromOnCookie');
         let data = fetchCookie();
         if (data === undefined) {
             return;
@@ -1006,8 +1005,6 @@ const query = function getQueryForm(data) {
     }
 
     function rendererSearchFormOn_data() {
-        // console.log('rendererSearchFormOn_data', _data);
-
         for (let key in _data) {
             let value = _data[key].value, type = _data[key].type, mold = _data[key].mold;
             _data[key].select = value;

resources/views/inventory/statement/changeInventory.blade.php

@@ -68,7 +68,7 @@
 
 @section('lastScript')
     <script type="text/javascript" src="{{asset('js/queryForm/export.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200803.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200803a.js')}}"></script>
     <script>
         new Vue({
             el:"#list",

resources/views/order/index/delivering.blade.php

@@ -174,7 +174,7 @@
 
 @section('lastScript')
     <script type="text/javascript" src="{{asset('js/queryForm/export.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200803.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200803a.js')}}"></script>
     <script>
         new Vue({
             el:"#list",

resources/views/order/wave/search.blade.php

@@ -83,7 +83,7 @@
 @endsection
 
 @section("lastScript")
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200803.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200803a.js')}}"></script>
     <script>
         let vueList = new Vue({
             el: "#wave_div",

resources/views/personnel/laborReport/index.blade.php

@@ -234,7 +234,7 @@
 
 @section('lastScript')
     <script type="text/javascript" src="{{asset('js/queryForm/export.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200803.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200803a.js')}}"></script>
     <script>
             @if(isset($request))
         let request={!! json_encode($request) !!};

resources/views/process/index.blade.php

@@ -476,7 +476,7 @@
 
 @section('lastScript')
     <script type="text/javascript" src="{{asset('js/queryForm/export.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200803.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200803a.js')}}"></script>
     <script>
         new Vue({
             el:"#process",

resources/views/rejected/search/general.blade.php

@@ -209,7 +209,7 @@
         let csrfInput='@csrf';
     </script>
     <script src="{{asset('js/queryForm/export.js')}}"></script>
-    <script src="{{asset('js/queryForm/queryForm200803.js')}}"></script>
+    <script src="{{asset('js/queryForm/queryForm200803a.js')}}"></script>
     <script>
         new Vue({
             el:"#list",

resources/views/waybill/index.blade.php

@@ -362,7 +362,7 @@
         }
     </style>
     <script type="text/javascript" src="{{asset('js/queryForm/export.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200803.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200803a.js')}}"></script>
     <script>
         let vueList=new Vue({
             el:'#list',

resources/views/waybill/menu.blade.php

@@ -27,7 +27,7 @@
             </li>@endcan
             @can('运输管理-删除')
             <li class="nav-item">
-                <a class="nav-link" href="{{url('waybill/recycle')}}">回收站</a>
+                <a class="nav-link" href="{{url('waybill/recycle')}}" :class="{active:isActive('recycle',2)}">回收站</a>
             </li>
             @endcan
         </ul>

resources/views/weight/package/index.blade.php

@@ -78,7 +78,7 @@
 
 @section('lastScript')
     <script type="text/javascript" src="{{asset('js/queryForm/export.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200803.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200803a.js')}}"></script>
     <script>
             @if(isset($request))
         let request={!! json_encode($request) !!};

routes/apiLocal.php

@@ -25,6 +25,6 @@ Route::post('logistic/logisticNumberReturnIsUnique', 'RejectedBillController@api
 
 Route::post('commodity/getCommodityByBarcode', 'CommodityController@apiGetCommodityByBarcode');
 
-Route::post('waybill/recoverSelected', 'WaybillsController@apiRestoreSelected');
-Route::post('waybill/changeFee', 'WaybillsController@changeFee');
+Route::post('waybill/recoverSelected', 'WaybillController@apiRestoreSelected');
+Route::post('waybill/changeFee', 'WaybillController@changeFee');
 

routes/web.php

@@ -67,8 +67,8 @@ Route::post('maintenance/paperBox/excel/import','PaperBoxController@import');
 Route::resource('maintenance/paperBox', 'PaperBoxController');
 Route::get('maintenance/paperBox/excel/goImport',function (){return view('maintenance.paperBox.import');});
 
-Route::post('waybill/deleteImg','WaybillsController@deleteImg');
-Route::post('waybill/upload','WaybillsController@upload');
+Route::post('waybill/deleteImg','WaybillController@deleteImg');
+Route::post('waybill/upload','WaybillController@upload');
 Route::get('waybill/relating',function (){return view('waybill.menuWaybill');});
 Route::resource('maintenance/waybillPriceModel','WaybillPriceModelsController');
 Route::get('maintenance/waybillPriceModel/excel/goImport',function (){return view('maintenance.waybillPriceModel.import');});
@@ -77,22 +77,22 @@ Route::get('maintenance/waybillPriceModel/cities/{province_id}','WaybillPriceMod
 Route::resource('waybill/waybillFinancialSnapshot','WaybillFinancialSnapshotsController');
 Route::resource('waybill/waybillFinancialExcepted','WaybillFinancialExceptedController');
 
-Route::get('waybill/recycle', 'WaybillsController@recycle');   //回收站
-Route::any('waybill/ontop/top','WaybillsController@waybillOnTop');
-Route::any('waybill/ontop/cancel','WaybillsController@cancelOnTop');
+Route::get('waybill/recycle', 'WaybillController@recycle');   //回收站
+Route::any('waybill/ontop/top','WaybillController@waybillOnTop');
+Route::any('waybill/ontop/cancel','WaybillController@cancelOnTop');
 
-Route::get('waybill/index','WaybillsController@index');
-Route::get('waybill/delivering','WaybillsController@delivering');
-Route::post('waybill/storeCarrierBill','WaybillsController@storeCarrierBill');
-Route::post('waybill/is/waybillPriceModel','WaybillsController@isWaybillPriceModel');
-Route::post('waybill/addCounty','WaybillsController@addCounty');
-Route::any('waybill/waybillAudit','WaybillsController@waybillAudit');
-Route::any('waybill/waybillEdit/{id}','WaybillsController@waybillEdit');
-Route::any('waybill/waybillRetreatAudit','WaybillsController@waybillRetreatAudit');
-Route::any('waybill/waybillEndAudit','WaybillsController@waybillEndAudit');
-Route::any('waybill/export','WaybillsController@export');
-Route::any('waybill/waybillUpdate/{id}','WaybillsController@waybillUpdate');
-Route::resource('waybill','WaybillsController');
+Route::get('waybill/index','WaybillController@index');
+Route::get('waybill/delivering','WaybillController@delivering');
+Route::post('waybill/storeCarrierBill','WaybillController@storeCarrierBill');
+Route::post('waybill/is/waybillPriceModel','WaybillController@isWaybillPriceModel');
+Route::post('waybill/addCounty','WaybillController@addCounty');
+Route::any('waybill/waybillAudit','WaybillController@waybillAudit');
+Route::any('waybill/waybillEdit/{id}','WaybillController@waybillEdit');
+Route::any('waybill/waybillRetreatAudit','WaybillController@waybillRetreatAudit');
+Route::any('waybill/waybillEndAudit','WaybillController@waybillEndAudit');
+Route::any('waybill/export','WaybillController@export');
+Route::any('waybill/waybillUpdate/{id}','WaybillController@waybillUpdate');
+Route::resource('waybill','WaybillController');
 
 
 Route::any('waybillFinancialSnapshot/export/{id}','WaybillFinancialSnapshotsController@export');

tests/Feature/WaybillsTest.php → tests/Feature/WaybillTest.php

@@ -13,7 +13,7 @@ use Tests\TestCase;
 use Illuminate\Foundation\Testing\WithFaker;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 
-class WaybillsTest extends TestCase
+class WaybillTest extends TestCase
 {
     use RefreshDatabase;
 

tests/codeCoverage/Http/Controllers/WaybillsController.php.html

@@ -2,7 +2,7 @@
 <html lang="en">
  <head>
   <meta charset="UTF-8">
-  <title>Code Coverage for D:\Demo\bswas\app\Http\Controllers\WaybillsController.php</title>
+  <title>Code Coverage for D:\Demo\bswas\app\Http\Controllers\WaybillController.php</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <link href="../../.css/bootstrap.min.css" rel="stylesheet" type="text/css">
   <link href="../../.css/octicons.css" rel="stylesheet" type="text/css">
@@ -19,7 +19,7 @@
          <li class="breadcrumb-item"><a href="../../index.html">D:\Demo\bswas\app</a></li>
          <li class="breadcrumb-item"><a href="../index.html">Http</a></li>
          <li class="breadcrumb-item"><a href="index.html">Controllers</a></li>
-         <li class="breadcrumb-item active">WaybillsController.php</li>
+         <li class="breadcrumb-item active">WaybillController.php</li>
 
        </ol>
       </nav>
@@ -73,7 +73,7 @@
       </tr>
 
       <tr>
-       <td class="danger"><abbr title="App\Http\Controllers\WaybillsController">WaybillsController</abbr></td>
+       <td class="danger"><abbr title="App\Http\Controllers\WaybillController">WaybillController</abbr></td>
        <td class="danger big">       <div class="progress">
          <div class="progress-bar bg-danger" role="progressbar" aria-valuenow="0.00" aria-valuemin="0" aria-valuemax="100" style="width: 0.00%">
            <span class="sr-only">0.00% covered (danger)</span>
@@ -403,7 +403,7 @@
      <tr><td><div align="right"><a name="21"></a><a href="#21">21</a></div></td><td class="codeLine"><span class="keyword">use</span><span class="default">&nbsp;</span><span class="default">Maatwebsite</span><span class="default">\</span><span class="default">Excel</span><span class="default">\</span><span class="default">Facades</span><span class="default">\</span><span class="default">Excel</span><span class="keyword">;</span></td></tr>
      <tr><td><div align="right"><a name="22"></a><a href="#22">22</a></div></td><td class="codeLine"><span class="keyword">use</span><span class="default">&nbsp;</span><span class="default">Ramsey</span><span class="default">\</span><span class="default">Uuid</span><span class="default">\</span><span class="default">Uuid</span><span class="keyword">;</span></td></tr>
      <tr><td><div align="right"><a name="23"></a><a href="#23">23</a></div></td><td class="codeLine"></td></tr>
-     <tr><td><div align="right"><a name="24"></a><a href="#24">24</a></div></td><td class="codeLine"><span class="keyword">class</span><span class="default">&nbsp;</span><span class="default">WaybillsController</span><span class="default">&nbsp;</span><span class="keyword">extends</span><span class="default">&nbsp;</span><span class="default">Controller</span></td></tr>
+     <tr><td><div align="right"><a name="24"></a><a href="#24">24</a></div></td><td class="codeLine"><span class="keyword">class</span><span class="default">&nbsp;</span><span class="default">WaybillController</span><span class="default">&nbsp;</span><span class="keyword">extends</span><span class="default">&nbsp;</span><span class="default">Controller</span></td></tr>
      <tr><td><div align="right"><a name="25"></a><a href="#25">25</a></div></td><td class="codeLine"><span class="keyword">{</span></td></tr>
      <tr><td><div align="right"><a name="26"></a><a href="#26">26</a></div></td><td class="codeLine"></td></tr>
      <tr><td><div align="right"><a name="27"></a><a href="#27">27</a></div></td><td class="codeLine"><span class="default">&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="keyword">public</span><span class="default">&nbsp;</span><span class="keyword">function</span><span class="default">&nbsp;</span><span class="default">index</span><span class="keyword">(</span><span class="default">Request</span><span class="default">&nbsp;</span><span class="default">$request</span><span class="keyword">)</span></td></tr>

tests/codeCoverage/Http/Controllers/index.html

@@ -772,7 +772,7 @@
       </tr>
 
       <tr>
-       <td class="warning"><img src="../../.icons/file-code.svg" class="octicon" /><a href="WaybillsController.php.html">WaybillsController.php</a></td>
+       <td class="warning"><img src="../../.icons/file-code.svg" class="octicon" /><a href="WaybillController.php.html">WaybillController.php</a></td>
        <td class="warning big">       <div class="progress">
          <div class="progress-bar bg-warning" role="progressbar" aria-valuenow="65.09" aria-valuemin="0" aria-valuemax="100" style="width: 65.09%">
            <span class="sr-only">65.09% covered (warning)</span>

webpack.mix.js

@@ -22,5 +22,5 @@ mix.copy('resources/images','public/images');
 mix.copy('resources/icon/faviconc.ico','public/faviconc.ico');
 mix.js('resources/js/trix.js','public/js/trix.js');
 mix.copy('resources/sass/trix.css','public/css/trix.css');
-mix.copy('resources/js/queryForm/queryForm.js','public/js/queryForm/queryForm200803.js');
+mix.copy('resources/js/queryForm/queryForm.js','public/js/queryForm/queryForm200803a.js');
 mix.copy('resources/js/queryForm/export.js','public/js/queryForm/export.js');