合并分支 'release' 到 'master'

README.md

@@ -58,3 +58,4 @@
 15、iconfont图标库：http://www.iconfont.cn/   
 16、腾讯地图：http://map.qq.com/  
 16、nodejs：https://nodejs.org/ 
+17
\ No newline at end of file

webmain/flow/input/inputjs/mode_goodly.js

@@ -22,7 +22,7 @@ function initbodys(){
 		for(i=0;i<da.length;i++){
 			d  = da[i];
 			bo = false;
-			for(j=0;j<dao.length;j++)if(dao[j].aid==d.value)bo=true;
+			// for(j=0;j<dao.length;j++)if(dao[j].aid==d.value)bo=true;
 			oii++;
 			if(!bo){
 				if(oii>0){
@@ -38,15 +38,16 @@ function initbodys(){
 					aid:d.value
 				});
 				$(form('count'+nam[2]+'')).attr('max', d.stock);
-			}else{
-				oii--;
-				if(i==0){
-					this.setrowdata(nam[0],nam[1],{
-						temp_aid:'',
-						aid:'0'
-					});
-				}
 			}
+			// else{
+			// 	oii--;
+			// 	if(i==0){
+			// 		this.setrowdata(nam[0],nam[1],{
+			// 			temp_aid:'',
+			// 			aid:'0'
+			// 		});
+			// 	}
+			// }	
 		}
 	}
 }

webmain/flow/input/mode_goodlyAction.php

@@ -10,11 +10,11 @@ class mode_goodlyClassAction extends inputAction{
 		$this->sssaid = '0';
 		foreach($data as $k=>$rs){
 			if($rs['count']==0)return '行['.($k+1).']的数量不能为0';
-			if(!isset($cbarr[$rs['aid']])){
-				$cbarr[$rs['aid']] = 1;
-			}else{
-				return '行['.($k+1).']的物品已申请了';
-			}
+			// if(!isset($cbarr[$rs['aid']])){
+			// 	$cbarr[$rs['aid']] = 1;
+			// }else{
+			// 	return '行['.($k+1).']的物品已申请了';
+			// }
 			$this->sssaid.=','.$rs['aid'].'';
 		}
 	}

webmain/model/loginModel.php

@@ -302,6 +302,7 @@ class loginClassModel extends Model
         $port = getconfig("redis_port");
 
         $redis->connect($host,$port);
+
         $sid = 'PHPREDIS_SESSION:'.$cookieSid;
         $redis->delete($sid);
         $redis->close();

webmain/task/openapi/opencustomerAction.php

@@ -15,19 +15,11 @@ class opencustomerClassAction extends openapiAction
     //客户列表
     public function listAction(){
         $post = $_POST;
-        $email=$post['email'];
-        $sql  = "select u.id,u.email from oa_userinfo u where u.email = '$email'";
+        $page = $post['size'] ?  $post['size']:0;
+        $page_size = $post['page_size']? $post['page_size']:10;
+        $sort =$post['sort']? $post['sort']: 'desc';
+        $sql  = 'select id,contract_number,name from [Q]customer as c  order by c.id '.$sort.' limit '.$page.','.$page_size;
         $data = $this->db->getall($sql);
-        $uid=$data[0]['id'];//用户id
-        $data = $this->db->getall('select id,contract_number,name from 
-                                    oa_customer 
-                                    where (uid = ' . $uid . '
-                                        or department_id=(select deptname from oa_userinfo where id=' . $uid . ') 
-                                    or department_id like concat((select deptname from oa_userinfo where id=' . $uid . '),",%") 
-                                    or department_id like concat("%,",(select deptname from oa_userinfo where id=' . $uid . ')) 
-                                    or department_id like concat("%,",(select deptname from oa_userinfo where id=' . $uid . '),",%"))
-                                    and status = 1 
-                                    order by id desc');
         foreach ($data as $key => $vo){
             $supp ='select open_bank_name,bank_code,bank_holder,open_address from [Q]customer_bank_info   where mid='.$vo['id'];
             $contacts ='select name,job,tel,email,adress,remarks from [Q]contracts  where mid='.$vo['id'];

webmain/task/openapi/openfkAction.php

@@ -69,7 +69,7 @@ class openfkClassAction extends openapiAction
             }
             //启动流程
             $this->goflow($id);
-            $this->showreturn(['numb' => $this->data['docnum']], '插入数据成功', '200');
+            $this->showreturn(['numb' => $this->data['docnum'],'id'=>$id], '插入数据成功', '200');
         } else $this->showreturn([], '插入数据失败', '201');
     }
 

webmain/task/openapi/opensupplierAction.php

@@ -15,17 +15,11 @@ class opensupplierClassAction extends openapiAction
     //供应商列表
     public function listAction(){
         $post = $_POST;
-        $email=$post['email'];
-        $sql  = "select u.id,u.email from oa_userinfo u where u.email = '$email'";
+        $page = $post['size'] ?  $post['size']:0;
+        $page_size = $post['page_size']? $post['page_size']:10;
+        $sort =$post['sort']? $post['sort']: 'desc';
+        $sql  = 'select id,number,name from [Q]supplier as c  order by c.id '.$sort.' limit '.$page.','.$page_size;
         $data = $this->db->getall($sql);
-        $uid=$data[0]['id'];//用户id
-        $data = $this->db->getall('select id,number,name from oa_supplier where (uid = ' . $uid . '
-                or department_id=(select deptname from oa_userinfo where id=' . $uid . ') 
-                or department_id like concat((select deptname from oa_userinfo where id=' . $uid . '),",%") 
-                or department_id like concat("%,",(select deptname from oa_userinfo where id=' . $uid . ')) 
-                or department_id like concat("%,",(select deptname from oa_userinfo where id=' . $uid . '),",%"))
-                and status = 1 
-                order by id desc');
         foreach ($data as $key => $vo){
             $supp ='select open_bank_name,bank_code,bank_holder,open_address from [Q]supplier_bank_info   where mid='.$vo['id'];
             $contacts ='select name,job,tel,email,adress,remarks from [Q]supplier_contract   where mid='.$vo['id'];