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

app/Console/Commands/SyncBatchTask.php

@@ -161,7 +161,7 @@ sql;
         }
         $orders = Order::query()->select("id","code")->whereIn("code",$orderCodes)->get();
         if (count($orderCodes) != count($orders))LogService::log(__METHOD__,"波次同步-本地订单缺失",json_encode($orderCodes)." | ".count($orderCodes)." | ".count($orders));
-        if (count($orderCodes) != count($orders)){
+        if ($orders){
             $orderIds = [];
             $orderMap = [];
             foreach ($orders as $order){

resources/views/maintenance/region/index.blade.php

@@ -18,7 +18,7 @@
                 <div class="row" v-for="region in parentMapping[0]">
                     <div class="col-5 offset-4">
                         <div class="row m-0">
-                            <span class="fa fa-angle-double-right col-1 cursor-pointer"></span>
+                            <span class="fa fa-angle-double-right col-1 cursor-pointer" @click="showItem()"></span>
                             <label class="col-4">@{{ region.name }}</label>
                             <label class="col-4">@{{ region.code }}</label>
                             <label class="col-3">
@@ -27,15 +27,32 @@
                             </label>
                         </div>
                     </div>
-                    <div class="col-5 offset-5">
-                        <div class="row m-0">
-                            <span class="fa fa-angle-double-right col-1 cursor-pointer"></span>
-                            <label class="col-4">@{{ region.name }}</label>
-                            <label class="col-4">@{{ region.code }}</label>
-                            <label class="col-3">
-                                <span class="fa fa-circle" :class="region.deleted_at ? 'text-danger' : 'text-success'"></span>
-                                <span v-if="region.deleted_at">冻结</span><span v-else>正常</span>
-                            </label>
+                    <div class="col-5 offset-5 border rounded border-2">
+                        <div class="row" v-for="city in parentMapping[region.id]">
+                            <div class="col-12">
+                                <div class="row m-0">
+                                    <span class="fa fa-angle-double-right col-1 cursor-pointer"></span>
+                                    <label class="col-3">@{{ city.name }}</label>
+                                    <label class="col-4">@{{ city.code }}</label>
+                                    <label class="col-3">
+                                        <span class="fa fa-circle" :class="city.deleted_at ? 'text-danger' : 'text-success'"></span>
+                                        <span v-if="city.deleted_at">冻结</span><span v-else>正常</span>
+                                    </label>
+                                </div>
+                                <div class="row m-0">
+                                    <div class="col-10 offset-2">
+                                        <div class="row" v-for="district in parentMapping[city.id]">
+                                            <span class="fa fa-angle-double-right col-1 cursor-pointer"></span>
+                                            <label class="col-3">@{{ city.name }}</label>
+                                            <label class="col-4">@{{ city.code }}</label>
+                                            <label class="col-3">
+                                                <span class="fa fa-circle" :class="city.deleted_at ? 'text-danger' : 'text-success'"></span>
+                                                <span v-if="city.deleted_at">冻结</span><span v-else>正常</span>
+                                            </label>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
                         </div>
                     </div>
                 </div>
@@ -64,6 +81,7 @@
                     else parent[p] = [region];
                 });
                 this.parentMapping = parent;
+                console.log(parent);
             },
         });
     </script>