根据用户需求修改页面。

application/controllers/Appauth.php

@@ -2,7 +2,7 @@
 defined('BASEPATH') OR exit('No direct script access allowed');
 
 /**
- * Class 应用授权管理类
+ * Class 接入授权管理类
  */
 class Appauth extends MY_Controller
 {
@@ -16,7 +16,7 @@ class Appauth extends MY_Controller
     }
 
     /**
-     * 应用授权列表页
+     * 接入授权列表页
      */
     public function index()
     {
@@ -66,7 +66,7 @@ class Appauth extends MY_Controller
     }
 
     /**
-     * 查看应用授权信息
+     * 查看接入授权信息
      * @param $app_id  APPID
      */
     public function view($app_id)
@@ -77,14 +77,14 @@ class Appauth extends MY_Controller
             $this->assign("appauth",$appauth);
         }else{
             $this->assign("appauth",$this->appauth_model->get_model());
-            $message = "应用授权信息不存在或者已经被删除";
+            $message = "接入授权信息不存在或者已经被删除";
         }
         $this->assign("message",$message);
         $this->display("appauth/view.html");
     }
 
     /**
-     * 增加应用授权
+     * 增加接入授权
      */
     public function add()
     {
@@ -96,7 +96,7 @@ class Appauth extends MY_Controller
     }
 
     /**
-     * 保存应用授权信息
+     * 保存接入授权信息
      */
     public function save()
     {
@@ -130,13 +130,13 @@ class Appauth extends MY_Controller
             $data['status'] = "10";
             $this->appauth_model->insert_appauth($data);
             $msg['icon'] = 1;
-            $msg['msg'] = "应用授权信息保存成功！";
+            $msg['msg'] = "接入授权信息保存成功！";
         }
         $this->response($msg);
     }
 
     /**
-     * 更新应用授权信息
+     * 更新接入授权信息
      */
     public function update()
     {
@@ -166,13 +166,13 @@ class Appauth extends MY_Controller
         if ($msg['code']) {
             $this->appauth_model->update_appauth($data);
             $msg['icon'] = 1;
-            $msg['msg'] = "应用授权信息保存成功！";
+            $msg['msg'] = "接入授权信息保存成功！";
         }
         $this->response($msg);
     }
 
     /**
-     * 删除应用授权
+     * 删除接入授权
      * @param $app_id
      */
     public function delete($app_id)
@@ -182,10 +182,10 @@ class Appauth extends MY_Controller
             $appauth = $this->appauth_model->get_appauth_with_id($app_id);
             if ($appauth) {
                 $this->appauth_model->delete_appauth($app_id);
-                $data['msg'] = "应用授权信息删除成功！";
+                $data['msg'] = "接入授权信息删除成功！";
             } else {
                 $data['icon'] = 2;
-                $data['msg'] = "应用授权信息不存在或者已经被删除！";
+                $data['msg'] = "接入授权信息不存在或者已经被删除！";
             }
         } else {
             $data['icon'] = 2;
@@ -195,7 +195,7 @@ class Appauth extends MY_Controller
     }
 
     /**
-     * 禁用应用授权
+     * 禁用接入授权
      * @param $app_id
      */
     public function stopuse($app_id)
@@ -206,10 +206,10 @@ class Appauth extends MY_Controller
             if ($appauth) {
                 $appauth['status'] = "40";
                 $this->appauth_model->update_appauth($appauth);
-                $data['msg'] = "应用授权信息停用成功！";
+                $data['msg'] = "接入授权信息停用成功！";
             } else {
                 $data['icon'] = 2;
-                $data['msg'] = "应用授权信息不存在或者已经被删除！";
+                $data['msg'] = "接入授权信息不存在或者已经被删除！";
             }
         } else {
             $data['icon'] = 2;
@@ -219,7 +219,7 @@ class Appauth extends MY_Controller
     }
 
     /**
-     * 启用应用授权
+     * 启用接入授权
      * @param $app_id
      */
     public function restore($app_id)
@@ -230,10 +230,10 @@ class Appauth extends MY_Controller
             if ($appauth) {
                 $appauth['status'] = "10";
                 $this->appauth_model->update_appauth($appauth);
-                $data['msg'] = "应用授权恢复成功！";
+                $data['msg'] = "接入授权恢复成功！";
             } else {
                 $data['icon'] = 2;
-                $data['msg'] = "应用授权信息不存在或者已经被删除！";
+                $data['msg'] = "接入授权信息不存在或者已经被删除！";
             }
         } else {
             $data['icon'] = 2;
@@ -243,7 +243,7 @@ class Appauth extends MY_Controller
     }
 
     /**
-     * 批量禁用应用授权
+     * 批量禁用接入授权
      */
     public function disable_all(){
         $ids = rtrim($this->input->post("ids",true),",");
@@ -255,13 +255,13 @@ class Appauth extends MY_Controller
             $wheres = array('app_id'=>array('$in'=>$ids));
             $this->appauth_model->set_val("status",$wheres,"40");
             $data['icon'] = 1;
-            $data['msg'] = "批量禁用应用授权成功！";
+            $data['msg'] = "批量禁用接入授权成功！";
         }
         $this->response($data);
     }
 
     /**
-     * 批量启用应用授权
+     * 批量启用接入授权
      */
     public function enable_all(){
         $ids = rtrim($this->input->post("ids",true),",");
@@ -273,7 +273,7 @@ class Appauth extends MY_Controller
             $wheres = array('app_id'=>array('$in'=>$ids));
             $this->appauth_model->set_val("status",$wheres,"10");
             $data['icon'] = 1;
-            $data['msg'] = "批量启用应用授权成功！";
+            $data['msg'] = "批量启用接入授权成功！";
         }
         $this->response($data);
     }

application/controllers/Index.php

@@ -33,11 +33,11 @@ class Index extends Public_Controller {
                 $user = $this->user_model->get_user_with_username_password($username, hash_hmac('sha256',$password,$this->config->item('secret_key')));
                 if (count($user) >= 1) {
                     if ($user[0]['status'] == "20") {
-                        $message = "该用户未验证，请验证后再登录！";
+                        $message = "该帐号未验证，请验证后再登录！";
                     } elseif ($user[0]['status'] == "30") {
-                        $message = "该用户已锁定，请联系管理员！";
+                        $message = "该帐号已锁定，请联系管理员！";
                     } elseif ($user[0]['status'] == "40") {
-                        $message = "该用户已停用，请联系管理员！";
+                        $message = "该帐号已停用，请联系管理员！";
                     } else {
                         $rand = substr(md5(microtime()), rand(0, 26), 5);
                         $session_data = array("user_id" => (string)$user[0]["user_id"], "current_key" => $rand, "username" => $user[0]['username'], "user_type" => $user[0]['user_type']);
@@ -46,7 +46,7 @@ class Index extends Public_Controller {
                         $this->session->set_userdata($session_data);
                     }
                 } else {
-                    $message = "用户名或密码错误，请重试！";
+                    $message = "帐号名或密码错误，请重试！";
                 }
             }else{
                 $message = "用户名或密码不能为空！";

application/controllers/User.php

@@ -2,7 +2,7 @@
 defined('BASEPATH') OR exit('No direct script access allowed');
 
 /**
- * Class 用户管理类
+ * Class 帐号管理类
  */
 class User extends MY_controller
 {
@@ -21,7 +21,7 @@ class User extends MY_controller
     }
 
     /**
-     * 用户列表页
+     * 帐号列表页
      */
     public function index()
     {
@@ -77,8 +77,8 @@ class User extends MY_controller
     }
 
     /**
-     * 查看用户详情
-     * @param $user_id 用户id
+     * 查看帐号详情
+     * @param $user_id 帐号id
      */
     public function view($user_id)
     {
@@ -87,14 +87,14 @@ class User extends MY_controller
         if($user){
             $this->assign("user",$user);
         }else{
-            $message = "用户信息不存在或者已经被删除";
+            $message = "帐号信息不存在或者已经被删除";
         }
         $this->assign("message",$message);
         $this->display("user/view.html");
     }
 
     /**
-     * 更新用户信息
+     * 更新帐号信息
      */
     public function update()
     {
@@ -124,15 +124,15 @@ class User extends MY_controller
         $data['user_type']=$user_type = $this->input->post("user_type",true);
         if(!$username){
             $msg['code'] = 0;
-            $msg['msg'] = "用户名不能为空！";
+            $msg['msg'] = "帐号名不能为空！";
         }
         if(!preg_match_all("/^[a-zA-Z\d_]{5,18}$/",$username) && $msg['code']){
             $msg['code'] = 0;
-            $msg['msg'] = "用户名格式不正确，只支持英文和数字，最小长度为5，最大长度为18！";
+            $msg['msg'] = "帐号名格式不正确，只支持英文和数字，最小长度为5，最大长度为18！";
         }
         if($this->user_model->is_exists("username",$username,$old_user['username']) && $msg['code']){
             $msg['code'] = 0;
-            $msg['msg'] = "该用户名已存在请换一个。";
+            $msg['msg'] = "该帐号名已存在请换一个。";
         }
         if($password && strlen($password)<8 && $msg['code']){
             $msg['code'] = 0;
@@ -176,12 +176,12 @@ class User extends MY_controller
         }
         if($user_type == 2 && $branch_id =="" && $msg['code']){
             $msg['code'] = 0;
-            $msg['msg'] = "用户类型为工程师时，必须填写分支机构。";
+            $msg['msg'] = "帐号类型为工程师时，必须填写分支机构。";
         }
         if($msg['code']){
             $this->user_model->update_user($data);
             $msg['icon'] = 1;
-            $msg['msg'] = "用户信息更新成功！";
+            $msg['msg'] = "帐号信息更新成功！";
         }
         $this->response($msg);
     }
@@ -194,7 +194,7 @@ class User extends MY_controller
         $field = $this->input->post("name",true);
         $value = $this->input->post("param",true);
         if($field == "username"){
-            $msg = "用户名已存在！";
+            $msg = "帐号名已存在！";
         }
         if($field == "mobile"){
             $msg = "手机号码已存在！";
@@ -211,7 +211,7 @@ class User extends MY_controller
     }
 
     /**
-     * 增加用户
+     * 增加帐号
      */
     public function add()
     {
@@ -221,7 +221,7 @@ class User extends MY_controller
     }
 
     /**
-     * 保存用户数据
+     * 保存帐号数据
      */
     public function save(){
         $cahce_branch = $this->cache->get('branchs');
@@ -249,13 +249,13 @@ class User extends MY_controller
         $data['user_type']=$user_type = $this->input->post("user_type",true);
         if(!$username){
             $msg['code'] = 0;
-            $msg['msg'] = "用户名不能为空！";
+            $msg['msg'] = "帐号名不能为空！";
         }elseif(!preg_match_all("/^[a-zA-Z\d_]{5,18}$/",$username) && $msg['code']){
             $msg['code'] = 0;
-            $msg['msg'] = "用户名格式不正确，只支持英文和数字，最小长度为5，最大长度为18！";
+            $msg['msg'] = "帐号名格式不正确，只支持英文和数字，最小长度为5，最大长度为18！";
         }elseif($this->user_model->is_exists("username",$username) && $msg['code']){
             $msg['code'] = 0;
-            $msg['msg'] = "该用户名已存在请换一个。";
+            $msg['msg'] = "该帐号名已存在请换一个。";
         }
         if(!$password && $msg['code']){
             $msg['code'] = 0;
@@ -297,7 +297,7 @@ class User extends MY_controller
         }
         if($user_type == 2 && $branch_id =="" && $msg['code']){
             $msg['code'] = 0;
-            $msg['msg'] = "用户类型为工程师时，必须填写分支机构。";
+            $msg['msg'] = "帐号类型为工程师时，必须填写分支机构。";
         }
         if($msg['code']){
             $data['password']= hash_hmac('sha256',$password,$this->config->item('secret_key'));
@@ -306,14 +306,14 @@ class User extends MY_controller
             $data['last_login_time'] = "";
             $this->user_model->insert_user($data);
             $msg['icon'] = 1;
-            $msg['msg'] = "用户信息保存成功！";
+            $msg['msg'] = "帐号信息保存成功！";
         }
         $this->response($msg);
     }
 
     /**
-     * 删除用户数据
-     * @param $user_id 用户ID
+     * 删除帐号数据
+     * @param $user_id 帐号ID
      */
     public function delete($user_id)
     {
@@ -323,10 +323,10 @@ class User extends MY_controller
                 $user = $this->user_model->get_user_with_user_id($user_id);
                 if ($user) {
                     $this->user_model->delete_user($user_id);
-                    $data['msg'] = "用户删除成功！";
+                    $data['msg'] = "帐号删除成功！";
                 } else {
                     $data['icon'] = 2;
-                    $data['msg'] = "用户信息不存在或者已经被删除！";
+                    $data['msg'] = "帐号信息不存在或者已经被删除！";
                 }
             }else{
                 $data['icon'] = 2;
@@ -340,8 +340,8 @@ class User extends MY_controller
     }
 
     /**
-     * 禁用用户
-     * @param $user_id 用户Id
+     * 禁用帐号
+     * @param $user_id 帐号Id
      */
     public function stopuse($user_id){
         $data['icon'] = 1;
@@ -350,10 +350,10 @@ class User extends MY_controller
             if($user) {
                 $user['status'] = "40";
                 $this->user_model->update_user($user);
-                $data['msg'] = "用户停用成功！";
+                $data['msg'] = "帐号停用成功！";
             }else{
                 $data['icon'] = 2;
-                $data['msg'] = "用户信息不存在或者已经被删除！";
+                $data['msg'] = "帐号信息不存在或者已经被删除！";
             }
         } else {
             $data['icon'] = 2;
@@ -363,8 +363,8 @@ class User extends MY_controller
     }
 
     /**
-     * 启用用户
-     * @param $user_id 用户Id
+     * 启用帐号
+     * @param $user_id 帐号Id
      */
     public function restore($user_id){
         $data['icon'] = 1;
@@ -373,10 +373,10 @@ class User extends MY_controller
             if($user) {
                 $user['status'] = "10";
                 $this->user_model->update_user($user);
-                $data['msg'] = "用户恢复成功！";
+                $data['msg'] = "帐号恢复成功！";
             }else{
                 $data['icon'] = 2;
-                $data['msg'] = "用户信息不存在或者已经被删除！";
+                $data['msg'] = "帐号信息不存在或者已经被删除！";
             }
         } else {
             $data['icon'] = 2;
@@ -386,8 +386,8 @@ class User extends MY_controller
     }
 
     /**
-     * 修改用户密码
-     * @param $user_id 用户ID
+     * 修改帐号密码
+     * @param $user_id 帐号ID
      */
     public function change_password($user_id){
         $data['code'] = 0;
@@ -396,7 +396,7 @@ class User extends MY_controller
         if($user){
             $this->assign("user",$user);
         }else{
-           $message = "用户信息不存在或者已经被删除！";
+           $message = "帐号信息不存在或者已经被删除！";
         }
         if($this->input->post()){
             $password = $this->input->post("password",true);
@@ -442,7 +442,7 @@ class User extends MY_controller
     }
 
     /**
-     * 批量删除用户
+     * 批量删除帐号
      */
     public function delete_all(){
         $ids = rtrim($this->input->post("ids",true),",");
@@ -453,13 +453,13 @@ class User extends MY_controller
         }else{
             $this->user_model->delete_all_user($ids);
             $data['icon'] = 1;
-            $data['msg'] = "批量删除用户成功！";
+            $data['msg'] = "批量删除帐号成功！";
         }
         $this->response($data);
     }
 
     /**
-     * 批量禁用用户
+     * 批量禁用帐号
      */
     public function disable_all(){
         $ids = rtrim($this->input->post("ids",true),",");
@@ -471,13 +471,13 @@ class User extends MY_controller
             $wheres = array('user_id'=>array('$in'=>$ids));
             $this->user_model->set_val("status",$wheres,"40");
             $data['icon'] = 1;
-            $data['msg'] = "批量禁用用户成功！";
+            $data['msg'] = "批量禁用帐号成功！";
         }
         $this->response($data);
     }
 
     /**
-     * 批量启用用户
+     * 批量启用帐号
      */
     public function enable_all(){
         $ids = rtrim($this->input->post("ids",true),",");
@@ -489,7 +489,7 @@ class User extends MY_controller
             $wheres = array('user_id'=>array('$in'=>$ids));
             $this->user_model->set_val("status",$wheres,"10");
             $data['icon'] = 1;
-            $data['msg'] = "批量启用用户成功！";
+            $data['msg'] = "批量启用帐号成功！";
         }
         $this->response($data);
     }

application/controllers/Workorder.php

@@ -109,9 +109,15 @@ class Workorder extends MY_Controller
                 $remarks[] = $remark;
             }
             $workorder['remark_list'] = $remarks;
-            $workorder['last_remark_user'] = $remarks[count($remarks) - 1]['remark_user'];
-            $workorder['last_remark_content'] = $remarks[count($remarks) - 1]['remark_content'];
-            $workorder['last_remark_time'] = $remarks[count($remarks) - 1]['remark_time'];
+            if(count($workorder['remark_list'])>0) {
+                $workorder['last_remark_user'] = $remarks[count($remarks) - 1]['remark_user'];
+                $workorder['last_remark_content'] = $remarks[count($remarks) - 1]['remark_content'];
+                $workorder['last_remark_time'] = $remarks[count($remarks) - 1]['remark_time'];
+            }else{
+                $workorder['last_remark_user'] = "";
+                $workorder['last_remark_content'] = "";
+                $workorder['last_remark_time'] = "";
+            }
             $workorders[] = $workorder;
         }
         $this->counts();
@@ -185,9 +191,15 @@ class Workorder extends MY_Controller
                 $remarks[] = $remark;
             }
             $workorder['remark_list'] = $remarks;
-            $workorder['last_remark_user'] = $remarks[count($remarks) - 1]['remark_user'];
-            $workorder['last_remark_content'] = $remarks[count($remarks) - 1]['remark_content'];
-            $workorder['last_remark_time'] = $remarks[count($remarks) - 1]['remark_time'];
+            if(count($workorder['remark_list'])>0) {
+                $workorder['last_remark_user'] = $remarks[count($remarks) - 1]['remark_user'];
+                $workorder['last_remark_content'] = $remarks[count($remarks) - 1]['remark_content'];
+                $workorder['last_remark_time'] = $remarks[count($remarks) - 1]['remark_time'];
+            }else{
+                $workorder['last_remark_user'] = "";
+                $workorder['last_remark_content'] = "";
+                $workorder['last_remark_time'] = "";
+            }
             $workorders[] = $workorder;
         }
         $this->assign("keyword", $keyword);
@@ -354,9 +366,9 @@ class Workorder extends MY_Controller
             $remarks[] = $remark;
         }
         $workorder['remark_list'] = $remarks;
-        $workorder['last_remark_user'] = $remarks[count($remarks) - 1]['remark_user'];
+        /*$workorder['last_remark_user'] = $remarks[count($remarks) - 1]['remark_user'];
         $workorder['last_remark_content'] = $remarks[count($remarks) - 1]['remark_content'];
-        $workorder['last_remark_time'] = $remarks[count($remarks) - 1]['remark_time'];
+        $workorder['last_remark_time'] = $remarks[count($remarks) - 1]['remark_time'];*/
         $this->assign("workorder", $workorder);
         $this->display("workorder/view.html");
     }

application/core/MY_Controller.php

@@ -48,19 +48,19 @@ class Public_Controller extends CI_Controller
         "20" => "邮件"
     );
 
-    //用户角色
+    //帐号角色
     public $user_types = array(
         "1" => "管理员",
         "2" => "工程师"
     );
 
-    //用户状态
+    //帐号状态
     public $user_status = array(
         "10" => "正常",
         "40" => "已停用"
     );
 
-    //应用授权状态
+    //接入授权状态
     public $appauth_status = array(
         "10" => "启用",
         "40" => "停用"

application/libraries/Notices.php

@@ -46,6 +46,9 @@ class Notices{
      * @param $workorder
      */
     public function create_workorder($workorder){
+        if(count($workorder['remark_list'])<1) {
+            $workorder['remark_list'][0]=array("remark_content"=>"");
+        }
         $receive_user = $this->CI->user_model->get_user_with_user_id($workorder['receive_user_id']);
         if($this->setting['is_sms'] && in_array("10",$workorder['send_type'])){
             $sms_content = '你有新工单需要处理，工单ID：'.$workorder['workorder_id'].'，工单名称：'.$workorder['workorder_name'].'，类型：'.$workorder['type'].',备注：'.$workorder['remark_list'][count($workorder['remark_list'])-1]['remark_content'];
@@ -107,7 +110,11 @@ class Notices{
                 $email_content .= '</tr>';
             }
             $email_content .='<tr>';
-            $email_content .='<td valign="top" rowspan="1" colspan="5" style="word-break: break-all;"><strong>备注：</strong>'.$workorder['remark_list'][count($workorder['remark_list'])-1]['remark_content'].'</td>';
+            if(count($workorder['remark_list'])>0) {
+                $email_content .= '<td valign="top" rowspan="1" colspan="5" style="word-break: break-all;"><strong>备注：</strong>' . $workorder['remark_list'][count($workorder['remark_list']) - 1]['remark_content'] . '</td>';
+            }else{
+                $email_content .= '<td valign="top" rowspan="1" colspan="5" style="word-break: break-all;">&nbsp;</td>';
+            }
             $email_content .='</tr>';
             $email_content .='</tbody></table>';
             $email_content .='<p><br/>&nbsp;</p><p><br/>&nbsp;</p>';

application/models/Appauth_model.php

@@ -41,7 +41,7 @@ class Appauth_model extends CI_Model
     }
 
     /**
-     * 列表应用授权
+     * 列表接入授权
      */
     public function list_appauth($limit, $offset, $like = NULL, $where = NULL, $order = NULL)
     {
@@ -60,7 +60,7 @@ class Appauth_model extends CI_Model
     }
 
     /**
-     * 获取应用授权数据条数
+     * 获取接入授权数据条数
      */
     public function count_appauth($like = NULL, $where = NULL)
     {
@@ -76,7 +76,7 @@ class Appauth_model extends CI_Model
     }
 
     /**
-     *新增应用授权
+     *新增接入授权
      */
     public function insert_appauth($app_auth)
     {
@@ -93,7 +93,7 @@ class Appauth_model extends CI_Model
     }
 
     /**
-     *更新应用授权
+     *更新接入授权
      */
     public function update_appauth($app_auth)
     {
@@ -103,7 +103,7 @@ class Appauth_model extends CI_Model
     }
 
     /**
-     * 删除应用授权
+     * 删除接入授权
      */
     public function delete_appauth($app_id)
     {

application/models/User_model.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * 用户模型
+ * 帐号模型
  */
 class User_model extends CI_Model {
 
@@ -17,7 +17,7 @@ class User_model extends CI_Model {
     }
 
     /**
-     * 用户登录
+     * 帐号登录
      */
     public function get_user_with_username_password($username, $password){
 		return $this->mongo_db->where_or(array("username"=> $username, "mobile"=> $username , "email"=> $username))->where(array("password"=> $password))->get($this->collection_name);
@@ -43,7 +43,7 @@ class User_model extends CI_Model {
     }
 
     /**
-     * 列表用户
+     * 列表帐号
      */
     public function list_user($limit,$offset,$like = NULL,$where = NULL,$order = NULL){
         if(!$order){
@@ -78,7 +78,7 @@ class User_model extends CI_Model {
     }
 
     /**
-     * 用户选择列表
+     * 帐号选择列表
      */
     public function select_users($user_type,$banch_id=null){
         $order = array("create_time"=>"ASC");
@@ -90,7 +90,7 @@ class User_model extends CI_Model {
     }
 
     /**
-     * 获取用户信息
+     * 获取帐号信息
      */
     public function get_user_with_user_id($user_id){
         return $this->mongo_db->where(array("user_id"=> $user_id))->find_one($this->collection_name);
@@ -118,14 +118,14 @@ class User_model extends CI_Model {
     }
     
     /**
-     *新增用户 
+     *新增帐号 
      */
     public function insert_user($user_data){
 		return $this->mongo_db->insert($this->collection_name, $user_data);
     }
     
     /**
-     *更新用户 
+     *更新帐号 
      */
     public function update_user($user_data){
         $data['filter'] = array("user_id"=>$user_data['user_id']);
@@ -134,14 +134,14 @@ class User_model extends CI_Model {
     }
 
     /**
-     * 删除用户
+     * 删除帐号
      */
     public function delete_user($user_id){
         return $this->mongo_db->where(array("user_id"=>$user_id))->delete($this->collection_name);
     }
 
     /**
-     * 删除多个用户
+     * 删除多个帐号
      */
     public function delete_all_user($user_ids){
         return $this->mongo_db->where_in("user_id",$user_ids)->delete($this->collection_name,true);

application/views/templates/appauth/add.html

@@ -21,7 +21,7 @@
     <div class="panel panel-default">
         <div class="panel-body">
             <fieldset>
-                <legend>新增应用授权</legend>
+                <legend>新增接入授权</legend>
                 <div class="form-group">
                     <label class="col-xs-1 control-label"><span>*</span>应用名称:</label>
                     <div class="col-sm-4">

application/views/templates/appauth/index.html

@@ -27,7 +27,7 @@
                 <div class="pull-left">
                     <div class="btn-group">
                         <button type="button" class="add" id="add_appauth">
-                            增加应用授权
+                            增加接入授权
                         </button>
                         <span class="btn_line"></span>
                         <button type="button" class="disable" id="disable_appauth" disabled>
@@ -159,11 +159,11 @@
             });
         });
         $("#add_appauth").click(function () {
-            parent.$('#mainFrameTabs').bTabsAdd("tab21","新增应用授权","appauth/add");
+            parent.$('#mainFrameTabs').bTabsAdd("tab21","新增接入授权","appauth/add");
         })
         $(".bootstrap-table").on('click',".delete",function () {
             var id = $(this).data("id");
-            layer.confirm("确定要删除该应用授权吗？删除后该应用将不能与系统通讯！", {skin: 'layer-ext-myskin',icon: 3, title:'提示'}, function(index){
+            layer.confirm("确定要删除该接入授权吗？删除后该应用将不能与系统通讯！", {skin: 'layer-ext-myskin',icon: 3, title:'提示'}, function(index){
                 if(id != "" && id != undefined) {
                     $.post(
                         "appauth/delete/" + id,
@@ -181,7 +181,7 @@
         })
         $(".bootstrap-table").on('click',".stop_use",function () {
             var id = $(this).data("id");
-            layer.confirm("确定要停用该应用授权吗？停用后该应用将不能与系统通讯！", {skin: 'layer-ext-myskin',icon: 3, title:'提示'}, function(index){
+            layer.confirm("确定要停用该接入授权吗？停用后该应用将不能与系统通讯！", {skin: 'layer-ext-myskin',icon: 3, title:'提示'}, function(index){
                 if(id != "" && id != undefined) {
                     $.post(
                         "appauth/stopuse/" + id,
@@ -217,7 +217,7 @@
             if (id != "" && id != undefined) {
                 layer.open({
                     type: 2,
-                    title: "应用授权详情",
+                    title: "接入授权详情",
                     offset: 'auto',
                     shade: [0.3],
                     area: ['800px', '400px'],
@@ -258,9 +258,9 @@
                 }
             })
             if(ids == ""){
-                layer.alert("请选择要停用的应用授权！",{skin: 'layer-ext-myskin',icon: 3, title:'提示'});
+                layer.alert("请选择要停用的接入授权！",{skin: 'layer-ext-myskin',icon: 3, title:'提示'});
             }else{
-                layer.confirm('确定要禁用选择的应用授权吗?', {skin: 'layer-ext-myskin',icon: 3, title:'提示'}, function(index){
+                layer.confirm('确定要禁用选择的接入授权吗?', {skin: 'layer-ext-myskin',icon: 3, title:'提示'}, function(index){
                     $.post(
                         "appauth/disableall",{'ids':ids},
                         function (data) {
@@ -281,9 +281,9 @@
                 }
             })
             if(ids == ""){
-                layer.alert("请选择要启用的应用授权！",{skin: 'layer-ext-myskin',icon: 3, title:'提示'});
+                layer.alert("请选择要启用的接入授权！",{skin: 'layer-ext-myskin',icon: 3, title:'提示'});
             }else{
-                layer.confirm('确定要启用选择的应用授权吗?', {skin: 'layer-ext-myskin',icon: 3, title:'提示'}, function(index){
+                layer.confirm('确定要启用选择的接入授权吗?', {skin: 'layer-ext-myskin',icon: 3, title:'提示'}, function(index){
                     $.post(
                         "appauth/enableall",{'ids':ids},
                         function (data) {

application/views/templates/appauth/view.html

@@ -21,7 +21,7 @@
     <div class="panel panel-default">
         <div class="panel-body">
             <fieldset>
-                <legend>修改应用授权</legend>
+                <legend>修改接入授权</legend>
                 <div class="form-group">
                     <label class="col-sm-2 control-label"><span>*</span>应用名称</label>
                     <div class="col-sm-4">

application/views/templates/index/login.html

@@ -25,7 +25,7 @@
                 <p>{$sys_name}</p>
             </div>
             <form id="validateform" method="post">
-                <input type="text" name="username" id="username" autocomplete="off" placeholder="用户名" datatype="s5-18" nullmsg="用户名不能为空！">
+                <input type="text" name="username" id="username" autocomplete="off" placeholder="帐号名" datatype="s5-18" nullmsg="帐号名不能为空！">
                 <input type="password" name="password" id="password" autocomplete="off" placeholder="密码" datatype="*" nullmsg="密码不能为空！">
                 <span class="hidden" id="msg"></span>
                 <input value="登录" style="width:100%;" type="submit">

application/views/templates/main.html

@@ -89,11 +89,11 @@
                     </li>
                     <li>
                         <a href="#users" class="nav-header icon-user" data-toggle="collapse">
-                            用户管理
+                            帐号管理
                             <span class="pull-right fa fa-angle-down"></span>
                         </a>
                         <ul id="users" class="nav nav-list secondmenu">
-                            <li mid="tab6" funurl="user/index"><a href="#">用户管理</a></li>
+                            <li mid="tab6" funurl="user/index"><a href="#">帐号管理</a></li>
                         </ul>
                     </li>
                     <li>
@@ -102,7 +102,7 @@
                             <span class="pull-right fa fa-angle-down"></span>
                         </a>
                         <ul id="systemSetting" class="nav nav-list secondmenu">
-                            <li mid="tab7" funurl="appauth/index"><a href="#">应用授权管理</a></li>
+                            <li mid="tab7" funurl="appauth/index"><a href="#">接入授权管理</a></li>
                             <li mid="tab8" funurl="template/workorder"><a href="#">工单表格编辑</a></li>
                             <li mid="tab9" funurl="template/report"><a href="#">报表格式编辑</a></li>
                             <li mid="tab10" funurl="setting/setting"><a href="#">系统设置</a></li>

application/views/templates/user/add.html

@@ -22,46 +22,46 @@
     <div class="panel panel-default">
         <div class="panel-body">
             <fieldset>
-                <legend>新增用户</legend>
+                <legend>新增帐号</legend>
                 <div class="form-group">
-                    <label class="col-sm-1 control-label"><span>*</span>用户名：</label>
-                    <div class="col-sm-4">
-                        <input name="username" type="text" datatype="s5-18" nullmsg="用户名不能为空！" ajaxurl="user/validate" class="form-control" id="username">
+                    <label class="col-xs-2 control-label"><span>*</span>帐号名：</label>
+                    <div class="col-xs-4">
+                        <input name="username" type="text" datatype="s5-18" nullmsg="帐号名不能为空！" ajaxurl="user/validate" class="form-control" id="username">
                     </div>
                 </div>
                 <div class="form-group">
-                    <label class="col-sm-1 control-label"><span>*</span>密码：</label>
-                    <div class="col-sm-4">
+                    <label class="col-xs-2 control-label"><span>*</span>密码：</label>
+                    <div class="col-xs-4">
                         <input name="password" class="form-control" datatype="*8-40" nullmsg="密码不能为空！" id="password" placeholder="" size="45" type="password">
                     </div>
                 </div>
                 <div class="form-group">
-                    <label class="col-sm-1 control-label"><span>*</span>确认密码：</label>
-                    <div class="col-sm-4">
+                    <label class="col-xs-2 control-label"><span>*</span>确认密码：</label>
+                    <div class="col-xs-4">
                         <input name="repassword" class="form-control" datatype="*" recheck="password" errormsg="您两次输入的账号密码不一致！" id="repassword" placeholder="" size="45" type="password">
                     </div>
                 </div>
                 <div class="form-group">
-                    <label class="col-sm-1 control-label"><span>*</span>姓名：</label>
-                    <div class="col-sm-4">
+                    <label class="col-xs-2 control-label"><span>*</span>姓名：</label>
+                    <div class="col-xs-4">
                         <input name="name" type="text" datatype="s" nullmsg="姓名不能为空！" class="form-control" id="name">
                     </div>
                 </div>
                 <div class="form-group">
-                    <label class="col-sm-1 control-label"><span>*</span>手机：</label>
-                    <div class="col-sm-4">
+                    <label class="col-xs-2 control-label"><span>*</span>手机：</label>
+                    <div class="col-xs-4">
                         <input name="mobile" type="text" datatype="mobile" nullmsg="手机号不能为空！" ajaxurl="user/validate" class="form-control" id="mobile">
                     </div>
                 </div>
                 <div class="form-group">
-                    <label class="col-sm-1 control-label"><span>*</span>邮箱：</label>
-                    <div class="col-sm-4">
+                    <label class="col-xs-2 control-label"><span>*</span>邮箱：</label>
+                    <div class="col-xs-4">
                         <input name="email" type="email" datatype="e" nullmsg="邮箱不能为空！" ajaxurl="user/validate" class="form-control" id="email">
                     </div>
                 </div>
                 <div class="form-group" id="branchs">
-                    <label class="col-sm-1 control-label">分支机构：</label>
-                    <div class="col-sm-4">
+                    <label class="col-xs-2 control-label">分支机构：</label>
+                    <div class="col-xs-4">
                         <select class="form-control validate[required]" name="branch[]" id="branch" multiple>
                             {foreach $branch as $k=>$val}
                             <option value="{$val['branch_id']}">{$val['branch_name']}</option>
@@ -70,8 +70,8 @@
                     </div>
                 </div>
                 <div class="form-group has-feedback">
-                    <label class="col-sm-1 control-label"><span>*</span>用户类型：</label>
-                    <div class="col-sm-4">
+                    <label class="col-xs-2 control-label"><span>*</span>帐号类型：</label>
+                    <div class="col-xs-4">
                         <select class="form-control validate[required]" name="user_type" id="user_type">
                             {foreach $user_types as $k=>$val}
                             <option value="{$k}">{$val}</option>
@@ -94,11 +94,16 @@
 <script type="text/javascript" charset="utf-8" src="static/js/layer/layer.js"></script>{literal}
 <script language="javascript" type="text/javascript">
     $(function(){
+        var layer_index = parent.layer.getFrameIndex(window.name);
         $("select").select2({
             minimumResultsForSearch: -1
         });
         $("#cannel").click(function () {
-            parent.$('#mainFrameTabs').CloseTabs("tab11","tab6");
+            if(layer_index!="" && layer_index != undefined){
+                parent.layer.close(layer_index);
+            }else {
+                parent.$('#mainFrameTabs').CloseTabs("tab11", "tab6");
+            }
         })
         $("#user_type").change(function () {
             if($(this).val() == 1){
@@ -124,7 +129,11 @@
                 $.post("user/save", data, function (data) {
                     layer.msg(data.msg, {icon: data.icon, time: 3000}, function () {
                         if (data.code) {
-                            parent.$('#mainFrameTabs').CloseTabs("tab11","tab6");
+                            if(layer_index!="" && layer_index != undefined){
+                                parent.layer.close(layer_index);
+                            }else {
+                                parent.$('#mainFrameTabs').CloseTabs("tab11", "tab6");
+                            }
                         }else{
                             $("button").removeAttr("disabled");
                         }

application/views/templates/user/change_password.html

@@ -24,7 +24,7 @@
             <fieldset>
                 <legend>修改密码</legend>
                 <div class="form-group">
-                    <label class="col-xs-3 control-label">用户名</label>
+                    <label class="col-xs-3 control-label">帐号名</label>
                     <div class="col-xs-6">
                         <input name="username" type="text" class="form-control" id="username" value="{$user['username']}" readonly>
                     </div>

application/views/templates/user/index.html

@@ -27,7 +27,7 @@
                     <div class="btn-group">
                         {if !array_key_exists('from',$smarty.session)}
                         <button type="button" class="add" id="add_user">
-                            新增用户
+                            新增帐号
                         </button>
                         {/if}
                         <button type="button" class="delete_btn" id="delete_user" disabled>
@@ -77,11 +77,11 @@
             <tr>
                 <th class="text-center" style="width: 40px"><input name="check_all" class="check_all" value="true" type="checkbox"></th>
                 <th class="text-center">ID</th>
-                <th class="text-center">用户名</th>
+                <th class="text-center">帐号名</th>
                 <th class="text-center">姓名</th>
                 <th class="text-center">电话</th>
                 <th class="text-center">E-mail</th>
-                <th class="text-center">用户类型</th>
+                <th class="text-center">帐号类型</th>
                 <th class="text-center">状态</th>
                 <th class="text-center">创建时间</th>
                 <th class="text-center">最后一次登录时间</th>
@@ -187,11 +187,11 @@
         });
         $("select").select2({minimumResultsForSearch: -1});
         $("#add_user").click(function () {
-            parent.$('#mainFrameTabs').bTabsAdd("tab11","新增用户","user/add");
+            parent.$('#mainFrameTabs').bTabsAdd("tab11","新增帐号","user/add");
         })
         $(".bootstrap-table").on('click',".delete",function () {
             var id = $(this).data("id");
-            layer.confirm("确定要删除该用户吗？删除后该用户相关的工单也将被删除！", {skin: 'layer-ext-myskin',icon: 3, title:'提示'}, function(index){
+            layer.confirm("确定要删除该帐号吗？删除后该帐号相关的工单也将被删除！", {skin: 'layer-ext-myskin',icon: 3, title:'提示'}, function(index){
                 if(id != "" && id != undefined) {
                     $.post(
                         "user/delete/" + id,
@@ -209,7 +209,7 @@
         })
         $(".bootstrap-table").on('click',".stop_use",function () {
             var id = $(this).data("id");
-            layer.confirm("确定要停用该用户吗？停用后该用户将不能登录！", {skin: 'layer-ext-myskin',icon: 3, title:'提示'}, function(index){
+            layer.confirm("确定要停用该帐号吗？停用后该帐号将不能登录！", {skin: 'layer-ext-myskin',icon: 3, title:'提示'}, function(index){
                 if(id != "" && id != undefined) {
                     $.post(
                         "user/stopuse/" + id,
@@ -245,10 +245,10 @@
             if(id != "" && id != undefined) {
                 layer.open({
                     type: 2,
-                    title: "用户详情",
+                    title: "帐号详情",
                     offset: 'auto',
                     shade: [0.3],
-                    area: ['900px','400px'],
+                    area: ['900px','450px'],
                     anim: 0,
                     shadeClose:false,
                     content: 'user/view/'+id,
@@ -312,9 +312,9 @@
                 }
             })
             if(ids == ""){
-                layer.alert("请选择要删除的用户！",{skin: 'layer-ext-myskin',icon: 3, title:'提示'});
+                layer.alert("请选择要删除的帐号！",{skin: 'layer-ext-myskin',icon: 3, title:'提示'});
             }else{
-                layer.confirm('确定要删除选择的用户吗?', {skin: 'layer-ext-myskin',icon: 3, title:'提示'}, function(index){
+                layer.confirm('确定要删除选择的帐号吗?', {skin: 'layer-ext-myskin',icon: 3, title:'提示'}, function(index){
                     $.post(
                         "user/deleteall",{'ids':ids},
                         function (data) {
@@ -335,9 +335,9 @@
                 }
             })
             if(ids == ""){
-                layer.alert("请选择要禁用的用户！",{skin: 'layer-ext-myskin',icon: 3, title:'提示'});
+                layer.alert("请选择要禁用的帐号！",{skin: 'layer-ext-myskin',icon: 3, title:'提示'});
             }else{
-                layer.confirm('确定要禁用选择的用户吗?', {skin: 'layer-ext-myskin',icon: 3, title:'提示'}, function(index){
+                layer.confirm('确定要禁用选择的帐号吗?', {skin: 'layer-ext-myskin',icon: 3, title:'提示'}, function(index){
                     $.post(
                         "user/disableall",{'ids':ids},
                         function (data) {
@@ -358,9 +358,9 @@
                 }
             })
             if(ids == ""){
-                layer.alert("请选择要启用的用户！",{skin: 'layer-ext-myskin',icon: 3, title:'提示'});
+                layer.alert("请选择要启用的帐号！",{skin: 'layer-ext-myskin',icon: 3, title:'提示'});
             }else{
-                layer.confirm('确定要启用选择的用户吗?', {skin: 'layer-ext-myskin',icon: 3, title:'提示'}, function(index){
+                layer.confirm('确定要启用选择的帐号吗?', {skin: 'layer-ext-myskin',icon: 3, title:'提示'}, function(index){
                     $.post(
                         "user/enableall",{'ids':ids},
                         function (data) {

application/views/templates/user/view.html

@@ -24,9 +24,9 @@
         <div class="panel-body">
             <fieldset>
                 <div class="form-group">
-                    <label class="col-sm-2 control-label"><span>*</span>用户名：</label>
+                    <label class="col-sm-2 control-label"><span>*</span>帐号名：</label>
                     <div class="col-sm-4">
-                        <input name="username" type="text" class="form-control" id="username" datatype="s5-18" nullmsg="用户名不能为空！" ajaxurl="user/validate/{$user['username']}" value="{$user['username']}">
+                        <input name="username" type="text" class="form-control" id="username" datatype="s5-18" nullmsg="帐号名不能为空！" ajaxurl="user/validate/{$user['username']}" value="{$user['username']}">
                     </div>
                 </div>
                 <div class="form-group">
@@ -58,7 +58,7 @@
                     </div>
                 </div>
                 <div class="form-group has-feedback" {if $user['user_id']==1}style="display:none"{/if}>
-                    <label class="col-sm-2 control-label"><span>*</span>用户类型：</label>
+                    <label class="col-sm-2 control-label"><span>*</span>帐号类型：</label>
                     <div class="col-sm-3">
                         <select class="form-control validate[required]" name="user_type" id="user_type">
                             {foreach $user_types as $k=>$val}
@@ -68,7 +68,7 @@
                     </div>
                 </div>
             </fieldset>
-            <div class="form-actions text-left">
+            <div class="form-actions text-right">
                 <button type="submit" id="dosubmit" class="btn btn-primary ">保存</button>
                 <button type="button" id="cannel" class="btn btn-default">取消</button>
             </div>

application/views/templates/warning/ignoreindex.html

@@ -136,7 +136,7 @@
                     title: "告警详情",
                     offset: 'auto',
                     shade: [0.3],
-                    area: ['700px','520px'],
+                    area: ['800px','620px'],
                     anim: 0,
                     shadeClose:false,
                     content: 'warning/view/'+id,

application/views/templates/warning/index.html

@@ -186,7 +186,7 @@
                     title: "告警详情",
                     offset: 'auto',
                     shade: [0.3],
-                    area: ['700px','520px'],
+                    area: ['800px','620px'],
                     anim: 0,
                     shadeClose:false,
                     content: 'warning/view/'+id,
@@ -221,7 +221,7 @@
                     title: "生成工单",
                     offset: 'auto',
                     shade: [0.3],
-                    area: ['900px','80%'],
+                    area: ['900px','650px'],
                     anim: 0,
                     shadeClose:false,
                     content: 'workorder/create?ids='+warning_id,
@@ -255,7 +255,7 @@
                     title: "生成工单",
                     offset: 'auto',
                     shade: [0.3],
-                    area: ['900px','75%'],
+                    area: ['900px','650px'],
                     anim: 0,
                     shadeClose:false,
                     content: 'workorder/create?ids='+ids,

application/views/templates/warning/view.html

@@ -76,7 +76,7 @@
                     </div>
                 </div>
             </fieldset>
-            <div class="form-actions text-left">
+            <div class="form-actions text-right">
                 <button type="button" id="cannel" class="btn btn-default">关闭</button>
             </div>
         </div>

application/views/templates/workorder/create.html

@@ -10,7 +10,7 @@
     <link href="static/css/select2.min.css" rel="stylesheet">
     <link href="static/js/skins/all.css" rel="stylesheet">
     <link rel="stylesheet" href="static/css/style.css">
-    <script language="javascript" type="text/javascript"> var SITE_URL = "/";</script>
+    <script language="javascript" type="text/javascript"> var SITE_URL = "{base_url()}";</script>
     <script type="text/javascript" charset="utf-8" src="static/ueditor/neditor_min.config.js"></script>
     <script type="text/javascript" charset="utf-8" src="static/ueditor/neditor.all.js"></script>
     <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
@@ -68,9 +68,9 @@
                     </div>
                 </div>
                 <div class="form-group">
-                    <label class="col-sm-2 control-label"><span>*</span>备注：</label>
+                    <label class="col-sm-2 control-label">备注：</label>
                     <div class="col-sm-6">
-                        <textarea class="form-control" rows="3" datatype="remark" nullmsg="备注不能为空！" errormsg="备注不能包含英文格式?:\" name="remark_content"></textarea>
+                        <textarea class="form-control" rows="3" datatype="empty|remark" errormsg="备注不能包含英文格式?:\" name="remark_content"></textarea>
                     </div>
                 </div>
                 <div class="form-group">
@@ -98,7 +98,7 @@
                 <div class="form-group has-feedback">
                     <label class="col-sm-2 control-label"><span>*</span>下发账号：</label>
                     <div class="col-sm-3">
-                        <select class="form-control" name="receive_user" datatype="*" nullmsg="请选择下发工程师！">
+                        <select class="form-control" id="receive_user" name="receive_user" datatype="*" nullmsg="请选择下发工程师！">
                             <option value=""  selected="selected">请选择下发工程师</option>
                             {foreach $user_list as $k=>$val}
                                 <option value="{$val['user_id']}">{$val['name']}</option>
@@ -106,15 +106,17 @@
                             {foreach $sso_user_list as $k=>$val}
                                 <option value="{$val['user_id']}">{$val['name']}({$val['from']})</option>
                             {/foreach}
+                            <option value="add_user">新增账号</option>
                         </select>
                     </div>
                 </div>
             </fieldset>
-            <div class="form-actions text-left">
+            <div class="form-actions text-right" style="width: 100%; position: fixed; left: 0; bottom: 0; margin-left: 0; z-index:3000;">
                 <button type="submit" id="dosubmit" class="btn btn-primary ">保存</button>
                 <button type="button" id="cannel" class="btn btn-default">取消</button>
             </div>
         </div>
+
     </div>
 </form>
 <script type="text/javascript" charset="utf-8" src="static/js/jquery.js"></script>
@@ -168,6 +170,7 @@
             },
             datatype:{
                 'remark':/[^\/\:\?]/,
+                "empty":/^\s*$/
             },
             beforeSubmit:function(curform){
                 $("button").attr("disabled","disabled");
@@ -197,6 +200,22 @@
         $("#cannel").click(function () {
                 parent.layer.close(layer_index);
         });
+        $("#receive_user").change(function () {
+            var vals = $(this).val();
+            if(vals !="" && vals !=undefined && vals=='add_user'){
+                layer.open({
+                    type: 2,
+                    title: "新增用户",
+                    area: ['80%','84%'],
+                    scrollbar:false,
+                    resize: false,
+                    content:'user/add',
+                    end: function(){
+                        window.location.reload();
+                    }
+                });
+            }
+        })
     })
 </script>
 </body>

application/views/templates/workorder/finished.html

@@ -74,7 +74,7 @@
                 <td>{foreach $val['send_type'] as $type}{$send_type[$type]}&nbsp;{/foreach}</td>
                 <td data-searchable="true"><p>{$val['receive_user']['name']}<br>{$val['receive_user']['mobile']}<br>{$val['receive_user']['email']}</p></td>
                 <td class="text-center" data-searchable="true">{$val['create_time']->toDateTime()|date_format:'%Y-%m-%d %H:%M:%S'}</td>
-                <td  class="text-left" data-searchable="true"><p class="text_over">备注人：{$val['last_remark_user']['name']}<br>内容：{$val['last_remark_content']}</p>时间：{$val['last_remark_time']->toDateTime()|date_format:'%Y-%m-%d %H:%M:%S'}</td>
+                <td  class="text-left" data-searchable="true">{if $val['last_remark_user'] != ""}<p class="text_over">备注人：{$val['last_remark_user']['name']}</p><div class="text_over" style="width: 200px;">内容：{$val['last_remark_content']}</div>时间：{$val['last_remark_time']->toDateTime()|date_format:'%Y-%m-%d %H:%M:%S'}{/if}</td>
                 <td class="text-center" data-searchable="true">{$workorder_status[$val['status']]}</td>
                 <td  class="text-left">
                     <a href="javascript:;" data-id="{$val['workorder_id']}" class="view_info">

application/views/templates/workorder/index.html

@@ -88,7 +88,7 @@
                 <td>{foreach $val['send_type'] as $type}{$send_type[$type]}&nbsp;{/foreach}</td>
                 <td data-searchable="true"><p>{$val['receive_user']['name']}<br>{$val['receive_user']['mobile']}<br>{$val['receive_user']['email']}</p></td>
                 <td class="text-center" data-searchable="true">{$val['create_time']->toDateTime()|date_format:'%Y-%m-%d %H:%M:%S'}</td>
-                <td class="text-left" data-searchable="true"><p class="text_over">备注人：{$val['last_remark_user']['name']}</p><div class="text_over" style="width: 200px;">内容：{$val['last_remark_content']}</div>时间：{$val['last_remark_time']->toDateTime()|date_format:'%Y-%m-%d %H:%M:%S'}</td>
+                <td class="text-left" data-searchable="true">{if $val['last_remark_user'] != ""}<p class="text_over">备注人：{$val['last_remark_user']['name']}</p><div class="text_over" style="width: 200px;">内容：{$val['last_remark_content']}</div>时间：{$val['last_remark_time']->toDateTime()|date_format:'%Y-%m-%d %H:%M:%S'}{/if}</td>
                 <td class="text-center" data-searchable="true"><span class="status{$val['status']}">{$workorder_status[$val['status']]}</span></td>
                 <td class="text-left">
                     <a href="javascript:;" data-id="{$val['workorder_id']}" class="view_info">

application/views/templates/workorder/view.html

@@ -88,7 +88,7 @@
                     </div>
                 </div>
             </fieldset>
-            <div class="form-actions text-left">
+            <div class="form-actions text-right">
                 <button type="button" id="cannel" class="btn btn-default">关闭</button>
             </div>
         </div>

static/css/style.css

@@ -70,6 +70,10 @@ label,th{font-weight: normal;}
     white-space: nowrap;
 }
 
+.text_over a{
+    color: #333;
+}
+
 .radio label, .checkbox label{
     padding: 0 10px 0 0;
 }
@@ -581,6 +585,9 @@ fieldset{
     background: #fdfdfd;
     padding:6px;
 }
+.panel-body fieldset{
+    padding-bottom: 60px;
+}
 .bottom_line{
     border-bottom: #ddd solid 1px;
 }
@@ -613,8 +620,8 @@ fieldset{
     border-top: #eeeeee solid 1px;
     border-bottom: #eeeeee solid 1px;
     background: #f8f8f8;
-    margin-left: -16px;
     margin-right: -16px;
+    width: 100%; position: fixed; left: 0; bottom: 0; margin-left: 0; z-index:3000;
 }
 .panel-body .form-actions button{
     padding: 0 24px;