diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 65aba71ee..227c7a0bf 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -296,7 +296,7 @@ module.exports = {
   ConfirmPassword:'确认密码',
   reenterLoginPassword:'请重新输入登录密码',
   enterUserName:'请输入用户姓名',
-  RoleAssignment:'角色分配',
+  RoleAssignment:'角色配置',
   selectUserRole:'请选择用户角色',
   DepartmentAllocation:'部门分配',
   ClickSelectDepartment:'点击选择部门',
diff --git a/jero-web/src/components/tools/HeaderNotice.vue b/jero-web/src/components/tools/HeaderNotice.vue
index 9f1c74ea9..f8a157de6 100644
--- a/jero-web/src/components/tools/HeaderNotice.vue
+++ b/jero-web/src/components/tools/HeaderNotice.vue
@@ -9,7 +9,7 @@
     :overlayStyle="{ width: '300px', top: '50px' }">
     <template slot="content">
       <a-spin :spinning="loadding">
-        <a-tabs>
+        <a-tabs class="tabs">
           <a-tab-pane :tab="msg1Title" key="1">
             <a-list>
               <a-list-item :key="index" v-for="(record, index) in announcement1" v-if="index <= 4">
@@ -218,6 +218,9 @@
   .header-notice-wrapper {
     top: 50px !important;
   }
+  .tabs .ant-tabs-nav .ant-tabs-tab-active{
+        color: #000F16!important;
+  }
 </style>
 <style lang="less" scoped>
   .header-notice {
diff --git a/jero-web/src/views/documentManage/library/docDetail/index.vue b/jero-web/src/views/documentManage/library/docDetail/index.vue
index 1d15c348e..a6714dca2 100644
--- a/jero-web/src/views/documentManage/library/docDetail/index.vue
+++ b/jero-web/src/views/documentManage/library/docDetail/index.vue
@@ -248,6 +248,7 @@
           window.open(url, '_blank')
         } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') {
           console.log(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
+          downloadFile('/sys/common/download', fileQuery.fileName, { id: fileQuery.id })
           let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
           window.open(url, '_blank')
         } else {
diff --git a/jero-web/src/views/documentManage/library/index.vue b/jero-web/src/views/documentManage/library/index.vue
index 7bbff77fe..9f9cf8c76 100644
--- a/jero-web/src/views/documentManage/library/index.vue
+++ b/jero-web/src/views/documentManage/library/index.vue
@@ -141,7 +141,7 @@
           ...this.$refs.searchRef.queryParam,
           id: this.idList.join(',')
         }
-        downloadFile('document/bussDocumentLibraryEO/exportExcel', '文档库.xlsx', query, this.Deselect)
+        downloadFile('document/bussDocumentLibraryEO/exportExcel', '文档库.xls', query, this.Deselect)
       },
       Deselect() {
         this.$refs.tableDataRef.selectedRowKeys = []
@@ -162,7 +162,7 @@
       },
       //下载模板
       handleModule() {
-        downloadFile('document/bussDocumentLibraryEO/exportTemplate', '文档库.xlsx', {})
+        downloadFile('document/bussDocumentLibraryEO/exportTemplate', '文档库.xls', {})
       },
       //批量删除
       handleDel() {
diff --git a/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue b/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue
index 7b1d82008..783ada671 100644
--- a/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue
+++ b/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue
@@ -120,9 +120,9 @@
                        @click="checkedClick(item)"
                        :class="{ 'null-input':item.checked }">
                     <div class="text-header">
-                      <span>{{item.type}}</span>
-                      <span>{{item.number}}</span>
-                      <span>{{item.title}}</span>
+                      <span :title="item.module_type">{{item.module_type}}</span>
+                      <span :title="item.serial_number">{{item.serial_number}}</span>
+                      <span :title="item.title">{{item.title}}</span>
                     </div>
                     <div class="text-content">
                       {{item.content}}
@@ -638,6 +638,11 @@
       font-size: 16px;
       font-weight: bold;
       color: #040B29;
+      display: inline-block;
+      max-width: 200px;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      overflow: hidden;
     }
   }
 
diff --git a/jero-web/src/views/documentTools/searchCenter/components/whole.vue b/jero-web/src/views/documentTools/searchCenter/components/whole.vue
index 8dc3c24e9..6751fa664 100644
--- a/jero-web/src/views/documentTools/searchCenter/components/whole.vue
+++ b/jero-web/src/views/documentTools/searchCenter/components/whole.vue
@@ -4,7 +4,7 @@
       <span>检索范围：</span>
       <span>{{ queryParam.selectValue }}</span>
     </div>
-    <a-checkbox-group v-model="checkboxText">
+    <a-checkbox-group v-model="checkboxText" v-if="conList.length > 0">
       <li v-for="(item,index) in conList" :key="index">
         <div style="margin-bottom: 10px;position: relative">
           <a-checkbox :value="item.id" class="checkbox-left"></a-checkbox>
@@ -12,31 +12,32 @@
                @click="checkedClick(item)"
                :class="{ 'null-input':item.checked }">
             <div class="text-header">
-              <span>{{item.module_type}}</span>
-              <span>{{item.serial_number}}</span>
-              <span>{{item.title}}</span>
+              <span :title="item.module_type">{{item.module_type}}</span>
+              <span :title="item.serial_number">{{item.serial_number}}</span>
+              <span :title="item.title">{{item.title}}</span>
             </div>
-            <div class="text-content" v-html="item.content" v-if="!queryParam.selectValue">
+            <div class="text-content" :title="item.content" v-html="item.content" v-if="!queryParam.selectValue">
 
             </div>
-            <div class="text-content" v-html="item.content"
+            <div class="text-content" :title="item.content" v-html="item.content"
                  v-else-if="(item.file_text instanceof Array) && queryParam.selectValue">
 
             </div>
-            <div class="text-content" v-html="item.content" v-else-if="!item.file_text && queryParam.selectValue">
+            <div class="text-content" :title="item.content" v-html="item.content"
+                 v-else-if="!item.file_text && queryParam.selectValue">
 
             </div>
-            <div class="text-content" v-html="item.file_text" v-else>
+            <div class="text-content" :title="item.file_text" v-html="item.file_text" v-else>
 
             </div>
           </div>
         </div>
       </li>
     </a-checkbox-group>
-    <div>
-        暂无数据
+    <div class="noData" v-else>
+      暂无数据
     </div>
-    <div class="page">
+    <div class="page" v-if="conList.length > 0">
       <a-pagination
         :show-total="total => $t('total')+` ${total} `+$t('strip')"
         show-quick-jumper
@@ -181,6 +182,11 @@
       font-size: 16px;
       font-weight: bold;
       color: #040B29;
+      display: inline-block;
+      max-width: 200px;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      overflow: hidden;
     }
   }
 
@@ -195,4 +201,10 @@
     text-align: right;
     margin-top: 20px;
   }
+
+  .noData {
+    width: 100%;
+    text-align: center;
+    line-height: 10;
+  }
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/system/DictList.vue b/jero-web/src/views/system/DictList.vue
index baa7b612f..2dfa37371 100644
--- a/jero-web/src/views/system/DictList.vue
+++ b/jero-web/src/views/system/DictList.vue
@@ -125,7 +125,7 @@
           },
           {
             title: this.$t('DictionaryName'),
-            align: 'left',
+            align: 'center',
             dataIndex: 'dictName'
           },
           // {
@@ -136,12 +136,12 @@
           // },
           {
             title: this.$t('DictionaryNumber'),
-            align: 'left',
+            align: 'center',
             dataIndex: 'dictCode'
           },
           {
             title: this.$t('describe'),
-            align: 'left',
+            align: 'center',
             dataIndex: 'description'
           },
           {
diff --git a/jero-web/src/views/system/PermissionList.vue b/jero-web/src/views/system/PermissionList.vue
index b3034056f..5c4b494bb 100644
--- a/jero-web/src/views/system/PermissionList.vue
+++ b/jero-web/src/views/system/PermissionList.vue
@@ -107,39 +107,39 @@
           {
             title: this.$t('MenuName'),
             dataIndex: 'name',
+            align: 'center',
             key: 'name'
           },
           {
             title: this.$t('MenuEnName'),
             dataIndex: 'menuEn',
+            align: 'center',
             key: 'menuEn'
           },
-          {
-            title: this.$t('MenuType'),
-            dataIndex: 'menuType',
-            key: 'menuType',
-            customRender: this.text
-          },
           {
             title: 'icon',
             dataIndex: 'icon',
+            align: 'center',
             key: 'icon'
           },
           {
             title: this.$t('assembly'),
             dataIndex: 'component',
+            align: 'center',
             key: 'component',
             scopedSlots: { customRender: 'component' }
           },
           {
             title: this.$t('route'),
             dataIndex: 'url',
+            align: 'center',
             key: 'url',
             scopedSlots: { customRender: 'url' }
           },
           {
             title: this.$t('sort'),
             dataIndex: 'sortNo',
+            align: 'center',
             key: 'sortNo'
           },
           {
diff --git a/jero-web/src/views/system/RoleUserList.vue b/jero-web/src/views/system/RoleUserList.vue
index d1b3cd4ce..5caa65379 100644
--- a/jero-web/src/views/system/RoleUserList.vue
+++ b/jero-web/src/views/system/RoleUserList.vue
@@ -30,7 +30,7 @@
       <!--          <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
       <!--            <a-button type="primary" icon="import">{{$t('import')}}</a-button>-->
       <!--          </a-upload>-->
-      <div  @click="handleExportXls($t('RoleManagement'))" class="operator-text">
+      <div @click="handleExportXls($t('RoleManagement'))" class="operator-text">
         <a-icon type="export" :rotate="-90"/>
         {{$t('export')}}
       </div>
@@ -52,27 +52,13 @@
         :loading="loading"
         @change="handleTableChange">
          <span slot="action" slot-scope="text, record">
-            <a @click="handleOpen(record)">{{$t('user')}}</a>
-            <a-divider type="vertical"/>
-
-            <a-dropdown>
-              <a class="ant-dropdown-link">
-                {{$t('more')}} <a-icon type="down"/>
-              </a>
-              <a-menu slot="overlay">
-                <a-menu-item>
-                  <a @click="handlePerssion(record.id)">{{$t('toGrantAuthorization')}}</a>
-                </a-menu-item>
-                <a-menu-item>
-                  <a @click="handleEdit(record)">{{$t('edit')}}</a>
-                </a-menu-item>
-                <a-menu-item>
-                  <a-popconfirm :title="$t('areYouSure')" @confirm="() => handleDelete1(record.id)">
-                    <a>{{$t('delete')}}</a>
+             <a @click="handlePerssion(record.id)" class="text">{{$t('toGrantAuthorization')}}</a>
+             <a @click="handleEdit(record)" class="text">{{$t('edit')}}</a>
+           <a-popconfirm :title="$t('areYouSure')" @confirm="() => handleDelete1(record.id)">
+                    <a class="text">{{$t('delete')}}</a>
                   </a-popconfirm>
-                </a-menu-item>
-              </a-menu>
-            </a-dropdown>
+           <!--            <a @click="handleOpen(record)">{{$t('user')}}</a>-->
+           <!--            <a-divider type="vertical"/>-->
         </span>
       </a-table>
     </div>
@@ -275,7 +261,15 @@
 
       },
       handleDelete1: function(id) {
-        this.handleDelete(id)
+        let that = this
+        getAction(this.url.delete, { id: id }).then((res) => {
+          if (res.success) {
+            that.$message.success(res.message)
+            that.loadData()
+          } else {
+            that.$message.warning(res.message)
+          }
+        })
         this.dataSource2 = []
         this.currentRoleId = ''
       },
@@ -393,6 +387,7 @@
   .ant-btn {
     margin-left: 8px
   }
+
   .box-title-text {
     line-height: 1.4;
     display: flex;
@@ -426,4 +421,8 @@
     height: 38px;
     /*margin-top: 2px;*/
   }
+
+  .text {
+    margin-right: 8px;
+  }
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/system/UserAnnouncementList.vue b/jero-web/src/views/system/UserAnnouncementList.vue
index 7a5a08b23..da361e911 100644
--- a/jero-web/src/views/system/UserAnnouncementList.vue
+++ b/jero-web/src/views/system/UserAnnouncementList.vue
@@ -61,12 +61,13 @@
       :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
       :columns="columns"
       :dataSource="dataSource"
+      :scroll="{x: 1600}"
       :pagination="ipagination"
       :loading="loading"
       @change="handleTableChange">
       <span slot="msgContent" slot-scope="text,scope">
            <a :style="{'color':scope.readFlag == 0 ? 'red':'#00A0E9'}" :title="text" @click="msgContentClick(scope)">
-             {{text && text.length > 25?text.slice(0,24)+'...':text}}
+             {{text}}
            </a>
       </span>
       <span slot="msgCategory" slot-scope="text,scope">
@@ -82,7 +83,7 @@
 
 <script>
   import { filterObj } from '@/utils/util'
-  import { getAction, putAction , deleteAction } from '@/api/manage'
+  import { getAction, putAction, deleteAction } from '@/api/manage'
   import ShowAnnouncement from '@/components/tools/ShowAnnouncement'
   import { JeroListMixin } from '@/mixins/JeroListMixin'
   import DynamicNotice from '../../components/tools/DynamicNotice'
@@ -109,17 +110,21 @@
             title: this.$t('MessageContent'),
             align: 'center',
             dataIndex: 'msgContent',
+            width: 600,
+            ellipsis: true,
             scopedSlots: { customRender: 'msgContent' }
           },
           {
             title: this.$t('MessageType'),
             align: 'center',
             dataIndex: 'msgCategory',
+            width: 200,
             scopedSlots: { customRender: 'msgCategory' }
           },
           {
             title: this.$t('NotificationTime'),
             align: 'center',
+            width: 200,
             dataIndex: 'sendTime'
           }
         ],
@@ -160,10 +165,10 @@
               getAction(that.url.readAllMsg, { ids: selectedRowKeys.join(',') }).then((res) => {
                 if (res.success) {
                   that.selectedRowKeys = []
-                  that.$message.success(this.$t('OperationSuccessful'))
+                  that.$message.success(that.$t('OperationSuccessful'))
                   that.loadData()
-                }else{
-                  that.$message.success(this.$t('operationFailed'))
+                } else {
+                  that.$message.success(that.$t('operationFailed'))
                 }
               })
             }
@@ -193,10 +198,10 @@
               deleteAction(that.url.deleteUrl, { ids: selectedRowKeys.join(',') }).then((res) => {
                 if (res.success) {
                   that.selectedRowKeys = []
-                  that.$message.success(this.$t('OperationSuccessful'))
+                  that.$message.success(that.$t('OperationSuccessful'))
                   that.loadData()
-                }else{
-                  that.$message.success(this.$t('operationFailed'))
+                } else {
+                  that.$message.success(that.$t('operationFailed'))
                 }
               })
             }
diff --git a/jero-web/src/views/system/UserList.vue b/jero-web/src/views/system/UserList.vue
index 022b958d0..ed7b3ce74 100644
--- a/jero-web/src/views/system/UserList.vue
+++ b/jero-web/src/views/system/UserList.vue
@@ -107,6 +107,10 @@
             <a-avatar shape="square" :src="getAvatarView(record.avatar)" icon="user"/>
           </div>
         </template>
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)" >{{$t('RoleAssignment')}}</a>
+        </span>
+
       </a-table>
     </div>
     <!-- table区域-end -->
@@ -206,14 +210,14 @@
             align: 'center',
             width: 80,
             dataIndex: 'status_dictText'
+          },
+          {
+            title: this.$t('operation'),
+            dataIndex: 'action',
+            scopedSlots: {customRender: 'action'},
+            align: "center",
+            width: 80
           }
-          // {
-          //   title: this.$t('operation'),
-          //   dataIndex: 'action',
-          //   scopedSlots: {customRender: 'action'},
-          //   align: "center",
-          //   width: 170
-          // }
         ],
         superQueryFieldList: [
           { type: 'input', value: 'username', text: this.$t('userAccount') },
diff --git a/jero-web/src/views/system/modules/UserModal.vue b/jero-web/src/views/system/modules/UserModal.vue
index 6bd9b9d7e..1949f3a6c 100644
--- a/jero-web/src/views/system/modules/UserModal.vue
+++ b/jero-web/src/views/system/modules/UserModal.vue
@@ -1,6 +1,6 @@
 <template>
   <a-drawer
-    :title="title"
+    :title="$t('RoleAssignment')"
     :maskClosable="true"
     :width="drawerWidth"
     placement="right"
@@ -22,41 +22,44 @@
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
 
-        <a-form-item :label="$t('userAccount')" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input :placeholder="$t('enterUserAccount')" v-decorator.trim="[ 'username', validatorRules.username]" :readOnly="!!model.id"/>
+        <a-form-item v-if="!disabled" :label="$t('userAccount')" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-input :placeholder="$t('enterUserAccount')" v-decorator.trim="[ 'username', validatorRules.username]"
+                   :readOnly="!!model.id"/>
         </a-form-item>
 
-        <template v-if="!model.id">
-          <a-form-item :label="$t('LoginPassword')" :labelCol="labelCol" :wrapperCol="wrapperCol" >
-            <a-input type="password" :placeholder="$t('enterLoginPassword')" autocomplete = 'new-password' v-decorator="[ 'password',validatorRules.password]" />
+        <template v-if="!model.id && !disabled">
+          <a-form-item :label="$t('LoginPassword')" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <a-input type="password" :placeholder="$t('enterLoginPassword')" autocomplete='new-password'
+                     v-decorator="[ 'password',validatorRules.password]"/>
           </a-form-item>
 
-          <a-form-item :label="$t('ConfirmPassword')" :labelCol="labelCol" :wrapperCol="wrapperCol" >
-            <a-input type="password" @blur="handleConfirmBlur" :placeholder="$t('reenterLoginPassword')" v-decorator="[ 'confirmpassword', validatorRules.confirmpassword]"/>
+          <a-form-item v-if="!disabled" :label="$t('ConfirmPassword')" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <a-input type="password" @blur="handleConfirmBlur" :placeholder="$t('reenterLoginPassword')"
+                     v-decorator="[ 'confirmpassword', validatorRules.confirmpassword]"/>
           </a-form-item>
         </template>
 
-        <a-form-item :label="$t('userName')" :labelCol="labelCol" :wrapperCol="wrapperCol" >
-          <a-input :placeholder="$t('enterUserName')" v-decorator.trim="[ 'realname', validatorRules.realname]" />
+        <a-form-item v-if="!disabled" :label="$t('userName')" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-input :placeholder="$t('enterUserName')" v-decorator.trim="[ 'realname', validatorRules.realname]"/>
         </a-form-item>
 
         <!--<a-form-item label="工号" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
-          <!--<a-input placeholder="请输入工号" v-decorator.trim="[ 'workNo', validatorRules.workNo]" />-->
+        <!--<a-input placeholder="请输入工号" v-decorator.trim="[ 'workNo', validatorRules.workNo]" />-->
         <!--</a-form-item>-->
 
         <!--<a-form-item label="职务" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
-          <!--<j-select-position placeholder="请选择职务" :multiple="false" v-decorator="['post', {}]"/>-->
+        <!--<j-select-position placeholder="请选择职务" :multiple="false" v-decorator="['post', {}]"/>-->
         <!--</a-form-item>-->
 
-        <a-form-item :label="$t('RoleAssignment')" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!roleDisabled" >
+        <a-form-item :label="$t('RoleAssignment')" :labelCol="labelCol" :wrapperCol="wrapperCol"
+                     v-show="!roleDisabled">
           <a-select
             mode="multiple"
-            :disabled="departDisabled"
             style="width: 100%"
             :placeholder="$t('selectUserRole')"
-            optionFilterProp = "children"
+            optionFilterProp="children"
             v-model="selectedRole"
-            :getPopupContainer= "(target) => target.parentNode">
+            :getPopupContainer="(target) => target.parentNode">
             <a-select-option v-for="(role,roleindex) in roleList" :key="roleindex.toString()" :value="role.id">
               {{ role.roleName }}
             </a-select-option>
@@ -64,7 +67,8 @@
         </a-form-item>
 
         <!--部门分配-->
-        <a-form-item :label="$t('DepartmentAllocation')" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!departDisabled">
+        <a-form-item :label="$t('DepartmentAllocation')" :labelCol="labelCol" :wrapperCol="wrapperCol"
+                     v-show="!departDisabled && !disabled">
           <a-input-search
             :placeholder="$t('ClickSelectDepartment')"
             v-model="checkedDepartNameString"
@@ -77,20 +81,20 @@
         <!--租户分配-->
         <!--<a-form-item label="租户分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!departDisabled">-->
 
-          <!--<a-select-->
-            <!--mode="multiple"-->
-            <!--style="width: 100%"-->
-            <!--placeholder="请选择租户分配"-->
-            <!--:disabled="disableSubmit"-->
-            <!--v-model="currentTenant">-->
-            <!--<a-select-option v-for="(item, index) in tenantList" :key="index" :value="item.id">-->
-              <!--{{ item.name }}-->
-            <!--</a-select-option>-->
-          <!--</a-select>-->
+        <!--<a-select-->
+        <!--mode="multiple"-->
+        <!--style="width: 100%"-->
+        <!--placeholder="请选择租户分配"-->
+        <!--:disabled="disableSubmit"-->
+        <!--v-model="currentTenant">-->
+        <!--<a-select-option v-for="(item, index) in tenantList" :key="index" :value="item.id">-->
+        <!--{{ item.name }}-->
+        <!--</a-select-option>-->
+        <!--</a-select>-->
         <!--</a-form-item>-->
 
-       <!-- update--begin--autor:wangshuai-----date:20200108------for：新增身份和负责部门------ -->
-        <a-form-item :label="$t('identity')" :labelCol="labelCol" :wrapperCol="wrapperCol">
+        <!-- update--begin--autor:wangshuai-----date:20200108------for：新增身份和负责部门------ -->
+        <a-form-item v-if="!disabled" :label="$t('identity')" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-radio-group
             v-model="identity"
             @change="identityChange">
@@ -98,63 +102,69 @@
             <a-radio value="2">{{$t('superior')}}</a-radio>
           </a-radio-group>
         </a-form-item>
-        <a-form-item :label="$t('ResponsibleDepartment')" :labelCol="labelCol" :wrapperCol="wrapperCol"  v-if="departIdShow==true">
+        <a-form-item :label="$t('ResponsibleDepartment')" :labelCol="labelCol" :wrapperCol="wrapperCol"
+                     v-if="departIdShow==true && !disabled">
           <a-select
+            :disabled="disabled"
             mode="multiple"
             style="width: 100%"
             :placeholder="$t('selectResponsibleDepartment')"
             v-model="departIds"
-            optionFilterProp = "children"
-            :getPopupContainer = "(target) => target.parentNode"
+            optionFilterProp="children"
+            :getPopupContainer="(target) => target.parentNode"
             :dropdownStyle="{maxHeight:'200px',overflow:'auto'}"
           >
             <a-select-option v-for="item in resultDepartOptions" :key="item.key" :value="item.key"
-            >{{item.title}}</a-select-option
+            >{{item.title}}
+            </a-select-option
             >
           </a-select>
         </a-form-item>
         <!-- update--end--autor:wangshuai-----date:20200108------for：新增身份和负责部门------ -->
-<!--        <a-form-item label="头像" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
-<!--          <j-image-upload class="avatar-uploader" text="上传" v-model="fileList" ></j-image-upload>-->
-<!--        </a-form-item>-->
+        <!--        <a-form-item label="头像" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+        <!--          <j-image-upload class="avatar-uploader" text="上传" v-model="fileList" ></j-image-upload>-->
+        <!--        </a-form-item>-->
 
         <!--<a-form-item label="生日" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
-          <!--<a-date-picker-->
-            <!--style="width: 100%"-->
-            <!--placeholder="请选择生日"-->
-            <!--v-decorator="['birthday', {initialValue:!model.birthday?null:moment(model.birthday,dateFormat)}]"-->
-            <!--:getCalendarContainer="node => node.parentNode"/>-->
+        <!--<a-date-picker-->
+        <!--style="width: 100%"-->
+        <!--placeholder="请选择生日"-->
+        <!--v-decorator="['birthday', {initialValue:!model.birthday?null:moment(model.birthday,dateFormat)}]"-->
+        <!--:getCalendarContainer="node => node.parentNode"/>-->
         <!--</a-form-item>-->
 
-        <a-form-item :label="$t('Gender')" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-select v-decorator="[ 'sex', {}]" :placeholder="$t('selectGender')" :getPopupContainer= "(target) => target.parentNode">
+        <a-form-item v-if="!disabled" :label="$t('Gender')" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-select v-decorator="[ 'sex', {}]" :placeholder="$t('selectGender')"
+                    :getPopupContainer="(target) => target.parentNode">
             <a-select-option :value="1">{{$t('male')}}</a-select-option>
             <a-select-option :value="2">{{$t('female')}}</a-select-option>
           </a-select>
         </a-form-item>
 
-        <a-form-item :label="$t('mailbox')" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input :placeholder="$t('enterEmailAddress')" v-decorator="[ 'email', validatorRules.email]" />
+        <a-form-item v-if="!disabled" :label="$t('mailbox')" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-input :placeholder="$t('enterEmailAddress')" v-decorator="[ 'email', validatorRules.email]"/>
         </a-form-item>
 
-        <a-form-item :label="$t('phoneNumber')" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input :placeholder="$t('enterMobileNumber')" :disabled="isDisabledAuth('user:form:phone')" v-decorator="[ 'phone', validatorRules.phone]" />
+        <a-form-item v-if="!disabled" :label="$t('phoneNumber')" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-input :placeholder="$t('enterMobileNumber')" :disabled="isDisabledAuth('user:form:phone')"
+                   v-decorator="[ 'phone', validatorRules.phone]"/>
         </a-form-item>
 
         <!--<a-form-item label="座机" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
-          <!--<a-input placeholder="请输入座机" v-decorator="[ 'telephone', validatorRules.telephone]"/>-->
+        <!--<a-input placeholder="请输入座机" v-decorator="[ 'telephone', validatorRules.telephone]"/>-->
         <!--</a-form-item>-->
 
-<!--        <a-form-item label="工作流引擎" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
-<!--          <j-dict-select-tag  v-decorator="['activitiSync', {}]" placeholder="请选择是否同步工作流引擎" :type="'radio'" :triggerChange="true" dictCode="activiti_sync"/>-->
-<!--        </a-form-item>-->
+        <!--        <a-form-item label="工作流引擎" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+        <!--          <j-dict-select-tag  v-decorator="['activitiSync', {}]" placeholder="请选择是否同步工作流引擎" :type="'radio'" :triggerChange="true" dictCode="activiti_sync"/>-->
+        <!--        </a-form-item>-->
 
       </a-form>
     </a-spin>
     <depart-window ref="departWindow" @ok="modalFormOk"></depart-window>
 
     <div class="drawer-bootom-button" v-show="!disableSubmit">
-      <a-popconfirm :title="$t('AreYouWantDiscardEditing')" @confirm="handleCancel" :okText="$t('determine')" :cancelText="$t('cancel')">
+      <a-popconfirm :title="$t('AreYouWantDiscardEditing')" @confirm="handleCancel" :okText="$t('determine')"
+                    :cancelText="$t('cancel')">
         <a-button style="margin-right: .8rem">{{$t('cancel')}}</a-button>
       </a-popconfirm>
       <a-button @click="handleSubmit" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button>
@@ -168,68 +178,69 @@
   import Vue from 'vue'
   // 引入搜索部门弹出框的组件
   import departWindow from './DepartWindow'
-  import { ACCESS_TOKEN } from "@/store/mutation-types"
+  import { ACCESS_TOKEN } from '@/store/mutation-types'
   import { getAction } from '@/api/manage'
-  import {addUser,editUser,queryUserRole,queryall } from '@/api/api'
-  import { disabledAuthFilter } from "@/utils/authFilter"
-  import {duplicateCheck } from '@/api/api'
+  import { addUser, editUser, queryUserRole, queryall } from '@/api/api'
+  import { disabledAuthFilter } from '@/utils/authFilter'
+  import { duplicateCheck } from '@/api/api'
   import JImageUpload from '../../../components/jero/JImageUpload'
 
   export default {
-    name: "UserModal",
+    name: 'UserModal',
     components: {
       JImageUpload,
-      departWindow,
+      departWindow
     },
-    data () {
+    data() {
       return {
         departDisabled: false, //是否是我的部门调用该页面
         roleDisabled: false, //是否是角色维护调用该页面
-        modalWidth:800,
-        drawerWidth:700,
-        modaltoggleFlag:true,
+        modalWidth: 800,
+        drawerWidth: 700,
+        disabled: false,
+        modaltoggleFlag: true,
         confirmDirty: false,
-        selectedDepartKeys:[], //保存用户选择部门id
-        checkedDepartKeys:[],
-        checkedDepartNames:[], // 保存部门的名称 =>title
-        checkedDepartNameString:"", // 保存部门的名称 =>title
-        resultDepartOptions:[],
-        userId:"", //保存用户id
-        disableSubmit:false,
-        userDepartModel:{userId:'',departIdList:[]}, // 保存SysUserDepart的用户部门中间表数据需要的对象
-        dateFormat:"YYYY-MM-DD",
-        validatorRules:{
-          username:{
+        selectedDepartKeys: [], //保存用户选择部门id
+        checkedDepartKeys: [],
+        checkedDepartNames: [], // 保存部门的名称 =>title
+        checkedDepartNameString: '', // 保存部门的名称 =>title
+        resultDepartOptions: [],
+        userId: '', //保存用户id
+        disableSubmit: false,
+        userDepartModel: { userId: '', departIdList: [] }, // 保存SysUserDepart的用户部门中间表数据需要的对象
+        dateFormat: 'YYYY-MM-DD',
+        validatorRules: {
+          username: {
             rules: [{
               required: true, message: this.$t('enterUserAccount')
-            },{
-              validator: this.validateUsername,
+            }, {
+              validator: this.validateUsername
             }]
           },
-          password:{
+          password: {
             rules: [{
               required: true,
-              pattern:/^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/,
+              pattern: /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/,
               message: this.$t('passwordConsists')
             }, {
-              validator: this.validateToNextPassword,
-            }],
+              validator: this.validateToNextPassword
+            }]
           },
-          confirmpassword:{
+          confirmpassword: {
             rules: [{
-              required: true, message: this.$t('reenterLoginPassword'),
+              required: true, message: this.$t('reenterLoginPassword')
             }, {
-              validator: this.compareToFirstPassword,
-            }],
+              validator: this.compareToFirstPassword
+            }]
           },
-          realname:{rules: [{ required: true, message: this.$t('enterUserName') }]},
-          phone:{rules: [{validator: this.validatePhone}]},
-          email:{
+          realname: { rules: [{ required: true, message: this.$t('enterUserName') }] },
+          phone: { rules: [{ validator: this.validatePhone }] },
+          email: {
             rules: [{
               validator: this.validateEmail
-            }],
+            }]
           },
-          roles:{},
+          roles: {},
           //  sex:{initialValue:((!this.model.sex)?"": (this.model.sex+""))}
           workNo: {
             rules: [
@@ -239,280 +250,286 @@
           },
           telephone: {
             rules: [
-              { pattern: /^0\d{2,3}-[1-9]\d{6,7}$/, message: this.$t('enterCorrectLandline') },
+              { pattern: /^0\d{2,3}-[1-9]\d{6,7}$/, message: this.$t('enterCorrectLandline') }
             ]
           }
         },
-        departIdShow:false,
-        departIds:[], //负责部门id
-        title:this.$t('operation'),
+        departIdShow: false,
+        departIds: [], //负责部门id
+        title: this.$t('operation'),
         visible: false,
         model: {},
-        roleList:[],
-        selectedRole:[],
+        roleList: [],
+        selectedRole: [],
         labelCol: {
           xs: { span: 24 },
-          sm: { span: 5 },
+          sm: { span: 5 }
         },
         wrapperCol: {
           xs: { span: 24 },
-          sm: { span: 16 },
+          sm: { span: 16 }
         },
-        uploadLoading:false,
+        uploadLoading: false,
         confirmLoading: false,
-        headers:{},
-        form:this.$form.createForm(this),
-        picUrl: "",
+        headers: {},
+        form: this.$form.createForm(this),
+        picUrl: '',
         url: {
-          fileUpload: window._CONFIG['domianURL']+"/sys/common/upload",
-          userWithDepart: "/sys/user/userDepartList", // 引入为指定用户查看部门信息需要的url
-          userId:"/sys/user/generateUserId", // 引入生成添加用户情况下的url
-          syncUserByUserName:"/act/process/extActProcess/doSyncUserByUserName",//同步用户到工作流
+          fileUpload: window._CONFIG['domianURL'] + '/sys/common/upload',
+          userWithDepart: '/sys/user/userDepartList', // 引入为指定用户查看部门信息需要的url
+          userId: '/sys/user/generateUserId', // 引入生成添加用户情况下的url
+          syncUserByUserName: '/act/process/extActProcess/doSyncUserByUserName',//同步用户到工作流
           queryTenantList: '/sys/tenant/queryList'
         },
-        identity:"1",
-        fileList:[],
+        identity: '1',
+        fileList: [],
         tenantList: [],
-        currentTenant:[]
+        currentTenant: []
       }
     },
-    created () {
-      const token = Vue.ls.get(ACCESS_TOKEN);
-      this.headers = {"X-Access-Token":token}
+    created() {
+      const token = Vue.ls.get(ACCESS_TOKEN)
+      this.headers = { 'X-Access-Token': token }
       this.initTenantList()
 
     },
-    computed:{
-      uploadAction:function () {
-        return this.url.fileUpload;
+    computed: {
+      uploadAction: function() {
+        return this.url.fileUpload
       }
     },
     methods: {
-      isDisabledAuth(code){
-        return disabledAuthFilter(code);
+      isDisabledAuth(code) {
+        return disabledAuthFilter(code)
       },
-      initTenantList(){
-        getAction(this.url.queryTenantList).then(res=>{
-          if(res.success){
+      initTenantList() {
+        getAction(this.url.queryTenantList).then(res => {
+          if (res.success) {
             this.tenantList = res.result
           }
         })
       },
       //窗口最大化切换
-      toggleScreen(){
-        if(this.modaltoggleFlag){
-          this.modalWidth = window.innerWidth;
-        }else{
-          this.modalWidth = 800;
+      toggleScreen() {
+        if (this.modaltoggleFlag) {
+          this.modalWidth = window.innerWidth
+        } else {
+          this.modalWidth = 800
         }
-        this.modaltoggleFlag = !this.modaltoggleFlag;
+        this.modaltoggleFlag = !this.modaltoggleFlag
       },
-      initialRoleList(){
-        queryall().then((res)=>{
-          if(res.success){
-            this.roleList = res.result;
-          }else{
-            console.log(res.message);
+      initialRoleList() {
+        queryall().then((res) => {
+          if (res.success) {
+            this.roleList = res.result
+          } else {
+            console.log(res.message)
           }
-        });
+        })
       },
-      loadUserRoles(userid){
-        queryUserRole({userid:userid}).then((res)=>{
-          if(res.success){
-            this.selectedRole = res.result;
-          }else{
-            console.log(res.message);
+      loadUserRoles(userid) {
+        queryUserRole({ userid: userid }).then((res) => {
+          if (res.success) {
+            this.selectedRole = res.result
+          } else {
+            console.log(res.message)
           }
-        });
+        })
       },
-      refresh () {
-          this.selectedDepartKeys=[];
-          this.checkedDepartKeys=[];
-          this.checkedDepartNames=[];
-          this.checkedDepartNameString = "";
-          this.userId=""
-          this.resultDepartOptions=[];
-          this.departId=[];
-          this.departIdShow=false;
-          this.currentTenant = []
+      refresh() {
+        this.selectedDepartKeys = []
+        this.checkedDepartKeys = []
+        this.checkedDepartNames = []
+        this.checkedDepartNameString = ''
+        this.userId = ''
+        this.resultDepartOptions = []
+        this.departId = []
+        this.departIdShow = false
+        this.currentTenant = []
       },
-      add () {
-        this.picUrl = "";
-        this.refresh();
-        this.edit({activitiSync:'1'});
+      add() {
+        this.picUrl = ''
+        this.refresh()
+        this.edit({ activitiSync: '1' })
       },
-      edit (record) {
-        this.resetScreenSize(); // 调用此方法,根据屏幕宽度自适应调整抽屉的宽度
-        let that = this;
-        that.initialRoleList();
-        that.checkedDepartNameString = "";
-        that.form.resetFields();
-        if(record.hasOwnProperty("id")){
-          that.loadUserRoles(record.id);
+      edit(record) {
+        this.resetScreenSize() // 调用此方法,根据屏幕宽度自适应调整抽屉的宽度
+        let that = this
+        this.disabled = false
+        that.initialRoleList()
+        if (record.activitiSync) {
+          this.disabled = true
+        }
+        that.checkedDepartNameString = ''
+        that.form.resetFields()
+        if (record.hasOwnProperty('id')) {
+          that.loadUserRoles(record.id)
           setTimeout(() => {
-            this.fileList = record.avatar;
+            this.fileList = record.avatar
           }, 5)
         }
-        that.userId = record.id;
-        that.visible = true;
-        that.model = Object.assign({}, record);
+        that.userId = record.id
+        that.visible = true
+        that.model = Object.assign({}, record)
         that.$nextTick(() => {
-          that.form.setFieldsValue(pick(this.model,'username','sex','realname','email','phone','activitiSync','workNo','telephone','post'))
-        });
+          that.form.setFieldsValue(pick(this.model, 'username', 'sex', 'realname', 'email', 'phone', 'activitiSync', 'workNo', 'telephone', 'post'))
+        })
         //身份为上级显示负责部门，否则不显示
-        if(this.model.userIdentity=="2"){
-            this.identity="2";
-            this.departIdShow=true;
-        }else{
-            this.identity="1";
-            this.departIdShow=false;
+        if (this.model.userIdentity == '2') {
+          this.identity = '2'
+          this.departIdShow = true
+        } else {
+          this.identity = '1'
+          this.departIdShow = false
         }
         // 调用查询用户对应的部门信息的方法
-        that.checkedDepartKeys = [];
-        that.loadCheckedDeparts();
+        that.checkedDepartKeys = []
+        that.loadCheckedDeparts()
 
         //update-begin-author:taoyan date:2020710 for:多租户配置
-        if(!record.relTenantIds || record.relTenantIds.length==0){
+        if (!record.relTenantIds || record.relTenantIds.length == 0) {
           this.currentTenant = []
-        }else{
-          this.currentTenant = record.relTenantIds.split(',').map(Number);
+        } else {
+          this.currentTenant = record.relTenantIds.split(',').map(Number)
         }
         //update-end-author:taoyan date:2020710 for:多租户配置
       },
       //
-      loadCheckedDeparts(){
-        let that = this;
-        if(!that.userId){return}
-        getAction(that.url.userWithDepart,{userId:that.userId}).then((res)=>{
-          that.checkedDepartNames = [];
-          if(res.success){
-            var depart=[];
-            var departId=[];
+      loadCheckedDeparts() {
+        let that = this
+        if (!that.userId) {
+          return
+        }
+        getAction(that.url.userWithDepart, { userId: that.userId }).then((res) => {
+          that.checkedDepartNames = []
+          if (res.success) {
+            var depart = []
+            var departId = []
             for (let i = 0; i < res.result.length; i++) {
-              that.checkedDepartNames.push(res.result[i].title);
-              this.checkedDepartNameString = this.checkedDepartNames.join(",");
-              that.checkedDepartKeys.push(res.result[i].key);
+              that.checkedDepartNames.push(res.result[i].title)
+              this.checkedDepartNameString = this.checkedDepartNames.join(',')
+              that.checkedDepartKeys.push(res.result[i].key)
               //新增负责部门选择下拉框
               depart.push({
-                  key:res.result[i].key,
-                  title:res.result[i].title
+                key: res.result[i].key,
+                title: res.result[i].title
               })
               departId.push(res.result[i].key)
             }
-            that.resultDepartOptions=depart;
+            that.resultDepartOptions = depart
             //判断部门id是否存在，不存在择直接默认当前所在部门
-            if(this.model.departIds){
-                this.departIds=this.model.departIds.split(",");
-            }else{
-                this.departIds=departId;
+            if (this.model.departIds) {
+              this.departIds = this.model.departIds.split(',')
+            } else {
+              this.departIds = departId
             }
             that.userDepartModel.departIdList = that.checkedDepartKeys
-          }else{
-            console.log(res.message);
+          } else {
+            console.log(res.message)
           }
         })
       },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-        this.disableSubmit = false;
-        this.selectedRole = [];
-        this.userDepartModel = {userId:'',departIdList:[]};
-        this.checkedDepartNames = [];
-        this.checkedDepartNameString='';
-        this.checkedDepartKeys = [];
-        this.selectedDepartKeys = [];
-        this.resultDepartOptions=[];
-        this.departIds=[];
-        this.departIdShow=false;
-        this.identity="1";
-        this.fileList=[];
+      close() {
+        this.$emit('close')
+        this.visible = false
+        this.disableSubmit = false
+        this.selectedRole = []
+        this.userDepartModel = { userId: '', departIdList: [] }
+        this.checkedDepartNames = []
+        this.checkedDepartNameString = ''
+        this.checkedDepartKeys = []
+        this.selectedDepartKeys = []
+        this.resultDepartOptions = []
+        this.departIds = []
+        this.departIdShow = false
+        this.identity = '1'
+        this.fileList = []
       },
       moment,
-      handleSubmit () {
+      handleSubmit() {
 
-        const that = this;
+        const that = this
         // 触发表单验证
         this.form.validateFields((err, values) => {
           if (!err) {
-            that.confirmLoading = true;
-            if(!values.birthday){
-              values.birthday = '';
-            }else{
-              values.birthday = values.birthday.format(this.dateFormat);
+            that.confirmLoading = true
+            if (!values.birthday) {
+              values.birthday = ''
+            } else {
+              values.birthday = values.birthday.format(this.dateFormat)
             }
-            let formData = Object.assign(this.model, values);
-            if(that.fileList != ''){
-              formData.avatar = that.fileList;
-            }else{
-              formData.avatar = null;
+            let formData = Object.assign(this.model, values)
+            if (that.fileList != '') {
+              formData.avatar = that.fileList
+            } else {
+              formData.avatar = null
             }
             //update-begin-author:taoyan date:2020710 for:多租户配置
-            formData.relTenantIds = this.currentTenant.length>0?this.currentTenant.join(','):''
+            formData.relTenantIds = this.currentTenant.length > 0 ? this.currentTenant.join(',') : ''
             //update-end-author:taoyan date:2020710 for:多租户配置
-            formData.selectedroles = this.selectedRole.length>0?this.selectedRole.join(","):'';
-            formData.selecteddeparts = this.userDepartModel.departIdList.length>0?this.userDepartModel.departIdList.join(","):'';
-            formData.userIdentity=this.identity;
+            formData.selectedroles = this.selectedRole.length > 0 ? this.selectedRole.join(',') : ''
+            formData.selecteddeparts = this.userDepartModel.departIdList.length > 0 ? this.userDepartModel.departIdList.join(',') : ''
+            formData.userIdentity = this.identity
             //如果是上级择传入departIds,否则为空
-            if(this.identity==="2"){
-              formData.departIds=this.departIds.join(",");
-            }else{
-              formData.departIds="";
+            if (this.identity === '2') {
+              formData.departIds = this.departIds.join(',')
+            } else {
+              formData.departIds = ''
             }
             // that.addDepartsToUser(that,formData); // 调用根据当前用户添加部门信息的方法
-            let obj;
-            if(!this.model.id){
-              formData.id = this.userId;
-              obj=addUser(formData);
-            }else{
-              obj=editUser(formData);
+            let obj
+            if (!this.model.id) {
+              formData.id = this.userId
+              obj = addUser(formData)
+            } else {
+              obj = editUser(formData)
             }
-            obj.then((res)=>{
-              if(res.success){
-                that.$message.success(res.message);
-                that.$emit('ok');
-              }else{
-                that.$message.warning(res.message);
+            obj.then((res) => {
+              if (res.success) {
+                that.$message.success(res.message)
+                that.$emit('ok')
+              } else {
+                that.$message.warning(res.message)
               }
             }).finally(() => {
-              that.confirmLoading = false;
-              that.checkedDepartNames = [];
-              that.userDepartModel.departIdList = {userId:'',departIdList:[]};
-              that.close();
+              that.confirmLoading = false
+              that.checkedDepartNames = []
+              that.userDepartModel.departIdList = { userId: '', departIdList: [] }
+              that.close()
             })
 
           }
         })
       },
-      handleCancel () {
+      handleCancel() {
         this.close()
       },
-      validateToNextPassword  (rule, value, callback) {
-        const form = this.form;
-        const confirmpassword=form.getFieldValue('confirmpassword');
+      validateToNextPassword(rule, value, callback) {
+        const form = this.form
+        const confirmpassword = form.getFieldValue('confirmpassword')
 
         if (value && confirmpassword && value !== confirmpassword) {
-          callback(this.$t('passwordsEnteredTwice'));
+          callback(this.$t('passwordsEnteredTwice'))
         }
         if (value && this.confirmDirty) {
           form.validateFields(['confirm'], { force: true })
         }
-        callback();
+        callback()
       },
-      compareToFirstPassword  (rule, value, callback) {
-        const form = this.form;
+      compareToFirstPassword(rule, value, callback) {
+        const form = this.form
         if (value && value !== form.getFieldValue('password')) {
-          callback(this.$t('passwordsEnteredTwice'));
+          callback(this.$t('passwordsEnteredTwice'))
         } else {
           callback()
         }
       },
-      validatePhone(rule, value, callback){
-        if(!value){
+      validatePhone(rule, value, callback) {
+        if (!value) {
           callback()
-        }else{
+        } else {
           //update-begin--Author:kangxiaolin  Date:20190826 for：[05] 手机号不支持199号码段--------------------
-          if(new RegExp(/^1[3|4|5|7|8|9][0-9]\d{8}$/).test(value)){
+          if (new RegExp(/^1[3|4|5|7|8|9][0-9]\d{8}$/).test(value)) {
             //update-end--Author:kangxiaolin  Date:20190826 for：[05] 手机号不支持199号码段--------------------
 
             var params = {
@@ -520,7 +537,7 @@
               fieldName: 'phone',
               fieldVal: value,
               dataId: this.userId
-            };
+            }
             duplicateCheck(params).then((res) => {
               if (res.success) {
                 callback()
@@ -528,22 +545,22 @@
                 callback(this.$t('PnumberExists'))
               }
             })
-          }else{
-            callback(this.$t('enterPhoneCorrect'));
+          } else {
+            callback(this.$t('enterPhoneCorrect'))
           }
         }
       },
-      validateEmail(rule, value, callback){
-        if(!value){
+      validateEmail(rule, value, callback) {
+        if (!value) {
           callback()
-        }else{
-          if(new RegExp(/^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/).test(value)){
+        } else {
+          if (new RegExp(/^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/).test(value)) {
             var params = {
               tableName: 'sys_user',
               fieldName: 'email',
               fieldVal: value,
               dataId: this.userId
-            };
+            }
             duplicateCheck(params).then((res) => {
               console.log(res)
               if (res.success) {
@@ -552,33 +569,33 @@
                 callback(this.$t('MailboxExists'))
               }
             })
-          }else{
+          } else {
             callback(this.$t('enterMailboxCorrect'))
           }
         }
       },
-      validateUsername(rule, value, callback){
+      validateUsername(rule, value, callback) {
         var params = {
           tableName: 'sys_user',
           fieldName: 'username',
           fieldVal: value,
           dataId: this.userId
-        };
+        }
         duplicateCheck(params).then((res) => {
           if (res.success) {
-          callback()
-        } else {
-          callback(this.$t('UserExists'))
-        }
-      })
+            callback()
+          } else {
+            callback(this.$t('UserExists'))
+          }
+        })
       },
-      validateWorkNo(rule, value, callback){
+      validateWorkNo(rule, value, callback) {
         var params = {
           tableName: 'sys_user',
           fieldName: 'work_no',
           fieldVal: value,
           dataId: this.userId
-        };
+        }
         duplicateCheck(params).then((res) => {
           if (res.success) {
             callback()
@@ -587,88 +604,88 @@
           }
         })
       },
-      handleConfirmBlur  (e) {
-        const value = e.target.value;
+      handleConfirmBlur(e) {
+        const value = e.target.value
         this.confirmDirty = this.confirmDirty || !!value
       },
 
-      normFile  (e) {
-        console.log('Upload event:', e);
+      normFile(e) {
+        console.log('Upload event:', e)
         if (Array.isArray(e)) {
           return e
         }
         return e && e.fileList
       },
-      beforeUpload: function(file){
-        var fileType = file.type;
-        if(fileType.indexOf('image')<0){
-          this.$message.warning(this.$t('uploadPictures'));
-          return false;
+      beforeUpload: function(file) {
+        var fileType = file.type
+        if (fileType.indexOf('image') < 0) {
+          this.$message.warning(this.$t('uploadPictures'))
+          return false
         }
         //TODO 验证文件大小
       },
-      handleChange (info) {
-        this.picUrl = "";
+      handleChange(info) {
+        this.picUrl = ''
         if (info.file.status === 'uploading') {
-          this.uploadLoading = true;
+          this.uploadLoading = true
           return
         }
         if (info.file.status === 'done') {
-          var response = info.file.response;
-          this.uploadLoading = false;
-          console.log(response);
-          if(response.success){
-            this.model.avatar = response.message;
-            this.picUrl = "Has no pic url yet";
-          }else{
-            this.$message.warning(response.message);
+          var response = info.file.response
+          this.uploadLoading = false
+          console.log(response)
+          if (response.success) {
+            this.model.avatar = response.message
+            this.picUrl = 'Has no pic url yet'
+          } else {
+            this.$message.warning(response.message)
           }
         }
       },
       // 搜索用户对应的部门API
-      onSearch(){
-        this.$refs.departWindow.add(this.checkedDepartKeys,this.userId);
+      onSearch() {
+        this.$refs.departWindow.add(this.checkedDepartKeys, this.userId)
       },
 
       // 获取用户对应部门弹出框提交给返回的数据
-      modalFormOk (formData) {
-        this.checkedDepartNames = [];
-        this.selectedDepartKeys = [];
-        this.checkedDepartNameString = '';
-        this.userId = formData.userId;
-        this.userDepartModel.userId = formData.userId;
-        this.departIds=[];
-        this.resultDepartOptions=[];
-        var depart=[];
+      modalFormOk(formData) {
+        this.checkedDepartNames = []
+        this.selectedDepartKeys = []
+        this.checkedDepartNameString = ''
+        this.userId = formData.userId
+        this.userDepartModel.userId = formData.userId
+        this.departIds = []
+        this.resultDepartOptions = []
+        var depart = []
         for (let i = 0; i < formData.departIdList.length; i++) {
-          this.selectedDepartKeys.push(formData.departIdList[i].key);
-          this.checkedDepartNames.push(formData.departIdList[i].title);
-          this.checkedDepartNameString = this.checkedDepartNames.join(",");
+          this.selectedDepartKeys.push(formData.departIdList[i].key)
+          this.checkedDepartNames.push(formData.departIdList[i].title)
+          this.checkedDepartNameString = this.checkedDepartNames.join(',')
           //新增部门选择，如果上面部门选择后不为空直接付给负责部门
           depart.push({
-              key:formData.departIdList[i].key,
-              title:formData.departIdList[i].title
+            key: formData.departIdList[i].key,
+            title: formData.departIdList[i].title
           })
           this.departIds.push(formData.departIdList[i].key)
         }
-        this.resultDepartOptions=depart;
-        this.userDepartModel.departIdList = this.selectedDepartKeys;
+        this.resultDepartOptions = depart
+        this.userDepartModel.departIdList = this.selectedDepartKeys
         this.checkedDepartKeys = this.selectedDepartKeys  //更新当前的选择keys
-       },
+      },
       // 根据屏幕变化,设置抽屉尺寸
-      resetScreenSize(){
-        let screenWidth = document.body.clientWidth;
-        if(screenWidth < 500){
-          this.drawerWidth = screenWidth;
-        }else{
-          this.drawerWidth = 700;
+      resetScreenSize() {
+        let screenWidth = document.body.clientWidth
+        if (screenWidth < 500) {
+          this.drawerWidth = screenWidth
+        } else {
+          this.drawerWidth = 700
         }
       },
-      identityChange(e){
-        if(e.target.value==="1"){
-            this.departIdShow=false;
-        }else{
-            this.departIdShow=true;
+      identityChange(e) {
+        if (e.target.value === '1') {
+          this.departIdShow = false
+        } else {
+          this.departIdShow = true
         }
       }
     }
@@ -677,9 +694,10 @@
 
 <style scoped>
   .avatar-uploader > .ant-upload {
-    width:104px;
-    height:104px;
+    width: 104px;
+    height: 104px;
   }
+
   .ant-upload-select-picture-card i {
     font-size: 49px;
     color: #999;
@@ -690,9 +708,9 @@
     color: #666;
   }
 
-  .ant-table-tbody .ant-table-row td{
-    padding-top:10px;
-    padding-bottom:10px;
+  .ant-table-tbody .ant-table-row td {
+    padding-top: 10px;
+    padding-bottom: 10px;
   }
 
   .drawer-bootom-button {
diff --git a/jero-web/vue.config.js b/jero-web/vue.config.js
index 7c297794c..473925027 100644
--- a/jero-web/vue.config.js
+++ b/jero-web/vue.config.js
@@ -4,6 +4,7 @@ const CompressionPlugin = require('compression-webpack-plugin')
 function resolve(dir) {
   return path.join(__dirname, dir)
 }
+
 const webpack = require('webpack')
 // vue.config.js
 module.exports = {
@@ -32,11 +33,11 @@ module.exports = {
 
     // 生产环境，开启js\css压缩
     if (process.env.NODE_ENV === 'production') {
-        config.plugin('compressionPlugin').use(new CompressionPlugin({
-          test: /\.(js|css|less)$/, // 匹配文件名
-          threshold: 10240, // 对超过10k的数据压缩
-          deleteOriginalAssets: false // 不删除源文件
-        }))
+      config.plugin('compressionPlugin').use(new CompressionPlugin({
+        test: /\.(js|css|less)$/, // 匹配文件名
+        threshold: 10240, // 对超过10k的数据压缩
+        deleteOriginalAssets: false // 不删除源文件
+      }))
     }
     config.plugin('provide').use(webpack.ProvidePlugin, [{
       $: 'jquery',
@@ -57,9 +58,9 @@ module.exports = {
       .rule('vxe')
       .test(/\.js$/)
       .include
-        .add(resolve('node_modules/vxe-table'))
-        .add(resolve('node_modules/vxe-table-plugin-antd'))
-        .end()
+      .add(resolve('node_modules/vxe-table'))
+      .add(resolve('node_modules/vxe-table-plugin-antd'))
+      .end()
       .use()
       .loader('babel-loader')
       .end()
@@ -82,14 +83,14 @@ module.exports = {
   devServer: {
     port: 3000,
     proxy: {
-     /* '/api': {
-        target: 'https://mock.ihx.me/mock/5baf3052f7da7e07e04a5116/antd-pro', //mock API接口系统
-        ws: false,
-        changeOrigin: true,
-        pathRewrite: {
-          '/jero-boot': ''  //默认所有请求都加了jero-boot前缀，需要去掉
-        }
-      }, */
+      /* '/api': {
+         target: 'https://mock.ihx.me/mock/5baf3052f7da7e07e04a5116/antd-pro', //mock API接口系统
+         ws: false,
+         changeOrigin: true,
+         pathRewrite: {
+           '/jero-boot': ''  //默认所有请求都加了jero-boot前缀，需要去掉
+         }
+       }, */
       '/jero-boot': {
         target: 'http://localhost:8080', //请求本地 jero-boot后台项目
         // target: 'http://10.0.1.25:8080',