ad

app/admin/controller/Reorder.php

@@ -434,7 +434,9 @@ class Reorder extends Base
 //        }
         $role = $this->checkDataShare();
         if (!empty($role[DataGroupModel::$type_全部])) $condition .= "sr.cgderid = {$this->uid} or sr.person_id = {$this->uid} or sr.apply_id in (" . implode(',', $role[DataGroupModel::$type_全部]) . ")";
-
+		if(in_array($this->roleid,config('app.wsm_cgder_role'))){
+			$where[]=["order_type","=",1];
+		}
         $company_name = isset($this->post['company_name']) && $this->post['company_name'] !== "" ? trim($this->post['company_name']) : "";
         if ($company_name !== "") $where[] = ["sr.apply_id", 'in', get_company_item_user_by_name($company_name)];
 

app/command/NowReportHandle.php

@@ -1065,11 +1065,12 @@ class NowReportHandle extends Command
 					a.num '数量',
 					a.budget_price*a.num '竞价单总额',
 					d.remark '商品备注',
-					b.addtime '反馈时间',
-					b.creater '反馈人',
+					d.addtime '反馈时间',
+					d.creater '反馈人',
 					d.spuCode '反馈商品编码',
 					d.status '反馈商品状态',
 					d.good_name '反馈商品名称',
+					d.sale_price*a.num '竞价单总额',
 					d.cat_id '反馈商品分类',
 					d.unit_id '反馈商品单位',
 					d.tax '反馈商品税点',
@@ -1088,6 +1089,8 @@ class NowReportHandle extends Command
     	foreach ( $list as $value){
 //		$value["品牌"]=Db::name("brand")->where("id",$value["品牌"])->value("brand_name",'');
 	    $value["商品分类"]=Db::name("cat")->where("id",$value["商品分类"])->value("cat_name",'');
+	    $value["反馈商品分类"]=Db::name("cat")->where("id",$value["反馈商品分类"])->value("cat_name",'');
+	    $value["反馈商品单位"]=Db::name("unit")->where("id",$value["反馈商品单位"])->value("unit",'');
 	    $value["业务公司"]=Db::name("business")->where("companyNo",$value["业务公司"])->value("company","");
 		$value["所属平台"]=Db::name("platform")->where("id", $value["所属平台"])->value("platform_name","");
 		$value['申请人部门'] = Db::name("depart_user")->alias("a")->leftJoin("company_item ci", "a.itemid=ci.id")->where(["a.uid" => $value['申请人部门'], "a.status" => 1, "a.is_del" => 0])->value('ci.name', '');