Merge branch 'master' of http://git.dever.cc/dever-product/churen

tool/work/database/info.php

@@ -151,13 +151,19 @@ return array
         'mobile'      => array
         (
             'type'      => 'bigint-11',
-            'name'      => '手机号',
+            'name'      => '手机号/姓名',
             'default'   => '',
             'desc'      => '请输入手机号',
             'match'     => Dever::rule('mobile'),
             // 'is_numeric',
             'update'    => 'text',
-            
+            'search'    => array
+            (
+                'api' => 'work/info-getSearch',
+                'col' => 'col',
+                'result' => 'id',
+                'search' => 'id',
+            ),
             'value'     => Dever::input('search_option_mobile'),
             # 绑定js脚本，更新时使用，第一个参数是执行的方式，第二个参数执行的方法，第三个参数是传值。
             'bind'        => array('onblur', 'loading', array('url' => Dever::url("lib/manage.search","work"))),
@@ -174,7 +180,6 @@ return array
             'desc'      => '用户姓名（或微信名）',
             'match'     => 'option',
             'update'    => 'text',
-
             // 'search'    => 'fulltext',
             // 'list'      => true,
         ),
@@ -182,18 +187,11 @@ return array
         'work_num'      => array
         (
             'type'      => 'varchar-100',
-            'name'      => '用户姓名/手机号',
+            'name'      => '工单号',
             'default'   => '',
             'desc'      => '工单号',
             'match'     => 'is_string',
             'update'    => 'hidden',
-            'search'    => array
-            (
-                'api' => 'work/info-getSearch',
-                'col' => 'col',
-                'result' => 'id',
-                'search' => 'id',
-            ),
             // 'search'    => 'fulltext',
             // 'list'      => true,
         ),

tool/work/lib/Manage.php

@@ -144,6 +144,7 @@ Class Manage
 			if ($branch_id) {
 				$temp = explode(',', $branch_id);
 				if (isset($temp[1])) {
+					$w['group'] = $temp[0];
 					$w['appoint_id'] = $temp[1];
 				}
 			}