121

.env

@@ -1 +1 @@
-APP_DEBUG = true

[APP]
DEFAULT_TIMEZONE = Asia/Shanghai


[LANG]
default_lang = zh-cn
+APP_DEBUG = false

[APP]
DEFAULT_TIMEZONE = Asia/Shanghai


[LANG]
default_lang = zh-cn

app/admin/controller/Customar.php

@@ -2,6 +2,7 @@
 
 namespace app\admin\controller;
 
+use app\admin\model\ChangeLog;
 use app\BaseController;
 use think\App;
 use think\facade\Db;
@@ -231,9 +232,12 @@ class Customar extends BaseController
             ];
             $datainfo = Db::name('customer_info')->save($data);
             // var_dump(Db::name('customer_info')->getLastSql());
+            $stn = array_diff($idinfo,$data);
+            $json = json_encode($stn);
             if ($datainfo) {
+                ChangeLog::logAdd("2",$idinfo['companyNo'],$idinfo,$json,$this->post['token'],$this->post);
                // $var=[];
-                //var_dump($customer_member);
+//                var_dump($customer_member);
                 foreach ($customer_member as $value) {
 //                    $to = GetInfoById($token, ['id' => $value['ownerid']]);
 //
@@ -263,14 +267,18 @@ class Customar extends BaseController
                      $item['addtime']=date("Y-m-d H:i:s");
                     $item['updatetime'] = date("Y-m-d H:i:s");
                      // $var[]=$item;
-                }
-                $vp = Db::name('customer_member')->save($item);
-                  //var_dump(Db::name('customer_member')->getLastSql());
+
+                    $vp = Db::name('customer_member')->save($item);
+
+//                  var_dump(Db::name('customer_member')->getLastSql());
+//                $var = array_diff($customer_member,$item);
+//                $jsn = json_encode($var);
                 if ($vp == false) {
+//                    ChangeLog::logAdd("2",$item['companyNo'],$item,$jsn,$this->post['token'],$this->post);
                     Db::rollback();
                     return error_show(1003, "更新失败");
                 }
-
+                }
                 Db::commit();
                 return error_show(0, "更新成功");
             } else {

app/admin/controller/Customer.php

@@ -2,6 +2,7 @@
 
 namespace app\admin\controller;
 
+use app\admin\model\ChangeLog;
 use app\BaseController;
 use think\App;
 use think\facade\Db;
@@ -258,7 +259,11 @@ class Customer extends BaseController
             "updatetime"=>date("Y-m-d H:i:s"),
         ];
         $org = Db::name('customer_org1')->save($vir);
-        return $org ? error_show(0,"更新成功") : error_show(1004,"更新失败");
+        if($org){
+            return error_show(0,"更新成功");
+        }else{
+            return error_show(1004,"更新失败");
+        }
     }
     /*查询*/
     public function selec(){

app/admin/controller/Suppler.php

@@ -3,6 +3,7 @@
 namespace app\admin\controller;
 
 use app\admin\common\Ocr;
+use app\admin\model\ChangeLog;
 use app\BaseController;
 use think\App;
 use think\facade\Db;
@@ -333,9 +334,9 @@ class Suppler extends BaseController
         if($name==""){
             return error_show(1002,"数据标题不能为空");
         }
-        $rename = Db::name('supplier')->where(['is_del' => 0, 'name' => $name])->find();
+        $rename = Db::name('supplier')->where(['is_del' => 0, 'name' => $name])->where([["id","<>",$id]])->find();
 
-        if (!empty($rename)&&$rename['id']!=$id) {
+        if ($rename!=false) {
             return error_show(1002, "公司名称已存在");
         }
 //        $nature = isset($this->post['nature']) && $this->post['nature']!==""? trim($this->post['nature']) :"";
@@ -428,8 +429,11 @@ class Suppler extends BaseController
                     $data['ocr_status']=2;
                 }
             }
+            $ino = array_diff($info,$data);
+            $tem = json_encode($ino);
             $join = Db::name('supplier')->where(['id'=>$id,'is_del'=>0])->save($data);
             if($join){
+                ChangeLog::logAdd("1",$info['code'],$info,$tem,$this->post['token'],$this->post);
                 $item = Db::name('supplier_contact')->where(['code'=>$info['code']])->find();
                     $temp = [];
                 isset($item['id']) && $item['id'] !== "" ? $temp['id'] =$item['id'] : '';
@@ -442,9 +446,11 @@ class Suppler extends BaseController
                     $temp['is_del'] = 0;
                 isset($item['id']) && $item['id'] !== "" ? '' : $temp['addtime'] = date("Y-m-d H:i:s");
                     $temp['updatetime'] = date("Y-m-d H:i:s");
-
+//                    $st = array_diff($item,$temp);
+//                    $snm =json_encode($st);
                 $vp = Db::name('supplier_contact')->save($temp);
                 if ($vp == "") {
+//                    ChangeLog::logAdd("1",$item['code'],$item,$snm,$this->post['token'],$this->post);
                     Db::rollback();
                     return error_show(1002, "更新失败");
                 }
@@ -484,7 +490,10 @@ class Suppler extends BaseController
             return error_show(1002,"供应商信息不存在");
         }
         $supp= Db::name('supplier')->update(['id'=>$id,'is_del'=>1,"updatetime"=>date("Y-m-d H:i:s")]);
+        $vam = array_diff($sup,$supp);
+        $vap = json_encode($vam);
         if($supp){
+            ChangeLog::logAdd("1",$sup['code'],$sup,$vap,$this->post['token'],$this->post);
             return error_show(0,"删除成功");
         }else{
             return error_show(1002,"删除失败");

app/admin/model/ChangeLog.php

@@ -11,18 +11,21 @@ class ChangeLog extends Model
         unset($post['token']);
         $createrid= isset($user['data']['id']) ? $user['data']['id'] :0;
         $creater = isset($user['data']['nickname']) ? $user['data']['nickname'] :'';
-        $db = array_diff($before_info,$after_info);
+//        $item= array_diff($before_info,$after_info);
+        $json = json_encode($after_info);
+        $jsp = json_encode($before_info);
         $data=[
             "createrid"=>$createrid,
             "creater"=>$creater,
-            "before_info"=>isset($before_info[ 'before_info']) ? trim($before_info['before_info']) :"",
-            "after_info"=>$db,
-            "code"=>isset($code['code']) ? trim($code['code']."") :"",
+            "before_info"=>$jsp,
+            "after_info"=>$json,
+            "code"=>$code,
             "type"=>$type,
-            "action_data"=>json_encode($post),
+          //  "action_data"=>json_encode($post),
             "addtime"=>date("Y-m-d H:i:s"),
-            "updatetime"=>date("Y-m-d H:i:s")
+          //  "updatetime"=>date("Y-m-d H:i:s")
         ];
+//        var_dump($data);
         self::insert($data);
     }
 }