Browse Source

Merge branch 'wugg-dev' of wugg/phpstock into version1.5

wugg 2 years ago
parent
commit
6df1d241b2
1 changed files with 6 additions and 6 deletions
  1. 6 6
      app/admin/controller/Filing.php

+ 6 - 6
app/admin/controller/Filing.php

@@ -45,12 +45,11 @@ class Filing extends Base
 	//订单录入
 	public function  orderAdd(){
     	$param=$this->request->param([
-//    		"sale_id"=>"",
     		"companyNo"=>'',
     		"poCode"=>"",
     		"workCode"=>"",
     		"khNo"=>"",
-    		"qrdType"=>"3",
+    		"qrdType"=>3,
     		"goodName"=>"",
 	 		"tax"=>"",
 	 		"goodNum"=>"",
@@ -75,7 +74,7 @@ class Filing extends Base
 	 		"poCode|PO编号"=>"require|max:255|min:1",
 	 		"workCode|单据编号"=>"require|max:255|min:1",
 	 		"khNo|客户公司编号"=>"require|max:255|min:1",
-	 		"qrdType|订单类型"=>"require|number|in:[1,2,3]",
+	 		"qrdType|订单类型"=>"require|number|in:1,2,3",
 	 		"goodName|商品名称"=>"require|max:255|min:1",
 	 		"tax|税率"=>"require|number|gt:0",
 	 		"goodNum|商品数量"=>"require|number|gt:0",
@@ -86,7 +85,7 @@ class Filing extends Base
 	 		"buyerid|销售员ID"=>"require|number|gt:0",
 	 		"buyer_name|销售员"=>"require|max:255|min:1",
 	 		"sendtime|发货时间"=>"require|date",
-	 		"cat|商品分类id"=>"require|number|gt:0",
+	 		"cat_id|商品分类id"=>"require|number|gt:0",
 	 		"cgd_tax|采购毛利率"=>"require|float|gt:0",
 	 		"pay_id|支付渠道"=>"require|number"
     		]);
@@ -325,9 +324,9 @@ class Filing extends Base
     	$valid=Validate::rule([
     		"orderCode|销售单号"=>"require|max:255",
 	 		"companyNo|业务公司编号"=>"require|max:255|min:1",
-	 		"supplierNo|业务公司编号"=>"require|max:255|min:1",
+	 		"supplierNo|供应商公司编号"=>"require|max:255|min:1",
 	 		"poCode|PO编号"=>"require|max:255|min:1",
-	 		"workCode|单据编号"=>"require|max:255|min:1",
+	 		"workCode|业务编号"=>"require|max:255|min:1",
 	 		"khNo|客户公司编号"=>"require|max:255|min:1",
 	 		"mobile|联系人电话"=>"require|number|mobile",
 	 		"contactor|联系人"=>"require|max:255|min:1",
@@ -336,6 +335,7 @@ class Filing extends Base
 	 		"buyerid|销售员ID"=>"require|number|gt:0",
 	 		"buyer_name|销售员"=>"require|max:255|min:1",
 	 		"sendtime|发货时间"=>"require|date",
+	 		"tax|商品利率"=>"require|number",
 	 		"cgd_tax|采购毛利率"=>"require|float|gt:0",
     		]);
     	if($valid->check($param)==false) return error_show(1004,$valid->getError());