Explorar o código

Merge branch 'dev-wgg' of wugg/cxinv into dev

wugg %!s(int64=2) %!d(string=hai) anos
pai
achega
ab8cec7b41
Modificáronse 4 ficheiros con 17 adicións e 2 borrados
  1. 2 1
      .gitignore
  2. 12 0
      app/command/Report.php
  3. 1 1
      app/common.php
  4. 2 0
      config/console.php

+ 2 - 1
.gitignore

@@ -3,4 +3,5 @@
 /vendor
 *.log
 .env
-/runtime
+/runtime
+/config

+ 12 - 0
app/command/Report.php

@@ -110,6 +110,18 @@ class Report extends Command
                 $method="R";
                 $file='采购部门销售业绩';
                 break;
+            case 'L':
+		        $method="L";
+		        $file='客服部业绩提成';
+		        break;
+	        case 'S':
+		        $method="S";
+		        $file='项目部业绩提成';
+		        break;
+	        case 'T':
+		        $method="T";
+		        $file='新媒体业绩提成';
+		        break;
 			default:
 				$file='暂无数据';
 				$method="";

+ 1 - 1
app/common.php

@@ -723,7 +723,7 @@ if(!function_exists("getPayRate")){
 	 * @param $payday
 	 * @return array|mixed
 	 */
-	function getPayRate($payday=0):array{
+	function getPayRate($payday=0){
 				$rate=0;
 			switch ($payday){
 				case 1:

+ 2 - 0
config/console.php

@@ -7,6 +7,8 @@ return [
     'commands' => [
     	"generrateinvoice"=>app\admin\command\GenerrateInvoice::class,
 		"getorderinfoandinvoiceinfo"=>app\admin\command\GetOrderInfoAndInvoiceInfo::class,
+	    "queryvalidinvoice"=>app\admin\command\QueryInvalidInvoice::class,
+	    "downredinvres"=>app\admin\command\downredinvres::class,
 
 		'copyCxData'=>app\command\copyCxData::class,//复制采销数据到中间表
         'handleCxData'=>app\command\handleCxData::class,//处理中间表的采销数据