修改接口地址

src/api/admin.js

@@ -9,7 +9,7 @@ export default {
      * 获取所有租户
      */
     getAllTenantList(params) {
-        return axios.get('/permission/api/tenant/getTenantList', {params})
+        return axios.get('/permission/qiaoBi/tenant/getTenantList', {params})
     },
 
 }

src/api/application.js

@@ -10,13 +10,13 @@ export default {
         return axios.post('/vision/list',data)
     },
     queryApplication(data){
-        return axios.post('/permission/api/qiaoBiApplication/queryApplication',data)
+        return axios.post('/permission/qiaoBi/qiaoBiApplication/queryApplication',data)
     },
 
     /**
      * 查询功能
      */
     queryFunctionList(params) {
-        return axios.get('/permission/api/function/queryPageList', {params})
+        return axios.get('/permission/qiaoBi/function/queryPageList', {params})
     },
 }

src/api/common.js

@@ -5,7 +5,7 @@ export default {
      * 用户信息
      */
     getUserInfo() {
-        return axios.get('/permission/api/system/userinfo')
+        return axios.get('/permission/qiaoBi/system/userinfo')
     },
     /**
      * 根据类型查询字典
@@ -13,7 +13,7 @@ export default {
      * @returns 
      */
     getSysDictByType(data){
-        return axios.post('/permission/api/system/getSysDict',data)
+        return axios.post('/permission/qiaoBi/system/getSysDict',data)
     },
     /**
      * 根据appID获取功能权限
@@ -21,6 +21,6 @@ export default {
      * @returns 
      */
     getPermissionList(params) {
-        return axios.get('/permission/api/system/getPermissionList',{ params })
+        return axios.get('/permission/qiaoBi/system/getPermissionList',{ params })
     },
 }

src/api/department.js

@@ -7,7 +7,7 @@ export default {
      * @returns 
      */
     getDepartmentList(params){
-        return axios.get('/permission/api/department/queryPageList', {params})
+        return axios.get('/permission/qiaoBi/department/queryPageList', {params})
     },
 
 
@@ -17,17 +17,17 @@ export default {
      * @returns
      */
     queryDepartmentInfo(params){
-        return axios.get('/permission/api/department/queryDepartmentInfo', {params})
+        return axios.get('/permission/qiaoBi/department/queryDepartmentInfo', {params})
     },
 
     //添加
     addDepartment(data){
-        return axios.post('/permission/api/department/add', data)
+        return axios.post('/permission/qiaoBi/department/add', data)
     },
 
     //编辑
     updateDepartment(data){
-        return axios.post('/permission/api/department/update', data)
+        return axios.post('/permission/qiaoBi/department/update', data)
     },
 
     /**
@@ -35,7 +35,7 @@ export default {
      */
     deleteDepartment(params) {
         return axios({
-            url: '/permission/api/department/delete',
+            url: '/permission/qiaoBi/department/delete',
             method: 'post',
             params: params
         })

src/api/examine.js

@@ -7,7 +7,7 @@ export default {
      * @returns 
      */
     queryAuditTask(data){
-        return axios.post('/permission/api/businessTask/queryAuditTask',data)
+        return axios.post('/permission/qiaoBi/businessTask/queryAuditTask',data)
     },
     /**
      * 处理审核任务
@@ -15,6 +15,6 @@ export default {
      * @returns 
      */
     auditTask(data){
-        return axios.post('/permission/api/businessTask/auditTask',data)
+        return axios.post('/permission/qiaoBi/businessTask/auditTask',data)
     },
 }

src/api/paymentCode.js

@@ -7,23 +7,23 @@ export default {
      * @returns 
      */
     getPaymentCode(data){
-        return axios.post('/permission/api/paidCode/queryList',data)
+        return axios.post('/permission/qiaoBi/paidCode/queryList',data)
     },
 
 
     //新增付费码
     addPaymentCode(data){
-        return axios.post('/permission/api/paidCode/add', data)
+        return axios.post('/permission/qiaoBi/paidCode/add', data)
     },
 
     //编辑付费码
     updatePaymentCode(data){
-        return axios.post('/permission/api/paidCode/update', data)
+        return axios.post('/permission/qiaoBi/paidCode/update', data)
     },
 
     //编辑付费码状态
     updatePaymentCodeStatus(data){
-        return axios.post('/permission/api/paidCode/updateStatus', data)
+        return axios.post('/permission/qiaoBi/paidCode/updateStatus', data)
     },
 
 

src/api/personnel.js

@@ -7,14 +7,14 @@ export default {
      * @returns 
      */
     getPersonnelList(data){
-        return axios.post('/permission/api/personnel/queryPageList2', data)
+        return axios.post('/permission/qiaoBi/personnel/queryPageList2', data)
     },
 
     /**
      * 更新人员启用禁用状态
      */
     updateState(params){
-        return axios.get('/permission/api/personnel/updateState', {params})
+        return axios.get('/permission/qiaoBi/personnel/updateState', {params})
     },
 
     /**
@@ -22,7 +22,7 @@ export default {
      */
     deletePersonnel(params) {
         return axios({
-            url: '/permission/api/personnel/delete',
+            url: '/permission/qiaoBi/personnel/delete',
             method: 'post',
             params: params
         })
@@ -34,6 +34,12 @@ export default {
      * @returns 
      */
     updateExpitrTime(data) {
-        return axios.post('/permission/api/personnel/updateExpitrTime', data)
-    }
+        return axios.post('/permission/qiaoBi/personnel/updateExpitrTime', data)
+    },
+     /**
+     * 编辑人员
+     */
+     editPersonnel(data) {
+        return axios.post('/permission/qiaoBi/personnel/update', data)
+    },
 }

src/api/position.js

@@ -5,7 +5,7 @@ export default {
      * 查询职位
      */
     getPositionList(params) {
-        return axios.get('/permission/api/position/queryPageList', {params})
+        return axios.get('/permission/qiaoBi/position/queryPageList', {params})
     },
     /**
      * 获取职位信息
@@ -13,27 +13,27 @@ export default {
      * @returns
      */
     queryPositionInfo(params){
-        return axios.get('/permission/api/position/queryPositionInfo', {params})
+        return axios.get('/permission/qiaoBi/position/queryPositionInfo', {params})
     },
     /**
      * 
      * 编辑职位
      */
     updatePosition(data) {
-        return axios.post('/permission/api/position/update', data)
+        return axios.post('/permission/qiaoBi/position/update', data)
     },
     /**
      * 新增职位
      */
     addPosition(data) {
-        return axios.post('/permission/api/position/add', data)
+        return axios.post('/permission/qiaoBi/position/add', data)
     },
     /**
      * 删除职位
      */
     deletePosition(params) {
         return axios({
-            url: '/permission/api/position/delete',
+            url: '/permission/qiaoBi/position/delete',
             method: 'post',
             params: params
         })

src/api/registerAndLogin.js

@@ -8,7 +8,7 @@ export default {
      * @returns 
      */
     getPhoneCode(data){
-        return axios.post('/permission/api/admin/getPhoneCode',data)
+        return axios.post('/permission/qiaoBi/admin/getPhoneCode',data)
     },
     /**
      * 个人用户注册
@@ -24,7 +24,7 @@ export default {
      * @return {*} 
      */
     personnelSignUp(data){
-        return axios.post('/permission/api/qiaoBiPerson/personnelSignUp',data)
+        return axios.post('/permission/qiaoBi/qiaoBiPerson/personnelSignUp',data)
     },
     /**
      * 查询会员版本
@@ -33,7 +33,7 @@ export default {
      * @returns 
      */
     queryQiaoBiVipType(data){
-        return axios.post('/permission/api/vipType/queryQiaoBiVipType',data)
+        return axios.post('/permission/qiaoBi/vipType/queryQiaoBiVipType',data)
     },
     /**
      * 手机号登录
@@ -43,7 +43,7 @@ export default {
      * @returns 
      */
     loginByPhone(data){
-        return axios.post('/permission/api/admin/loginByPhone',data)
+        return axios.post('/permission/qiaoBi/admin/loginByPhone',data)
     },
     /**
      * 账号密码登录
@@ -53,13 +53,13 @@ export default {
      * @returns 
      */
     login(data) {
-        return axios.post('/permission/api/admin/login', data)
+        return axios.post('/permission/qiaoBi/admin/login', data)
     },
     backAccountLogin(data){
-        return axios.post('/permission/api/qiaoBiPerson/backAccountLogin',data)
+        return axios.post('/permission/qiaoBi/qiaoBiPerson/backAccountLogin',data)
     },
     backPhoneLogin(data){
-        return axios.post('/permission/api/qiaoBiPerson/backPhoneLogin',data)
+        return axios.post('/permission/qiaoBi/qiaoBiPerson/backPhoneLogin',data)
     },
     
 }

src/api/tenant.js

@@ -7,7 +7,7 @@ export default {
      * @returns 
      */
     queryQiaoBiTenant(data){
-        return axios.post('/permission/api/tenant/queryQiaoBiTenant',data)
+        return axios.post('/permission/qiaoBi/tenant/queryQiaoBiTenant',data)
     },
     /**
      * 编辑企业会员类型以及数量
@@ -15,6 +15,6 @@ export default {
      * @returns 
      */
     updateTenantVip(data){
-        return axios.post('/permission/api/tenant/updateTenantVip',data)
+        return axios.post('/permission/qiaoBi/tenant/updateTenantVip',data)
     },
 }

src/api/version.js

@@ -7,42 +7,42 @@ export default {
      * @returns 
      */
     getVersionList(data){
-        return axios.post('/permission/api/version/queryVersionList',data)
+        return axios.post('/permission/qiaoBi/version/queryVersionList',data)
     },
 
     //添加应用版本
     addVersion(data){
-        return axios.post('/permission/api/version/add', data)
+        return axios.post('/permission/qiaoBi/version/add', data)
     },
 
     //编辑应用版本
     updateVersion(data){
-        return axios.post('/permission/api/version/update', data)
+        return axios.post('/permission/qiaoBi/version/update', data)
     },
 
     //删除应用版本
     removeVersions(data){
-        return axios.post('/permission/api/version/delete', data)
+        return axios.post('/permission/qiaoBi/version/delete', data)
     },
 
     //编辑版本状态
     updateVisionStatus(data){
-        return axios.post('/permission/api/version/updateStatus', data)
+        return axios.post('/permission/qiaoBi/version/updateStatus', data)
     },
 
     //编辑版本状态
     queryPublicVersionLast(data){
-        return axios.post('/permission/api/version/queryPublicVersionLast', data)
+        return axios.post('/permission/qiaoBi/version/queryPublicVersionLast', data)
     },
 
     //查询版本功能及代码
     queryFunctionCode(data){
-        return axios.post('/permission/api/version/queryFunctionCode', data)
+        return axios.post('/permission/qiaoBi/version/queryFunctionCode', data)
     },
 
     //查询版本功能及代码
     addFunction(data){
-        return axios.post('/permission/api/version/addFunction', data)
+        return axios.post('/permission/qiaoBi/version/addFunction', data)
     },
 
 }

src/api/vipType.js

@@ -7,30 +7,30 @@ export default {
      * @returns 
      */
     getVipList(data){
-        return axios.post('/permission/api/vipType/query',data)
+        return axios.post('/permission/qiaoBi/vipType/query',data)
     },
 
 
     //添加应用会员类型
     addVipType(data){
-        return axios.post('/permission/api/vipType/add', data)
+        return axios.post('/permission/qiaoBi/vipType/add', data)
     },
 
     //编辑应用会员类型
     updateVipType(data){
-        return axios.post('/permission/api/vipType/update', data)
+        return axios.post('/permission/qiaoBi/vipType/update', data)
     },
     //删除会员类型
     deleteVipType(data){
-        return axios.post('/permission/api/vipType/delete', data)
+        return axios.post('/permission/qiaoBi/vipType/delete', data)
     },
     //查询会员类型功能
     getVipTypeFunction(data){
-        return axios.post('/permission/api/vipType/queryFunction', data)
+        return axios.post('/permission/qiaoBi/vipType/queryFunction', data)
     },
     //查询窍笔所有功能
     queryQiaoBiFunction(data){
-        return axios.post('/permission/api/qiaoBiApplication/queryFunction', data)
+        return axios.post('/permission/qiaoBi/qiaoBiApplication/queryFunction', data)
     },
 
 }

src/router/index.js

@@ -61,8 +61,25 @@ export let backStageManageRouterItem = [
         component: () => import('@/views/backStageManage/home/index.vue'),
         meta: { title: '首页', icon: 'home' },
       },
-    ]
+    ],
+  },
+  {
+    path: '/administrator',
+    component: administrator_layout,
+    redirect: '/administrator/personalMessage',
+    meta: { title: '人员信息', icon: 'home' },
+    hidden:true,
+    children: [
+      {
+        path: 'personalMessage',
+        name: 'Administrator_personalMessage',
+        component: () => import('@/views/backStageManage/organization/personnel/details.vue'),
+        meta: { title: '个人信息', icon: 'home' },
+        hidden:true
+      },
+    ],
   },
+  
 ]
 export const defaultBackStageManageRouterItem = [
   {
@@ -331,6 +348,7 @@ router.beforeEach((to, from, next) => {
             var permission = response.data
             // if(permission.length>0){}
               setRoutePermission(permission).then(() => { // 生成可访问的路由表
+                backStageManageRouterItem = backStageManageRouterItem.concat(Store.state.permission.addRouters)
                 router.addRoutes(Store.state.permission.addRouters); // 动态添加可访问路由表
                 next({ ...to, replace: true })
               })

src/views/backStageManage/layout/components/Navbar.vue

@@ -19,6 +19,9 @@
             </el-dropdown-item>
           </router-link>
           <el-dropdown-item divided>
+            <span @click="personalMessage" style="display:block;">个人信息</span>
+          </el-dropdown-item>
+          <el-dropdown-item divided>
             <span @click="logout" style="display:block;">退出</span>
           </el-dropdown-item>
         </el-dropdown-menu>
@@ -83,6 +86,18 @@ export default {
         }
       )
     },
+    personalMessage(){
+      this.$router.push(
+        {
+          path:'/administrator/personalMessage',
+          query:{
+            tenantId:this.userinfo.tenantId,
+            personalId:this.userinfo.id
+          }
+          
+        }
+      )
+    },
     toggleFullScreen() {
       const elem = document.documentElement;
       if (elem.requestFullscreen) {

src/views/backStageManage/organization/personnel/components/detail.vue

@@ -1,7 +1,18 @@
 <template>
-  <div>
-    <p class="form_item_title">人员信息：</p>
-    <el-form ref="form" :model="personalForm" :rules="rules" label-position="left" label-width="100px" :class="model == 'detail'?'pointer_events_none':''">
+  <div class="message">
+    <div class="form_item_title">
+        个人信息：
+        <div>
+            <el-button v-if="!personalForm.edit" type="text" @click="edit(1)">编辑</el-button>
+            <template v-else>
+                <div>
+                     <el-button type="text" :loading="personalForm.btnLoading" @click="savePersonalForm">保存</el-button>
+                     <el-button type="text" @click="cancel(1)">取消</el-button>
+                </div>
+            </template>
+        </div>
+    </div>
+    <el-form ref="personalForm" :model="personalForm" :rules="rule1" label-position="left" label-width="100px" :class="personalForm.edit != true?'pointer_events_none':''">
         <el-row :gutter="24">
             <el-col :span="12">
                 <el-form-item label="姓名：" prop="name">
@@ -12,17 +23,18 @@
                 </el-form-item>
             </el-col>
             <el-col :span="12">
-                <el-form-item label="邮箱：" prop="email">
+                <el-form-item label="状态：" prop="state">
                     <el-input
-                        v-model="personalForm.email"
-                        placeholder="邮箱"
+                        :value="personalForm.state==1?'启用':'禁用'"
+                        readonly
+                        placeholder="状态"
                     ></el-input>
                 </el-form-item>
             </el-col>
             <el-col :span="12">
                 <el-form-item label="手机号：" prop="mobile">
                     <el-input
-                        v-model="form.mobile"
+                        v-model="personalForm.mobile"
                         placeholder="手机号"
                         maxlength="11"
                     ></el-input>
@@ -31,7 +43,7 @@
             <el-col :span="12">
                 <el-form-item label="邮箱：" prop="email">
                     <el-input
-                        v-model="form.email"
+                        v-model="personalForm.email"
                         placeholder="邮箱"
                     ></el-input>
                 </el-form-item>
@@ -39,7 +51,7 @@
             <el-col :span="12">
                 <el-form-item label="账号：" prop="username">
                     <el-input
-                        v-model="form.email"
+                        v-model="personalForm.email"
                         placeholder="邮箱"
                     ></el-input>
                 </el-form-item>
@@ -47,7 +59,8 @@
             <el-col :span="12">
                 <el-form-item label="会员类型：" prop="username">
                     <el-input
-                        v-model="form.vipTypeName"
+                        v-model="personalForm.vipTypeName"
+                        readonly
                         placeholder="会员类型"
                     ></el-input>
                 </el-form-item>
@@ -56,7 +69,8 @@
                 <el-col :span="12">
                     <el-form-item label="到期时间：" prop="expitrTime">
                         <el-input
-                            v-model="form.expitrTime"
+                            v-model="personalForm.expitrTime"
+                            readonly
                             placeholder="到期时间"
                         ></el-input>
                     </el-form-item>
@@ -64,8 +78,9 @@
                 <el-col :span="12">
                     <el-form-item label="剩余天数：" prop="expitrTime">
                         <el-input
-                            :value="getRemainDays(form.expitrTime)"
-                            placeholder="到期时间"
+                            :value="getRemainDays(personalForm.expitrTime)"
+                            readonly
+                            placeholder="剩余天数"
                         ></el-input>
                     </el-form-item>
                 </el-col>
@@ -73,8 +88,19 @@
             
         </el-row>
     </el-form>
-    <p class="form_item_title">所属企业信息：</p>
-    <el-form ref="form" :model="tenantForm" :rules="rules" label-position="left" label-width="100px" :class="model == 'detail'?'pointer_events_none':''">
+    <div class="form_item_title">
+        所属企业信息：
+        <div>
+            <el-button v-if="!tenantForm.edit" type="text" @click="edit(2)">编辑</el-button>
+            <template v-else>
+                <div>
+                     <el-button type="text" :loading="tenantForm.btnLoading" @click="saveTenantForm">保存</el-button>
+                     <el-button type="text" @click="cancel(2)">取消</el-button>
+                </div>
+            </template>
+        </div>
+    </div>
+    <el-form ref="tenantForm" :model="tenantForm" label-position="left" label-width="100px" :class="tenantForm.edit != true?'pointer_events_none':''">
         <el-row :gutter="24">
             <el-col :span="12">
                 <el-form-item label="名称：" prop="name">
@@ -86,21 +112,27 @@
             </el-col>
             <el-col :span="12">
                 <el-form-item label="类型：" prop="type">
-                    <el-select v-model="tenantForm.type" placeholder="企业类型">
+                    <el-select v-model="tenantForm.type" placeholder="企业类型" style="width:100%">
                         <el-option v-for="item in tenantType" :key="item.dictChildValue" :label="item.dictChildLabel" :value="Number(item.dictChildValue)"></el-option>
                     </el-select>
                 </el-form-item>
             </el-col>
             <el-col :span="12">
                 <el-form-item label="状态：" prop="state">
-                    <el-select v-model="tenantForm.state" placeholder="企业类型">
-                        <el-option v-for="item in tenantType" :key="item.dictChildValue" :label="item.dictChildLabel" :value="Number(item.dictChildValue)"></el-option>
-                    </el-select>
+                    <el-input
+                        :value="tenantForm.state==1?'启用':'禁用'"
+                        readonly
+                        placeholder="状态"
+                    ></el-input>
                 </el-form-item>
             </el-col>
             <el-col :span="12">
                 <el-form-item label="可使用人数：" prop="number">
-                    <el-input-number v-model="tenantForm.number" size="small" controls-position="right" :min="0"></el-input-number>
+                    <el-input
+                        :value="tenantForm.number || 0"
+                        readonly
+                        placeholder="可使用人数"
+                    ></el-input>
                 </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -129,8 +161,7 @@
             </el-col>
         </el-row>
     </el-form>
-    <p class="form_item_title">版本信息：</p>
-    <div style="border:1px solid white;padding:10px;margin:10px 0;border-radius:8px;height:300px">
+    <div style="border:1px solid white;padding:10px;margin:10px 0;border-radius:8px;height:300px" :class="tenantForm.edit != true?'pointer_events_none':''">
         <vipTypeTable :tableData="tenantForm.vipTypes||[]"></vipTypeTable>
     </div>
   </div>
@@ -151,13 +182,43 @@ export default {
   data() {
     return {
         tenantForm:{},
-        personalForm:{}
+        personalForm:{},
+        editMessage:{},
+        rule1:{
+            mobile: [
+                { required: true, message: "请输入手机号码", trigger: "blur" },
+                {
+                    pattern:
+                    /(^((\+86)|(86))?(1[3-9])\d{9}$)|(^(0\d{2,3})-?(\d{7,8})$)/,
+                    message: "请输入正确的手机号码",
+                    trigger: "blur",
+                },
+            ],
+            email: [
+                    { required: false, message: "请输入邮箱", trigger: "blur" },
+                    {
+                        pattern:
+                            /^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9_\.\-])+\.)+([a-zA-Z0-9]{2,4})+$/,
+                        message: "请输入正确的邮箱格式",
+                        trigger: "blur",
+                    },
+                ],
+        }
     };
   },
   watch: {
-    
+    personalId(){
+        this.getPersonalForm()
+    },
+    tenantId(){
+        this.getTenantForm()
+    }
+  },
+  computed: {
+    tenantType(){
+        return this.$store.state.admin.tenantType
+    }
   },
-  computed: {},
   created() {},
   mounted() {
     this.init()
@@ -169,7 +230,7 @@ export default {
     },
     //获取租户信息
     getTenantForm(){
-        if(this.tenantId){
+        if(!this.tenantId){
             return
         }
         var params = {
@@ -177,7 +238,7 @@ export default {
         }
         this.$api.queryQiaoBiTenant(params).then(response=>{
             if(response.code == 200){
-                var data = response.data
+                var data = response.data.records
                 if(data && data.length){
                     this.tenantForm = data[0]
                 }
@@ -187,17 +248,22 @@ export default {
     },
     //获取人员信息
     getPersonalForm(){
-        if(this.personalId){
+        if(!this.personalId){
             return
         }
         var params = {
-            id:this.personalId
+            id:this.personalId,
+            current:1,
+            size:1
         }
         this.$api.getPersonnelList(params).then(response=>{
             if(response.code == 200){
                 var data = response.data
                 if(data && data.length){
                     this.personalForm = data[0]
+                    if(!this.personalForm.vipTypes || this.personalForm.vipTypes.length == 0){
+                        
+                    }
                 }
             }
         }).catch(error=>{
@@ -227,8 +293,75 @@ export default {
         }
         return `剩余${remainDays}天`
     },
+    //保存个人信息
+    savePersonalForm(){
+        this.$refs['personalForm'].validate((valid) => {
+            if (valid) {
+                this.$set(this.personalForm,'btnLoading',true)
+                this.$api.editPersonnel(this.personalForm).then((response) => {
+                    if(response.code == 200){
+                        this.$message.success("保存成功");
+                        this.$set(this.personalForm,'edit',false)
+                        this.$set(this.personalForm,'btnLoading',false)
+                    } 
+                })
+                .catch((error) => {
+                    this.$set(this.personalForm,'btnLoading',false)
+                });
+            }
+        })
+        
+    },
+    //保存所属企业信息
+    saveTenantForm(){
+        this.tenantForm.tenantId = this.tenantForm.id
+        this.$set(this.tenantForm,'btnLoading',true)
+        this.$api.updateTenantVip(this.tenantForm).then(response => {
+            if (response.code === 200) {
+                this.btnLoading = false
+                this.$message.success('保存成功');
+                this.$set(this.tenantForm,'edit',false)
+                this.$set(this.tenantForm,'btnLoading',false)
+            }
+        })
+        .catch(error => {
+            this.$set(this.tenantForm,'btnLoading',false)
+        });
+    },
+    edit(type){
+        if(type == 1){
+            this.editMessage.personalForm = JSON.parse(JSON.stringify(this.personalForm))
+            this.$set(this.personalForm,'edit',true)
+        }
+        if(type == 2){
+            this.editMessage.tenantForm = JSON.parse(JSON.stringify(this.tenantForm))
+            this.$set(this.tenantForm,'edit',true)
+        }
+    },
+    cancel(type){
+        if(type == 1){
+            this.personalForm = JSON.parse(JSON.stringify(this.editMessage.personalForm))
+            this.$set(this.personalForm,'edit',false)
+        }
+        if(type == 2){
+            this.tenantForm = JSON.parse(JSON.stringify(this.editMessage.tenantForm))
+            this.$set(this.tenantForm,'edit',false)
+        }
+    },
   },
 };
 </script>
 <style lang="scss" scoped>
+.message{
+    width: 800px;
+    margin: 0px auto;
+}
+.form_item_title{
+    padding: 10px 0;
+    font-weight: bold;
+    font-size: 16px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+}
 </style>

src/views/backStageManage/organization/personnel/components/personnel.vue

@@ -42,7 +42,7 @@
                 <template slot-scope="scope">
                     <div class="block">
                         {{ scope.row.expitrTime }}
-                        <el-popover
+                        <!-- <el-popover
                             placement="bottom"
                             title="修改到期时间"
                             width="220"
@@ -55,11 +55,11 @@
                                 placeholder="选择日期时间">
                             </el-date-picker>
                             <div style="display: flex;justify-content: flex-end;">
-                               <el-button type="text" size="small" @click="submit('expitrTime',editMessage.expitrTime,scope.row)">确认</el-button> 
+                               <el-button type="text" size="small" :loading="editMessage.loading" @click="submit('expitrTime',editMessage.expitrTime,scope.row)">确认</el-button> 
                             </div>
                             
                             <el-button type="text" size="small" slot="reference" @click="addEditMessage('expitrTime',scope.row.expitrTime)">修改</el-button>
-                        </el-popover>
+                        </el-popover> -->
                     </div>
                 </template>
             </el-table-column>
@@ -129,7 +129,9 @@ export default {
                 positionIds:[],
                 ...defaultSearchForm
             },
-            editMessage:{}
+            editMessage:{
+                loading:false
+            }
         };
     },
     watch: {},
@@ -153,16 +155,17 @@ export default {
                 id:row.id,
             }
             params[field] = data
+            this.editMessage.loading = true
             this.$api.updateExpitrTime(params).then(response=>{
                 if(response.code == 200){
                     this.$message.success('修改成功')
                     row[field] = data
                     delete this.editMessage[field]
                     this.$refs['popover_'+field+'_'+row.id].doClose()
-                    console.log(this.$refs['popover_'+field+'_'+row.id])
+                    this.editMessage.loading = false
                 }
             }).catch(error=>{
-                
+                this.editMessage.loading = false
             })
         },
         //获取剩余天数
@@ -286,7 +289,9 @@ export default {
             this.getList()
         },
         getTenantList() {
-            console.log(123456)
+            if(this.userinfo.roleType != 1){
+                return
+            }
             this.$api.getAllTenantList().then(response => {
                 this.tenantList = response.data
             })

src/views/backStageManage/organization/personnel/details.vue

@@ -0,0 +1,33 @@
+<template>
+  <div>
+    <detail :personalId="personalId" :tenantId="tenantId"></detail>
+  </div>
+</template>
+
+<script>
+import detail from './components/detail.vue';
+export default {
+  components: {
+    detail
+  },
+  props: {},
+  data() {
+    return {
+    };
+  },
+  watch: {},
+  computed: {
+    personalId(){
+        return this.$route.query.personalId
+    },
+    tenantId(){
+        return this.$route.query.tenantId
+    }
+  },
+  created() {},
+  mounted() {},
+  methods: {},
+};
+</script>
+<style lang="scss" scoped>
+</style>

src/views/layout/mixins/index.js

@@ -4,8 +4,8 @@ import Store from '@/store'
 export const webSocket = {
   methods: {
     connectWebSocket(userId) {
-      // let webSocket = new WebSocket(`ws://139.224.24.90:8871/permission/api/ws/` + userId)
-      let webSocket = new WebSocket(`ws://139.224.24.90:8880/permission/api/ws/` + userId)
+      // let webSocket = new WebSocket(`ws://139.224.24.90:8871/permission/qiaoBi/ws/` + userId)
+      let webSocket = new WebSocket(`ws://139.224.24.90:8880/permission/qiaoBi/ws/` + userId)
       Store.commit('SET_WEB_SOCKET', webSocket)
       webSocket.onopen = () => {
         console.log('WebSocket连接成功')