Merge branch 'zengjun'

# Conflicts:
#	app/Http/Controllers/TestController.php
#	resources/js/queryForm/queryForm.js

resources/js/queryForm/queryForm.js

@@ -27,6 +27,7 @@ const query = function getQueryForm(data) {
             if(!this.autoSubmit){
                 return;
             }
+            // console.log(_data);
             saveSearchOnCookie();
             let form = $("<form method='" + _this.method +"'></form>");
             for (const key in _data) {
@@ -130,12 +131,12 @@ const query = function getQueryForm(data) {
                 if ([null, '', undefined].includes(condition.type) && ![null, undefined].includes(condition.name)) {
                     condition.type = 'input';
                 }
-                if (['dateTime_dateTime', 'dateTimeLocal','input_input'].includes(condition.type)) {
-                    td = $("<td  style='width: 330px'></td>")
+                if (['dateTime_dateTime', 'input_input'].includes(condition.type)) {
+                    td = $("<td  style='width: 330px'</td>")
                 } else if (['select_multiple_select', 'time', 'dateTime_select'].includes(condition.type)) {
-                    td = $("<td  style='width: 280px'></td>");
+                    td = $("<td  style='width: 280px'</td>");
                 } else if (['time', 'dateTime_select'].includes(condition.type)) {
-                    td = $("<td  style='width: 320px'></td>");
+                    td = $("<td  style='width: 320px'</td>");
                 }
                 td.append(createModule(condition));
                 tr.append(td);
@@ -159,7 +160,7 @@ const query = function getQueryForm(data) {
             conditions.forEach(function (condition, index, array) {
                 if (['input', 'select', 'dateTime', 'input_select'].includes(condition.type)) {
                     _width += 260;
-                } else if (['dateTime_dateTime','dateTimeLocal', 'input_input'].includes(condition.type)) {
+                } else if (['dateTime_dateTime', 'input_input'].includes(condition.type)) {
                     _width += 330;
                 } else if (['select_multiple_select','search_select'].includes(condition.type)) {
                     _width += 280;
@@ -327,7 +328,6 @@ const query = function getQueryForm(data) {
             || (type === "search_select" && getSearchSelect(condition))
             || (type === "input_select" && getInputSelect(condition))
             || (type === "dateTime" && getdateTime(condition))
-            || (type === "dateTimeLocal" && getDateTimeLocal(condition))
             || (type === "time" && getTime(condition))
             || (type === "input_input" && getInputInput(condition))
             || (type === "dateTime_dateTime" && getdateTimedateTime(condition))
@@ -336,17 +336,6 @@ const query = function getQueryForm(data) {
             || (type === "checkbox" && getCheckBox(condition));
     }
 
-    //dateTimeLocal
-    function getDateTimeLocal(condition) {
-        let dateTimeLocal = $("<input name = '"+ condition.name +"' type='datetime-local' step='01' class='form-control form-control-sm' style='vertical-align: middle; max-width: 280px;' placeholder='" + condition.placeholder + "' autocomplete='off' data-toggle='tooltip' data-placement='top' >");
-        dateTimeLocal.attr('title', condition.tip === undefined ? '' : condition.tip);
-        dateTimeLocal.bind('input propertychange', function () {
-            let dom = {name: condition.name, type: 'dateTimeLocal', value: this.value, mold: 'dateTimeLocal'};
-            modifyData(dom);
-        });
-        return dateTimeLocal;
-    }
-
     // input
     function getInput(condition) {
         let input = $("<input name='" + condition.name + "' class='form-control form-control-sm' style='vertical-align: middle; max-width: 200px;' placeholder='" + condition.placeholder + "' autocomplete='off' data-toggle='tooltip' data-placement='top' >");
@@ -1051,7 +1040,7 @@ const query = function getQueryForm(data) {
     }
 
     function redenerSearchFormOnData(key, value, mold) {
-        if (mold === 'input' ||mold === 'dateTime' || mold === 'dateTimeLocal') {
+        if (mold === 'input' ||mold === 'dateTime') {
             rendererSearchFormOnInput(key, value, mold);
         } else if (mold === 'select') {
             rendererSearchFormOnSelect(key, value, mold);
@@ -1068,7 +1057,7 @@ const query = function getQueryForm(data) {
     function switchData() {
         _this.condition.forEach(function (conditions) {
             conditions.forEach(function (condition) {
-                if (['input', 'select', 'dateTime','dateTimeLocal', 'search_select', 'time', 'select_multiple_select','checkbox'].includes(condition.type)) {
+                if (['input', 'select', 'dateTime', 'search_select', 'time', 'select_multiple_select','checkbox'].includes(condition.type)) {
                     if (!condition.select) {
                         condition.select = '';
                     }
@@ -1166,7 +1155,7 @@ const query = function getQueryForm(data) {
             // }
             _data[key].select = value;
 
-            if (['input', 'dateTime', 'dateTimeLocal'].includes(mold)) {
+            if (['input', 'dateTime'].includes(mold)) {
                 rendererSearchFormOnInput(key, value, mold);
             } else if (['select'].includes(mold)) {
                 rendererSearchFormOnSelect(key, value, mold);

resources/js/utilities/tempTip.js

@@ -13,24 +13,32 @@ const tempTip={
         this.inputType=type;
     },
     showSuccess:function(text){
-        let tiper=$("<div class='row' style='color:white;opacity:0.9;position:fixed;top:40%;transform:translateY(-50%);z-index:"+this.index+";width:100%;'>" +
+        let parWidth = document.body.offsetWidth;
+        let parHeight = document.body.offsetHeight;
+        let parentDom = $("<div style='top: 0;left: 0;width: "+parWidth+"px;height: "+parHeight+"px;position:fixed'></div>");
+        let tiper=$("<div class='row' style='color:white;opacity:0.9;position: relative;top:40%;transform:translateY(-50%);z-index:"+this.index+";width:100%;'>" +
             "<div class='col-8 offset-2'><div class='card'><div class='card-body h4 bg-success text-center'>" +
             text +
             "</div></div></div></div>");
         tiper.animate({opacity:'0'},this.fadingDuration,'swing',function () {
-            tiper.remove();
+            parentDom.remove();
         });
-        $('body').append(tiper)
+        parentDom.append(tiper);
+        $('body').append(parentDom);
     },
     show:function(text){
-        let tiper=$("<div class='row' style='color:white;opacity:0.9;position:fixed;top:40%;transform:translateY(-50%);width:100%;z-index:"+this.index+";'>" +
+        let parWidth = document.body.offsetWidth;
+        let parHeight = document.body.offsetHeight;
+        let parentDom = $("<div style='top: 0;left: 0;width: "+parWidth+"px;height: "+parHeight+"px;position:fixed'></div>");
+        let tiper=$("<div class='row' style='color:white;opacity:0.9;top:40%;position: relative;transform:translateY(-50%);width:100%;z-index:"+this.index+";'>" +
             "<div class='col-8 offset-2'><div class='card'><div class='card-body h2 bg-danger text-center'>" +
             text +
             "</div></div></div></div>");
         tiper.animate({opacity:'0'},this.fadingDuration,'swing',function () {
-            tiper.remove();
+            parentDom.remove();
         });
-        $('body').append(tiper)
+        parentDom.append(tiper);
+        $('body').append(parentDom);
     },
     okWindow:function(text,okText){
         let bg=$("<div style='opacity:0.4;position:fixed;top:0;width:100%;height:100%;z-index:"+this.index+";background-color:#000;'></div>" );

resources/views/store/checkingReceive/mission.blade.php

@@ -41,16 +41,10 @@
         <button class="btn btn-sm btn-outline-info" @click="openImport()">导入</button>
     </div>
 
-    <label for="all" class="d-none" id="cloneCheckAll">
-        <input id="all" type="checkbox" @click="checkAll($event)">全选
-    </label>
     <table class="table table-sm text-nowrap table-bordered d-none" id="headerRoll"></table>
     <table class="table table-striped table-sm text-nowrap table-hover mt-1" id="headerParent">
         <tr id="header"></tr>
         <tr v-for="(storeCheckingReceive,i) in storeCheckingReceives">
-            <td>
-                <label><input class="checkItem" type="checkbox" :value="storeCheckingReceives.id" v-model="checkData" /></label>
-            </td>
             <td>@{{ i+1 }}</td>
             <td>@{{ storeCheckingReceive.id }}</td>
             <td>@{{ storeCheckingReceive.owner_name }}</td>
@@ -129,8 +123,6 @@
                 });
                 _this.form.init();
                 let column = [
-                    {name:'cloneCheckAll',customization:true,type:'checkAll',column:'id',
-                        dom:$('#cloneCheckAll').removeClass('d-none'), neglect: true},
                     {name:'index',value: '序号', neglect: true},
                     {name:'id',value: 'ID', neglect: true},
                     {name:'owner_name',value: '货主'},
@@ -141,16 +133,13 @@
                     {name:'created_at',value: '创建时间'},
                     {name:'operating',value: '操作', neglect: true},
                 ];
-                setTimeout(function () {
-                    let header = new Header({
-                        el: "#header",
-                        column: column,
-                        data: _this.storeCheckingReceives,
-                        restorationColumn: 'id',
-                        vue:vue,
-                    });
-                    header.init();
-                },0);
+                let header = new Header({
+                    el: "#header",
+                    column: column,
+                    data: _this.storeCheckingReceives,
+                    restorationColumn: 'id',
+                });
+                header.init();
             },
             methods:{
                 checkAll(event){

resources/views/store/checkingReceive/show.blade.php

@@ -82,9 +82,9 @@
         </div>
         @endcan
         <div class="ml-2 mt-2">
-            <button class="btn btn-sm btn-outline-dark" @click="exportItem()">导出</button>
-            @can('入库管理-盘收一体-盘收-编辑')<button v-if="storeCheckingReceive.status != '已收货'" class="btn btn-sm btn-outline-danger" @click="isResetAmount()">重新清点</button>@endcan
-            @can('入库管理-盘收一体-盘收-编辑')<button v-if="storeCheckingReceive.status != '已收货'" class="btn btn-sm btn-outline-success" data-toggle="modal" data-target="#asnWindow">匹配ASN单据</button>@endcan
+            <button type="button" class="btn btn-sm btn-outline-dark" @click="exportItem()">导出</button>
+            @can('入库管理-盘收一体-盘收-编辑')<button type="button" v-if="storeCheckingReceive.status != '已收货'" class="btn btn-sm btn-outline-danger" @click="isResetAmount()">重新清点</button>@endcan
+            @can('入库管理-盘收一体-盘收-编辑')<button type="button" v-if="storeCheckingReceive.status != '已收货'" class="btn btn-sm btn-outline-success" data-toggle="modal" data-target="#asnWindow">匹配ASN单据</button>@endcan
         </div>
         <div class="row text-primary ml-1 mr-2 mt-1 mb-1 w-100" style="background-color: #c3e3b5">
             <span class="ml-1">任务ID： <b class="text-dark">@{{ storeCheckingReceive.id }}</b></span>