Merge branch 'zzd'

# Conflicts:
#	resources/js/queryForm/queryForm.js
#	resources/views/process/index.blade.php

app/Http/Controllers/TestController.php

@@ -277,8 +277,8 @@ class TestController extends Controller
     /*1*/
     function test(Request $request)
     {/**/
-        $str = 'a';
-        dd(is_object($str));
+        $str = (int)'b';
+        dd($str);
     }
 
 }

app/Services/ProcessService.php

@@ -10,8 +10,9 @@ use Illuminate\Http\Request;
 Class ProcessService
 {
     private function conditionQuery(Request $request){
-        $processes=Process::filterAuthorities()->with(['tutorials','signs','signUnitPrice','processesContents'=>function($query){
-            return $query->with(['commodity'=>function($query){
+        $processes=Process::filterAuthorities()->with(['tutorials','signs',
+            'signUnitPrice','processesContents'=>function($query){
+            return $query->with(['signCommodityName','signCommoditySku','commodity'=>function($query){
                 return $query->with('barcodes');
             }]);
         }])->orderBy('processes.id','DESC');

app/Services/WaybillService.php

@@ -2,16 +2,19 @@
 
 namespace App\Services;
 
+use App\Owner;
 use App\Services\common\QueryService;
+use App\User;
 use App\Waybill;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
 use Ramsey\Uuid\Uuid;
 
 Class WaybillService
 {
     private function conditionQuery(Request $request){
-        $waybills = Waybill::with(['owner','wmsCommodities','waybillAuditLogs' => function ($query) {
+        $waybills = Waybill::filterAuthorities()->with(['owner','wmsCommodities','waybillAuditLogs' => function ($query) {
             return $query->with('user');
         }])->selectRaw('waybills.* ,waybill_on_tops.id top_id ,waybill_on_tops.remark,waybill_on_tops.updated_at top_update')
             ->leftJoin('waybill_on_tops','waybill_on_tops.waybill_id','=','waybills.id')
@@ -44,7 +47,7 @@ Class WaybillService
     }
 
     public function some(Request $request){
-        return $waybills = Waybill::with(['owner'])->selectRaw('waybills.* ,waybill_on_tops.id top_id ,waybill_on_tops.remark,waybill_on_tops.updated_at top_update')
+        return $waybills = Waybill::filterAuthorities()->with(['owner'])->selectRaw('waybills.* ,waybill_on_tops.id top_id ,waybill_on_tops.remark,waybill_on_tops.updated_at top_update')
             ->leftJoin('waybill_on_tops','waybill_on_tops.waybill_id','=','waybills.id')
             ->whereNull('waybill_on_tops.deleted_at')
             ->orderBy('waybill_on_tops.updated_at','desc')

app/Waybill.php

@@ -5,6 +5,7 @@ namespace App;
 use Illuminate\Database\Eloquent\Model;
 use App\Traits\ModelTimeFormat;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Support\Facades\Auth;
 
 class Waybill extends Model
 {
@@ -133,4 +134,11 @@ class Waybill extends Model
     }
 
 
+    public static function filterAuthorities(){
+        $user = Auth::user();
+        $owner_ids=$user->getPermittingOwnerIdsAttribute();
+        return (new static)->newQuery()->whereIn('owner_id',$owner_ids);
+    }
+
+
 }

resources/js/utilities/sort.js

@@ -1,5 +1,32 @@
-
-function sort(array) {
-    array = [{id:12,name:'a12458',value:'周及'},{id:15,name:'d12458',value:'蓝及'},];
-
+var i=0;
+function sort(array = [{id:12,name:'a12458',value:'周及'},{id:15,name:'d12458',value:'蓝及'}]) {
+    let data = {};
+    data['0']='';data['1']='';data['2']='';data['3']='';data['4']='';data['5']='';data['6']='';data['7']='';data['8']='';
+    data['9']='';data['a']='';data['b']='';data['c']='';data['d']='';data['e']='';data['f']='';data['g']='';data['h']='';
+    data['i']='';data['j']='';data['k']='';data['l']='';data['m']='';data['n']='';data['o']='';data['p']='';data['q']='';
+    data['r']='';data['s']='';data['t']='';data['u']='';data['v']='';data['w']='';data['x']='';data['y']='';data['z']='';
+    data['A']='';data['B']='';data['C']='';data['D']='';data['E']='';data['F']='';data['G']='';data['H']='';data['I']='';
+    data['J']='';data['K']='';data['L']='';data['M']='';data['N']='';data['O']='';data['P']='';data['Q']='';data['R']='';
+    data['S']='';data['T']='';data['U']='';data['V']='';data['W']='';data['X']='';data['Y']='';data['Z']='';
+    array.forEach(function (obj) {
+        if (!data[obj.name.charAt(i)])  data[obj.name.charAt(i)] = [obj];
+        data[obj.name.charAt(i)] = data[obj.name.charAt(i)].push(obj);
+    });
+    for (let key in data){
+        if (!data[key]){
+            delete data[key];
+            continue;
+        }
+        if (data[key].length > 1){
+            if ( !data[key].some(function (value, index) {
+                return value !== array[0];
+            })) continue;
+            else {
+                i=0;
+                data[key] = this.sort(data[key]);
+            }
+        }
+    }
+    i++;
+    return data;
 }

resources/views/process/index.blade.php

@@ -477,6 +477,7 @@
 @section('lastScript')
     <script type="text/javascript" src="{{asset('js/queryForm/export200804.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/queryForm200805b.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/sort.js')}}"></script>
     <script>
         new Vue({
             el:"#process",