ad

app/admin/controller/Filing.php

@@ -2,7 +2,7 @@
 
 namespace app\admin\controller;
 
-use think\facade\Db;
+use app\admin\model\ActionLog;use think\facade\Db;
 use think\facade\Validate;
 
 //报备单
@@ -159,17 +159,14 @@ class Filing extends Base
         $names = $userCommon->handle('getCodeAndName', ['code' => [$param['customerCode'], $param['supplierNo']]]);
         if (!isset($names['data'][$param['customerCode']]) || $names['data'][$param['customerCode']] == '') return json_show(1004, '该业务公司不存在');
         if (!isset($names['data'][$param['supplierNo']]) || $names['data'][$param['supplierNo']] == '') return json_show(1004, '该供应商不存在');
-
-        $rs = Db::name('filing')
-            ->strict(false)
-            ->insert(array_merge($param, [
+		$data=array_merge($param, [
                 'customerName' => $names['data'][$param['customerCode']],
                 'supplierName' => $names['data'][$param['supplierNo']],
                 'filingCode' => makeNo('BM'),
                 'service_proportion' => $param['expect_service_proportion'],//服务费比例与期望服务费比例一致
                 'service_charge' => $param['expect_service'],//服务费与期望服务费一致
                 'specinfo' => json_encode($param['spec_list']),
-                "wait_num"=>$param["num"],
+                'wait_num'=>$param['num'],
                 'send_way' => 2,
                 'cert_fee' => 0,
                 'pakge_fee' => 0,
@@ -196,8 +193,12 @@ class Filing extends Base
                 'good_img' => implode(',', $param['good_img']),
                 'origin_place' => implode(',', $param['origin_place']),
                 'delivery_place' => implode(',', $param['delivery_place']),
-            ]));
-
+            ]);
+        $rs = Db::name('filing')
+            ->strict(false)
+            ->insert($data);
+		         $stn = ['order_code' => $data['filingCode'], 'status' => 0, 'action_remark' => '', 'action_type' => 'add'];
+                ActionLog::logAdd(['id'=>$this->uid,'nickname'=>$this->uname], $stn, 'BBD', 0, $data);
         return $rs ? json_show(0, '创建报备单成功') : json_show(1004, '创建报备单失败');
 
     }
@@ -335,7 +336,8 @@ class Filing extends Base
             ]);
         $rs = Db::name('filing')
             ->save(array_intersect_key($data,$row));
-
+				$stn = ['order_code' => $row['filingCode'], 'status' => 0, 'action_remark' => '', 'action_type' => 'edit'];
+                ActionLog::logAdd(['id'=>$this->uid,'nickname'=>$this->uname], $stn, 'BBD', 0, $data);
         return $rs ? json_show(0, '报备单更新成功') : json_show(1004, '报备单更新失败');
 
     }
@@ -390,7 +392,7 @@ class Filing extends Base
 
         if (!$val->check($param)) return json_show(1004, $val->getError());
         $rs = Db::name('filing')
-            ->field('id,status,is_determine_price,price,cgd_charge,platform_id,customerCode,customerName')
+            ->field('id,filingCode,status,is_determine_price,price,cgd_charge,platform_id,customerCode,customerName')
             ->where(['is_del' => 0, 'id' => $param['id'],"status"=>0])
             ->findOrEmpty();
         if (empty($rs)) return json_show(1005, '该报备单不存在或不允许审核');
@@ -423,8 +425,10 @@ class Filing extends Base
 
         $res = Db::name('filing')
             ->where(['is_del' => 0, 'id' => $param['id']])
-            ->whereIn('status', [0, 2])
+            ->whereIn('status', 0)
             ->update($update);
+        		 $stn = ['order_code' => $rs['filingCode'], 'status' =>$param['is_check'], 'action_remark' => '', 'action_type' => 'status'];
+                ActionLog::logAdd(['id'=>$this->uid,'nickname'=>$this->uname], $stn, 'BBD', 0, $update);
         return $res ? json_show(0, '操作成功') : json_show(1004, '操作失败');
 
 
@@ -787,7 +791,8 @@ class Filing extends Base
 	  
 			if($fillup==false)throw new \Exception('报备单更新失败');
             //待办已办先不处理
-
+			$stn = ['order_code' => $filing['filingCode'], 'status' =>$wait_num>0?3:4, 'action_remark' => '', 'action_type' => 'status'];
+            ActionLog::logAdd(['id'=>$this->uid,'nickname'=>$this->uname], $stn, 'BBD', $filing['status'], $param);
             //关联表
            $gu= Db::name('order_num')
                 ->insert([