order 添加 souce_id company_id

application/admin/controller/pig/Market.php

@@ -43,7 +43,8 @@ class Market extends Backend
     {
         $admin_id = $this->auth->id;
         $company = new \app\admin\model\pig\Company;
-        $companyinfo = $company->where('admin_id', $admin_id)->where('type', 3)->find();
+        //$companyinfo = $company->where('admin_id', $admin_id)->where('type', 3)->find();
+        $companyinfo = $company->getAdminCompany($admin_id);
         $province_id = $companyinfo['province_id'];
 
         //设置过滤方法

application/admin/controller/pig/Order.php

@@ -4,6 +4,7 @@ namespace app\admin\controller\pig;
 
 use app\common\controller\Backend;
 use think\Db;
+use app\admin\model\pig\Company;
 
 /**
  * 订单
@@ -83,6 +84,16 @@ class Order extends Backend
                     $this->error('生成码数量需要大于0！');
                 }
 
+                if (!$params['customer_id'] || !$params['supplier_id']) {
+                    $this->error('请选择供应商和者客户！');
+                }
+
+                $company = new Company();
+                $customer = $company->where('id', $params['customer_id'])->find();
+                if (!$customer) {
+                    $this->error('请选择客户！');
+                }
+
                 if ($this->dataLimit && $this->dataLimitFieldAutoFill) {
                     $params[$this->dataLimitField] = $this->auth->id;
                 }
@@ -137,7 +148,12 @@ class Order extends Backend
                     } else {
                         $params['code'] = $str.$list[count($list)-1]['id'];
                     }
+
                     
+                    $params['company_id'] = $this->auth->company_id;
+                    $params['source_id'] = $this->auth->province_id;
+                    $params['province_id'] = $customer['province_id'];
+
                     $params['num'] = $num;
                     $result = $this->model->allowField(true)->save($params);
                     Db::commit();

application/admin/library/Auth.php

@@ -62,7 +62,15 @@ class Auth extends \fast\Auth
         $admin->loginip = request()->ip();
         $admin->token = Random::uuid();
         $admin->save();
-        Session::set("admin", $admin->toArray());
+        $admin_arr = $admin->toArray();
+
+        $company = new \app\admin\model\pig\Company;
+        $companyinfo = $company->getAdminCompany($admin->id);
+
+        $admin_arr['company_id'] = $companyinfo['id'];
+        $admin_arr['province_id'] = $companyinfo['province_id'];
+        
+        Session::set("admin", $admin_arr);
         $this->keeplogin($keeptime);
         return true;
     }
@@ -363,7 +371,6 @@ class Auth extends \fast\Auth
                 $titleArr[$pathArr[$rule['name']]] = $rule['title'];
                 $menuArr[$pathArr[$rule['name']]] = $rule;
             }
-
         }
         ksort($menuArr);
         $this->breadcrumb = $menuArr;

application/admin/model/pig/Company.php

@@ -65,4 +65,9 @@ class Company extends Model
     {
         return $this->belongsTo('app\admin\model\general\Province', 'province_id', 'id', [], 'LEFT')->setEagerlyType(0);
     }
+
+    public function getAdminCompany($adminid)
+    {
+        return $this->where('type', 3)->where('admin_id', $adminid)->find();
+    }
 }

application/admin/view/pig/order/add.html

@@ -31,12 +31,14 @@
             <input id="c-leavetime" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[leavetime]" type="text" value="{:date('Y-m-d H:i:s')}">
         </div>
     </div>
+<!--
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Province_id')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-province_id" data-source="general/province/index" class="form-control selectpage" name="row[province_id]" type="text" value="1">
         </div>
     </div>
+-->
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">检疫图片:</label>
         <div class="col-xs-12 col-sm-8">

application/admin/view/pig/order/edit.html

@@ -40,12 +40,14 @@
             <input id="c-leavetime" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[leavetime]" type="text" value="{:$row.leavetime?datetime($row.leavetime):''}">
         </div>
     </div>
+<!--
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Province_id')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-province_id" data-source="general/province/index" class="form-control selectpage" name="row[province_id]" type="text" value="{$row.province_id|htmlentities}">
         </div>
     </div>
+-->
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">检疫图片:</label>
         <div class="col-xs-12 col-sm-8">