Jelajahi Sumber

社区服务

lizhen 1 Minggu lalu
induk
melakukan
49bd5a9f03

+ 4 - 4
application/admin/lang/zh-cn/servicegrade.php

@@ -1,12 +1,12 @@
 <?php
 <?php
 
 
 return [
 return [
-    'User_id'       => '考试用户',
-    'Paper_id'      => '社区服务类型',
+    'User_id'       => '考试用户ID',
+    'Paper_id'      => '社区服务类型ID',
     'Question_ids'  => '试卷ID集合',
     'Question_ids'  => '试卷ID集合',
     'User_answers'  => '用户答案集合',
     'User_answers'  => '用户答案集合',
     'Createtime'    => '创建时间',
     'Createtime'    => '创建时间',
     'Updatetime'    => '修改时间',
     'Updatetime'    => '修改时间',
-    'Paper.name'    => '名称',
-    'User.nickname' => '昵称'
+    'Paper.name'    => '社区服务类型',
+    'User.nickname' => '考试用户昵称'
 ];
 ];

+ 2 - 2
application/admin/lang/zh-cn/servicequestion.php

@@ -2,7 +2,7 @@
 
 
 return [
 return [
     'Id'           => 'ID',
     'Id'           => 'ID',
-    'Paper_id'     => '所属社区服务类型',
+    'Paper_id'     => '社区服务类型ID',
     'Kind'         => '试题类型',
     'Kind'         => '试题类型',
     'Kind single'  => '单选',
     'Kind single'  => '单选',
     'Kind multi'   => '多选',
     'Kind multi'   => '多选',
@@ -15,5 +15,5 @@ return [
     'Set status to 0'=> '设为隐藏',
     'Set status to 0'=> '设为隐藏',
     'Weigh'        => '权重排序',
     'Weigh'        => '权重排序',
     'Deletetime'   => '删除时间',
     'Deletetime'   => '删除时间',
-    'Paper.name'   => '名称'
+    'Paper.name'   => '社区服务类型'
 ];
 ];

+ 3 - 3
application/admin/view/servicegrade/index.html

@@ -7,9 +7,9 @@
                 <div class="widget-body no-padding">
                 <div class="widget-body no-padding">
                     <div id="toolbar" class="toolbar">
                     <div id="toolbar" class="toolbar">
                         <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
                         <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
-                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('servicegrade/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
-                        <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('servicegrade/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
-                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('servicegrade/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
+<!--                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('servicegrade/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>-->
+<!--                        <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('servicegrade/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>-->
+<!--                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('servicegrade/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>-->
                         
                         
 
 
                         
                         

+ 5 - 5
application/admin/view/servicepaper/index.html

@@ -18,20 +18,20 @@
                     <div id="toolbar" class="toolbar">
                     <div id="toolbar" class="toolbar">
                         <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
                         <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
                         <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('servicepaper/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
                         <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('servicepaper/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
-                        <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('servicepaper/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
-                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('servicepaper/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
+<!--                        <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('servicepaper/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>-->
+<!--                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('servicepaper/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>-->
                         
                         
 
 
-                        <div class="dropdown btn-group {:$auth->check('servicepaper/multi')?'':'hide'}">
+                        <!--<div class="dropdown btn-group {:$auth->check('servicepaper/multi')?'':'hide'}">
                             <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
                             <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
                             <ul class="dropdown-menu text-left" role="menu">
                             <ul class="dropdown-menu text-left" role="menu">
                                 {foreach name="statusList" item="vo"}
                                 {foreach name="statusList" item="vo"}
                                 <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:" data-params="status={$key}">{:__('Set status to ' . $key)}</a></li>
                                 <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:" data-params="status={$key}">{:__('Set status to ' . $key)}</a></li>
                                 {/foreach}
                                 {/foreach}
                             </ul>
                             </ul>
-                        </div>
+                        </div>-->
 
 
-                        <a class="btn btn-success btn-recyclebin btn-dialog {:$auth->check('servicepaper/recyclebin')?'':'hide'}" href="servicepaper/recyclebin" title="{:__('Recycle bin')}"><i class="fa fa-recycle"></i> {:__('Recycle bin')}</a>
+<!--                        <a class="btn btn-success btn-recyclebin btn-dialog {:$auth->check('servicepaper/recyclebin')?'':'hide'}" href="servicepaper/recyclebin" title="{:__('Recycle bin')}"><i class="fa fa-recycle"></i> {:__('Recycle bin')}</a>-->
                     </div>
                     </div>
                     <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
                     <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
                            data-operate-edit="{:$auth->check('servicepaper/edit')}"
                            data-operate-edit="{:$auth->check('servicepaper/edit')}"

+ 3 - 3
application/admin/view/servicequestion/index.html

@@ -18,7 +18,7 @@
                     <div id="toolbar" class="toolbar">
                     <div id="toolbar" class="toolbar">
                         <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
                         <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
                         <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('servicequestion/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
                         <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('servicequestion/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
-                        <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('servicequestion/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
+                <!--        <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('servicequestion/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
                         <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('servicequestion/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
                         <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('servicequestion/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
                         
                         
 
 
@@ -29,9 +29,9 @@
                                 <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:" data-params="status={$key}">{:__('Set status to ' . $key)}</a></li>
                                 <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:" data-params="status={$key}">{:__('Set status to ' . $key)}</a></li>
                                 {/foreach}
                                 {/foreach}
                             </ul>
                             </ul>
-                        </div>
+                        </div>-->
 
 
-                        <a class="btn btn-success btn-recyclebin btn-dialog {:$auth->check('servicequestion/recyclebin')?'':'hide'}" href="servicequestion/recyclebin" title="{:__('Recycle bin')}"><i class="fa fa-recycle"></i> {:__('Recycle bin')}</a>
+<!--                        <a class="btn btn-success btn-recyclebin btn-dialog {:$auth->check('servicequestion/recyclebin')?'':'hide'}" href="servicequestion/recyclebin" title="{:__('Recycle bin')}"><i class="fa fa-recycle"></i> {:__('Recycle bin')}</a>-->
                     </div>
                     </div>
                     <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
                     <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
                            data-operate-edit="{:$auth->check('servicequestion/edit')}"
                            data-operate-edit="{:$auth->check('servicequestion/edit')}"

+ 6 - 3
public/assets/js/backend/servicegrade.js

@@ -22,17 +22,20 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 pk: 'id',
                 pk: 'id',
                 sortName: 'id',
                 sortName: 'id',
+                search: false,
                 columns: [
                 columns: [
                     [
                     [
                         {checkbox: true},
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
                         {field: 'id', title: __('Id')},
                         {field: 'user_id', title: __('User_id')},
                         {field: 'user_id', title: __('User_id')},
+                        {field: 'user.nickname', title: __('User.nickname'), operate: 'LIKE'},
+
                         {field: 'paper_id', title: __('Paper_id')},
                         {field: 'paper_id', title: __('Paper_id')},
-                        {field: 'question_ids', title: __('Question_ids'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
+                        {field: 'paper.name', title: __('Paper.name'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
+
+                        // {field: 'question_ids', title: __('Question_ids'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
                         {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {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: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        {field: 'paper.name', title: __('Paper.name'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
-                        {field: 'user.nickname', title: __('User.nickname'), operate: 'LIKE'},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                     ]
                 ]
                 ]

+ 1 - 0
public/assets/js/backend/servicepaper.js

@@ -22,6 +22,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 pk: 'id',
                 pk: 'id',
                 sortName: 'weigh',
                 sortName: 'weigh',
+                search: false,
                 columns: [
                 columns: [
                     [
                     [
                         {checkbox: true},
                         {checkbox: true},

+ 3 - 1
public/assets/js/backend/servicequestion.js

@@ -22,16 +22,18 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 pk: 'id',
                 pk: 'id',
                 sortName: 'weigh',
                 sortName: 'weigh',
+                search: false,
                 columns: [
                 columns: [
                     [
                     [
                         {checkbox: true},
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
                         {field: 'id', title: __('Id')},
                         {field: 'paper_id', title: __('Paper_id')},
                         {field: 'paper_id', title: __('Paper_id')},
+                        {field: 'paper.name', title: __('Paper.name'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
+
                         {field: 'kind', title: __('Kind'), searchList: {"SINGLE":__('Kind single'),"MULTI":__('Kind multi')}, formatter: Table.api.formatter.normal},
                         {field: 'kind', title: __('Kind'), searchList: {"SINGLE":__('Kind single'),"MULTI":__('Kind multi')}, formatter: Table.api.formatter.normal},
                         {field: 'title', title: __('Title'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
                         {field: 'title', title: __('Title'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
                         {field: 'status', title: __('Status'), searchList: {"1":__('Status 1'),"0":__('Status 0')}, formatter: Table.api.formatter.status},
                         {field: 'status', title: __('Status'), searchList: {"1":__('Status 1'),"0":__('Status 0')}, formatter: Table.api.formatter.status},
                         {field: 'weigh', title: __('Weigh'), operate: false},
                         {field: 'weigh', title: __('Weigh'), operate: false},
-                        {field: 'paper.name', title: __('Paper.name'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                     ]
                 ]
                 ]