|
|
@@ -38,10 +38,9 @@ class Exec extends \app\admin\BaseController{
|
|
|
}
|
|
|
|
|
|
public function add(){
|
|
|
- $param=$this->request->param(["name"=>"","companyNo"=>"",'relaComNo'=>'',"action"=>'',"type"=>""],"post","trim");
|
|
|
+ $param=$this->request->param(["name"=>"","companyNo"=>"",'relaComNo'=>'',"action"=>''],"post","trim");
|
|
|
$valid=Validate::rule([
|
|
|
"name|脚本名称"=>'require|max:255',
|
|
|
- "type|脚本类型"=>'require|number|in:1,2',
|
|
|
"companyNo|业务公司"=>'requireWithout:relaComNo|max:255',
|
|
|
"relaComNo|业务公司"=>'requireWithout:companyNo|max:255',
|
|
|
]);
|
|
|
@@ -57,7 +56,7 @@ class Exec extends \app\admin\BaseController{
|
|
|
"companyNo"=>$companyNo,
|
|
|
"companyName"=>Db::name("supplier_info")->where(["code"=>$companyNo])->value("name",""),
|
|
|
"action"=>$param["action"]??"",
|
|
|
- "type"=>$param['type'],
|
|
|
+ "type"=>0,
|
|
|
"status"=>0,
|
|
|
"addtime"=>date("Y-m-d H:i:s"),
|
|
|
"updatetime"=>date("Y-m-d H:i:s")
|
|
|
@@ -79,13 +78,14 @@ class Exec extends \app\admin\BaseController{
|
|
|
}
|
|
|
//新建脚本数据
|
|
|
public function addlog(){
|
|
|
- $param=$this->request->param(["id"=>"","start"=>"","end"=>"","companyNo"=>"",'relaComNo'=>''],"post","trim");
|
|
|
+ $param=$this->request->param(["id"=>"","start"=>"","end"=>"","companyNo"=>"",'relaComNo'=>'',"type"=>""],"post","trim");
|
|
|
$valid=Validate::rule([
|
|
|
"id|脚本ID"=>'require|number|gt:0',
|
|
|
"start|起始时间"=>'require|dateFormat:y-m-d',
|
|
|
"end|结束时间"=>'require|dateFormat:y-m-d|gt:start',
|
|
|
"companyNo|业务公司"=>'requireWithout:relaComNo|max:255',
|
|
|
"relaComNo|业务公司"=>'requireWithout:companyNo|max:255',
|
|
|
+ "type|执行类型"=>'require|number|in:1,2',
|
|
|
]);
|
|
|
if($valid->check($param)==false) return error_show(1004,$valid->getError());
|
|
|
$exec =Db::name("exec")->where("id",$param['id'])->findOrEmpty();
|
