Browse Source

Merge branch 'version1.5' of ssh://192.168.10.210:10022/wugg/stock into version1.5

wugg 3 years ago
parent
commit
cffcd66db7
1 changed files with 3 additions and 2 deletions
  1. 3 2
      app/admin/controller/Suppler.php

+ 3 - 2
app/admin/controller/Suppler.php

@@ -99,7 +99,7 @@ class Suppler extends BaseController
         $warehouse= isset($this->post['warehouse']) && $this->post['warehouse']!==""?trim($this->post['warehouse']) :"";
         $warehouse= isset($this->post['warehouse']) && $this->post['warehouse']!==""?trim($this->post['warehouse']) :"";
         $pay_day= isset($this->post['pay_day']) && $this->post['pay_day']!==""?trim($this->post['pay_day']) :"";
         $pay_day= isset($this->post['pay_day']) && $this->post['pay_day']!==""?trim($this->post['pay_day']) :"";
         $scope= isset($this->post['scope']) && $this->post['scope']!==""?trim($this->post['scope']) :"";
         $scope= isset($this->post['scope']) && $this->post['scope']!==""?trim($this->post['scope']) :"";
-        $status= isset($this->post['status']) && $this->post['status']!==""?intval($this->post['status']) :"1";
+        $status= isset($this->post['status']) && $this->post['status']!==""?intval($this->post['status']) :"0";
         //$registertime= isset($this->post['registertime']) && $this->post['registertime']!==""?
         //$registertime= isset($this->post['registertime']) && $this->post['registertime']!==""?
         // $this->post['registertime'] :"";
         // $this->post['registertime'] :"";
         $supplier_img = isset($this->post['supplier_img']) && $this->post['supplier_img'] !=="" ? trim($this->post['supplier_img']):"";
         $supplier_img = isset($this->post['supplier_img']) && $this->post['supplier_img'] !=="" ? trim($this->post['supplier_img']):"";
@@ -157,7 +157,7 @@ class Suppler extends BaseController
                 "registertime"=>date('Y-m-d H:i:s'),
                 "registertime"=>date('Y-m-d H:i:s'),
                 "person"=>$person,
                 "person"=>$person,
                 "personid"=>$personid,
                 "personid"=>$personid,
-                "remark"=>""
+
             ];
             ];
             if($supplier_img!==""){
             if($supplier_img!==""){
                 $ocr=new Ocr();
                 $ocr=new Ocr();
@@ -359,6 +359,7 @@ class Suppler extends BaseController
             $data=[
             $data=[
                 "id"=>$id,
                 "id"=>$id,
                 "source"=>$source,
                 "source"=>$source,
+                "name"=>$name,
                 "coop_state"=>$coop_state,
                 "coop_state"=>$coop_state,
                 "category"=>$category,
                 "category"=>$category,
                 "delivery_way"=>$delivery_way,
                 "delivery_way"=>$delivery_way,