diff --git a/admin/application/admin/controller/Firm.php b/admin/application/admin/controller/Firm.php
index 9c6144d..1d97f3e 100644
--- a/admin/application/admin/controller/Firm.php
+++ b/admin/application/admin/controller/Firm.php
@@ -11,6 +11,7 @@ use app\common\controller\Backend;
  */
 class Firm extends Backend
 {
+    protected $noNeedRight = ['index'];
 
     /**
      * Firm模型对象
diff --git a/admin/application/admin/controller/Firmtags.php b/admin/application/admin/controller/Firmtags.php
index ebf9a2d..03f43bc 100644
--- a/admin/application/admin/controller/Firmtags.php
+++ b/admin/application/admin/controller/Firmtags.php
@@ -108,6 +108,7 @@ class Firmtags extends Backend
                 $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.add' : $name) : $this->modelValidate;
                 $this->model->validateFailException()->validate($validate);
             }
+            $params['firm_id'] = session_admin_firm_id();
             $result = $this->model->allowField(true)->save($params);
             Db::commit();
         } catch (ValidateException|PDOException|Exception $e) {
diff --git a/admin/application/admin/view/auth/admin/add.html b/admin/application/admin/view/auth/admin/add.html
index 3cb174e..5a85e46 100644
--- a/admin/application/admin/view/auth/admin/add.html
+++ b/admin/application/admin/view/auth/admin/add.html
@@ -42,6 +42,25 @@
             {:build_radios('row[status]', ['normal'=>__('Normal'), 'hidden'=>__('Hidden')])}
         </div>
     </div>
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('选择企业')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-firm_id" min="0" data-rule="required"
+
+                   data-source="firm/index" class="form-control selectpage"
+                   name="row[firm_id]" type="text" value="{:session_admin_firm_id()}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('选择门店')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-firmstore_id" min="0" data-rule="required"
+
+                   data-source="firmstore/index" class="form-control selectpage"
+                   name="row[firmstore_id]" type="text" value="{:session_admin_firmstore_id()}">
+        </div>
+    </div>
     <div class="form-group hidden layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">
diff --git a/admin/application/admin/view/auth/admin/edit.html b/admin/application/admin/view/auth/admin/edit.html
index a36d009..cea93c6 100644
--- a/admin/application/admin/view/auth/admin/edit.html
+++ b/admin/application/admin/view/auth/admin/edit.html
@@ -36,6 +36,24 @@
             <input type="password" class="form-control" id="password" name="row[password]" autocomplete="new-password" value="" data-rule="password" />
         </div>
     </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('选择企业')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-firm_id" min="0" data-rule="required"
+
+                   data-source="firm/index" class="form-control selectpage"
+                   name="row[firm_id]" type="text" value="{:session_admin_firm_id()}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('选择门店')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-firmstore_id" min="0" data-rule="required"
+
+                   data-source="firmstore/index" class="form-control selectpage"
+                   name="row[firmstore_id]" type="text" value="{:session_admin_firmstore_id()}">
+        </div>
+    </div>
     <div class="form-group">
         <label for="loginfailure" class="control-label col-xs-12 col-sm-2">{:__('Loginfailure')}:</label>
         <div class="col-xs-12 col-sm-8">
diff --git a/admin/application/admin/view/firmcustomer/index.html b/admin/application/admin/view/firmcustomer/index.html
index 6972c27..e4e4080 100644
--- a/admin/application/admin/view/firmcustomer/index.html
+++ b/admin/application/admin/view/firmcustomer/index.html
@@ -20,7 +20,7 @@
                         <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('firmcustomer/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('firmcustomer/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('firmcustomer/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
-                        <a href="firmtags/add" class="btn btn-success btn-dialog {:$auth->check('firmtags/add')?'':'hide'}" title="{:__('添加标签')}" ><i class="fa fa-plus"></i> {:__('添加标签')}</a>
+                        <a href="firmtags/add" class="btn btn-success btn-dialog" title="{:__('添加标签')}" ><i class="fa fa-plus"></i> {:__('添加标签')}</a>
 
 
                         <div class="dropdown btn-group {:$auth->check('firmcustomer/multi')?'':'hide'}">
diff --git a/admin/public/assets/js/backend/firmcustomer.js b/admin/public/assets/js/backend/firmcustomer.js
index 634fdb9..b037f76 100644
--- a/admin/public/assets/js/backend/firmcustomer.js
+++ b/admin/public/assets/js/backend/firmcustomer.js
@@ -89,7 +89,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             $('.firmcustomer-sync-info').on('click',function (e){
                 //读取下拉框的值
                 let wx_id = $('#c-rel_wx').attr('data-wx_id');
-                console.log(wx_id);
+                // console.log(wx_id);
                 // console.log(e);
                 let load_index = layer.load(1);
                 $.post('Gewechatfriends/getFriendDetail',{wx_id:wx_id},function (res) {
diff --git a/admin/public/assets/js/backend/firmtags.js b/admin/public/assets/js/backend/firmtags.js
index afc1a87..09180c2 100644
--- a/admin/public/assets/js/backend/firmtags.js
+++ b/admin/public/assets/js/backend/firmtags.js
@@ -32,10 +32,19 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 ]
             });
 
+            //当表格数据加载完成时
+            table.on('load-success.bs.table', function (e, data) {
+
+            });
             // 为表格绑定事件
             Table.api.bindevent(table);
         },
         add: function () {
+            // $(function (){
+            //
+            //     // layer.msg(11)
+            //     $('#c-firm_id').click();
+            // });
             Controller.api.bindevent();
         },
         edit: function () {