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

app/admin/controller/Good.php

@@ -63,7 +63,7 @@ class Good extends Base
         	if($good->isEmpty())$this->error("商品信息{$item['spuCode']}不存在");
         	if(!isset($catArr[$item['cat_code']]))$this->error("商品{$item['spuCode']}所选类目不存在");
         	$tax = $catArr[$item['cat_code']]['tax']==""?[]:explode('、', $catArr[$item['cat_code']]['tax']);
-        	if(!in_array($item['tax'],$tax))$this->error("商品{$item['spuCode']}所选税率与类目包含税率不一致");
+        	if(!in_array($item['tax'],$tax) && $param['status']==2)$this->error("商品{$item['spuCode']}所选税率与类目包含税率不一致");
         	//采购端修改 只能在待财务设置税务类目状态 切该商品未参与采购付款回票对账
         	//销售端修改 只要没参与销售回款开票结算
         	$temp['id']=$good->id;
@@ -80,8 +80,7 @@ class Good extends Base
         	}
         	if($param['status']==2){
         	    if($good->qrd_to_pay)$this->error("商品{$item['spuCode']}已参与销售回款开票结算");
-        	    $check = CheckTax($item['is_discount'],$item['tax'],$item['inv_tag'],
-        	    $item['addTax'],$message);
+        	    $check = CheckTax($item['is_discount'],$item['tax'],$item['inv_tag'],$item['addTax'],$message);
         	    if($check==false)$this->error("商品{$item['spuCode']}{$message}");
         	    $temp['inv_cat_code']=$catArr[$item['cat_code']]['merge_code'];
         	    $temp['inv_cat_name']=$catArr[$item['cat_code']]['short_name'];

app/admin/controller/Menu.php

@@ -49,7 +49,7 @@ class Menu extends Base{
             $condition['id'] = $menuid;
             $condition['level'] = [0,$level,2];
         }
-
+	
         $menuAll = Db::name("admin_menu")
             ->where($condition)
             ->column("id,menu_name,menu_img,menu_route,menu_url,pid,is_show,is_private,menu_type,level,status,weight");
@@ -305,6 +305,7 @@ class Menu extends Base{
             $result=Db::name("action")->where("id","=",$actid)->save($data);
             if($result){
                 Db::commit();
+                event('rolesave');
                 return app_show(0,"更新成功");
             }else{
                 Db::rollback();
@@ -335,6 +336,7 @@ class Menu extends Base{
             $data = ['status'=>$status,"updatetime"=>date("Y-m-d H:i:s")];
             $result=Db::name("action")->where("id","=",$actid)->save($data);
             if($result){
+            	 event('rolesave');
                 return app_show(0,"更新成功");
             }else{
                 return error_show(1004,"更新失败");
@@ -386,6 +388,7 @@ class Menu extends Base{
             $in = Db::name("action")->insert($data);
             if($in){
                     Db::commit();
+                    event("rolesave");
                   return app_show(0,"添加成功");
             }
 
@@ -412,6 +415,7 @@ class Menu extends Base{
             $data = ['is_del'=>1,"updatetime"=>date("Y-m-d H:i:s")];
             $result=Db::name("action")->where($act)->update($data);
             if($result){
+            	 event('rolesave');
                 return app_show(0,"删除成功");
             }else{
                 return error_show(1004,"删除失败");

app/admin/model/Action.php

@@ -0,0 +1,14 @@
+<?php
+declare (strict_types = 1);
+
+namespace app\admin\model;
+
+use think\Model;
+
+/**
+ * @mixin \think\Model
+ */
+class Action extends Model
+{
+    //
+}

app/admin/model/RoleAction.php

@@ -0,0 +1,14 @@
+<?php
+declare (strict_types = 1);
+
+namespace app\admin\model;
+
+use think\Model;
+
+/**
+ * @mixin \think\Model
+ */
+class RoleAction extends Model
+{
+    //
+}

app/event.php

@@ -2,6 +2,7 @@
 // 事件定义文件
 return [
     'bind'      => [
+    	'rolesave'=>\app\event\roleEvent::class
     ],
 
     'listen'    => [
@@ -10,6 +11,7 @@ return [
         'HttpEnd'  => [],
         'LogLevel' => [],
         'LogWrite' => [],
+        "rolesave"=>[\app\listener\roleListen::class]
     ],
 
     'subscribe' => [

app/event/roleEvent.php

@@ -0,0 +1,8 @@
+<?php
+declare (strict_types = 1);
+
+namespace app\event;
+
+class roleEvent
+{
+}

app/listener/roleListen.php

@@ -0,0 +1,18 @@
+<?php
+declare (strict_types = 1);
+
+namespace app\listener;
+
+use app\admin\model\Action;use app\admin\model\RoleAction;class roleListen
+{
+    /**
+     * 事件监听处理
+     *
+     * @return mixed
+     */
+    public function handle($event)
+    {
+    	$acction= Action::where(["status"=>1,"is_del"=>0])->column("id");
+        RoleAction::where(["role_id"=>1])->save(["action_conllect"=>implode(",",$acction)]);
+    }
+}