同步波次号BUG

app/Console/Commands/SyncBatchTask.php

@@ -217,10 +217,12 @@ sql;
         }
         $updateOrder = [["code","batch_id"]];
         foreach ($batches as $batch){
-            $updateOrder[] = [
-                "code"=>$map[$batch->code],
-                "batch_id"=>$batch->id
-            ];
+            foreach ($map[$batch->code] as $on){
+                $updateOrder[] = [
+                    "code"=>$on,
+                    "batch_id"=>$batch->id
+                ];
+            }
             unset($map[$batch->code]);
         }
         if (count($updateOrder)>1){

resources/sass/text.scss

@@ -132,4 +132,23 @@
 //文本强调阴影
 .text-shadow-stress{
     text-shadow: 3px 3px 3px yellow
+}
+
+//滚动条美化
+.scrollbar::-webkit-scrollbar {
+    /*滚动条整体样式*/
+    width : 10px;  /*高宽分别对应横竖滚动条的尺寸*/
+    height: 1px;
+}
+.scrollbar::-webkit-scrollbar-thumb {
+    /*滚动条里面小方块*/
+    border-radius: 10px;
+    box-shadow   : inset 0 0 5px rgba(0, 0, 0, 0.2);
+    background   : #535353;
+}
+.scrollbar::-webkit-scrollbar-track {
+    /*滚动条里面轨道*/
+    box-shadow   : inset 0 0 5px rgba(0, 0, 0, 0.2);
+    border-radius: 10px;
+    background   : #ededed;
 }

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

@@ -2,6 +2,12 @@
     <div class="modal-dialog modal-lg modal-dialog-centered modal-dialog-scrollable">
         <div class="modal-content">
             <div class="modal-header">
+                <label class="ml-5">
+                    <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>
+                </div>
                 <button type="button" class="close" data-dismiss="modal">&times;</button>
             </div>
             <div class="modal-body">

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

@@ -57,6 +57,9 @@
                 freeze:{},
                 errors : {},
                 mapping:{},
+                mappingPool:{},
+                result : [],
+                stop:false,
             },
             methods:{
                 openModal(model = null,index = null){
@@ -80,12 +83,15 @@
                         window.tempTip.postBasicRequest(url,{},res=>{
                             this.$set(this.data,'regions',res);
                             let mapping = {};
-                            res.forEach(region=>{
+                            let mappingPool = {};
+                            res.forEach((region,i)=>{
                                 if (!region["parent_id"])region["parent_id"] = 0;
                                 if (mapping[region["parent_id"]]) mapping[region["parent_id"]].push(region);
                                 else mapping[region["parent_id"]] = [region];
+                                mappingPool[region.id] = i;
                             });
                             this.mapping = mapping;
+                            this.mappingPool = mappingPool;
                         });
                     }
                 },
@@ -166,6 +172,51 @@
                        return "新增"+map[type]+"成功";
                    })
                 },
+                search(e){
+                    this.stop = false;
+                    this.result = [];
+                    let val = e.target.value;
+                    if (!val)return;
+                    this.data.regions.some(region=>{
+                        if (this.stop)return true;
+                        if (region.name.indexOf(val) !== -1)this.result.push(this._traceParent(region));
+                    });
+                },
+                _traceParent(region){
+                    let text = "<b class='text-warning font-weight-bold'>"+region.name+"</b>";
+                    let sign = false;
+                    let obj = {};
+                    let isGo = true;
+                    while (isGo){
+                        if (sign) text = region.name+"&nbsp;<span class='text-dark'>-></span>&nbsp;"+text;
+                        else sign = true;
+                        switch (region.type) {
+                            case 1:
+                                obj.province_id = region.id;
+                                break;
+                            case 2:
+                                obj.city_id = region.id;
+                                break;
+                            case 3:
+                                obj.district_id = region.id;
+                                break;
+                            case 4:
+                                obj.town_id = region.id;
+                                break;
+                            case 5:
+                                obj.street_id = region.id;
+                                break;
+                        }
+                        if (!region.parent_id)isGo = false;
+                        region = this.data.regions[this.mappingPool[region.parent_id]];
+                    }
+                    obj.text = text;
+                    return obj;
+                },
+                selectedSearch(obj){
+                    this.freeze = obj;
+                    this.stop = true;
+                },
             },
         });
     </script>