Merge branch 'master' into Haozi

# Conflicts:
#	app/Providers/AppServiceProvider.php

app/Authority.php

@@ -38,15 +38,13 @@ class Authority extends Model
     public  static  function  filterRecycle(Collection $authorities)
     {
         $owners = Owner::query()->whereNotNull("deleted_at")->get();
-        $owner_names = $owners->map(function($owner){
-            if (mb_strpos($owner->name,"（停用）")){
-                $name =  mb_substr($owner->name,0,mb_stripos($owner->name,"（停用）"));
-                return "(货主：{$name})";
-            }
-            return "(货主：{$owner->name})";
+
+        $owner_keys = $owners->map(function($owner){
+            return '_'.$owner['id'];
         })->toArray();
-        return $authorities->filter(function ($authority)use($owner_names){
-            return !in_array($authority->alias_name,$owner_names);
+
+        return $authorities->filter(function ($authority)use($owner_keys){
+            return !in_array($authority->name,$owner_keys);
         });
     }
 }

app/Http/Controllers/DeliveryAppointmentController.php

@@ -155,9 +155,9 @@ class DeliveryAppointmentController extends Controller
                 $insert[] = [
                     "delivery_appointment_id" => $appointment->id,
                     "license_plate_number"    => $car["license_plate_number"],
-                    "car_id"                  => $car["car_id"],
-                    "driver_name"             => $car["driver_name"],
-                    "driver_phone"            => $car["driver_phone"],
+                    "car_id"                  => $car["car_id"] ?? null,
+                    "driver_name"             => $car["driver_name"] ?? null,
+                    "driver_phone"            => $car["driver_phone"] ?? null,
                     "appointment_number"      => $number,
                 ];
             }

app/Http/Controllers/TestController.php

@@ -735,7 +735,7 @@ class TestController extends Controller
 
     public function reNewBatches3()
     {
-        $batches = Batch::query()->where('id', '>', 94486)->get('code');
+        $batches = Batch::query()->where('id', '>', 95812)->get('code');
         $batchCodes = $batches->map(function ($batch) {
             return $batch['code'];
         })->toArray();
@@ -762,7 +762,7 @@ class TestController extends Controller
 //        dd($logs);
         foreach ($batchCodes as $code) {
 //            $request=Cache::get('temp'.$code)['description'];
-            $request = Log::query()->select('description')->where('CREATED_AT', '>=', '2021-04-05')
+            $request = Log::query()->select('description')->where('CREATED_AT', '>=', '2021-04-09')
                 ->where('method', "issued_newBatch")
                 ->where('description', 'like', "%{$code}%")
                 ->first();

app/Http/Controllers/api/thirdPart/haiq/StorageController.php

@@ -38,20 +38,16 @@ class StorageController
             "priority" => 99,//优先级 1-2147483647 1最低
             "sequenceFlag" => -1,//是否需要有序 1：需要有序 0：不需要有序
             "bins" => [$bin],//可执行货箱任务
-        ]];*///IDE0005714,IDE0004970
+        ]];*///IDE0005714,IDE0004970,IDE0005676,IDE0005665
         $this->post = [[
             "taskMode"      => 1,
             "bins"=>[[
-                "taskCode"  =>'t'.microtime(true),
+                "taskCode"  =>'t2'.microtime(true),
                 "binCode"   => "IDE0005714",
                 "fromLocCode" => "BIN-IN1",
                 "toLocCode" => "",
-            ],[
-                "taskCode"  =>'t1'.microtime(true),
-                "binCode"   => "IDE0004970",
-                "fromLocCode" => "BIN-IN1",
-                "toLocCode" => "",
-            ],],
+            ],
+                ],
             "groupCode"     => 'g'.microtime(true),
             "priority"      => 20,
             "sequenceFlag"  => 1,
@@ -68,30 +64,46 @@ class StorageController
             "priority"      => 20,
             "sequenceFlag"  => 1,
         ]];
-        $this->backIn = [[
-            "taskMode"      => 1,
+        $this->moveBinIn = [[
+            "taskMode"      => 6,
             "bins"=>[[
-                "taskCode"  =>"testIn1ax",
-                "binCode"   => "IDE0000007",
-                "fromLocCode" => "BIN-IN1",
+                "taskCode"  =>'t1'.microtime(true),
+                "binCode"   => "IDE0000036",
+                "fromLocCode" => "HAIB1-01-03", //B1是面对架货右手，从右往左数列，第三个数字从下往上数行
                 "toLocCode" => "",
             ],[
-                "taskCode"  =>"testIn2ax",
-                "binCode"   => "IDE0000129",
-                "fromLocCode" => "BIN-IN1",
+                "taskCode"  =>'t2'.microtime(true),
+                "binCode"   => "IDE0004973",
+                "fromLocCode" =>  "HAIB1-02-03", //B1是面对架货右手，从右往左数列，第三个数字从下往上数行
                 "toLocCode" => "",
-            ],],
-            "groupCode"     => 'WMx135ax',
+            ],[
+                "taskCode"  =>'t3'.microtime(true),
+                "binCode"   => "IDE0005716",
+                "fromLocCode" =>  "HAIB1-03-02", //B1是面对架货右手，从右往左数列，第三个数字从下往上数行
+                "toLocCode" => "",
+            ],
+                ],
+            "groupCode"     => 'g'.microtime(true),
             "priority"      => 20,
             "sequenceFlag"  => 1,
         ]];
-        $this->backIn2 = [[
-            "taskMode"      => 6,
+        $this->moveBinIn2 = [[
+            "taskMode"      => 3,
             "bins"=>[[
-                "taskCode"  =>'t'.microtime(true),
-                "binCode"   => "IDE0005679",
-                "fromLocCode" => "HAIB2-03-02",
-                "toLocCode" => "",
+                "taskCode"  =>'t1'.microtime(true),
+                "binCode"   => "IDE0000036",
+                "fromLocCode" => "", //B1是面对架货右手，从右往左数列，第三个数字从下往上数行
+                "toLocCode" => "HAIB1-01-03",
+            ],[
+                "taskCode"  =>'t2'.microtime(true),
+                "binCode"   => "IDE0004973",
+                "fromLocCode" =>  "", //B1是面对架货右手，从右往左数列，第三个数字从下往上数行
+                "toLocCode" => "HAIB1-02-03",
+            ],[
+                "taskCode"  =>'t3'.microtime(true),
+                "binCode"   => "IDE0005716",
+                "fromLocCode" =>  "", //B1是面对架货右手，从右往左数列，第三个数字从下往上数行
+                "toLocCode" => "HAIB1-03-02",
             ],],
             "groupCode"     => 'g'.microtime(true),
             "priority"      => 20,
@@ -129,57 +141,6 @@ class StorageController
                 "fromLocCode" => "HAIB1-02-02", //B1是面对架货右手，从右往左数列，第三个数字从下往上数行
                 "toLocCode" => "",
             ],
-//                ,[
-//                "taskCode"  =>'t'.Uuid::uuid4(),
-//                "binCode"   => "IDE0005680",
-//                "fromLocCode" => "HAIB2-03-02", //B1是面对架货右手，从右往左数列，第三个数字从下往上数行
-//                "toLocCode" => "",
-//            ],[
-//                "taskCode"  =>'t'.Uuid::uuid4(),
-//                "binCode"   => "IDE0005676",
-//                "fromLocCode" => "HAIB2-03-01", //B1是面对架货右手，从右往左数列，第三个数字从下往上数行
-//                "toLocCode" => "",
-//            ],[
-//                "taskCode"  =>'t'.Uuid::uuid4(),
-//                "binCode"   => "IDE0005714",
-//                "fromLocCode" => "HAIB2-02-03", //B1是面对架货右手，从右往左数列，第三个数字从下往上数行
-//                "toLocCode" => "",
-//            ],[
-//                "taskCode"  =>'t'.Uuid::uuid4(),
-//                "binCode"   => "IDE0005677",
-//                "fromLocCode" => "HAIB2-02-02", //B1是面对架货右手，从右往左数列，第三个数字从下往上数行
-//                "toLocCode" => "",
-//            ],[
-//                "taskCode"  =>'t'.Uuid::uuid4(),
-//                "binCode"   => "IDE0005682",
-//                "fromLocCode" => "HAIB2-02-01", //B1是面对架货右手，从右往左数列，第三个数字从下往上数行
-//                "toLocCode" => "",
-//            ],[
-//                "taskCode"  =>'t'.Uuid::uuid4(),
-//                "binCode"   => "IDE0005679",
-//                "fromLocCode" => "HAIB2-01-03", //B1是面对架货右手，从右往左数列，第三个数字从下往上数行
-//                "toLocCode" => "",
-//            ],[
-//                "taskCode"  =>'t'.Uuid::uuid4(),
-//                "binCode"   => "IDE0000166",
-//                "fromLocCode" => "HAIB2-01-02", //B1是面对架货右手，从右往左数列，第三个数字从下往上数行
-//                "toLocCode" => "",
-//            ],[
-//                "taskCode"  =>'t'.Uuid::uuid4(),
-//                "binCode"   => "IDE0005710",
-//                "fromLocCode" => "HAIB2-01-01", //B1是面对架货右手，从右往左数列，第三个数字从下往上数行
-//                "toLocCode" => "",
-//            ],[
-//                "taskCode"  =>'t'.Uuid::uuid4(),
-//                "binCode"   => "IDE0005678",
-//                "fromLocCode" => "HAIB1-03-01", //B1是面对架货右手，从右往左数列，第三个数字从下往上数行
-//                "toLocCode" => "",
-//            ],[
-//                "taskCode"  =>'t'.Uuid::uuid4(),
-//                "binCode"   => "IDE0004975",
-//                "fromLocCode" => "HAIB1-03-02", //B1是面对架货右手，从右往左数列，第三个数字从下往上数行
-//                "toLocCode" => "",
-//            ],
                 ],
             "groupCode"     => 'g'.microtime(true),
             "priority"      => 20,
@@ -265,10 +226,10 @@ class StorageController
         return $this->relocate($request,$this->post2);
     }
     public function moveBinIn(Request $request){
-        return $this->relocate($request,$this->backIn);
+        return $this->relocate($request,$this->moveBinIn);
     }
     public function moveBinIn2(Request $request){
-        return $this->relocate($request,$this->backIn2);
+        return $this->relocate($request,$this->moveBinIn2);
     }
 
     public function moveBinM(Request $request){

app/Http/Controllers/api/thirdPart/hengli/PackageController.php

@@ -21,7 +21,6 @@ class PackageController extends WeightBaseController
 
     public function new_(Request $request)
     {
-        app('LogService')->log(__METHOD__, $this->name, "上传信息：".  json_encode($request->getContent()));
         return $this->new($request);
     }
 

app/Http/Controllers/api/thirdPart/weight/WeightBaseController.php

@@ -29,8 +29,7 @@ class WeightBaseController
 
     public function new(Request $request)
     {
-        app('LogService')->log(__METHOD__, 'WeightBaseController', "记录上传日志：" . json_encode($request->getContent()) . '||' , null);
-
+        app('LogService')->log(__METHOD__, $this->name, "记录上传日志：" . json_encode($request->getContent()) . '||' , null);
         $errors = $this->validator($request);
         if(count($errors)){
             return $this->validatorErrors($errors);

app/Providers/AppServiceProvider.php

@@ -16,7 +16,6 @@ use App\Services\CustomerLogStatusService;
 use App\Services\CustomerService;
 use App\Services\DepositoryService;
 use App\Services\FacilitatorService;
-use App\Services\DischargeTaskDossierService;
 use App\Services\FeatureService;
 use App\Services\ForeignHaiRoboticsService;
 use App\Services\InventoryAccountMissionService;
@@ -97,7 +96,6 @@ use App\Services\WeighExceptedService;
 use App\Services\OrderFreezeService;
 use App\Services\RegionService;
 use App\Services\UserWorkgroupService;
-use App\Services\DeliveryAppointment;
 use App\Services\DischargeTaskService;
 use App\Services\DeliveryAppointmentService;
 use Illuminate\Queue\Events\JobFailed;
@@ -151,7 +149,6 @@ class AppServiceProvider extends ServiceProvider
 
     private function loadingService(){
         app()->singleton('AllInventoryService',AllInventoryService::class);
-//        app()->singleton('ApiUserService',\App\Services\api\UserService::class);
         app()->singleton('AuthorityService',AuthorityService::class);
         app()->singleton('BatchService',BatchService::class);
         app()->singleton('BatchUpdateService', BatchUpdateService::class);
@@ -166,10 +163,8 @@ class AppServiceProvider extends ServiceProvider
         app()->singleton('CustomerService',CustomerService::class);
         app()->singleton('ConfigurationService',ConfigurationService::class);
         app()->singleton('DataHandlerService',DataHandlerService::class);
-        app()->singleton('DeliveryAppointment',DeliveryAppointment::class);
         app()->singleton('DeliveryAppointmentService',DeliveryAppointmentService::class);
         app()->singleton('DepositoryService',DepositoryService::class);
-        app()->singleton('DischargeTaskDossierService',DischargeTaskDossierService::class);
         app()->singleton('DischargeTaskService',DischargeTaskService::class);
         app()->singleton('FacilitatorService',FacilitatorService::class);
         app()->singleton('FeatureService',FeatureService::class);

app/Services/ForeignHaiRoboticsService.php

@@ -154,9 +154,9 @@ class ForeignHaiRoboticsService
             if(!$stationTaskMaterialBox){
                 throw new ErrorException('该料箱没有安排在处理队列中');
             }
-//            $this->putBinToStore($stationTaskMaterialBox)
-//                ?true
-//                :(function(){throw new ErrorException('呼叫机器人回收U型线料箱失败');})();
+            $this->putBinToStore($stationTaskMaterialBox)
+                ?true
+                :(function(){throw new ErrorException('呼叫机器人回收U型线料箱失败');})();
             LogService::log('海柔请求','markBinProcessed1.7',
                 json_encode($stationTaskMaterialBox));
             $stationTaskMaterialBox_next=

resources/js/queryForm/header.js

@@ -10,11 +10,13 @@ window.Header = function getHeader(object) {
     let _is_restorationColumn_asc = object.is_restorationColumn_asc || false;    //恢复原数据基准字段的排序类型 true:asc false:desc
     let _before = object.before;//前置元素
     let _name = object.name ? object.name+"." : "";//唯一名称 用于区别模块 本地存储
+    let _isForbidDrag = object.isForbidDrag;
 
     let sortType = {}; //排序类型
     let columnArr = []; //列数组
 
     let moveTd = {}; //移动列
+    let isNested = _targetDom.getElementsByTagName("table").length>0;
 
     function getTargetChildNode(dom) { //递归获取input子节点
         if (!dom || dom.tagName==='INPUT')return dom;
@@ -22,6 +24,7 @@ window.Header = function getHeader(object) {
     }
     function createHeaderBefore() {//生成前置元素
         let tr = document.createElement("tr");
+        tr.className = "text-center";
         _before.forEach(be=>{
             let th = document.createElement("th");
             if (be.colspan)th.colSpan = be.colspan;
@@ -36,54 +39,58 @@ window.Header = function getHeader(object) {
         });
         _targetDom.insertBefore(tr, _targetDom.firstChild);
     }
-    function appendFloat(th) {
-        th.style.position = "sticky";
-        th.style.position = "-webkit-sticky";
+    function appendFloat(div,cla="") {
+        div.style.overflowX = "hidden";
+        div.className="m-0 p-0";
+        let th = document.createElement("th");
+        th.className = "pl-2 pr-2 header-float "+cla;
         th.style.top = _fixedTop+"px";
-        th.style.backgroundColor = "white";
-        th.style.zIndex = "99";
+        th.appendChild(div);
+        return th;
     }
     function createHeader() {//生成表头列
         let tr = document.createElement("tr");
-        tr.className = "text-center";
+        tr.className = "text-nowrap";
         let firstTr = _targetDom.getElementsByTagName("tr")[0];
         let tds = [];
         if (firstTr)tds = firstTr.children;
 
         if (_isCheckAllBox){//是否开启全选
-            let th = document.createElement("th");
-            appendFloat(th);
-            if (firstTr) th.style.minWidth = tds[0].offsetWidth+"px";
-            th.className = "text-left";
+            let div = document.createElement("div");
             let check = document.createElement("input");
             check.type = "checkbox";
             check.id = "checkAll";
             if (firstTr)bindCheckbox(check);
-            th.appendChild(check);
-            tr.appendChild(th);
+            div.appendChild(check);
+            tr.appendChild(appendFloat(div,"text-left"));
         }
 
         let i = (_isCheckAllBox && firstTr) ? 1 : 0;
         for (i;i<(tds.length>0 ? tds.length : _columns.length);i++){
-            let th = document.createElement("th");
-            appendFloat(th);
+            let div = document.createElement("div");
+            let th = appendFloat(div);
             let column = _columns[(_isCheckAllBox && firstTr) ? i-1 : i];
             let wid = localStorage.getItem(_name+column.name);
             if (wid){
+                div.style.width = wid+"px";
+                th.style.minWidth = wid+"px";
                 let trs = _targetDom.children;
-                while(trs[0].tagName !== 'TR')trs = trs[0].children;
-                for (let j=0;j<trs.length;j++){
-                    trs[j].children[i].style.minWidth = wid+"px";
+                while(trs[0] && trs[0].tagName !== 'TR')trs = trs[0].children;
+                if (trs[0]){
+                    for (let j=0;j<trs.length;j++){
+                        trs[j].children[i].firstChild.style.width = wid+"px";
+                        trs[j].children[i].style.minWidth = wid+"px";
+                    }
                 }
             }
             if (column){
-                if (column.type === 'multi')  multiColumn(th,column);
-                else defaultColumn(th,column);
+                if (column.type === 'multi')  multiColumn(div,column);
+                else defaultColumn(div,column);
             }
             tr.appendChild(th);
         }
         bindMove(tr);
-        if (_targetDom.firstChild) _targetDom.insertBefore(tr, _targetDom.firstChild);
+        if (_targetDom.firstChild)_targetDom.insertBefore(tr, _targetDom.firstChild);
         else _targetDom.appendChild(tr);
     }
 
@@ -105,12 +112,11 @@ window.Header = function getHeader(object) {
             });
             th.appendChild(div);
         }
-        return th;
     }
 
     function defaultColumn(th,column) { //默认列样式的生成
-        if (column.style)for (let key in column.style)if (column.style.hasOwnProperty(key)) th.style[key] = column.style[key];
-        if (column.class)th.className =  column.class;
+        if (column.style)for (let key in column.style)if (column.style.hasOwnProperty(key)) th.parentElement.style[key] = column.style[key];
+        if (column.class)th.parentElement.className +=  column.class;
         let span = document.createElement("span");
         span.style.display = "inline-block";
         if (!column.neglect){
@@ -122,7 +128,6 @@ window.Header = function getHeader(object) {
         }
         span.appendChild(document.createTextNode((column.value ? column.value : '')));
         th.appendChild(span);
-        return th;
     }
 
     //点击事件触发的排序规则
@@ -218,6 +223,7 @@ window.Header = function getHeader(object) {
         }
     }
     function bindMove(tr) {
+        if (_isForbidDrag)return;
         for (let j=0;j<tr.children.length;j++){ //为首列绑定拖拽列宽事件
             tr.children[j].onmousedown = function (){
                 if (j===0 && event.offsetX<10)return;
@@ -246,22 +252,45 @@ window.Header = function getHeader(object) {
             if (moveTd.oldX){
                 event.stopPropagation();
                 let diff = event.clientX-moveTd.oldX;
-                let newWidth = moveTd.dom.offsetWidth+diff+"px";
-                setTimeout(()=>{
-                    let trs = _targetDom.children;
-                    if (trs){
-                        while(trs[0].tagName !== 'TR')trs = trs[0].children;
-                        for (let j=0;j<trs.length;j++){
-                            if (trs[j].children[moveTd.index]) trs[j].children[moveTd.index].style.minWidth = newWidth;
+                let newWidth = moveTd.dom.firstChild.offsetWidth+diff+"px";
+                if (diff!==0){
+                    let trs = _targetDom.getElementsByTagName("tr");
+                    for (let j=(_before ? 1 : 0);j<trs.length;j++){
+                        if (isNested){
+                            let table = trs[j].parentElement;
+                            while (table.tagName!=='TABLE') table = table.parentElement;
+                            if (table.id!==object.el)continue;
                         }
+                        trs[j].children[moveTd.index].firstChild.style.width = newWidth;
+                        trs[j].children[moveTd.index].style.minWidth = newWidth;
                     }
-                },0);
-                moveTd.oldX = event.clientX;
+                    moveTd.oldX = event.clientX;
+                }
             }
         };
     }
+    function repaintDom() {
+        let trs = _targetDom.getElementsByTagName("tr");
+        for (let i=0;i<trs.length;i++){
+            if (isNested){
+                let table = trs[i].parentElement;
+                while (table.tagName!=='TABLE') table = table.parentElement;
+                if (table.id!==object.el)continue;
+            }
+            let tds = trs[i].children;
+            for (let j=0;j<tds.length;j++){
+                let div = document.createElement("div");
+                div.style.overflowX = "hidden";
+                let count = tds[j].childNodes.length;
+                for (let k=0;k<count;k++){div.appendChild(tds[j].childNodes[0]);}
+                tds[j].appendChild(div);
+                tds[j].className += " pl-2 pr-2";
+            }
+        }
+    }
     //初始化
     this.init = function() {
+        if (!_isForbidDrag)repaintDom();
         createHeader();
         if (_before)createHeaderBefore();
     };

resources/js/queryForm/queryForm.js

@@ -618,8 +618,8 @@ const query = function getQueryForm(data) {
         input.attr('title', controlJsType(condition.tip[1], 'undefined') ? '' : condition.tip[1]);
         input.attr('placeholder', controlJsType(condition.placeholder[1], 'undefined') ? '' : condition.placeholder[1])
 
-        let ul_div = $("<div class='pl-0 tooltipTarget' style='position: absolute;left: 100px;top:25px; max-height: 150px; overflow-y: scroll; border: 1px solid rgb(221, 221, 221); border-radius: 5px; text-align: center; transform: scale(0.9);z-index:1' tabindex='1'></div>");
-        let ul = $("<ul name='" + condition.name + "' class='list-group pl-0 m-0 p-0 bg-white' style='list-style-type: none;width: 150px;top:35px; z-index: 100' ></ul>");
+        let ul_div = $("<div class='pl-0 tooltipTarget' style='position: absolute;left: 100px;top:25px; max-height: 150px; overflow-y: scroll; border: 1px solid rgb(221, 221, 221); border-radius: 5px; text-align: center; transform: scale(0.9);z-index:95' tabindex='1'></div>");
+        let ul = $("<ul name='" + condition.name + "' class='list-group pl-0 m-0 p-0 bg-white' style='list-style-type: none;width: 150px;top:35px; z-index: 95' ></ul>");
         let check = $("<input id='multipleCheckBox' type = 'checkbox' style='z-index:101;position:fixed;top:0;right: 0;border:1px green' >");
         let isMouseenterCheckBox = false;
 

resources/sass/text.scss

@@ -225,4 +225,12 @@
 //规定最小宽度
 .td-min-width-80 tr td{
     min-width: 80px;
+}
+
+//浮动表头
+.header-float{
+    position: sticky;
+    position: -webkit-sticky;
+    background-color: white;
+    z-index: 50;
 }

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

@@ -81,12 +81,16 @@
                             </div>
                             <span v-else>@{{ order.soreference5 }}</span>
                         </td>
-                        <td class="text-muted text-wrap text-letter" style="max-width: 200px">@{{ order.c_contact }}</td>
-                        <td class="text-muted text-wrap text-letter" style="width: 150px">@{{ order.c_tel2?order.c_tel2:order.c_tel1 }}</td>
+                        <td class="text-muted text-wrap text-letter">
+                            <div class="text-overflow-warp-200">@{{ order.c_contact }}</div>
+                        </td>
+                        <td class="text-muted text-wrap text-letter">
+                            <div class="text-overflow-warp-200 w-100">@{{ order.c_tel2?order.c_tel2:order.c_tel1 }}</div>
+                        </td>
                         <td class="text-nowrap"> @{{ order.c_province }}</td>
                         <td class="text-nowrap"> @{{ order.c_city }}</td>
-                        <td class="text-nowrap"> @{{ order.c_district }}</td>
-                        <td class="text-muted text-wrap text-letter" style="max-width: 500px">@{{ order.c_address1 }}</td>
+                        <td class="text-nowrap"><div class="text-overflow-warp-200">@{{ order.c_district }}</div></td>
+                        <td class="text-muted text-wrap text-letter"><div class="text-overflow-warp-200" style="max-width: 100%">@{{ order.c_address1 }}</div></td>
                         <td class="text-nowrap">@{{ order.waveno }}</td>
                         <td class="text-nowrap"> @{{ order.warehouseid }}</td>
                         <td class="text-nowrap"><span v-if="order.edisendflag2=='Y'">是</span><span v-if="order.edisendflag2=='N'">否</span><span v-if="order.edisendflag2=='W'">错误</span></td>
@@ -94,15 +98,15 @@
                         <td class="text-center" style="min-width: 900px">
                             <div :class="commodities[order.orderno]&&commodities[order.orderno].length==1 ? '' : 'up'" :id="'order-'+i">
                                 <div v-for="oracleDOCOrderDetail in commodities[order.orderno]" class="row">
-                                    <div class="col-2">@{{ oracleDOCOrderDetail.sku }}</div>
-                                    <div class="col-2">@{{ oracleDOCOrderDetail.alternate_sku1 }}</div>
-                                    <div class="col-2" @dblclick.stop="replaceText($event)">
+                                    <div class="col-2 border border-1">@{{ oracleDOCOrderDetail.sku }}</div>
+                                    <div class="col-2 border border-1">@{{ oracleDOCOrderDetail.alternate_sku1 }}</div>
+                                    <div class="col-2 border border-1" @dblclick.stop="replaceText($event)">
                                         <div class="w-100 text-overflow-replace-100 text-primary">@{{ oracleDOCOrderDetail.descr_c  }}</div>
                                     </div>
-                                    <div class="col-1">@{{ oracleDOCOrderDetail.qtyordered }}</div>
-                                    <div class="col-2">@{{ oracleDOCOrderDetail.lotnum }}</div>
-                                    <div class="col-1 m-0 p-0">@{{ oracleDOCOrderDetail.orderdetailcodename }}</div>
-                                    <div class="col-2">@{{ oracleDOCOrderDetail.checktime }}</div>
+                                    <div class="col-1 border border-1">@{{ oracleDOCOrderDetail.qtyordered }}</div>
+                                    <div class="col-2 border border-1">@{{ oracleDOCOrderDetail.lotnum }}</div>
+                                    <div class="col-1 m-0 p-0 border border-1">@{{ oracleDOCOrderDetail.orderdetailcodename }}</div>
+                                    <div class="col-2 border border-1">@{{ oracleDOCOrderDetail.checktime }}</div>
                                 </div>
                             </div>
                             <div class="row text-center cursor-pointer" v-if="commodities[order.orderno]&&commodities[order.orderno].length>1">
@@ -285,7 +289,7 @@
                     [   {name:'codename_c',type:'select',placeholder:'订单状态',data:this.codes},
                         {name:'orderdate_start',type:'time',tip:['选择显示日期的起始时间','选择显示日期的起始时间'],
                             rules:{date_relevance:{date:['orderdate_start','orderdate_end'],relevance:'addtime',killing:'relevance',default:[31,92,183,366]}}},
-                        {name:'orderno',type:'input',tip:'编号，糊模查找需要在左边打上%符号',placeholder: '编号'},
+                        {name:'orderno',type:'input',tip:'SO号，糊模查找需要在左边打上%符号',placeholder: 'SO号'},
                         {name:'carriername',type:'input',tip:'',placeholder:'承运人'},
                         {name:['notes','addtime'],type:'input_select',tip:['右侧选择查询范围，默认为一月内','查询范围，范围越短搜索越快'],placeholder: ['备注',''],
                             data:[{name:'31',value:'近一月'},{name:'92',value:'近三月'},{name:'183',value:'近半年'},{name:'366',value:'近一年'},{name:'0',value:'不限'},],
@@ -345,9 +349,9 @@
                     {name:'edisendflag2',value: '快递获取标记'},
                     {name:'edisendtime2',value: '快递获取时间'},
                     {name:"commodity", type:"multi",title:"商品信息",rows:[
-                            {value:"产品代码",col:"2"},
-                            {value:"产品条码",col:"2"},
-                            {value:"产品名称",col:"2"},
+                            {value:"商品编码",col:"2"},
+                            {value:"商品条码",col:"2"},
+                            {value:"商品名称",col:"2"},
                             {value:"订单数量",col:"1"},
                             {value:"批次号",col:"2"},
                             {value:"明细状态",col:"1"},

resources/views/process/index.blade.php

@@ -588,6 +588,7 @@
                     restorationColumn: 'serial_number',
                     fixedTop:($('#form_div').height())+2,
                     is_restorationColumn_asc :true,
+                    isForbidDrag:true,
                 }).init();
             },
             methods: {

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

@@ -82,18 +82,18 @@
                         <td style="min-width: 900px">
                             <div class="w-100" :class="rejectedBill.items.length>1 ? 'up' : ''" :id="'rejected-'+rejectedBill.id">
                                 <div class="row" v-for="item in rejectedBill.items">
-                                    <div class="col-2">
+                                    <div class="col-2 border border-1">
                                         <div class="w-100 text-overflow-warp-200">@{{item.barcode_goods}}</div>
                                     </div>
-                                    <div class="col-2">
+                                    <div class="col-2 border border-1">
                                         <div class="w-100 text-overflow-warp-200">@{{item.name_goods}}</div>
                                     </div>
-                                    <div class="col-1">@{{item.amount}}</div>
-                                    <div class="col-1">@{{item.quality_label}}</div>
-                                    <div class="col-2">@{{item.batch_number}}</div>
-                                    <div class="col-1">@{{item.made_at}}</div>
-                                    <div class="col-1">@{{item.validity_at}}</div>
-                                    <div class="col-2">@{{item.remark}}</div>
+                                    <div class="col-1 border border-1">@{{item.amount}}</div>
+                                    <div class="col-1 border border-1">@{{item.quality_label}}</div>
+                                    <div class="col-2 border border-1">@{{item.batch_number}}</div>
+                                    <div class="col-1 border border-1">@{{item.made_at}}</div>
+                                    <div class="col-1 border border-1">@{{item.validity_at}}</div>
+                                    <div class="col-2 border border-1">@{{item.remark}}</div>
                                 </div>
                             </div>
                             <div class="text-center cursor-pointer" v-if="rejectedBill.items.length>1" @click="unfold(rejectedBill.id)">

resources/views/test.blade.php

@@ -3,6 +3,8 @@
 <head>
     <meta charset="utf-8">
     <title>table</title>
+    <link href="//netdna.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">
+    <link href="https://cdn.bootcdn.net/ajax/libs/twitter-bootstrap/5.0.0-beta2/css/bootstrap-grid.css" rel="stylesheet">
     <style type="text/css">
         #test th{
             position: sticky;
@@ -16,7 +18,7 @@
 <body>
 <button onclick="a()">11111111</button>
 <table id="table" cellspacing="0" cellpadding="2" width="100%" border="1">
-    <tr id="test">
+    <tr id="test" style="white-space: nowrap !important;">
         <th >用户编号</th>
         <th>试用时间</th>
         <th>转正时间</th>
@@ -25,7 +27,7 @@
         <th>身高</th>
     </tr>
     <tr>
-        <td style="overflow-x: hidden">200004512312312321321</td>
+        <td style="overflow-x: hidden"><div>1</div>200004512312312321321</td>
         <td>2001-2-15</td>
         <td>2001-3-15</td>
         <td>1978-8-5</td>
@@ -246,20 +248,38 @@
         <td>2001-3-23</td>
         <td>2001-2-23</td>
         <td>汉</td>
-        <td>171</td>
+        <td>171
+
+        </td>
     </tr>
 </table>
+<div style="position: sticky;bottom: 0;left: 0;background-color: #007bff;width: 50px;height: 50px;cursor: pointer;text-align: center">
+    <h1><span class="fa fa-spin fa-gear" style="color: #1b1e21"></span></h1>
+</div>
 <script type="text/javascript">
     var tTD; //用来存储当前更改宽度的Table Cell,避免快速移动鼠标的问题
 
     var table = document.getElementById("table");
+    function a1() {
+        let div = document.createElement("div");
+        div.className = "test ";
+        div.className += "test1";
+        div.className += "test2";
+        console.log(div);
+    }
     function a() {
+        sessionStorage.setItem("test","测试存储效果");
+        console.log(sessionStorage.getItem("test"))
+    }
+    function a2() {
         for (let i=0;i<table.children[0].children.length;i++){
             let arr = table.children[0].children[i].children;
             for (let j=0;j<arr.length;j++){
                 let td = arr[j];
                 let div = document.createElement("div");
-                td.insert
+                div.style.overflowX = "hidden";
+                let count = td.childNodes.length;
+                for (let k=0;k<count;k++){div.appendChild(td.childNodes[0]);}
                 td.appendChild(div);
             }
         }
@@ -309,9 +329,12 @@
                 //调整该列中的每个Cell
                 table = tTD;
                 while (table.tagName != 'TABLE') table = table.parentElement;
-                for (i = 0; i < table.rows.length; i++) {
-                    table.rows[i].cells[tTD.cellIndex].width = tTD.width;
-                }
+                setTimeout(()=>{
+                    for (i = 0; i < table.rows.length; i++) {
+                        let td = table.rows[i].cells[tTD.cellIndex];
+                        td.firstChild.style.width = tTD.width+"px";
+                    }
+                });
                 //调整整个表
                 table.width = tTD.tableWidth + (tTD.offsetWidth - tTD.oldWidth);
                 table.style.width = table.width;

resources/views/transport/waybill/index.blade.php

@@ -123,7 +123,7 @@
                         <input v-else type="number" class="form-control form-control-sm" @blur="addWaybillCharge($event)" onfocus="$(this).css('width','85px')" :value="waybill.charge" :data_id="waybill.id" >
                         <input type="number" class="form-control form-control-sm"  @blur="updateWaybillCharge($event)" :value="waybill.charge" :data_id="waybill.id" style="min-width:85px;display: none">
                     </td>
-                        @else
+                    @else
                         <td class="td-warm" ><span v-if="waybill.charge">@{{waybill.charge|money}}</span></td>
                     @endcan
                     <td class="td-warm">@{{waybill.other_charge}}</td>
@@ -708,7 +708,7 @@
                     let oldCharge = span.text();
                     let charge = target.val();
                     if(charge !== span.text()){
-                        let ajaxUrl= '{{url("apiLocal/waybill/changeCharge")}}';
+                        let ajaxUrl= '{{url("apiLocal/transport/waybill/changeCharge")}}';
                         axios.post(ajaxUrl,{'id':id,'charge':charge}).then(function (response) {
                             if(response.data.success){
                                 _this.updateWaybill(id,charge);
@@ -735,7 +735,7 @@
                     let _this = this;
                     let id = target.attr('data_id');
                     let charge = target.val();
-                    let ajaxUrl= '{{url("apiLocal/waybill/changeCharge")}}';
+                    let ajaxUrl= '{{url("apiLocal/transport/waybill/changeCharge")}}';
                     if(charge === ''|| charge === null){
                         target.css('width','75px');
                         return;
@@ -782,7 +782,7 @@
                     let oldFee = span.text();
                     let fee = target.val();
                     if(fee !== span.text()){
-                        let ajaxUrl= '{{url("apiLocal/waybill/changeFee")}}';
+                        let ajaxUrl= '{{url("apiLocal/transport/waybill/changeFee")}}';
                         axios.post(ajaxUrl,{'id':id,'fee':fee}).then(function (response) {
                             if(response.data.success){
                                 _this.updateWaybills(id,fee);
@@ -809,7 +809,7 @@
                     let _this = this;
                     let id = target.attr('data_id');
                     let fee = target.val();
-                    let ajaxUrl= '{{url("apiLocal/waybill/changeFee")}}';
+                    let ajaxUrl= '{{url("apiLocal/transport/waybill/changeFee")}}';
                     if(fee === ''|| fee === null){
                         target.css('width','75px');
                         return;

tests/webApi/thirdPart/haiq/storage.http

@@ -11,19 +11,20 @@ POST http://bswas/api/thirdPart/haiq/storage/postBin1
 POST http://bswas/api/thirdPart/haiq/storage/postBin2
 
 ###
-POST http://bswas/api/thirdPart/haiq/storage/moveBin2
+POST http://bswas/api/thirdPart/haiq/storage/moveBinIn
 
 ###
-POST http://bswas/api/thirdPart/haiq/storage/moveBinM
+POST http://bswas/api/thirdPart/haiq/storage/moveBinIn2
 
 ###
-POST http://bswas/api/thirdPart/haiq/storage/moveBinM2
+POST http://bswas/api/thirdPart/haiq/storage/moveBin2
 
 ###
-POST http://bswas/api/thirdPart/haiq/storage/moveBinIn
+POST http://bswas/api/thirdPart/haiq/storage/moveBinM
 
 ###
-POST http://bswas/api/thirdPart/haiq/storage/moveBinIn2
+POST http://bswas/api/thirdPart/haiq/storage/moveBinM2
+
 
 ###
 POST http://bswas/api/thirdPart/haiq/storage/lightOn

tests/webApi/weight.http

@@ -5,7 +5,7 @@
 ## * 'ptr' and 'ptrp' create a POST request with a simple or parameter-like body;
 ## * 'mptr' and 'fptr' create a POST request to submit a form with a text or file field (multipart/form-data);
 
-POST https://testwas.baoshi56.com/api/thirdPart/weight/new
+GET http://unsafe.baoshi56.com/api/thirdPart/hengli/weight/new
 Content-Type: application/json
 
 {"barcode":"testChannel11","weight":"5","id":"00C66186389","key":"2C7FACD3AFC3FFE547FC54CDA076A25D","time":"2020-2-26 14:17:07"}