登陆修改

front-vue/src/api/login.js

@@ -7,7 +7,7 @@ const scope = 'server'
 // 登录方法
 export function login(username, password, code, uuid,sscDomain) {
   return request({
-    url: '/auth/login',
+    url: '/auth/zcLogin',
     method: 'post',
     data: { username, password, code, uuid, sscDomain }
   })

front-vue/src/layout/components/Sidebar/Logo.vue

@@ -43,7 +43,7 @@ export default {
     }
   },
   created() {
-      this.getlistDomain();
+      //this.getlistDomain();
   },
    // 查询域名
   methods:{

front-vue/src/store/modules/user.js

@@ -44,10 +44,21 @@ const user = {
       return new Promise((resolve, reject) => {
         login(username, password, code, uuid,sscDomain).then(res => {
           let data = res.data
-          setToken(data.access_token)
-          commit('SET_TOKEN', data.access_token)
-          setExpiresIn(data.expires_in)
-          commit('SET_EXPIRES_IN', data.expires_in)
+          // 未认证
+          if (data.code == "0") {
+
+          // 认证单个企业
+          } else if (data.code == "1") {
+            setToken(data.tokenInfo.access_token);
+            commit('SET_TOKEN', data.tokenInfo.access_token)
+            setExpiresIn(data.tokenInfo.expires_in)
+            commit('SET_EXPIRES_IN', data.tokenInfo.expires_in)
+          // 多加企业
+          } else {
+
+          }
+
+
           resolve()
         }).catch(error => {
           reject(error)
@@ -136,7 +147,7 @@ const user = {
         })
       })
     },
-    
+
     // 退出系统
     LogOut({ commit, state }) {
       return new Promise((resolve, reject) => {

front-vue/src/views/system/user/index.vue

@@ -34,9 +34,6 @@
                         <el-form-item label="用户姓名" prop="nickName">
                             <el-input v-model="queryParams.nickName" placeholder="请输入用户姓名" clearable size="small" style="width: 240px" @keyup.enter.native="handleQuery" />
                         </el-form-item>
-                        <el-form-item label="手机号码" prop="phonenumber">
-                            <el-input v-model="queryParams.phonenumber" onkeyup="this.value = this.value.replace(/[^\d.]/g,'');" placeholder="请输入手机号码" clearable size="small" style="width: 240px" @keyup.enter.native="handleQuery" />
-                        </el-form-item>
                         <el-form-item label="状态" prop="status">
                             <el-select v-model="queryParams.status" placeholder="用户状态" clearable size="small" style="width: 240px">
                                 <el-option v-for="dict in statusOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
@@ -52,20 +49,11 @@
                     <el-col :span="1.5">
                         <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['system:user:add']">新增</el-button>
                     </el-col>
-                    <!--           <el-col :span="1.5">
-            <el-button
-              type="info"
-              icon="el-icon-upload2"
-              size="mini"
-              @click="handleImport"
-              v-hasPermi="['system:user:import']"
-            >导入</el-button>
-          </el-col> -->
                     <el-col :span="1.5">
                         <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport" v-hasPermi="['system:ownUser:export']">导出</el-button>
                     </el-col>
                 </el-row>
-             
+
                 <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange" stripe border>
                     <!-- <el-table-column type="selection" width="50" align="center" /> -->
                     <el-table-column label="序号" type="index" width="50" align="center">
@@ -76,9 +64,6 @@
                     <el-table-column label="用户编号" align="center" prop="userId" v-if="uncheckList.userId" />
                     <el-table-column label="登录名称" align="center" prop="userName" :show-overflow-tooltip="true" v-if="uncheckList.userName" />
                     <el-table-column label="用户姓名" align="center" prop="nickName" :show-overflow-tooltip="true" v-if="uncheckList.nickName" />
-                    <el-table-column label="公司" align="center" prop="scyName" :show-overflow-tooltip="true" v-if="uncheckList.scyName" />
-                    <el-table-column label="部门" align="center" prop="deptName" :show-overflow-tooltip="true" v-if="uncheckList.deptName" />
-                    <el-table-column label="手机号码" align="center" prop="phonenumber" width="120" v-if="uncheckList.phonenumber" />
                     <el-table-column label="状态" align="center" prop="state" v-if="uncheckList.state">
                         <template slot-scope="scope">
                             <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
@@ -124,11 +109,6 @@
                 </el-row>
                 <el-row>
                     <el-col :span="12">
-                        <el-form-item label="手机号码" prop="phonenumber">
-                            <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
                         <el-form-item label="邮箱" prop="email">
                             <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
                         </el-form-item>
@@ -145,19 +125,6 @@
                             <el-input v-model="form.password" placeholder="请输入用户密码" show-password maxlength="20" />
                         </el-form-item>
                     </el-col>
-                    
-                    <!-- <el-col :span="12">
-            <el-form-item label="学历" prop="education">
-              <el-select v-model="form.education" placeholder="请选择">
-                <el-option
-                  v-for="dict in educationOptions"
-                  :key="dict.dictValue"
-                  :label="dict.dictLabel"
-                  :value="dict.dictValue"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col> -->
                 </el-row>
                 <el-row>
                     <el-col :span="12">
@@ -169,52 +136,7 @@
                             </el-select>
                         </el-form-item>
                     </el-col>
-                    <!-- <el-col :span="12">
-                        <el-form-item label="用户性别">
-                            <el-select v-model="form.sex" placeholder="请选择">
-                                <el-option v-for="dict in sexOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue"></el-option>
-                            </el-select>
-                        </el-form-item>
-                    </el-col> -->
-
-                    <el-col :span="12">
-                        <!-- <el-form-item label="员工姓名"  prop="ssName" v-if="peoplpeName==false||peoplpeName==true&&form.staffCode!=null">
-              <el-select v-model="form.staffCode" filterable size="small" :disabled="peoplpeName" >
-                <el-option
-                v-for="(item, index) in nameList"
-                :key="index"
-                :label="item.ssName"
-                :value="item.ssId"
-              ></el-option>
-            </el-select>
-        </el-form-item> -->
-                        <el-form-item prop="ssName" label="员工姓名" width="120">
-                            <el-select v-model="form.staffCode" filterable clearable remote reserve-keyword placeholder="请选择员工姓名" size="small" :disabled="peoplpeName" :remote-method="getNametList" :loading="loading">
-                                <el-option v-for="(item, index) in nameList" :key="index" :label="item.ssName" :value="item.ssId">
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
                 </el-row>
-                <!-- <el-row>
-          <el-col :span="12">
-            <el-form-item label="职级" prop="postIds">
-              <el-select v-model="form.postIds" multiple multiple-limit="1" placeholder="请选择">
-                <el-option
-                  v-for="item in postOptions"
-                  :key="item.postId"
-                  :label="item.postName"
-                  :value="item.postId"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="职位" prop="position">
-              <el-input v-model="form.position" placeholder="请输入职位" maxlength="10"/>
-            </el-form-item>
-          </el-col>
-        </el-row> -->
                 <el-row>
                     <el-col :span="24">
                         <el-form-item label="备注">
@@ -352,14 +274,6 @@ export default {
                     value: "用户姓名",
                 },
                 {
-                    label: "scyName",
-                    value: "公司",
-                },
-                {
-                    label: "deptName",
-                    value: "部门",
-                },
-                {
                     label: "phonenumber",
                     value: "手机号码",
                 },
@@ -579,13 +493,7 @@ export default {
             }
             columnfilter(this.selfDom);
         },
-        // 姓名列表
-        // getNametList(userId) {
-        //   nameList(userId).then((response) => {
-        //     console.log(response.data)
-        //     this.nameList = response.data;
-        //   });
-        // },
+
         getCompanyList() {
             companyList().then((response) => {
                 this.companyList = response.data;
@@ -701,7 +609,6 @@ export default {
             this.reset();
             this.peoplpeName = false;
             this.getTreeselect();
-            // this.getNametList("000000");
             getUser().then((response) => {
                 this.postOptions = response.posts;
                 this.roleOptions = response.roles;