linwu hai 5 meses
pai
achega
4e2a049a89

+ 2 - 2
app/admin/controller/Human.php

@@ -32,7 +32,7 @@ class Human extends AdminBaseController
     {
         $map   = $this->dealEqualInput(['status', 'is_arrive'], $this->dealLikeInput(['name']));
         $list  = HumanInstitutionApplyModel::where($map)
-            ->order(['status' => 'asc'])
+            ->order(['status' => 'asc','id'=>'desc'])
             ->limit(input('limit'))
             ->page(input('page'))
             ->append(['status_text', 'is_arrive_text'])
@@ -143,7 +143,7 @@ class Human extends AdminBaseController
     {
         $map   = $this->dealEqualInput(['status', 'is_arrive'], $this->dealLikeInput(['name']));
         $list  = HumanEnterpriseApplyModel::where($map)
-            ->order(['status' => 'asc'])
+            ->order(['status' => 'asc','id'=>'desc'])
             ->limit(input('limit'))
             ->page(input('page'))
             ->append(['status_text', 'is_arrive_text'])

+ 5 - 2
app/admin/view/human/enterprise_apply.html

@@ -59,6 +59,9 @@
                 <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="enterprise">
                     <i class="layui-icon layui-icon-edit"></i>转机构
                 </a>
+                <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="enterprise">
+                    <i class="layui-icon layui-icon-edit"></i>同步到参会列表
+                </a>
             </script>
         </div>
     </div>
@@ -79,7 +82,7 @@
             cols: [
                 [
                     {type: 'checkbox', fixed: 'left'},
-                    {field: 'name', title: '企业名称', width: 160},
+                    {field: 'name', title: '企业名称', width: 240},
                     {field: 'join', title: '参会人', width: 100},
                     {field: 'join_mobile', title: '参会手机号', width: 160},
                     {field: 'wechat', title: '微信号', width: 160},
@@ -89,7 +92,7 @@
                     {field: 'comment', title: '审核备注', width: 200},
                     {field: 'is_arrive_text', title: '签到', width: 100, align: 'center'},
                     {field: 'create_time', title: '申请时间', width: 160, align: 'center'},
-                    {title: '操作', width: 380, align: 'center', fixed: 'right', toolbar: '#setTpl'}
+                    {title: '操作', width: 500, align: 'center', fixed: 'right', toolbar: '#setTpl'}
                 ]
             ],
             page: true,

+ 5 - 2
app/admin/view/human/institution_apply.html

@@ -59,6 +59,9 @@
                 <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="enterprise">
                     <i class="layui-icon layui-icon-edit"></i>转企业
                 </a>
+                <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="enterprise">
+                    <i class="layui-icon layui-icon-edit"></i>同步到参会列表
+                </a>
             </script>
         </div>
     </div>
@@ -79,7 +82,7 @@
             cols: [
                 [
                     {type: 'checkbox', fixed: 'left'},
-                    {field: 'name', title: '机构名称', width: 160},
+                    {field: 'name', title: '机构名称', width: 240},
                     {field: 'join', title: '参会人', width: 100},
                     {field: 'join_mobile', title: '参会手机号', width: 160},
                     {field: 'wechat', title: '微信号', width: 160},
@@ -88,7 +91,7 @@
                     {field: 'comment', title: '审核备注', width: 200},
                     {field: 'is_arrive_text', title: '签到', width: 100, align: 'center'},
                     {field: 'create_time', title: '申请时间', width: 160, align: 'center'},
-                    {title: '操作', width: 380, align: 'center', fixed: 'right', toolbar: '#setTpl'}
+                    {title: '操作', width: 500, align: 'center', fixed: 'right', toolbar: '#setTpl'}
                 ]
             ],
             page: true,