ad

app/admin/controller/Addr.php

@@ -62,28 +62,30 @@ class Addr extends BaseController
     }
 
     public function query(){
-        $post=$this->request->only(["code"=>'',"level"=>3],"post","trim");
-        $valid =Validate::rule(["code|查询编号"=>"require|max:255","level|查询层级"=>"require|number|in:1,2,3"]);
+        $post=$this->request->only(["code"=>'',"name"=>"","level"=>"1"],"post","trim");
+        $valid =Validate::rule(["code|查询编号"=>"max:255","name|名称"=>"max:255","level"=>"require|max:255|in:1,2,3"]);
         if($valid->check($post)==false)return error_show(1004,$valid->getError());
-        $data=["province"=>[],"city"=>[],"area"=>[]];
-        $code =$post['code'];
-        if($post['level']==3){
-            $area =Db::name("area")->where(['area_code'=>$code])->field("name,area_code as code,city_code")->findOrEmpty();
-	        $data["area"]=$area;
-	        $code=$area['city_code'];
+        $where=[];
+        if($post['code']!='') $where[]=["parent_code","=",$post['code']];
+        if($post['name']!='') $where[]=["search_name","like","%{$post['name']}%"];
+        if($post['level']==1){
+        	$model = Db::name("provice")->field("name,province_code code,0 parent_code,name search_name")->buildSql();
         }
+        if($post['level']==2){
+        	$model = Db::name("city")->alias("a")
+        	->leftJoin("province b","a.province_code=b.province_code")
+        	->field("a.name,city_code code,a.province_code parent_code,CONCAT(b.name,a.name) search_name")->buildSql();
+        }
+		if($post['level']==3){
+        	$model = Db::name("area")->alias("a")
+        	->leftJoin("city b","a.city_code=b.city_code")
+        	->leftJoin("province b","a.province_code=b.province_code")
+        	->field("a.name,a.area_code code,a.city_code parent_code,CONCAT(c.name,b.name,a.name) search_name")
+        	->buildSql();
+        }
+//		$count = Db::table($model . ' f')->where($where)->count();
 
-		if($post['level']>=2){
-			    $city=Db::name("city")->where(['city_code'=>$code])->field("name,city_code as code,province_code")
-			    ->findOrEmpty();
-		        $data["city"]=$city;
-		        $code=$city['province_code'];
-		}
-		if($post['level']>=1){
-			$province=Db::name("province")->where(['province_code'=>$code])->field("name,province_code as code")
-			->findOrEmpty();
-	        $data['province']=$province;
-		}
+		$data = Db::table($model . ' f')->where($where)->select();
         return app_show(0,"获取成功",$data);
     }
 }

app/admin/controller/Cat.php

@@ -42,8 +42,6 @@ class Cat extends Base
         if ($param['company_name'] !== '') $where[] = ['c.createrid', 'in', get_company_item_user_by_name($param['company_name'])];
 
         $count = Db::name('cat')->alias('c')->where($where)->count();
-//        $total = ceil($count / $size);
-//        $page = $page >= $total ? $total : $page;
         $list = Db::name('cat')
             ->alias('c')
             ->where($where)
@@ -63,11 +61,6 @@ class Cat extends Base
                 ->where(['a.cat_id' => $value['id'], 'a.is_del' => 0])
                 ->select()
                 ->toArray();
-//            $temp = Db::name('specs')
-//                ->where(['id' => $info, 'is_del' => 0])
-//                ->field('id as specid,spec_name')
-//                ->select()
-//                ->toArray();
             if (empty($temp)) {
                 $temp = [];
             }
@@ -88,11 +81,9 @@ class Cat extends Base
         if ($param['search'] !== '') $where[] = ['search', 'like', '%' . $param['search'] . '%'];
         if ($param['pid'] !== '') $where[] = ['pid', '=', $param['pid']];
         if ($param['status'] !== '') $where[] = ['status', '=', $param['status']];
-
         $count = Db::name('cat')
             ->where($where)
             ->count();
-
         $list = Db::name('cat')
             ->where($where)
             ->page($param['page'], $param['size'])

app/admin/route/app.php

@@ -188,8 +188,8 @@ Route::rule("warequery", "admin/WareHouse/select");
 Route::rule("province", "admin/Addr/province");
 Route::rule("city", "admin/Addr/city");
 Route::rule("area", "admin/Addr/area");
-//Route::rule("addrall", "admin/Addr/all");
-Route::rule("addrall", "admin/Addr/query");
+Route::rule("addrall", "admin/Addr/all");
+Route::rule("addrquery", "admin/Addr/query");
 
 Route::rule("goodlist", "admin/Good/list");
 Route::rule("goodlistByYz", "admin/Good/listByYz");

app/command/NowReportHandle.php

@@ -425,6 +425,7 @@ class NowReportHandle extends Command
             `wpo`.`open_fee` AS `开模费`,
             `wpo`.`teach_fee` AS `工艺费`,
             `wpo`.`delivery_fee` AS `物流费`,
+            `wpo`.`diff_fee` AS `公差金额`,
             `wpo`.`good_price` AS `成本合计`,
             `wpo`.`total_fee` AS `采购货款`,
             ifnull( `wgb`.`tax`, `wgz`.`tax` )/100 AS `采购税点`,
@@ -472,7 +473,7 @@ class NowReportHandle extends Command
                     ->value("b.sendtype", '');
                 $value['是否库存品'] = '否';
             }
-            $value['发货方式'] = $sendtype == 1 ? '包邮' : $sendtype == 2 ? '自提' : "";
+            $value['发货方式'] = $sendtype == 1 ? '包邮' : ($sendtype == 2 ? '自提' : "");
             $value['售前退货数量'] = Db::name("sale_return")->where(["orderCode" => $value['确认单编号']])->sum('num');
             $value['售前退货金额'] = round($value['售前退货数量'] * $value['售前退货金额'], 2);
             yield $data[] = $value;