diff --git a/public/components/property/addActivitiesBeautifulStaff/addActivitiesBeautifulStaff.html b/public/components/property/addActivitiesBeautifulStaff/addActivitiesBeautifulStaff.html
index 10cf860a3..1b0af8c69 100644
--- a/public/components/property/addActivitiesBeautifulStaff/addActivitiesBeautifulStaff.html
+++ b/public/components/property/addActivitiesBeautifulStaff/addActivitiesBeautifulStaff.html
@@ -1,53 +1,71 @@
-<div id="addActivitiesBeautifulStaffModel" class="modal fade" tabindex="-1" role="dialog"
-    aria-labelledby="exampleModalLabel" aria-hidden="true">
-    <div class="modal-dialog modal-lg">
-        <div class="modal-content">
-            <div class="modal-body">
-                <h3 class="m-t-none m-b ">申请最美员工</h3>
-                <div class="ibox-content">
+<div class="row">
+    <div class="col-lg-12">
+        <div class="ibox">
+            <div class="ibox-title">
+                <h5>申请最美员工</h5>
+                <div class="ibox-tools" style="top:10px;">
+
+                </div>
+            </div>
+            <div class="ibox-content">
+                <div>
                     <div>
-                        <div>
-                            <div class="form-group row">
-                                <label class="col-sm-2 col-form-label">活动规则</label>
-                                <div class="col-sm-10">
-                                    <select class="custom-select" v-model="addActivitiesBeautifulStaffInfo.ruleId">
-                                        <option selected disabled value="">必填，请选择活动规则</option>
-                                        <option value="6666">最美员工</option>
-                                    </select>
-                                </div>
+                        <div class="form-group row">
+                            <label class="col-sm-2 col-form-label">活动规则</label>
+                            <div class="col-sm-10">
+                                <select class="custom-select" v-model="addActivitiesBeautifulStaffInfo.ruleId">
+                                    <option selected disabled value="">必填，请选择活动规则</option>
+                                    <option v-for="(item,index) in addActivitiesBeautifulStaffInfo.activitiesRules"
+                                        :value="item.ruleId">{{item.ruleName}}</option>
+                                </select>
                             </div>
-                            <div class="form-group row">
-                                <label class="col-sm-2 col-form-label">员工</label>
-                                <div class="col-sm-10">
-                                    <input v-model="addActivitiesBeautifulStaffInfo.staffId" type="text"
-                                        placeholder="必填，请填写员工" class="form-control">
-                                </div>
+                        </div>
+                        <div class="form-group row">
+                            <label class="col-sm-2 col-form-label">员工</label>
+
+                            <div class="col-sm-3">
+                                <vc:create path="frame/orgSelect2" parentModal="addActivitiesBeautifulStaffModel"
+                                    callBackListener="addActivitiesBeautifulStaff" callBackFunction="notify"
+                                    namespace="addActivitiesBeautifulStaff"></vc:create>
                             </div>
-                            <div class="form-group row">
-                                <label class="col-sm-2 col-form-label">员工编号</label>
-                                <div class="col-sm-10">
-                                    <input v-model="addActivitiesBeautifulStaffInfo.activitiesNum" type="text"
-                                        placeholder="必填，请填写员工编号" class="form-control">
-                                </div>
+                            <div class="col-sm-3">
+                                <vc:create path="frame/departmentSelect2" parentModal="addActivitiesBeautifulStaffModel"
+                                    callBackListener="addActivitiesBeautifulStaff" callBackFunction="notify"
+                                    namespace="addActivitiesBeautifulStaff"></vc:create>
                             </div>
-                            <div class="form-group row">
-                                <label class="col-sm-2 col-form-label">工作简介</label>
-                                <div class="col-sm-10">
-                                    <input v-model="addActivitiesBeautifulStaffInfo.workContent" type="text"
-                                        placeholder="必填，请填写工作简介" class="form-control">
-                                </div>
+                            <div class="col-sm-3">
+                                <vc:create path="frame/staffSelect2" parentModal="addActivitiesBeautifulStaffModel"
+                                    callBackListener="addActivitiesBeautifulStaff" callBackFunction="notify"
+                                    namespace="addActivitiesBeautifulStaff"></vc:create>
                             </div>
 
-                            <div class="ibox-content">
-                                <button class="btn btn-primary float-right" type="button"
-                                    v-on:click="saveActivitiesBeautifulStaffInfo()"><i
-                                        class="fa fa-check"></i>&nbsp;保存</button>
-                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
-                                    data-dismiss="modal">取消</button>
+                        </div>
+                        <div class="form-group row">
+                            <label class="col-sm-2 col-form-label">员工编号</label>
+                            <div class="col-sm-10">
+                                <input v-model="addActivitiesBeautifulStaffInfo.activitiesNum" type="text"
+                                    placeholder="必填，请填写员工编号" class="form-control">
                             </div>
                         </div>
+                        <div class="form-group row">
+                            <label class="col-sm-2 col-form-label">工作简介</label>
+                            <div class="col-sm-10">
+                                <div class=" no-padding">
+                                    <div class="summernote"></div>
+                                </div>
+                            </div>
+                        </div>
+
+                        <div class="ibox-content">
+                            <button class="btn btn-primary float-right" type="button"
+                                v-on:click="saveActivitiesBeautifulStaffInfo()"><i
+                                    class="fa fa-check"></i>&nbsp;保存</button>
+                            <button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
+                                @click="_closeAddActivitiesBeauifulStaffInfo()">取消</button>
+                        </div>
                     </div>
                 </div>
+
             </div>
         </div>
     </div>
diff --git a/public/components/property/addActivitiesBeautifulStaff/addActivitiesBeautifulStaff.js b/public/components/property/addActivitiesBeautifulStaff/addActivitiesBeautifulStaff.js
index 01836f936..af93b7d08 100644
--- a/public/components/property/addActivitiesBeautifulStaff/addActivitiesBeautifulStaff.js
+++ b/public/components/property/addActivitiesBeautifulStaff/addActivitiesBeautifulStaff.js
@@ -12,15 +12,20 @@
                 staffId: '',
                 activitiesNum: '',
                 workContent: '',
-
+                activitiesRules: []
             }
         },
         _initMethod: function () {
-
+            $that._initAddActivitiesBeautifulStaffInfo();
         },
         _initEvent: function () {
             vc.on('addActivitiesBeautifulStaff', 'openAddActivitiesBeautifulStaffModal', function () {
-                $('#addActivitiesBeautifulStaffModel').modal('show');
+                $that._listAddActivitiesRules();
+            });
+            vc.on("addActivitiesBeautifulStaff", "notify", function (_param) {
+                if (_param.hasOwnProperty("staffId")) {
+                    vc.component.addActivitiesBeautifulStaffInfo.staffId = _param.staffId;
+                }
             });
         },
         methods: {
@@ -98,7 +103,7 @@
                 }
 
                 vc.http.apiPost(
-                    'activitiesBeautifulStaff.saveActivitiesBeautifulStaff',
+                    '/activitiesRule/saveActivitiesBeautifulStaff',
                     JSON.stringify(vc.component.addActivitiesBeautifulStaffInfo),
                     {
                         emulateJSON: true
@@ -130,9 +135,93 @@
                     staffId: '',
                     activitiesNum: '',
                     workContent: '',
-
+                    activitiesRules: []
                 };
-            }
+            },
+            _listAddActivitiesRules: function (_page, _rows) {
+                let _that = $that.addActivitiesBeautifulStaffInfo;
+                var param = {
+                    params: {
+                        page: 1,
+                        row: 50,
+                        communityId: vc.getCurrentCommunity().communityId
+                    }
+                };
+                //发送get请求
+                vc.http.apiGet('/activitiesRule/queryActivitiesRule',
+                    param,
+                    function (json, res) {
+                        var _activitiesRuleManageInfo = JSON.parse(json);
+                        _that.activitiesRules = _activitiesRuleManageInfo.data;
+                    }, function (errInfo, error) {
+                        console.log('请求失败处理');
+                    }
+                );
+            },
+            _closeAddActivitiesBeauifulStaffInfo: function () {
+                vc.emit('activitiesBeautifulStaffManage', 'listActivitiesBeautifulStaff', {});
+            },
+            sendFile: function ($summernote, files) {
+                console.log('上传图片', files);
+
+                var param = new FormData();
+                param.append("uploadFile", files[0]);
+                param.append('communityId', vc.getCurrentCommunity().communityId);
+
+                vc.http.upload(
+                    'addNoticeView',
+                    'uploadImage',
+                    param,
+                    {
+                        emulateJSON: true,
+                        //添加请求头
+                        headers: {
+                            "Content-Type": "multipart/form-data"
+                        }
+                    },
+                    function (json, res) {
+                        //vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
+                        if (res.status == 200) {
+                            var data = JSON.parse(json);
+                            //关闭model
+                            $summernote.summernote('insertImage', "/callComponent/download/getFile/file?fileId=" + data.fileId + "&communityId=" + vc.getCurrentCommunity().communityId);
+                            return;
+                        }
+                        vc.toast(json);
+                    },
+                    function (errInfo, error) {
+                        console.log('请求失败处理');
+                        vc.toast(errInfo);
+                    });
+
+            },
+            _initAddActivitiesBeautifulStaffInfo: function () {
+                let $summernote = $('.summernote').summernote({
+                    lang: 'zh-CN',
+                    height: 300,
+                    placeholder: '必填，请输入工作简介',
+                    callbacks: {
+                        onImageUpload: function (files, editor, $editable) {
+                            vc.component.sendFile($summernote, files);
+                        },
+                        onChange: function (contents, $editable) {
+                            vc.component.addActivitiesBeautifulStaffInfo.workContent = contents;
+                        }
+                    },
+                    toolbar: [
+                        ['style', ['style']],
+                        ['font', ['bold', 'italic', 'underline', 'clear']],
+                        ['fontname', ['fontname']],
+                        ['color', ['color']],
+                        ['para', ['ul', 'ol', 'paragraph']],
+                        ['height', ['height']],
+                        ['table', ['table']],
+                        ['insert', ['link', 'picture']],
+                        ['view', ['fullscreen', 'codeview']],
+                        ['help', ['help']]
+                    ],
+                });
+            },
         }
     });
 
diff --git a/public/pages/property/activitiesBeautifulStaffManage/activitiesBeautifulStaffManage.html b/public/pages/property/activitiesBeautifulStaffManage/activitiesBeautifulStaffManage.html
index 5535ffd15..dea6e786a 100644
--- a/public/pages/property/activitiesBeautifulStaffManage/activitiesBeautifulStaffManage.html
+++ b/public/pages/property/activitiesBeautifulStaffManage/activitiesBeautifulStaffManage.html
@@ -1,5 +1,5 @@
 <div>
-    <div class="row">
+    <div class="row" v-if="activitiesBeautifulStaffManageInfo.componentShow =='activitiesBeautifulStaffManage'">
         <div class="col-lg-12">
             <div class="ibox ">
                 <div class="ibox-title">
@@ -44,11 +44,11 @@
             </div>
         </div>
     </div>
-    <div class="row">
+    <div class="row" v-if="activitiesBeautifulStaffManageInfo.componentShow =='activitiesBeautifulStaffManage'">
         <div class="col-lg-12">
             <div class="ibox">
                 <div class="ibox-title">
-                    <h5>最美员工信息</h5>
+                    <h5>最美员工</h5>
                     <div class="ibox-tools" style="top:10px;">
                         <button type="button" class="btn btn-primary btn-sm"
                             v-on:click="_openAddActivitiesBeautifulStaffModal()">
@@ -66,7 +66,7 @@
                                 <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>
                                 <th class="text-center">操作</th>
 
 
@@ -76,10 +76,10 @@
                             <tr
                                 v-for="activitiesBeautifulStaff in activitiesBeautifulStaffManageInfo.activitiesBeautifulStaffs">
                                 <td class="text-center">{{activitiesBeautifulStaff.beId}}</td>
-                                <td class="text-center">{{activitiesBeautifulStaff.ruleId}}</td>
-                                <td class="text-center">{{activitiesBeautifulStaff.staffId}}</td>
+                                <td class="text-center">{{activitiesBeautifulStaff.ruleName}}</td>
+                                <td class="text-center">{{activitiesBeautifulStaff.staffName}}</td>
                                 <td class="text-center">{{activitiesBeautifulStaff.activitiesNum}}</td>
-                                <td class="text-center">{{activitiesBeautifulStaff.workContent}}</td>
+                                <td class="text-center">{{activitiesBeautifulStaff.createTime}}</td>
                                 <td class="text-center">
                                     <div class="btn-group">
                                         <button class="btn-white btn btn-xs"
@@ -109,8 +109,9 @@
     </div>
 
 
-
-    <vc:create path="property/addActivitiesBeautifulStaff" callBackListener="" callBackFunction=""></vc:create>
+    <div v-bind:class="{no_display:activitiesBeautifulStaffManageInfo.componentShow != 'addActivitiesBeautifulStaff'}">
+        <vc:create path="property/addActivitiesBeautifulStaff" callBackListener="" callBackFunction=""></vc:create>
+    </div>
     <vc:create path="property/editActivitiesBeautifulStaff"></vc:create>
     <vc:create path="property/deleteActivitiesBeautifulStaff"></vc:create>
 
diff --git a/public/pages/property/activitiesBeautifulStaffManage/activitiesBeautifulStaffManage.js b/public/pages/property/activitiesBeautifulStaffManage/activitiesBeautifulStaffManage.js
index 4b366ca90..c5b67a4c6 100644
--- a/public/pages/property/activitiesBeautifulStaffManage/activitiesBeautifulStaffManage.js
+++ b/public/pages/property/activitiesBeautifulStaffManage/activitiesBeautifulStaffManage.js
@@ -1,85 +1,88 @@
 /**
     入驻小区
 **/
-(function(vc){
+(function (vc) {
     var DEFAULT_PAGE = 1;
     var DEFAULT_ROWS = 10;
     vc.extends({
-        data:{
-            activitiesBeautifulStaffManageInfo:{
-                activitiesBeautifulStaffs:[],
-                total:0,
-                records:1,
-                moreCondition:false,
-                beId:'',
-                conditions:{
-                    ruleId:'',
-staffName:'',
-activitiesNum:'',
+        data: {
+            activitiesBeautifulStaffManageInfo: {
+                activitiesBeautifulStaffs: [],
+                total: 0,
+                records: 1,
+                moreCondition: false,
+                componentShow: 'activitiesBeautifulStaffManage',
+                beId: '',
+                conditions: {
+                    ruleId: '',
+                    staffName: '',
+                    activitiesNum: '',
 
                 }
             }
         },
-        _initMethod:function(){
+        _initMethod: function () {
             vc.component._listActivitiesBeautifulStaffs(DEFAULT_PAGE, DEFAULT_ROWS);
         },
-        _initEvent:function(){
-            
-            vc.on('activitiesBeautifulStaffManage','listActivitiesBeautifulStaff',function(_param){
-                  vc.component._listActivitiesBeautifulStaffs(DEFAULT_PAGE, DEFAULT_ROWS);
+        _initEvent: function () {
+
+            vc.on('activitiesBeautifulStaffManage', 'listActivitiesBeautifulStaff', function (_param) {
+
+                vc.component._listActivitiesBeautifulStaffs(DEFAULT_PAGE, DEFAULT_ROWS);
             });
-             vc.on('pagination','page_event',function(_currentPage){
-                vc.component._listActivitiesBeautifulStaffs(_currentPage,DEFAULT_ROWS);
+            vc.on('pagination', 'page_event', function (_currentPage) {
+                vc.component._listActivitiesBeautifulStaffs(_currentPage, DEFAULT_ROWS);
             });
         },
-        methods:{
-            _listActivitiesBeautifulStaffs:function(_page, _rows){
-
+        methods: {
+            _listActivitiesBeautifulStaffs: function (_page, _rows) {
+                $that.activitiesBeautifulStaffManageInfo.componentShow = 'activitiesBeautifulStaffManage';
                 vc.component.activitiesBeautifulStaffManageInfo.conditions.page = _page;
                 vc.component.activitiesBeautifulStaffManageInfo.conditions.row = _rows;
                 var param = {
-                    params:vc.component.activitiesBeautifulStaffManageInfo.conditions
-               };
+                    params: vc.component.activitiesBeautifulStaffManageInfo.conditions
+                };
 
-               //发送get请求
-               vc.http.apiGet('activitiesBeautifulStaff.listActivitiesBeautifulStaffs',
-                             param,
-                             function(json,res){
-                                var _activitiesBeautifulStaffManageInfo=JSON.parse(json);
-                                vc.component.activitiesBeautifulStaffManageInfo.total = _activitiesBeautifulStaffManageInfo.total;
-                                vc.component.activitiesBeautifulStaffManageInfo.records = _activitiesBeautifulStaffManageInfo.records;
-                                vc.component.activitiesBeautifulStaffManageInfo.activitiesBeautifulStaffs = _activitiesBeautifulStaffManageInfo.data;
-                                vc.emit('pagination','init',{
-                                     total:vc.component.activitiesBeautifulStaffManageInfo.records,
-                                     currentPage:_page
-                                 });
-                             },function(errInfo,error){
-                                console.log('请求失败处理');
-                             }
-                           );
+                //发送get请求
+                vc.http.apiGet('/activitiesRule/queryActivitiesBeautifulStaff',
+                    param,
+                    function (json, res) {
+                        var _activitiesBeautifulStaffManageInfo = JSON.parse(json);
+                        vc.component.activitiesBeautifulStaffManageInfo.total = _activitiesBeautifulStaffManageInfo.total;
+                        vc.component.activitiesBeautifulStaffManageInfo.records = _activitiesBeautifulStaffManageInfo.records;
+                        vc.component.activitiesBeautifulStaffManageInfo.activitiesBeautifulStaffs = _activitiesBeautifulStaffManageInfo.data;
+                        vc.emit('pagination', 'init', {
+                            total: vc.component.activitiesBeautifulStaffManageInfo.records,
+                            currentPage: _page
+                        });
+                    }, function (errInfo, error) {
+                        console.log('请求失败处理');
+                    }
+                );
             },
-            _openAddActivitiesBeautifulStaffModal:function(){
-                vc.emit('addActivitiesBeautifulStaff','openAddActivitiesBeautifulStaffModal',{});
+            _openAddActivitiesBeautifulStaffModal: function () {
+                $that.activitiesBeautifulStaffManageInfo.componentShow = 'addActivitiesBeautifulStaff';
+                vc.emit('addActivitiesBeautifulStaff', 'openAddActivitiesBeautifulStaffModal', {});
             },
-            _openEditActivitiesBeautifulStaffModel:function(_activitiesBeautifulStaff){
-                vc.emit('editActivitiesBeautifulStaff','openEditActivitiesBeautifulStaffModal',_activitiesBeautifulStaff);
+            _openEditActivitiesBeautifulStaffModel: function (_activitiesBeautifulStaff) {
+                vc.emit('editActivitiesBeautifulStaff', 'openEditActivitiesBeautifulStaffModal', _activitiesBeautifulStaff);
             },
-            _openDeleteActivitiesBeautifulStaffModel:function(_activitiesBeautifulStaff){
-                vc.emit('deleteActivitiesBeautifulStaff','openDeleteActivitiesBeautifulStaffModal',_activitiesBeautifulStaff);
+            _openDeleteActivitiesBeautifulStaffModel: function (_activitiesBeautifulStaff) {
+                vc.emit('deleteActivitiesBeautifulStaff', 'openDeleteActivitiesBeautifulStaffModal', _activitiesBeautifulStaff);
             },
-            _queryActivitiesBeautifulStaffMethod:function(){
+            _queryActivitiesBeautifulStaffMethod: function () {
                 vc.component._listActivitiesBeautifulStaffs(DEFAULT_PAGE, DEFAULT_ROWS);
 
             },
-            _moreCondition:function(){
-                if(vc.component.activitiesBeautifulStaffManageInfo.moreCondition){
+            _moreCondition: function () {
+                if (vc.component.activitiesBeautifulStaffManageInfo.moreCondition) {
                     vc.component.activitiesBeautifulStaffManageInfo.moreCondition = false;
-                }else{
+                } else {
                     vc.component.activitiesBeautifulStaffManageInfo.moreCondition = true;
                 }
             }
 
-             
+
         }
     });
 })(window.vc);