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

app/Http/Controllers/LogController.php

@@ -62,10 +62,10 @@ class LogController extends Controller
             $query->where('description', 'like', '%' . $str . '%');
         }
         if ($request->has('created_at_start')) {
-            $query->where('created_at', '>=', $request->created_at_start);
+            $query->where('created_at', '>=', $request->created_at_start." 00:00:00");
         }
         if ($request->has('created_at_end')) {
-            $query->where('created_at', '<=', $request->created_at_end);
+            $query->where('created_at', '<=', $request->created_at_end." 23:59:59");
         }
         if ($request->has("is_exception")){
             $query->where(function(Builder $query){

app/Http/Controllers/StoreController.php

@@ -15,6 +15,7 @@ use App\WMSReflectReceive;
 use Carbon\Carbon;
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Contracts\View\Factory;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
@@ -182,8 +183,11 @@ class StoreController extends Controller
     public function quickStorage($asnno,$quality,$depository_code,$isVerification = true)
     {
         $task = Store::query()->where("asn_code",$asnno)
-            ->where("stored_method","快速入库")
-            ->orWhere('is_fast_stored','快速入库')
+            ->where(function ($query){
+                /** @var Builder $query */
+                $query->where("stored_method","快速入库")
+                    ->orWhere('is_fast_stored','快速入库');
+            })
             ->where("status","已入库")->first();
         if ($task)return ['success'=>false, 'data'=>"已被快速入库"];
         $db = DB::connection('oracle');

resources/views/customer/customerLogStatus/_edit.blade.php

@@ -0,0 +1,22 @@
+<div class="modal fade" tabindex="-1" role="dialog" id="modal">
+    <div class="modal-dialog modal-xl modal-dialog-centered modal-dialog-scrollable">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal">&times;</button>
+            </div>
+            <div class="modal-body">
+                <div class="row">
+                    <label class="col-3" for="name">名称</label>
+                    <input class="col-9" id="name" type="text" v-model="status.name">
+                </div>
+                <div class="row">
+                    <label class="col-3" for="description">说明</label>
+                    <textarea class="col-9" id="description" type="text" v-model="status.description"></textarea>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-success" @click="submitCustomerLogStatus()">提交</button>
+            </div>
+        </div>
+    </div>
+</div>

resources/views/customer/customerLogStatus/index.blade.php

@@ -4,22 +4,39 @@
 @section('content')
     <div id="nav2">
         @component('customer.menu')@endcomponent
-        @component('customer.customerLogStatus.menu')@endcomponent
+        @component('customer.customer.menu')@endcomponent
     </div>
 
     <div class="d-none container-fluid" id="container">
-        <table class="table table-striped table-bordered table-hover">
-            <tr>
-                <th>序号</th>
-                <th>名称</th>
-                <th>说明</th>
-                <th>创建时间</th>
-                <th>修改时间</th>
-            </tr>
-            <tr v-for="">
-                <td></td>
-            </tr>
-        </table>
+        <div class="card">
+            <div class="card-body">
+                @include("customer.customerLogStatus._edit")
+                <div class="row pull-right">
+                    @can("客户管理-客户-客户状态-录入")<button class="btn btn-outline-info mb-1 mr-3" @click="openModal()"><span class="fa fa-plus"></span>&nbsp;新&nbsp;&nbsp;增</button>@endcan
+                </div>
+                <table class="table table-striped table-bordered table-hover">
+                    <tr>
+                        <th>序号</th>
+                        <th>名称</th>
+                        <th>说明</th>
+                        <th>创建时间</th>
+                        <th>修改时间</th>
+                        <th>操作</th>
+                    </tr>
+                    <tr v-for="(model,i) in models">
+                        <td>@{{ i+1 }}</td>
+                        <td>@{{ model.name }}</td>
+                        <td>@{{ model.description }}</td>
+                        <td>@{{ model.createdAt }}</td>
+                        <td>@{{ model.updatedAt }}</td>
+                        <td>
+                            @can("客户管理-客户-客户状态-编辑")<button class="btn btn-sm btn-outline-info" @click="openModal(model)">改</button>@endcan
+                            @can("客户管理-客户-客户状态-删除")<button class="btn btn-sm btn-outline-danger" @click="deleteModel(model)">删</button>@endcan
+                        </td>
+                    </tr>
+                </table>
+            </div>
+        </div>
     </div>
 @stop
 
@@ -28,12 +45,28 @@
         new Vue({
             el:"#container",
             data:{
+                status:{},
                 models:[
                     @foreach($customerLogStatuses as $customerLogStatus)
-
+                    {id:"{{$customerLogStatus->id}}",'name':"{{$customerLogStatus->name}}", 'description':"{{$customerLogStatus->description}}"
+                        , 'createdAt':"{{$customerLogStatus->created_at}}"
+                        , 'updatedAt':"{{$customerLogStatus->updated_at}}"},
                     @endforeach
                 ],
             },
+            mounted(){
+                $("#container").removeClass("d-none");
+            },
+            methods:{
+                openModal(model){
+                   if (model) this.status={id:model.id,name:model.name,description:model.description};
+                   else this.status={id:"",name:"",description:""};
+                   $("#modal").modal("show");
+                },
+                deleteModel(model){
+                    window.tempTip.postBasicRequest();
+                },
+            },
         });
     </script>
-@stop
+@endsection

resources/views/customer/customerLogStatus/menu.blade.php

@@ -1,18 +0,0 @@
-<div class="container-fluid nav3">
-    <div class="card menu-third" >
-        <ul class="nav nav-pills">
-            @can('客户-查询')
-                <li class="nav-item">
-                    <a class="nav-link" href="{{url('customer/customer/customerLogStatus')}}" :class="{active:isActive('',4)}">查询</a>
-                </li> @endcan
-            @can('客户-录入')
-                <li class="nav-item">
-                    <a class="nav-link" href="{{url('customer/customer/create')}}" :class="{active:isActive('create',3)}">录入</a>
-                </li> @endcan
-            <li class="nav-item">
-                <a class="nav-link" href="{{url('customer/customer/customerLogStatus')}}" :class="{active:isActive('customerLogStatus',3)}">客户状态</a>
-            </li>
-            {{$slot}}
-        </ul>
-    </div>
-</div>

文档/WAS项目规范.md

@@ -11,6 +11,9 @@
 		模型中的方法可以使用名词，意为以方法当作属性字段
 	动作方法的命名
 		用及物动词，不及物动词都可以，可以有副词在动词前后，不能是“名词前动词后”描述动作，或不能“名词+形容词”来描述动作
+	代码命名
+	    文件命名统一为驼峰单数命名且首字母大写(视图文件非大写)加对应功能块(例如：user模块：Model:User  controller：UserController service：UserService)
+	    数据库命名：表名为复数,多词使用下划线连接,中间表为单数(对于中间表而言建议根据首字母在26个英文字母中的顺序排列连接表)
 ##控制器
 	限制
 		仅放请求