Merge branch 'master-new-wgg' of wugg/phpstock into master-new

app/admin/controller/Sale.php

@@ -968,7 +968,8 @@ class Sale extends Base
         $workNo = isset($this->post['workNo']) && $this->post['workNo'] != "" ? $this->post['workNo'] : "";
         $proof_type = isset($this->post['proof_type']) && $this->post['proof_type'] != "" ? intval($this->post['proof_type']) : 0;
         $proof_url = isset($this->post['proof_url']) && $this->post['proof_url'] != "" ? trim($this->post['proof_url']) : '';
-
+		if($proof_url=="")return error_show(1002, '参数 proof_url 不能为空');
+		if($proof_type==0)return error_show(1002, '参数 proof_type 不能为空');
 
         Db::startTrans();
         try {
@@ -2109,6 +2110,11 @@ class Sale extends Base
         if ($customer_code !== "") {
             $where[] = ['s.customer_code', "like", "%$customer_code%"];
         }
+        
+        $customer_name = isset($this->post['customer_name']) && $this->post['customer_name'] !== '' ? trim($this->post['customer_name']) : '';
+        if ($customer_name !== '') {
+            $where[] = ['s.customerName', 'like', "%$customer_name%"];
+        }
         $supplierNo = isset($this->post['supplierNo']) && $this->post['supplierNo'] !== "" ? trim($this->post['supplierNo']) : "";
         if ($supplierNo !== "") {
             $where[] = ['s.supplierNo', "=", $supplierNo];

public/index.php

@@ -11,7 +11,6 @@
 
 // [ 应用入口文件 ]
 namespace think;
-
 require __DIR__ . '/../vendor/autoload.php';
 header('Access-Control-Allow-Origin:*');
 header('Access-Control-Allow-Methods:POST,GET,OPTIONS,DELETE');