后台

application/admin/controller/Wentihuizong.php

@@ -51,7 +51,7 @@ class Wentihuizong extends Backend
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
 
             $list = $this->model
-                    ->with(['company','company'])
+                    ->with(['company','usercompany'])
                     ->where($where)
                     ->order($sort, $order)
                     ->paginate($limit);
@@ -59,7 +59,7 @@ class Wentihuizong extends Backend
             foreach ($list as $row) {
                 
                 $row->getRelation('company')->visible(['companyname']);
-				$row->getRelation('company')->visible(['projectname']);
+				$row->getRelation('usercompany')->visible(['projectname']);
             }
 
             $result = array("total" => $list->total(), "rows" => $list->items());

application/admin/lang/zh-cn/wentihuizong.php

@@ -13,5 +13,5 @@ return [
     'Result 1'            => '未解决',
     'Result 2'            => '已解决',
     'Company.companyname' => '公司名',
-    'Company.projectname' => '项目名称'
+    'Usercompany.projectname' => '项目名称'
 ];

application/admin/view/usercompany/add.html

@@ -3,7 +3,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('User_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-user_id" data-rule="required" data-source="user/user/index" data-field="nickname" class="form-control selectpage" name="row[user_id]" type="text" value="">
+            <input id="c-user_id" data-rule="required" data-source="user/index" data-field="nickname" class="form-control selectpage" name="row[user_id]" type="text" value="">
         </div>
     </div>
     <div class="form-group">

application/admin/view/usercompany/edit.html

@@ -1,6 +1,6 @@
 <form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
 
-    <div class="form-group">
+    <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('User_id')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-user_id" data-rule="required" data-source="user/user/index" data-field="nickname" class="form-control selectpage" name="row[user_id]" type="text" value="{$row.user_id|htmlentities}">
@@ -11,7 +11,7 @@
         <div class="col-xs-12 col-sm-8">
             <input id="c-company_id" data-rule="required" data-source="company/index" data-field="companyname" class="form-control selectpage" name="row[company_id]" type="text" value="{$row.company_id|htmlentities}">
         </div>
-    </div>
+    </div>-->
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Projectname')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -103,7 +103,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Weibaofanwei')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <textarea id="c-weibaofanwei" class="form-control " rows="5" name="row[weibaofanwei]" cols="50">{$row.weibaofanwei|htmlentities}</textarea>
+            <textarea id="c-weibaofanwei" class="form-control editor" rows="5" name="row[weibaofanwei]" cols="50">{$row.weibaofanwei|htmlentities}</textarea>
         </div>
     </div>
     <div class="form-group layer-footer">

application/admin/view/usercompany/index.html

@@ -7,9 +7,9 @@
                 <div class="widget-body no-padding">
                     <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-success btn-add {:$auth->check('usercompany/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('usercompany/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('usercompany/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
+                        <!--<a href="javascript:;" class="btn btn-success btn-add {:$auth->check('usercompany/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('usercompany/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('usercompany/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>-->
                         
 
                         

application/admin/view/usercompany/recyclebin.html

@@ -7,11 +7,11 @@
                 <div class="widget-body no-padding">
                     <div id="toolbar" class="toolbar">
                         {:build_toolbar('refresh')}
-                        <a class="btn btn-info btn-multi btn-disabled disabled {:$auth->check('usercompany/restore')?'':'hide'}" href="javascript:;" data-url="usercompany/restore" data-action="restore"><i class="fa fa-rotate-left"></i> {:__('Restore')}</a>
+                        <!--<a class="btn btn-info btn-multi btn-disabled disabled {:$auth->check('usercompany/restore')?'':'hide'}" href="javascript:;" data-url="usercompany/restore" data-action="restore"><i class="fa fa-rotate-left"></i> {:__('Restore')}</a>
                         <a class="btn btn-danger btn-multi btn-disabled disabled {:$auth->check('usercompany/destroy')?'':'hide'}" href="javascript:;" data-url="usercompany/destroy" data-action="destroy"><i class="fa fa-times"></i> {:__('Destroy')}</a>
                         <a class="btn btn-success btn-restoreall {:$auth->check('usercompany/restore')?'':'hide'}" href="javascript:;" data-url="usercompany/restore" title="{:__('Restore all')}"><i class="fa fa-rotate-left"></i> {:__('Restore all')}</a>
                         <a class="btn btn-danger btn-destroyall {:$auth->check('usercompany/destroy')?'':'hide'}" href="javascript:;" data-url="usercompany/destroy" title="{:__('Destroy all')}"><i class="fa fa-times"></i> {:__('Destroy all')}</a>
-                    </div>
+        -->            </div>
                     <table id="table" class="table table-striped table-bordered table-hover"
                            data-operate-restore="{:$auth->check('usercompany/restore')}"
                            data-operate-destroy="{:$auth->check('usercompany/destroy')}"

application/admin/view/wentihuizong/add.html

@@ -9,7 +9,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Uc_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-uc_id" data-rule="required" data-source="user/company/index" class="form-control selectpage" name="row[uc_id]" type="text" value="">
+            <input id="c-uc_id" data-rule="required" data-source="usercompany/index" data-field="projectname" class="form-control selectpage" name="row[uc_id]" type="text" value="">
         </div>
     </div>
     <div class="form-group">
@@ -21,13 +21,13 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Findtime')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-findtime" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[findtime]" type="text" value="{:date('Y-m-d H:i:s')}">
+            <input id="c-findtime" class="form-control" name="row[findtime]" type="text" value="">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Finishtime')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-finishtime" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[finishtime]" type="text" value="{:date('Y-m-d H:i:s')}">
+            <input id="c-finishtime" class="form-control"name="row[finishtime]" type="text" value="">
         </div>
     </div>
     <div class="form-group">

application/admin/view/wentihuizong/edit.html

@@ -1,6 +1,6 @@
 <form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
 
-    <div class="form-group">
+    <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Company_id')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-company_id" data-rule="required" data-source="company/index" data-field="companyname" class="form-control selectpage" name="row[company_id]" type="text" value="{$row.company_id|htmlentities}">
@@ -9,9 +9,9 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Uc_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-uc_id" data-rule="required" data-source="user/company/index" class="form-control selectpage" name="row[uc_id]" type="text" value="{$row.uc_id|htmlentities}">
+            <input id="c-uc_id" data-rule="required" data-source="usercompany/index" data-field="projectname" class="form-control selectpage" name="row[uc_id]" type="text" value="{$row.uc_id|htmlentities}">
         </div>
-    </div>
+    </div>-->
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Title')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -21,13 +21,13 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Findtime')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-findtime" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[findtime]" type="text" value="{:$row.findtime?datetime($row.findtime):''}">
+            <input id="c-findtime" class="form-control" name="row[findtime]" type="text" value="{$row.findtime|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Finishtime')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-finishtime" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[finishtime]" type="text" value="{:$row.finishtime?datetime($row.finishtime):''}">
+            <input id="c-finishtime" class="form-control"name="row[finishtime]" type="text" value="{$row.finishtime|htmlentities}">
         </div>
     </div>
     <div class="form-group">

application/admin/view/wentihuizong/index.html

@@ -8,8 +8,8 @@
                     <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-success btn-add {:$auth->check('wentihuizong/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('wentihuizong/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('wentihuizong/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('wentihuizong/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('wentihuizong/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>-->
                         
 
                         

application/admin/view/worker/index.html

@@ -18,7 +18,7 @@
                     <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-success btn-add {:$auth->check('worker/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('worker/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('worker/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('worker/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
                         
 
@@ -29,7 +29,7 @@
                                 <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:" data-params="status={$key}">{:__('Set status to ' . $key)}</a></li>
                                 {/foreach}
                             </ul>
-                        </div>
+                        </div>-->
 
                         <a class="btn btn-success btn-recyclebin btn-dialog {:$auth->check('worker/recyclebin')?'':'hide'}" href="worker/recyclebin" title="{:__('Recycle bin')}"><i class="fa fa-recycle"></i> {:__('Recycle bin')}</a>
                     </div>

application/admin/view/zhengce/index.html

@@ -8,8 +8,8 @@
                     <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-success btn-add {:$auth->check('zhengce/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('zhengce/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('zhengce/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('zhengce/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('zhengce/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>-->
                         
 
                         

public/assets/js/backend/usercompany.js

@@ -29,23 +29,25 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
                         {field: 'user_id', title: __('User_id')},
+                        {field: 'user.username', title: __('User.username'), operate: 'LIKE'},
+                        {field: 'user.nickname', title: __('User.nickname'), operate: 'LIKE'},
+                        {field: 'user.mobile', title: __('User.mobile'), operate: 'LIKE'},
                         {field: 'company_id', title: __('Company_id')},
+                        {field: 'company.companyname', title: __('Company.companyname'), operate: 'LIKE'},
+
                         {field: 'projectname', title: __('Projectname'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
                         {field: 'projectaddress', title: __('Projectaddress'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
-                        {field: 'image', title: __('Image'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
+//                        {field: 'image', title: __('Image'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
                         {field: 'starttime', title: __('Starttime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'endtime', title: __('Endtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'header', title: __('Header'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
-                        {field: 'header_avatar', title: __('Header_avatar'), operate: 'LIKE', events: Table.api.events.image, formatter: Table.api.formatter.image},
-                        {field: 'header_mobile', title: __('Header_mobile'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
-                        {field: 'xiaofang', title: __('Xiaofang'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
-                        {field: 'xiaofang_mobile', title: __('Xiaofang_mobile'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
+//                        {field: 'header_avatar', title: __('Header_avatar'), operate: 'LIKE', events: Table.api.events.image, formatter: Table.api.formatter.image},
+//                        {field: 'header_mobile', title: __('Header_mobile'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
+//                        {field: 'xiaofang', title: __('Xiaofang'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
+//                        {field: 'xiaofang_mobile', title: __('Xiaofang_mobile'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
                         {field: 'weituo', title: __('Weituo'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
                         {field: 'fuwujigou', title: __('Fuwujigou'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
-                        {field: 'user.username', title: __('User.username'), operate: 'LIKE'},
-                        {field: 'user.nickname', title: __('User.nickname'), operate: 'LIKE'},
-                        {field: 'user.mobile', title: __('User.mobile'), operate: 'LIKE'},
-                        {field: 'company.companyname', title: __('Company.companyname'), operate: 'LIKE'},
+
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]
@@ -73,6 +75,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     [
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
+                        {field: 'user_id', title: __('User_id')},
+                        {field: 'company_id', title: __('Company_id')},
                         {
                             field: 'deletetime',
                             title: __('Deletetime'),
@@ -95,14 +99,14 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                     url: 'usercompany/restore',
                                     refresh: true
                                 },
-                                {
+                                /*{
                                     name: 'Destroy',
                                     text: __('Destroy'),
                                     classname: 'btn btn-xs btn-danger btn-ajax btn-destroyit',
                                     icon: 'fa fa-times',
                                     url: 'usercompany/destroy',
                                     refresh: true
-                                }
+                                }*/
                             ],
                             formatter: Table.api.formatter.operate
                         }

public/assets/js/backend/wentihuizong.js

@@ -27,15 +27,17 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
                         {field: 'company_id', title: __('Company_id')},
+                        {field: 'company.companyname', title: __('Company.companyname'), operate: 'LIKE'},
+
                         {field: 'uc_id', title: __('Uc_id')},
+                        {field: 'usercompany.projectname', title: __('Usercompany.projectname'), 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: 'findtime', title: __('Findtime'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
                         {field: 'finishtime', title: __('Finishtime'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
                         {field: 'jiedian', title: __('Jiedian'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
                         {field: 'remark', title: __('Remark'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
                         {field: 'result', title: __('Result'), searchList: {"1":__('Result 1'),"2":__('Result 2')}, formatter: Table.api.formatter.normal},
-                        {field: 'company.companyname', title: __('Company.companyname'), operate: 'LIKE'},
-                        {field: 'company.projectname', title: __('Company.projectname'), 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}
                     ]
                 ]
@@ -58,3 +60,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
     };
     return Controller;
 });
+
+$("#c-uc_id").data("params", function (obj) {
+    return {
+        custom: {company_id: $("#c-company_id").val()}
+    };
+});
+$(document).on("change","#c-company_id",function(){
+    $("#c-uc_id").selectPageClear();
+})