Commit e6c1a5d3 by wangyalan-git

微v导入用户

parent 07868ea4
...@@ -45,3 +45,11 @@ export function updateMember(data) { ...@@ -45,3 +45,11 @@ export function updateMember(data) {
data data
}) })
} }
// 分页获取万科企业所有组织人员
export function getAllPersons(params) {
return request({
url: 'umsMember/getAllPersons',
method: 'get',
params
})
}
...@@ -6,7 +6,7 @@ import { getToken } from '@/utils/auth' ...@@ -6,7 +6,7 @@ import { getToken } from '@/utils/auth'
const service = axios.create({ const service = axios.create({
// baseURL: process.env.BASE_API, // baseURL: process.env.BASE_API,
withCredentials: true, withCredentials: true,
baseURL: 'http://192.168.31.112:8201/mall-admin', baseURL: 'http://192.168.31.113:8201/mall-admin',
// baseURL: 'http://hhg.api.jsonpro.cn:8201/mall-admin', // baseURL: 'http://hhg.api.jsonpro.cn:8201/mall-admin',
timeout: 60000 // 请求超时时间 timeout: 60000 // 请求超时时间
}) })
......
...@@ -38,6 +38,11 @@ ...@@ -38,6 +38,11 @@
type="primary" type="primary"
@click="handleAdd">导入用户 @click="handleAdd">导入用户
</el-button> </el-button>
<el-button class="btn-add"
size="small"
type="primary"
@click="addVMember">微V导入
</el-button>
</el-form> </el-form>
</el-card> </el-card>
<!-- 表格栏 --> <!-- 表格栏 -->
...@@ -107,6 +112,8 @@ ...@@ -107,6 +112,8 @@
@ok="getList"></add-admin> @ok="getList"></add-admin>
<import-member-modal ref="importMember" <import-member-modal ref="importMember"
@ok="getList"></import-member-modal> @ok="getList"></import-member-modal>
<import-v-member-modal ref="importVMember"
@ok="getList"></import-v-member-modal>
<!-- end --> <!-- end -->
</div> </div>
</template> </template>
...@@ -116,6 +123,7 @@ import { getMemberList, getAuditDetail, updateMcht,updateMember } from '@/api/us ...@@ -116,6 +123,7 @@ import { getMemberList, getAuditDetail, updateMcht,updateMember } from '@/api/us
import { getDepartmentList } from '@/api/inventory' import { getDepartmentList } from '@/api/inventory'
import AddAdmin from './modules/AddAdmin' import AddAdmin from './modules/AddAdmin'
import ImportMemberModal from './modules/importMemberModal' import ImportMemberModal from './modules/importMemberModal'
import ImportVMemberModal from './modules/importVMemberModal'
// 列表查询参数默认值 // 列表查询参数默认值
const defaultListQuery = { const defaultListQuery = {
pageNum: 1, pageNum: 1,
...@@ -127,7 +135,7 @@ const defaultListQuery = { ...@@ -127,7 +135,7 @@ const defaultListQuery = {
export default { export default {
name: 'UserList', name: 'UserList',
components: { AddAdmin, ImportMemberModal }, components: { AddAdmin, ImportMemberModal,ImportVMemberModal },
data() { data() {
return { return {
departmentOptions: [], departmentOptions: [],
...@@ -193,6 +201,10 @@ export default { ...@@ -193,6 +201,10 @@ export default {
handleAdd() { handleAdd() {
this.$refs.importMember.add() this.$refs.importMember.add()
}, },
// 从微V导入用户
addVMember() {
this.$refs.importVMember.add()
},
// 设置为管理员 // 设置为管理员
handleSet(row) { handleSet(row) {
this.$refs.addAdmin.add(row) this.$refs.addAdmin.add(row)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment