瀏覽代碼

添加公司名称显示

pengchanglu 3 年之前
父節點
當前提交
1d0afcbe1e

+ 36 - 0
application/admin/controller/pig/Codeorder.php

@@ -33,4 +33,40 @@ class Codeorder extends Backend
      * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑
      * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改
      */
+
+
+    /**
+     * 查看
+     */
+    public function index()
+    {
+        //当前是否为关联查询
+        $this->relationSearch = true;
+        //设置过滤方法
+        $this->request->filter(['strip_tags', 'trim']);
+        if ($this->request->isAjax()) {
+            //如果发送的来源是Selectpage,则转发到Selectpage
+            if ($this->request->request('keyField')) {
+                return $this->selectpage();
+            }
+            list($where, $sort, $order, $offset, $limit) = $this->buildparams();
+
+            $list = $this->model
+                    ->with(['admin'])
+                    ->where($where)
+                    ->order($sort, $order)
+                    ->paginate($limit);
+
+            foreach ($list as $row) {
+                
+                
+            }
+
+            $result = array("total" => $list->total(), "rows" => $list->items());
+
+            return json($result);
+        }
+        return $this->view->fetch();
+    }
+
 }

+ 26 - 12
application/admin/lang/zh-cn/pig/codeorder.php

@@ -1,16 +1,30 @@
 <?php
 
 return [
-    'Id'         => 'ID',
-    'Admin_id'   => '管理员ID',
-    'Orderid'    => '订单id',
-    'Num'        => '码个数',
-    'Content'    => '详情',
-    'Createtime' => '创建时间',
-    'Updatetime' => '更新时间',
-    'Deletetime' => '删除时间',
-    'Status'     => '状态',
-    'Status 1'   => '正常',
-    'Status 2'   => '删除',
-    'Status 3'   => '其他'
+    'Id'                 => 'ID',
+    'Admin_id'           => '管理员ID',
+    'Orderid'            => '订单id',
+    'Num'                => '码个数',
+    'Content'            => '详情',
+    'Createtime'         => '创建时间',
+    'Updatetime'         => '更新时间',
+    'Deletetime'         => '删除时间',
+    'Status'             => '状态',
+    'Status 1'           => '正常',
+    'Status 2'           => '删除',
+    'Status 3'           => '其他',
+    'Admin.id'           => 'ID',
+    'Admin.username'     => '用户名',
+    'Admin.nickname'     => '公司',
+    'Admin.password'     => '密码',
+    'Admin.salt'         => '密码盐',
+    'Admin.avatar'       => '头像',
+    'Admin.email'        => '电子邮箱',
+    'Admin.loginfailure' => '失败次数',
+    'Admin.logintime'    => '登录时间',
+    'Admin.loginip'      => '登录IP',
+    'Admin.createtime'   => '创建时间',
+    'Admin.updatetime'   => '更新时间',
+    'Admin.token'        => 'Session标识',
+    'Admin.status'       => '状态'
 ];

+ 4 - 0
application/admin/model/pig/Codeorder.php

@@ -46,4 +46,8 @@ class Codeorder extends Model
 
 
 
+    public function admin()
+    {
+        return $this->belongsTo('app\admin\model\Admin', 'admin_id', 'id', [], 'LEFT')->setEagerlyType(0);
+    }
 }

+ 1 - 1
application/extra/site.php

@@ -4,7 +4,7 @@ return array (
   'name' => '生猪屠宰溯源平台',
   'beian' => '皖ICP备2022001240号',
   'cdnurl' => '',
-  'version' => '1.0.3',
+  'version' => '1.0.4',
   'timezone' => 'Asia/Shanghai',
   'forbiddenip' => '',
   'languages' => 

+ 17 - 2
public/assets/js/backend/pig/codeorder.js

@@ -27,12 +27,27 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
                         //{field: 'admin_id', title: __('Admin_id')},
+						{field: 'admin.nickname', title: __('Admin.nickname'), operate: 'LIKE'},
                         {field: 'orderid', title: __('Orderid'), operate: 'LIKE'},
                         {field: 'num', title: __('Num')},
                         {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: '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: 'admin.id', title: __('Admin.id')},
+                        //{field: 'admin.username', title: __('Admin.username'), operate: 'LIKE'},
+                        //{field: 'admin.nickname', title: __('Admin.nickname'), operate: 'LIKE'},
+                        //{field: 'admin.password', title: __('Admin.password'), operate: 'LIKE'},
+                        //{field: 'admin.salt', title: __('Admin.salt'), operate: 'LIKE'},
+                        //{field: 'admin.avatar', title: __('Admin.avatar'), operate: 'LIKE', events: Table.api.events.image, formatter: Table.api.formatter.image},
+                        //{field: 'admin.email', title: __('Admin.email'), operate: 'LIKE'},
+                        //{field: 'admin.loginfailure', title: __('Admin.loginfailure')},
+                        //{field: 'admin.logintime', title: __('Admin.logintime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        //{field: 'admin.loginip', title: __('Admin.loginip'), operate: 'LIKE'},
+                        //{field: 'admin.createtime', title: __('Admin.createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        //{field: 'admin.updatetime', title: __('Admin.updatetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        //{field: 'admin.token', title: __('Admin.token'), operate: 'LIKE'},
+                        //{field: 'admin.status', title: __('Admin.status'), operate: 'LIKE', formatter: Table.api.formatter.status},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]

+ 1 - 1
命令.txt

@@ -17,7 +17,7 @@ code
 php think crud -t p_code -c pig/code -u 1  --force=true  
 
 code order
-php think crud -t p_code_order -c pig/codeorder -u 1  --force=true  
+php think crud -t p_code_order -c pig/codeorder -u 1  --force=true   --relation=admin --relationforeignkey=admin_id
 
 code create
 php think crud -t p_code_order -c pig/codecreate -u 1  --force=true