wuggemail@foxmail.com hace 3 meses
padre
commit
4b28356aee

+ 2 - 0
app/common.php

@@ -157,6 +157,8 @@ if(!function_exists('exportExcel')){
         header('Content-Type: application/vnd.ms-excel');
         header("Content-Disposition: attachment;filename=$filename.xlsx");
         header('Cache-Control: max-age=0');
+        //允许跨域请求
+        header('Access-Control-Allow-Origin:*');
         $objWriter = \PHPExcel_IOFactory::createWriter($objPHPExcel, 'Excel2007');
         $objWriter->save('php://output');
         exit;

+ 15 - 1
app/cxinv/controller/FinancialManager.php

@@ -170,8 +170,22 @@ class FinancialManager extends Base{
 
     public function info(){
         $id=$this->request->param("id",0,"intval");
-        $info=$this->model->with(['ProductRela'=>["product"]])->findOrEmpty($id);
+        $info=$this->model->with(['ProductRela'=>["product"],'FinancialTz'=>["ProductTz"]])->findOrEmpty($id);
         if($info->isEmpty()) return error("数据不存在");
+        if($info['status']==3){
+           $map = $info->FinancialTz->ProductTz->toArray();
+           $ProductMap = array_map(function ($item){
+               if($item['type']==1) return $item['product_id'];
+               },$map);
+           array_map(function (&$v)use ($ProductMap){
+              if(!in_array($v['product_id'],$ProductMap)){
+                  $v['isKt']=1;
+              }else{
+                  $v['isKt']=0;
+              }
+           },$info->ProductRela);
+
+        }
         return success("获取成功",$info);
     }
     //处理待确认数据

+ 3 - 1
app/cxinv/model/FinancialManager.php

@@ -78,6 +78,9 @@ class FinancialManager extends Base{
     public function ProductRela(){
         return $this->hasMany(ManagerProduct::class,'manager_id','id');
     }
+    public function FinancialTz(){
+       return $this->hasOne(FinancialTz::class,'manager_id','id');
+    }
 
     public function setErrorRemarkAttr($value,$data){
         return ($data['status']==4|| $data['status']==1)?$value:'';
@@ -242,7 +245,6 @@ class FinancialManager extends Base{
                 ProductStock::OutStock($product->id, $rednum);
                 $productID[] = ['product_id' => $product->id, 'type'=>2,'status'=>1,'num' => $rednum,'apply_id'=>$mainData['apply_id'], 'apply_name'=>$mainData['apply_name']];
             }
-           // $mainData['manager_status']=$mainData['balance_num']=='0'?1:2;
         } else {
             throw new \Exception('出库未找到财务商品信息');
         }