ad

app/common.php

@@ -146,11 +146,8 @@ if(!function_exists('exportExcel')){
             $k=0;
             foreach ($value as $k1=>$v1){
                 //设置单元格类型为文本  否则数字会被识别成科学计数法
-                $objPHPExcel->getActiveSheet()->getColumnDimension(PHPExcel_Cell::stringFromColumnIndex($k))->setWidth(20);
-                $objPHPExcel->getActiveSheet()->getStyle(PHPExcel_Cell::stringFromColumnIndex($k).$j)->getAlignment()->setWrapText(true);
-                $objPHPExcel->getActiveSheet()->getStyle(PHPExcel_Cell::stringFromColumnIndex($k).$j)->getAlignment()->setHorizontal(\PHPExcel_Style_Alignment::HORIZONTAL_LEFT);
-                $objPHPExcel->getActiveSheet()->getStyle(PHPExcel_Cell::stringFromColumnIndex($k).$j)->getNumberFormat()->setFormatCode(\PHPExcel_Style_NumberFormat::FORMAT_TEXT);
-                $objPHPExcel->getActiveSheet()->setCellValue(PHPExcel_Cell::stringFromColumnIndex($k).$j,$v1);
+                $objPHPExcel->getActiveSheet()->getCell(PHPExcel_Cell::stringFromColumnIndex($k).$j)->getStyle()->getNumberFormat()->setFormatCode(\PHPExcel_Style_NumberFormat::FORMAT_TEXT);
+                $objPHPExcel->getActiveSheet()->setCellValueExplicit(PHPExcel_Cell::stringFromColumnIndex($k).$j, strval($v1));
                 //设置纯文本格式字符串
                 $k++;
             }

app/cxinv/controller/FinancialManager.php

@@ -343,7 +343,7 @@ class FinancialManager extends Base{
         'goodNo','goodName','unit','num','goodPrice','totalPrice','cat_code','cat_name','tax','inv_fee','inv_buyer_code',
         'inv_buyer_name','inv_number','inv_open_date','inv_type','inv_seller_code','inv_seller_name','inv_item_id','inv_good_name',
         'inv_cat_code','inv_spec','inv_unit','inv_num','inv_subprice','inv_subtotal','inv_tax','inv_tax_total','inv_price','inv_total',
-        'cat_diff','tax_diff','remark'],
+        'if(cat_diff=1,"一致","不一致") cat_diff','if(tax_diff=1,"一致","不一致") tax_diff','remark'],
         ["invoiceCode","type",'source','seller_code','seller_name','inv_number','inv_open_date','inv_type','inv_seller_code','inv_seller_name',
         'inv_item_id','inv_good_name','inv_cat_code','inv_spec','inv_unit','inv_num','inv_subprice','inv_subtotal','inv_tax','inv_tax_total'],
         [
@@ -355,7 +355,12 @@ class FinancialManager extends Base{
         ->field($fields[$param['channel']-1])
         ->where($where)
         ->order("id desc")
-        ->select()->toArray();
+        ->select()->each(function (&$item){
+           $item['type'] = \app\cxinv\model\FinancialManager::$ManagerType[$item['type']]??"";
+           $item['source'] = \app\cxinv\model\FinancialManager::$ManagerSource[$item['source']]??"";
+           $item['goodType'] = \app\cxinv\model\FinancialManager::$ManagerGoodType[$item['goodType']]??"";
+           if(isset($item['inv_type'])) $item['inv_type'] =\app\cxinv\model\Invoice::$invoiceType[$item['inv_type']]??"";
+        })->toArray();
     exportExcel($list,$heade[$param['channel']-1],"manager");
     }
 }

app/cxinv/model/FinancialManager.php

@@ -71,6 +71,7 @@ class FinancialManager extends Base{
     protected $deleteTime='delete_time';
     public static $ManagerType=[1=>'入库',2=>'出库',3=>'入库红冲',4=>'出库红冲'];
     public static $ManagerSource=[1=>'结算',2=>'线下订单'];
+    public static $ManagerGoodType=[1=>'库存',2=>'非库存',3=>'采返'];
     public static $PlatformType=[1=>'ToB',2=>'ToC'];
     public static $StatusCn=[1=>'待处理',2=>'正常',3=>'计提',4=>'异常' ,5=>'取消数据'];
 

app/cxinv/model/Invoice.php

@@ -19,8 +19,8 @@ class Invoice extends Base{
 		             "electronic"=>"增值税电子普通发票",
 		             "blockchain_electronic"=>"区块链电子发票",
 		             "toll"=>"增值税电子普通发票（通行费）",
-		             "fully_digitalized_special_electronic"=>"全电专用发票",
-		             "fully_digitalized_normal_electronic"=>"全电普通发票",
+                    "fully_digitalized_special_electronic"=>"电子发票（增值税专用发票）",
+                    "fully_digitalized_normal_electronic"=>"电子发票（增值税普通发票）",
                     ];
       public static $invStatus=[0=>'待验证','1'=>'正常','2'=>'已作废','3'=>'已红冲'];
     //0待验证 1待关联订单 2订单部分关联 3订单完全关联