区域添加

客户管理-前端修改

app/Http/Controllers/TestController.php

@@ -133,52 +133,7 @@ class TestController extends Controller
     }
 
     public function zzd(){
-        dd(substr("2021-01-28",0,7) == date("Y-m"));
-    }
-
-
-    public function orderFreeze()
-    {
-        $freezeOrders = [];
-        $orders = Order::query()->whereBetween("updated_at",["2021-01-29 09:00:00","2021-01-29 14:00:00"])
-        ->get()->toArray();
-        foreach ($orders as $param){
-            if ($this->isFreeze($param))$freezeOrders[] = $param["code"];
-        }
-        $this->pushWMS($freezeOrders);
-    }
 
-    private function isFreeze($param)
-    {
-        $status = ['分配完成','创建订单','拣货完成','播种完成'];
-        if (array_search($param["wms_status"],$status)===false)return false;
-
-        $service = new OrderFreezeService();
-        $pools = $service->getFreezes();
-        foreach ($pools as $pool){
-            if ($pool["thawed_at"] && Carbon::parse($pool["thawed_at"])->lte(Carbon::today()))continue;
-            if ($pool["logistic_id"]!=$param["logistic_id"])continue;
-            if ($pool["province_name"] && (mb_strpos($param["province"],$pool["province_name"]) === false))continue;
-            if ($pool["city_name"] && (mb_strpos($param["city"],$pool["city_name"]) === false))continue;
-            if ($pool["district_name"] && (mb_strpos($param["district"],$pool["district_name"]) === false))continue;
-            if ($pool["town_name"] && (mb_strpos($param["address"],$pool["town_name"]) === false))continue;
-            if ($pool["street_name"] && (mb_strpos($param["address"],$pool["street_name"]) === false))continue;
-            return true;
-        }
-        return false;
-    }
-
-    private function pushWMS($freezeOrders)
-    {
-        if (!$freezeOrders)return;
-        $where = "''";
-        foreach ($freezeOrders as $f)$where .= ",'{$f}'";
-        $edit = date("Y-m-d H:i:s");
-        $sql = <<<sql
-UPDATE DOC_ORDER_HEADER SET edittime = TO_DATE('{$edit}','yyyy-mm-dd hh24:mi:ss'),releasestatus = 'H',waveno='*',notes = CASE WHEN notes IS NULL THEN '停运' ELSE  notes||',停运' END where ORDERNO in ({$where})
-sql;
-        DB::connection("oracle")->update($sql);
-        LogService::log(__METHOD__,"订单同步-自动冻结",$sql);
     }
 
     public function syncWeight()

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

@@ -10,42 +10,61 @@
                 <div class="ml-2">
                     <div v-for="region in parentMapping[0]" :style="{'margin-left':(2+region.type)+'%'}">
                         <div>
-                            <span class="fa fa-hand-o-right cursor-pointer" @click="showItem('tree-'+region.id,$event)" v-if="parentMapping[region.id]"></span>
+                            <span class="fa fa-hand-o-right cursor-pointer" :id="'fa-tree-'+region.id" @click="showItem('tree-'+region.id,$event)" v-if="parentMapping[region.id]"></span>
                             <span v-else>&nbsp;&nbsp;&nbsp;</span>
                             &nbsp;&nbsp;<span class="fa fa-circle" :class="region.deleted_at ? 'text-danger' : 'text-success'"></span>&nbsp;
                             @{{ region.name }}<label class="text-secondary" v-if="region.code">(@{{ region.code }})</label>
+                            <label class="cursor-pointer" @click="addRegion(region.id,region.type)">&nbsp;<span class="fa fa-plus-circle"></span></label>
                         </div>
                         <div :id="'tree-'+region.id" class="up">
                             <div v-for="city in parentMapping[region.id]" :style="{'margin-left':(2+city.type)+'%'}">
-                                <div>
-                                    <span class="fa fa-hand-o-right cursor-pointer" @click="showItem('tree-'+city.id,$event)" v-if="parentMapping[city.id]"></span>
+                                <div v-if="city.id">
+                                    <span class="fa fa-hand-o-right cursor-pointer" :id="'fa-tree-'+city.id" @click="showItem('tree-'+city.id,$event)" v-if="parentMapping[city.id]"></span>
                                     <span v-else>&nbsp;&nbsp;&nbsp;</span>
                                     &nbsp;&nbsp;<span class="fa fa-circle" :class="city.deleted_at ? 'text-danger' : 'text-success'"></span>&nbsp;
                                     @{{ city.name }}<label class="text-secondary" v-if="city.code">(@{{ city.code }})</label>
+                                    <label class="cursor-pointer" @click="addRegion(city.id,city.type)">&nbsp;<span class="fa fa-plus-circle"></span></label>
                                 </div>
+                                <label v-else>
+                                    <input @blur="submitRegion(city,region.id)" @keydown.13="submitRegion(city,region.id)" id="tree-edit-0" v-model="city.name"
+                                           class="form-control form-control-sm rounded-pill ml-1" type="text" placeholder="添加城市"/>
+                                </label>
                                 <div :id="'tree-'+city.id" class="up">
                                     <div v-for="district in parentMapping[city.id]" :style="{'margin-left':(2+district.type)+'%'}">
-                                        <div>
-                                            <span class="fa fa-hand-o-right cursor-pointer" @click="showItem('tree-'+district.id,$event)" v-if="parentMapping[district.id]"></span>
+                                        <div v-if="district.id">
+                                            <span class="fa fa-hand-o-right cursor-pointer" :id="'fa-tree-'+district.id" @click="showItem('tree-'+district.id,$event)" v-if="parentMapping[district.id]"></span>
                                             <span v-else>&nbsp;&nbsp;&nbsp;</span>
                                             &nbsp;&nbsp;<span class="fa fa-circle" :class="district.deleted_at ? 'text-danger' : 'text-success'"></span>&nbsp;
                                             @{{ district.name }}<label class="text-secondary" v-if="district.code">(@{{ district.code }})</label>
+                                            <label class="cursor-pointer" @click="addRegion(district.id,district.type)">&nbsp;<span class="fa fa-plus-circle"></span></label>
                                         </div>
+                                        <label v-else>
+                                            <input @blur="submitRegion(district,city.id)" @keydown.13="submitRegion(district,city.id)" id="tree-edit-0" v-model="district.name"
+                                                   class="form-control form-control-sm rounded-pill ml-1" type="text" placeholder="添加区/县"/>
+                                        </label>
                                         <div :id="'tree-'+district.id" class="up">
                                             <div v-for="town in parentMapping[district.id]" :style="{'margin-left':(2+town.type)+'%'}">
-                                                <div>
-                                                    <span class="fa fa-hand-o-right cursor-pointer" @click="showItem('tree-'+town.id,$event)" v-if="parentMapping[town.id]"></span>
+                                                <div v-if="town.id">
+                                                    <span class="fa fa-hand-o-right cursor-pointer" :id="'fa-tree-'+town.id" @click="showItem('tree-'+town.id,$event)" v-if="parentMapping[town.id]"></span>
                                                     <span v-else>&nbsp;&nbsp;&nbsp;</span>
                                                     &nbsp;&nbsp;<span class="fa fa-circle" :class="town.deleted_at ? 'text-danger' : 'text-success'"></span>&nbsp;
                                                     @{{ town.name }}<label class="text-secondary" v-if="town.code">(@{{ town.code }})</label>
+                                                    <label class="cursor-pointer" @click="addRegion(town.id,town.type)">&nbsp;<span class="fa fa-plus-circle"></span></label>
                                                 </div>
+                                                <label v-else>
+                                                    <input @blur="submitRegion(town,district.id)" @keydown.13="submitRegion(town,district.id)" id="tree-edit-0" v-model="town.name"
+                                                           class="form-control form-control-sm rounded-pill ml-1" type="text" placeholder="添加乡/镇"/>
+                                                </label>
                                                 <div :id="'tree-'+town.id" class="up">
                                                     <div v-for="street in parentMapping[town.id]" :style="{'margin-left':(2+street.type)+'%'}">
-                                                        <div>
-                                                            {{--<span class="fa fa-hand-o-right cursor-pointer" @click="showItem('tree-'+street.id,$event)"></span>&nbsp;&nbsp;--}}
+                                                        <div v-if="street.id">
                                                             <span class="fa fa-circle" :class="street.deleted_at ? 'text-danger' : 'text-success'"></span>&nbsp;
                                                             @{{ street.name }}<label class="text-secondary" v-if="street.code">(@{{ street.code }})</label>
                                                         </div>
+                                                        <label v-else>
+                                                            <input @blur="submitRegion(street,town.id)" @keydown.13="submitRegion(street,town.id)" id="tree-edit-0" v-model="street.name"
+                                                                   class="form-control form-control-sm rounded-pill ml-1" type="text" placeholder="添加村/街"/>
+                                                        </label>
                                                     </div>
                                                 </div>
                                             </div>
@@ -99,6 +118,31 @@
                         $("#"+id).slideDown();
                     }
                 },
+                addRegion(id,type){
+                    let obj = {name:"",code:"",type:Number(type)+1,parent_id:id};
+                    if (this.parentMapping[id])this.parentMapping[id].unshift(obj);
+                    else this.$set(this.parentMapping,id,[obj]);
+                    setTimeout(()=>{
+                        if (!this.showList[id]){
+                            this.showList[id] = true;
+                            document.getElementById("fa-tree-"+id).className = "fa fa-hand-o-down cursor-pointer";
+                            $("#tree-"+id).slideDown();
+                        }
+                        $("#tree-edit-0").focus();
+                    },0);
+                },
+                submitRegion(region,parent){
+                    if (region.id)return;
+                    if (!region.name){
+                        this.$delete(this.parentMapping[parent],0);
+                        if (this.parentMapping[parent].length === 0)this.$delete(this.parentMapping,parent);
+                        return;
+                    }
+                    window.tempTip.postBasicRequest("{{url('maintenance/region/store')}}",{name:region.name,parent_id:region.parent_id,type:region.type},res=>{
+                        region.id = res.id;
+                        this.$set(this.parentMapping[parent][0],region);
+                    })
+                },
             },
         });
     </script>