Merge branch 'dev' of http://rungit.jxdsy.cn:10000/sugar/zhupu into dev

application/admin/controller/family/FamilyPeople.php

@@ -22,8 +22,8 @@ class FamilyPeople extends Backend
      * @var \app\admin\model\family\FamilyPeople
      */
     protected $model = null;
-    protected $searchFields = 'id,name,identity_card,ext3,ext4,ext5';
-    protected $selectpageFields = "id,name";
+    protected $searchFields = 'id,name,identity_card,ext3,ext4,ext5,user_id';
+    protected $selectpageFields = "id,name,user_id";
 
     public function _initialize()
     {

application/admin/view/family/namecard/edit.html

@@ -3,19 +3,19 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Card_number')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-card_number" data-rule="required" class="form-control" name="row[card_number]" data-format-item="{user_id} - {name}" type="text" value="{$row.card_number|htmlentities}">
+            <input id="c-card_number" data-rule="required" class="form-control" name="row[card_number]" type="text" value="{$row.card_number|htmlentities}">
         </div>
     </div>
     <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="" data-source="family/Family_People/index"  class="form-control selectpage" data-primary-key="user_id" data-format-item="{user_id} - {name}" name="row[user_id]" type="text" value="{$row.user_id|htmlentities}">
+            <input id="c-user_id" data-rule="required" data-source="family/Family_People/index"  class="form-control selectpage" data-search-field="name" data-primary-key="user_id" data-field="user_id" data-format-item="{id} - {name}" name="row[user_id]" type="text" value="{$row.user_id|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Pid')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-pid" data-rule="" data-source="family/Family_People/index"  class="form-control selectpage"  data-primary-key="user_id" name="row[pid]" type="text" value="{$row.pid|htmlentities}">
+            <input id="c-pid" data-rule="required" data-source="family/Family_People/index"  class="form-control selectpage"  data-search-field="name" data-primary-key="user_id" data-field="user_id" data-format-item="{id} - {name}" name="row[pid]" type="text" value="{$row.pid|htmlentities}">
         </div>
     </div>
     <div class="form-group">