Merge branch 'master-new-dev-wf' of wugg/phpstock into master-new

app/admin/controller/Consult.php

@@ -2421,14 +2421,13 @@ class Consult extends Base
         }
 
         //查看非本公司的竞价单
-        $relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo']!="" ? trim($this->post['relaComNo']):"";
-        if($this->level!=1 & $relaComNo!="") {
-        	$companyNo='';
-        	$relaComArr=$userCommon->handle("hqInfo",["code"=>$relaComNo]);
-        	if(isset($relaComArr['code'])&&$relaComArr['code']==0&& empty($relaComArr['data'])) {
-        		$companyNo = $this->level==3?$relaComArr['data']['relation_code'] :$relaComArr['data']['code'];
-        	}
-        	$where[]=['b.companyNo','<>', $companyNo];
+        $relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo'] != "" ? trim($this->post['relaComNo']) : "";
+        if ($relaComNo != "") {
+            if ($this->level == 2) $where[] = ['b.companyNo', '<>', $relaComNo];
+            else {
+                $relaComArr = $userCommon->handle("hqInfo", ["code" => $relaComNo]);
+                $where[] = ['b.companyNo', '<>', $relaComArr['data']['relation_code'] ?? ''];
+            }
         }
 
         $count = Db::name('consult_info')

app/admin/controller/Orderuse.php

@@ -13,11 +13,11 @@ class Orderuse extends Base
     public function create()
     {
 
-        $param = $this->request->only(['companyNo', 'companyName', 'order_use'], 'post', 'trim');
+        $param = $this->request->only(['order_use'], 'post', 'trim');
 
         $val = Validate::rule([
-            'companyNo|公司编码' => 'require|length:18',
-            'companyName|公司名称' => 'require|max:255',
+//            'companyNo|公司编码' => 'require|length:18',
+//            'companyName|公司名称' => 'require|max:255',
             'order_use|订单用途' => 'require|max:255',
         ]);
 
@@ -52,15 +52,15 @@ class Orderuse extends Base
             ->field('id')
             ->where([
                 'is_del' => 0,
-                'companyNo' => $param['companyNo'],
+//                'companyNo' => $param['companyNo'],
                 'order_use' => $param['order_use'],
             ])
             ->findOrEmpty();
         if (!empty($tmp)) return json_show(1004, '同一公司下该订单用途已存在');
 
         $datainfo = Db::name('order_use')->insert([
-            "companyNo" => $param['companyNo'],
-            "companyName" => $param['companyName'],
+//            "companyNo" => $param['companyNo'],
+//            "companyName" => $param['companyName'],
             "order_use" => $param['order_use'],
             "creater" => $this->uname,
             "createrid" => $this->uid,
@@ -90,7 +90,7 @@ class Orderuse extends Base
             'start' => '',
             'end' => '',
             'company_name' => '',
-            'companyNo' => '',
+//            'companyNo' => '',
             'relaComNo' => '',
         ], 'post', 'trim');
 
@@ -140,12 +140,12 @@ class Orderuse extends Base
 
     public function edit()
     {
-        $param = $this->request->only(['id', 'companyNo', 'companyName', 'order_use'], 'post', 'trim');
+        $param = $this->request->only(['id', 'order_use'], 'post', 'trim');
 
         $val = Validate::rule([
             'id' => 'require|number|gt:0',
-            'companyNo|公司编码' => 'require|length:18',
-            'companyName|公司名称' => 'require|max:255',
+//            'companyNo|公司编码' => 'require|length:18',
+//            'companyName|公司名称' => 'require|max:255',
             'order_use|订单用途' => 'require|max:255',
         ]);
 
@@ -176,7 +176,7 @@ class Orderuse extends Base
             ->field('id')
             ->where([
                 'is_del' => 0,
-                'companyNo' => $param['companyNo'],
+//                'companyNo' => $param['companyNo'],
                 'order_use' => $param['order_use'],
             ])
             ->where('id', '<>', $param['id'])
@@ -187,8 +187,8 @@ class Orderuse extends Base
         $datainfo = Db::name("order_use")
             ->where(['is_del' => 0, 'id' => $param['id']])
             ->update([
-                "companyNo" => $param['companyNo'],
-                "companyName" => $param['companyName'],
+//                "companyNo" => $param['companyNo'],
+//                "companyName" => $param['companyName'],
                 "order_use" => $param['order_use'],
                 "updatetime" => date("Y-m-d H:i:s")
             ]);

app/admin/controller/Resigninfo.php

@@ -64,14 +64,14 @@ class Resigninfo extends Base
     public function create()
     {
 
-        $post = $this->request->only(['resign_uid', 'hand_uid', 'resign_date', 'expire_date', 'companyNo', 'is_hand' => 0, 'remark' => ''], 'post', 'trim');
+        $post = $this->request->only(['resign_uid', 'hand_uid', 'resign_date', 'expire_date', 'is_hand' => 0, 'remark' => ''], 'post', 'trim');
 
         $val = Validate::rule([
             'resign_uid|离职人' => 'require|number|gt:0',
             'hand_uid|交接人' => 'require|number|gt:0',
             'resign_date|离职日期' => 'require|date',
             'expire_date|生效时间' => 'require|date',
-            'companyNo|所属公司' => 'require|max:255',
+//            'companyNo|所属公司' => 'require|max:255',
             'is_hand|是否交接' => 'require|number|in:0,1',
             'remark|备注' => 'max:255',
         ]);
@@ -79,7 +79,7 @@ class Resigninfo extends Base
         if ($val->check($post) == false) return json_show(1004, $val->getError());
 
         $userCommon = new \app\admin\common\User();
-        $rs = $userCommon->handle('userlist', ['uid' => [$post['resign_uid'], $post['hand_uid']], 'companyNo' => $post['companyNo']]);
+        $rs = $userCommon->handle('userlist', ['uid' => [$post['resign_uid'], $post['hand_uid']]]);
         $uid_nickname = array_column($rs['data']['list'], 'nickname', 'id');
 
         if (!isset($uid_nickname[$post['resign_uid']])) return json_show(1004, '离职人不存在或不属于该公司');
@@ -90,7 +90,7 @@ class Resigninfo extends Base
 
             $status = 0;
             $data = [
-                'companyNo' => $post['companyNo'],
+//                'companyNo' => $post['companyNo'],
                 "resign_uid" => $post['resign_uid'],
                 "hand_uid" => $post['hand_uid'],
                 "resign_name" => $uid_nickname[$post['resign_uid']],
@@ -137,7 +137,7 @@ class Resigninfo extends Base
     //编辑
     public function edit()
     {
-        $post = $this->request->only(['id', 'resign_uid', 'hand_uid', 'resign_date', 'expire_date', 'companyNo', 'is_hand' => 0, 'remark' => ''], 'post', 'trim');
+        $post = $this->request->only(['id', 'resign_uid', 'hand_uid', 'resign_date', 'expire_date', 'is_hand' => 0, 'remark' => ''], 'post', 'trim');
 
         $val = Validate::rule([
             'id' => 'require|number|gt:0',
@@ -145,7 +145,7 @@ class Resigninfo extends Base
             'hand_uid|交接人' => 'require|number|gt:0',
             'resign_date|离职日期' => 'require|date',
             'expire_date|生效时间' => 'require|date',
-            'companyNo|所属公司' => 'require|max:255',
+//            'companyNo|所属公司' => 'require|max:255',
             'is_hand|是否交接' => 'require|number|in:0,1',
             'remark|备注' => 'max:255',
         ]);
@@ -153,7 +153,7 @@ class Resigninfo extends Base
         if ($val->check($post) == false) return json_show(1004, $val->getError());
 
         $userCommon = new \app\admin\common\User();
-        $rs = $userCommon->handle('userlist', ['uid' => [$post['resign_uid'], $post['hand_uid']], 'companyNo' => $post['companyNo']]);
+        $rs = $userCommon->handle('userlist', ['uid' => [$post['resign_uid'], $post['hand_uid']]]);
         $uid_nickname = array_column($rs['data']['list'], 'nickname', 'id');
 
         if (!isset($uid_nickname[$post['resign_uid']])) return json_show(1004, '离职人不存在或不属于该公司');
@@ -179,7 +179,7 @@ class Resigninfo extends Base
                 "is_hand" => $post['is_hand'],
                 "resign_date" => date('Y-m-d H:i:s'),
                 "is_del" => 0,
-                'companyNo' => $post['companyNo'],
+//                'companyNo' => $post['companyNo'],
                 "updatetime" => date('Y-m-d H:i:s'),
             ];
             $it = Db::name('resign_info')->where(['is_del' => 0, 'id' => $post['id']])->save($str);