queryForm time组件修复

控制台组件增加
创建时间新增

app/OrderPackageCountingRecord.php

@@ -11,12 +11,8 @@ class OrderPackageCountingRecord extends Model
     use LogModelChanging;
 
     protected $fillable=[
-        "targeted_at","owner_id","un_weigh_count","total_count"
+        "targeted_at","un_weigh_count","total_count"
     ];
     public $timestamps=false;
 
-    public function owner()
-    {   //货主
-        return $this->belongsTo(Owner::class);
-    }
 }

database/migrations/2021_01_25_104626_create_order_package_counting_records_table.php

@@ -14,11 +14,9 @@ class CreateOrderPackageCountingRecordsTable extends Migration
     public function up()
     {
         Schema::create('order_package_counting_records', function (Blueprint $table) {
-            $table->date("targeted_at")->comment("统计日期");
-            $table->bigInteger("owner_id")->comment("货主");
+            $table->date("targeted_at")->index()->comment("统计日期");
             $table->integer("un_weigh_count")->default(0)->comment("未称重数量");
             $table->integer("total_count")->default(0)->comment("总数");
-            $table->index(["targeted_at","owner_id"]);
         });
     }
 

resources/js/queryForm/queryForm.js

@@ -474,7 +474,7 @@ const query = function getQueryForm(data) {
         let min = $("<input id='" + condition.name + "_min' class='form-control form-control-sm ml-2' style='max-width: 100px;' placeholder='00:00' data-toggle='tooltip' data-placement='top' >");
         min.attr('title', controlJsType(condition.tip[1], 'undefined') ? '' : condition.tip[1]);
         dateTime.bind('input propertychange', function () {
-            let value = this.value !== '' ? this.value + ' ' +(!!min.val() ?  min.val() :'00:00' ) : '';
+            let value = this.value !== '' ? this.value + ' ' +(!!min.val() ?  min.val() :'23:59' ) : '';
             modifyData( {name: condition.name, type: 'time', value: value, mold: 'time'});
             // modifyData({name: condition.name, type: 'dateTime', value: this.value, mold: 'dateTime'});
         });
@@ -826,10 +826,10 @@ const query = function getQueryForm(data) {
                     if (relevance.value){
                         let today = getToday();
                         let tarDate = getSubDate(getToday(),relevance.value);
-                        _data[end.name].value = today;
-                        _data[start.name].value = tarDate;
-                        redenerSearchFormOnData(end.name, tarDate, end.mold);
-                        redenerSearchFormOnData(start.name, tarDate, start.mold);
+                        _data[end.name].value = today+" 23:59";
+                        _data[start.name].value = tarDate+" 00:00";
+                        /*redenerSearchFormOnData(end.name, tarDate+" 23:59", end.mold);
+                        redenerSearchFormOnData(start.name, tarDate+" 00:00", start.mold);*/
                     }
                     return;
                 }

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

@@ -3,7 +3,7 @@
         <div class="modal-content">
             <div class="modal-header">
                 <label class="ml-5">
-                    <input class="form-control rounded-pill" @keydown.13="search($event)" placeholder="快捷检索">
+                    <input class="form-control rounded-pill" @keydown.13="search($event)" placeholder="回车快捷检索地区">
                 </label>
                 <div class="scrollbar ml-2 border border-2 rounded pl-2 pr-5" style="overflow-y:auto;max-height:80px;overflow-x:hidden;">
                     <p class="mb-1 cursor-pointer" v-for="obj in result" v-html="obj.text" @click="selectedSearch(obj)"></p>

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

@@ -21,6 +21,7 @@
                         <th>区/县</th>
                         <th>乡/镇</th>
                         <th>村/街</th>
+                        <th>创建时间</th>
                         <th></th>
                     </tr>
                     <tr v-for="(freeze,i) in freezes">
@@ -31,6 +32,7 @@
                         <td>@{{ freeze.district ? freeze.district.name : '' }}</td>
                         <td>@{{ freeze.town ? freeze.town.name : '' }}</td>
                         <td>@{{ freeze.street ? freeze.street.name : '' }}</td>
+                        <td>@{{ freeze.created_at }}</td>
                         <td>
                             <button class="btn btn-sm btn-outline-danger" @click="deleteFreeze(freeze,i)">删除</button>
                             <button class="btn btn-sm btn-outline-info" @click="openModal(freeze,i)">编辑</button>