pengchanglu il y a 3 ans
Parent
commit
b29f6d50ca

+ 4 - 0
application/admin/controller/pig/Market.php

@@ -17,6 +17,9 @@ class Market extends Backend
      * @var \app\admin\model\pig\Market
      */
     protected $model = null;
+    protected $dataLimit = 'auth';//auth  personal
+    protected $searchFields = ['orderid'];
+    protected $excludeFields = ['orderid','name','supplier_id','customer_id','num','code','leavetime','province_id','images','content','createtime','updatetime','deletetime','status']; //排除的字段
 
     public function _initialize()
     {
@@ -54,6 +57,7 @@ class Market extends Backend
 
             $list = $this->model
                 ->where($where)
+                ->where('province_id', $province_id)
                 ->order($sort, $order)
                 ->paginate($limit);
 

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

@@ -19,6 +19,7 @@ class Order extends Backend
      */
     protected $model = null;
     protected $dataLimit = 'auth';
+    protected $searchFields = ['orderid'];
 
     public function _initialize()
     {

+ 1 - 1
application/admin/lang/zh-cn/pig/market.php

@@ -11,7 +11,7 @@ return [
     'Code'        => '码段',
     'Leavetime'   => '出厂时间',
     'Province_id' => '销售省份',
-    'Images'      => '图片',
+    'Images'      => '检疫图片',
     'Content'     => '详情',
     'Createtime'  => '创建时间',
     'Updatetime'  => '更新时间',

+ 1 - 1
application/admin/lang/zh-cn/pig/order.php

@@ -11,7 +11,7 @@ return [
     'Code'                => '码段',
     'Leavetime'           => '出厂时间',
     'Province_id'         => '销售省份',
-    'Images'              => '图片',
+    'Images'              => '检疫图片',
     'Content'             => '详情',
     'Createtime'          => '创建时间',
     'Updatetime'          => '更新时间',

+ 11 - 11
application/admin/view/pig/market/add.html

@@ -3,56 +3,56 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Orderid')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-orderid" class="form-control" name="row[orderid]" type="text" value="">
+            <input disabled="disabled" id="c-orderid" class="form-control" name="row[orderid]" type="text" value="">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Name')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-name" class="form-control" name="row[name]" type="text" value="">
+            <input disabled="disabled" id="c-name" class="form-control" name="row[name]" type="text" value="">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Supplier_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-supplier_id" data-rule="required" data-source="supplier/index" class="form-control selectpage" name="row[supplier_id]" type="text" value="">
+            <input disabled="disabled" id="c-supplier_id" data-rule="required" data-source="supplier/index" class="form-control selectpage" name="row[supplier_id]" type="text" value="">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Customer_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-customer_id" data-rule="required" data-source="customer/index" class="form-control selectpage" name="row[customer_id]" type="text" value="">
+            <input disabled="disabled" id="c-customer_id" data-rule="required" data-source="customer/index" class="form-control selectpage" name="row[customer_id]" type="text" value="">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Num')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-num" class="form-control" name="row[num]" type="number" value="1">
+            <input disabled="disabled" id="c-num" class="form-control" name="row[num]" type="number" value="1">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Code')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-code" class="form-control" name="row[code]" type="text" value="">
+            <input disabled="disabled" id="c-code" class="form-control" name="row[code]" type="text" value="">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Leavetime')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <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')}">
+            <input disabled="disabled" 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-rule="required" data-source="province/index" class="form-control selectpage" name="row[province_id]" type="text" value="">
+            <input disabled="disabled" id="c-province_id" data-rule="required" data-source="province/index" class="form-control selectpage" name="row[province_id]" type="text" value="">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Images')}:</label>
         <div class="col-xs-12 col-sm-8">
             <div class="input-group">
-                <input id="c-images" class="form-control" size="50" name="row[images]" type="text" value="">
+                <input disabled="disabled" id="c-images" class="form-control" size="50" name="row[images]" type="text" value="">
                 <div class="input-group-addon no-border no-padding">
                     <span><button type="button" id="faupload-images" class="btn btn-danger faupload" data-input-id="c-images" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp,image/webp" data-multiple="true" data-preview-id="p-images"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
                     <span><button type="button" id="fachoose-images" class="btn btn-primary fachoose" data-input-id="c-images" data-mimetype="image/*" data-multiple="true"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
@@ -65,7 +65,7 @@
     <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 id="c-content" class="form-control" name="row[content]" type="text" value="">
+            <input disabled="disabled" id="c-content" class="form-control" name="row[content]" type="text" value="">
         </div>
     </div>
     <div class="form-group">
@@ -74,7 +74,7 @@
             
             <div class="radio">
             {foreach name="statusList" item="vo"}
-            <label for="row[status]-{$key}"><input id="row[status]-{$key}" name="row[status]" type="radio" value="{$key}" {in name="key" value="1"}checked{/in} /> {$vo}</label> 
+            <label for="row[status]-{$key}"><input disabled="disabled" id="row[status]-{$key}" name="row[status]" type="radio" value="{$key}" {in name="key" value="1"}checked{/in} /> {$vo}</label> 
             {/foreach}
             </div>
 

+ 17 - 11
application/admin/view/pig/market/edit.html

@@ -3,56 +3,59 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Orderid')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-orderid" class="form-control" name="row[orderid]" type="text" value="{$row.orderid|htmlentities}">
+            <input disabled="disabled" id="c-orderid" class="form-control" name="row[orderid]" type="text" value="{$row.orderid|htmlentities}">
         </div>
     </div>
+<!--    
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Name')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-name" class="form-control" name="row[name]" type="text" value="{$row.name|htmlentities}">
+            <input disabled="disabled" id="c-name" class="form-control" name="row[name]" type="text" value="{$row.name|htmlentities}">
         </div>
     </div>
+-->    
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Supplier_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-supplier_id" data-rule="required" data-source="supplier/index" class="form-control selectpage" name="row[supplier_id]" type="text" value="{$row.supplier_id|htmlentities}">
+            <input disabled="disabled" id="c-supplier_id" data-rule="required" data-source="pig/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>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-customer_id" data-rule="required" data-source="customer/index" class="form-control selectpage" name="row[customer_id]" type="text" value="{$row.customer_id|htmlentities}">
+            <input disabled="disabled" id="c-customer_id" data-rule="required" data-source="pig/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>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Num')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-num" class="form-control" name="row[num]" type="number" value="{$row.num|htmlentities}">
+            <input disabled="disabled" id="c-num" class="form-control" name="row[num]" type="number" value="{$row.num|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Code')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-code" class="form-control" name="row[code]" type="text" value="{$row.code|htmlentities}">
+            <input disabled="disabled" id="c-code" class="form-control" name="row[code]" type="text" value="{$row.code|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Leavetime')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <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):''}">
+            <input disabled="disabled" 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-rule="required" data-source="province/index" class="form-control selectpage" name="row[province_id]" type="text" value="{$row.province_id|htmlentities}">
+            <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>
     </div>
+<!--
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Images')}:</label>
         <div class="col-xs-12 col-sm-8">
             <div class="input-group">
-                <input id="c-images" class="form-control" size="50" name="row[images]" type="text" value="{$row.images|htmlentities}">
+                <input disabled="disabled" id="c-images" class="form-control" size="50" name="row[images]" type="text" value="{$row.images|htmlentities}">
                 <div class="input-group-addon no-border no-padding">
                     <span><button type="button" id="faupload-images" class="btn btn-danger faupload" data-input-id="c-images" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp,image/webp" data-multiple="true" data-preview-id="p-images"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
                     <span><button type="button" id="fachoose-images" class="btn btn-primary fachoose" data-input-id="c-images" data-mimetype="image/*" data-multiple="true"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
@@ -62,24 +65,27 @@
             <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 id="c-content" class="form-control" name="row[content]" type="text" value="{$row.content|htmlentities}">
+            <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">
             
             <div class="radio">
             {foreach name="statusList" item="vo"}
-            <label for="row[status]-{$key}"><input id="row[status]-{$key}" name="row[status]" type="radio" value="{$key}" {in name="key" value="$row.status"}checked{/in} /> {$vo}</label> 
+            <label for="row[status]-{$key}"><input disabled="disabled" id="row[status]-{$key}" name="row[status]" type="radio" value="{$key}" {in name="key" value="$row.status"}checked{/in} /> {$vo}</label> 
             {/foreach}
             </div>
 
         </div>
     </div>
+-->
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">

+ 2 - 2
application/admin/view/pig/market/index.html

@@ -1,5 +1,5 @@
 <div class="panel panel-default panel-intro">
-    
+<!--    
     <div class="panel-heading">
         {:build_heading(null,FALSE)}
         <ul class="nav nav-tabs" data-field="status">
@@ -9,7 +9,7 @@
             {/foreach}
         </ul>
     </div>
-
+-->
 
     <div class="panel-body">
         <div id="myTabContent" class="tab-content">

+ 10 - 10
public/assets/js/backend/pig/market.js

@@ -27,21 +27,21 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 columns: [
                     [
                         {checkbox: true},
-                        {field: 'id', title: __('Id')},
-                        {field: 'admin_id', title: __('Admin_id')},
+                        //{field: 'id', title: __('Id')},
+                        //{field: 'admin_id', title: __('Admin_id')},
                         {field: 'orderid', title: __('Orderid'), operate: 'LIKE'},
-                        {field: 'name', title: __('Name'), operate: 'LIKE'},
-                        {field: 'supplier_id', title: __('Supplier_id')},
-                        {field: 'customer_id', title: __('Customer_id')},
+                        //{field: 'name', title: __('Name'), operate: 'LIKE'},
+                        //{field: 'supplier_id', title: __('Supplier_id')},
+                        //{field: 'customer_id', title: __('Customer_id')},
                         {field: 'num', title: __('Num')},
                         {field: 'code', title: __('Code'), operate: 'LIKE'},
                         {field: 'leavetime', title: __('Leavetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        {field: 'province_id', title: __('Province_id')},
+                        //{field: 'province_id', title: __('Province_id')},
                         {field: 'images', title: __('Images'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.images},
-                        {field: 'content', title: __('Content'), operate: 'LIKE'},
-                        {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        {field: 'status', title: __('Status'), searchList: {"1":__('Status 1'),"2":__('Status 2'),"3":__('Status 3')}, formatter: Table.api.formatter.status},
+                        //{field: 'content', title: __('Content'), operate: 'LIKE'},
+                        //{field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        //{field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        //{field: 'status', title: __('Status'), searchList: {"1":__('Status 1'),"2":__('Status 2'),"3":__('Status 3')}, formatter: Table.api.formatter.status},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]