pengchanglu 3 rokov pred
rodič
commit
7d12b8cca8

+ 21 - 0
application/admin/controller/pig/Order.php

@@ -195,6 +195,17 @@ class Order extends Backend
         }
         if ($this->request->isPost()) {
             $params = $this->request->post("row/a");
+
+            if (!$params['customer_id']) {
+                $this->error('请选择供应商和者客户!');
+            }
+
+            $company = new Company();
+            $customer = $company->where('id', $params['customer_id'])->find();
+            if (!$customer) {
+                $this->error('请选择客户!');
+            }
+
             if ($params) {
                 $params = $this->preExcludeFields($params);
                 $result = false;
@@ -206,6 +217,16 @@ class Order extends Backend
                         $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.edit' : $name) : $this->modelValidate;
                         $row->validateFailException(true)->validate($validate);
                     }
+                    $params['province_id'] = $customer['province_id'];
+                    if (isset($params['orderid'])) {
+                        unset($params['orderid']);
+                    }
+                    if (isset($params['num'])) {
+                        unset($params['num']);
+                    }
+                    if (isset($params['code'])) {
+                        unset($params['code']);
+                    }
                     $result = $row->allowField(true)->save($params);
                     Db::commit();
                 } catch (ValidateException $e) {

+ 15 - 5
application/admin/view/pig/market/edit.html

@@ -15,13 +15,19 @@
     </div>
 -->    
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Supplier_id')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">养殖场:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input disabled="disabled" id="c-company_id" data-rule="required" data-source="general/company/index?type=1" class="form-control selectpage" name="row[company_id]" type="text" data-params='{"custom[type]":"3"}' value="{$row.company_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">
             <input disabled="disabled" id="c-supplier_id" data-rule="required" data-source="general/company/index?type=1" class="form-control selectpage" name="row[supplier_id]" type="text" data-params='{"custom[type]":"1"}' value="{$row.supplier_id|htmlentities}">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Customer_id')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">经销商:</label>
         <div class="col-xs-12 col-sm-8">
             <input disabled="disabled" id="c-customer_id" data-rule="required" data-source="general/company/index?type=2" class="form-control selectpage" name="row[customer_id]" type="text" data-params='{"custom[type]":"2"}' value="{$row.customer_id|htmlentities}">
         </div>
@@ -45,7 +51,13 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Province_id')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">来源省份:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input disabled="disabled" id="c-source_id" data-source="general/province/index" class="form-control selectpage" name="row[source_id]" type="text" value="{$row.source_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">
             <input disabled="disabled" 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>
@@ -65,14 +77,12 @@
             <ul class="row list-inline faupload-preview" id="p-images"></ul>
         </div>
     </div>
--->
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Content')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input disabled="disabled" id="c-content" class="form-control" name="row[content]" type="text" value="{$row.content|htmlentities}">
         </div>
     </div>
-<!--
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
         <div class="col-xs-12 col-sm-8">