add

app/admin/controller/Purch.php

@@ -4,6 +4,7 @@
 namespace app\admin\controller;
 
 
+use app\admin\model\ActionLog;
 use think\App;
 use think\facade\Db;
 
@@ -135,8 +136,10 @@ class Purch extends \app\BaseController
             $data['wsm_supplierNo'] =isset($wsmcode['code']) ? $wsmcode['code']:"";
             $data['wsm_contactor'] =isset($wsmcode['wsm_contactor']) ? $wsmcode['wsm_contactor']:"";
             $data['wsm_mobile'] =isset($wsmcode['wsm_mobile']) ? $wsmcode['wsm_mobile']:"";
-            $data['wsm_addr'] =isset($wsmcode['wsm_addr']) ? $wsmcode['wsm_addr']:"";
+           // $data['wsm_addr'] =isset($wsmcode['wsm_addr']) ? $wsmcode['wsm_addr']:"";
             $data['addr_code'] =isset($wsmcode['addr_code']) ? $wsmcode['addr_code']:"";
+            $data['wsm_addr'] =isset($wsmcode['addr_code']) ? GetAddr($wsmcode['addr_code']):"";
+            $data['wsm_addr'].=isset($wsmcode['wsm_addr']) ? $wsmcode['wsm_addr']:"";
             $inorder= Db::name("purchease_in")->where(['cgdNo'=>$data['cgdNo'],"is_del"=>0])->select();
             $data['child']=empty($inorder)? [] : $inorder;
         }
@@ -287,10 +290,12 @@ class Purch extends \app\BaseController
         if($data['send_status']>1 && $status==0){
             return error_show(1004,"采购单发货中无法取消");
         }
+        $order = ["order_code"=>$cgdNo,"status"=>$data['status'],"action_remark"=>$remark];
         $data['status'] = $status;
         $data['remark'] = $remark;
         $data['updatetime'] =date("Y-m-d H:i:s");
         $upd=Db::name("purchease_order")->save($data);
+        ActionLog::idd($this->post['token'],$order,1,$status);
         return $upd?app_show(0,"更新成功"):error_show(1004,'更新失败');
     }
 

app/admin/controller/Purchin.php

@@ -126,8 +126,9 @@ class Purchin extends BaseController
         $info['wsm_supplierNo'] =isset($wsmcode['code']) ? $wsmcode['code']:"";
         $info['wsm_contactor'] =isset($wsmcode['wsm_contactor']) ? $wsmcode['wsm_contactor']:"";
         $info['wsm_mobile'] =isset($wsmcode['wsm_mobile']) ? $wsmcode['wsm_mobile']:"";
-        $info['wsm_addr'] =isset($wsmcode['wsm_addr']) ? $wsmcode['wsm_addr']:"";
-        $info['addr_code'] =isset($wsmcode['addr_code']) ? $wsmcode['addr_code']:"";
+        $data['addr_code'] =isset($wsmcode['addr_code']) ? $wsmcode['addr_code']:"";
+        $data['wsm_addr'] =isset($wsmcode['addr_code']) ? GetAddr($wsmcode['addr_code']):"";
+        $data['wsm_addr'].=isset($wsmcode['wsm_addr']) ? $wsmcode['wsm_addr']:"";
         $check = Db::name("purchease_info")->where(['wsm_in_code'=>$incode,"is_del"=>0])->select();
         $info['checkinfo']= $check;
         return app_show(0,'获取成功',$info);

app/admin/model/ActionLog.php

@@ -17,7 +17,7 @@ class ActionLog extends Model
      * @param $type
      * @param $status
      */
-   public  function Add($token,$order,$type,$status){
+    static function idd($token,$order,$type,$status){
         $user = GetUserInfo($token);
         $uid = isset($user['data']['id']) ? $user['data']['id'] :0;
         $name = isset($user['data']['nickname']) ? $user['data']['nickname'] :'';
@@ -38,9 +38,10 @@ class ActionLog extends Model
             "addtime"=>date("Y-m-d H:i:s"),
             "updatetime"=>date("Y-m-d H:i:s")
         ];
-        $this->insert($data);
+        self::insert($data);
    }
    public function  list(){}
 
    public function info(){}
+   static function aad(){}
 }

app/common.php

@@ -454,4 +454,30 @@ function deldir($path){
     return rmdir($path);
 }
 
+/**
+ * @param string $AddrJson
+ */
+function GetAddr($AddrJson=""){
+    if($AddrJson==""){
+        return '';
+    }
+    $adr = json_decode($AddrJson,true);
+    if(!is_array($adr)){
+        return '';
+    }
+    $addr='';
+    if(isset($adr['provice_code'])&&$adr['provice_code']!=''){
+        $provice = Db::name("province")->where(["province_code"=>$adr['provice_code']])->find();
+        $addr.=isset($provice['name']) ? $provice['name']:"";
+    }
+    if(isset($adr['city_code'])&&$adr['city_code']!=''){
+        $city = Db::name("city")->where(["city_code"=>$adr['city_code']])->find();
+        $addr.=isset($city['name']) ? $city['name']:"";
+    }
+    if(isset($adr['area_code'])&&$adr['area_code']!=''){
+        $area = Db::name("area")->where(["area_code"=>$adr['area_code']])->find();
+        $addr.=isset($area['name']) ? $area['name']:"";
+    }
+    return $addr;
+}