From b195c95d3a37995f6ff2aaa8038173660ec49d76 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期五, 05 一月 2024 18:43:05 +0800
Subject: [PATCH] 接口联调
---
src/views/unifiedManage/userLevel/components/AddUserLevel.vue | 81 +++++---
src/views/unifiedManage/userManage/components/EditUserInfo.vue | 75 ++++---
.env.development | 2
src/api/unifiedManage/userManage.js | 22 ++
vue.config.js | 11 -
.env | 2
src/views/unifiedManage/userManage/index.vue | 107 ++++++++++-
src/api/unifiedManage/userLevel.js | 55 +++++
src/views/unifiedManage/userLevel/index.vue | 140 ++++++++++-----
9 files changed, 345 insertions(+), 150 deletions(-)
diff --git a/.env b/.env
index 101017f..408561f 100644
--- a/.env
+++ b/.env
@@ -3,7 +3,7 @@
# 椤甸潰 title 鍓嶇紑
VUE_APP_TITLE=Basic
NODE_ENV=development
-VUE_APP_BATH_PATH='http://192.168.20.119:9083'
+VUE_APP_BATH_PATH='http://192.168.20.119:9081'
# 缃戠粶璇锋眰鍏敤鍦板潃
VUE_APP_API=/api/
diff --git a/.env.development b/.env.development
index 9073ccc..7984ecc 100644
--- a/.env.development
+++ b/.env.development
@@ -4,5 +4,5 @@
# 椤甸潰 title 鍓嶇紑
VUE_APP_TITLE=Basic
-VUE_APP_BATH_PATH='http://192.168.20.119:9083'
+VUE_APP_BATH_PATH='http://192.168.20.119:9081'
diff --git a/src/api/unifiedManage/userLevel.js b/src/api/unifiedManage/userLevel.js
index e42a4d4..516d581 100644
--- a/src/api/unifiedManage/userLevel.js
+++ b/src/api/unifiedManage/userLevel.js
@@ -1,10 +1,59 @@
import request from "@/common/untils/request.js"
-// 宸︿晶鑿滃崟
-export function getMenuTreeByRole(data) {
+// 绛夌骇鍒楄〃
+export const getListRole = async (data) => {
return request({
- url: "/api/menu/getMenuTreeByRole",
+ url: "/api/role/listRole",
+ method: "post",
+ data
+ })
+}
+// 鏍规嵁瑙掕壊id鑾峰彇鐢ㄦ埛鍒楄〃
+export const getUserList = async (data) => {
+ return request({
+ url: "/api/role/usersById",
+ method: "post",
+ data
+ })
+}
+// 鏂板瑙掕壊
+export const addRole = (data) => {
+ return request({
+ url: "/api/role/add",
+ method: "post",
+ data
+ })
+}
+// 缂栬緫瑙掕壊
+export const updateRole = (data) => {
+ return request({
+ url: "/api/role/update",
+ method: "post",
+ data
+ })
+}
+// 鑾峰彇鍙傝�冭鑹� 椤甸潰鏉冮檺 鑿滃崟 鐨勬暟鎹�
+export const getDataRole = (data) => {
+ return request({
+ url: "/api/role/prepare?useType=" + data.useType,
method: "get",
data
})
}
+// 瑙掕壊鍚敤銆佸仠鐢�
+export const roleChange = (data) => {
+ return request({
+ url: "/api/role/change",
+ method: "post",
+ data
+ })
+}
+
+// 鍒犻櫎瑙掕壊
+export const deleteRole = (id) => {
+ return request({
+ url: `/api/role/delete/${id}`,
+ method: "delete",
+ id
+ })
+}
diff --git a/src/api/unifiedManage/userManage.js b/src/api/unifiedManage/userManage.js
index f38660b..ef95fcf 100644
--- a/src/api/unifiedManage/userManage.js
+++ b/src/api/unifiedManage/userManage.js
@@ -1,9 +1,25 @@
import request from "@/common/untils/request.js"
-// 閿�鍞槑缁嗗垪琛�
-export function getSalesDetailsList(data) {
+// 鏌ヨ鐢ㄦ埛鍒楄〃getUsers
+export function listUser(data) {
return request({
- url: "/api/salesDetails/list",
+ url: "/api/user/getUsers",
+ method: "post",
+ data
+ })
+}
+// 鑾峰彇鎵�鏈夌瓑绾�
+export function getRoleIDs(data) {
+ return request({
+ url: "/api/role/listByOrg?useType=" + data.useType,
+ method: "get",
+ data
+ })
+}
+// 淇敼鐢ㄦ埛鐘舵��
+export function changeStatus(data) {
+ return request({
+ url: "/api/user/changeStatus",
method: "post",
data
})
diff --git a/src/views/unifiedManage/userLevel/components/AddUserLevel.vue b/src/views/unifiedManage/userLevel/components/AddUserLevel.vue
index 6884d07..e845320 100644
--- a/src/views/unifiedManage/userLevel/components/AddUserLevel.vue
+++ b/src/views/unifiedManage/userLevel/components/AddUserLevel.vue
@@ -71,6 +71,7 @@
<script>
// import codeMixin from "@/components/makepager/mixin/codeMixin"
+import { addRole, updateRole, getDataRole } from "@/api/unifiedManage/userLevel"
export default {
name: "AddUserLevel",
// mixins: [codeMixin],
@@ -83,6 +84,12 @@
title: "鏂板缓",
infomation: {}
}
+ }
+ },
+ editRow: {
+ type: Object,
+ default: () => {
+ return {}
}
}
},
@@ -110,21 +117,25 @@
watch: {
"editCommonConfig.visible"(val) {
if (val) {
+ console.log(val, "sssssss")
+ this.isOpen = val
this.$refs.form.resetFields()
this.getDataInfo()
}
},
"editCommonConfig.infomation"(val) {
- if (this.isopen) {
- this.$refs.form.resetFields()
- if (val.id) {
- this.getDataInfo(val)
- }
- }
+ console.log(val, "aaaa")
+ // if (this.isopen) {
+ // this.$refs.form.resetFields()
+ // if (val.id) {
+ // this.getDataInfo(val)
+ // }
+ // }
}
},
created() {
- this.getDataInfo()
+ console.log(this.editConfig.infomation, "sdddd")
+ this.getDataInfo(this.editConfig.infomation)
},
methods: {
handleClose() {
@@ -135,19 +146,18 @@
},
// 鑾峰彇鍙傝�冭鑹� 椤甸潰鏉冮檺 鑿滃崟 鐨勬暟鎹�
async getDataInfo(val) {
- console.log(val)
- // const rsp = await getDataRole({ useType: 1 })
- // if (rsp.code == 200) {
- // // 鍙傝�冭鑹�
- // this.prepareRoleList = rsp.data.roles ? rsp.data.roles : []
- // this.menusList = rsp.data.menus ? rsp.data.menus : []
- // // 椤甸潰鏉冮檺
- // this.completeList = rsp.data.subsystems ? rsp.data.subsystems : []
- // this.form.completeType = this.completeList.length > 0 ? this.completeList[0].systemType : 1
- // }
- // if (this.isopen) {
- // this.resetForm(val)
- // }
+ const rsp = await getDataRole({ useType: 2 })
+ if (rsp.code == 200) {
+ // 鍙傝�冭鑹�
+ this.prepareRoleList = rsp.data.roles ? rsp.data.roles : []
+ this.menusList = rsp.data.menus ? rsp.data.menus : []
+ // 椤甸潰鏉冮檺
+ this.completeList = rsp.data.subsystems ? rsp.data.subsystems : []
+ this.form.completeType = this.completeList.length > 0 ? this.completeList[0].systemType : 1
+ }
+ if (this.editConfig.visible) {
+ this.resetForm(val)
+ }
},
getMenuCheck(val) {
if (val && val.length > 0) {
@@ -172,16 +182,20 @@
this.completeList.length > 0 && this.completeList[0].systemType ? this.completeList[0].systemType : 1
if (this.form.menuIDs && this.form.menuIDs.length > 0) {
for (let i in this.menusList) {
- this.$refs["menuTree&" + this.menusList[i].systemType][0].setCheckedKeys(this.form.allMenu.split(","))
+ console.log(this.$refs["menuTree&" + this.menusList[i].systemType])
+ // this.$refs["menuTree&" + this.menusList[i].systemType][0].setCheckedKeys(this.form.allMenu.split(","))
}
}
} else {
+ console.log(this.menusList)
for (let i in this.menusList) {
- this.$refs["menuTree&" + this.menusList[i].systemType][0].setCheckedKeys([])
+ console.log(this.$refs["menuTree&" + this.menusList[i]?.systemType])
+ // this.$refs["menuTree&" + this.menusList[i]?.systemType][0].setCheckedKeys([])
}
}
},
- imgClick(item) {
+ imgClick(item, index) {
+ console.log(index)
this.form.completeType = item.systemType
this.$forceUpdate()
},
@@ -203,14 +217,14 @@
this.$refs[formName].validate((valid) => {
console.log(valid)
if (valid) {
- // let submitFn = this.editRow.id ? updateRole : addRole
- // let param = this.saveParams()
- // submitFn(param).then((reply) => {
- // if (reply && reply.code === 200) {
- // this.$message.success("淇濆瓨鎴愬姛")
- // this.$emit("shutdown", false)
- // }
- // })
+ let submitFn = this.editRow.id ? updateRole : addRole
+ let param = this.saveParams()
+ submitFn(param).then((reply) => {
+ if (reply && reply.code === 200) {
+ this.$message.success("淇濆瓨鎴愬姛")
+ this.$emit("shutdown", false)
+ }
+ })
}
})
},
@@ -251,11 +265,14 @@
id: this.editRow.id,
comment: data.comment || "",
name: data.name || "",
- useType: 1
+ useType: 2
},
menuIDs: menuIds
}
return params
+ },
+ shutdown() {
+ this.$emit("shutdown", false)
}
}
}
diff --git a/src/views/unifiedManage/userLevel/index.vue b/src/views/unifiedManage/userLevel/index.vue
index 3dc93de..94d452e 100644
--- a/src/views/unifiedManage/userLevel/index.vue
+++ b/src/views/unifiedManage/userLevel/index.vue
@@ -59,28 +59,19 @@
</div>
</div>
</div>
- <!-- 鏂板缓/缂栬緫 -->
- <AddUserLevel v-if="editConfig.visible" :edit-common-config="editConfig" />
+ <div class="overSpread" v-show="isopen"></div>
+ <!-- 娣诲姞/缂栬緫 -->
+ <AddUserLevel :isopen="isopen" @shutdown="shutdown" :editRow="editRow" />
</div>
</template>
<script>
import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
import AddUserLevel from "@/views/unifiedManage/userLevel/components/AddUserLevel"
+import { getListRole, getUserList, roleChange, deleteRole } from "@/api/unifiedManage/userLevel"
export default {
name: "UserLevel",
- props: {
- isDetail: {
- type: Boolean,
- default: false
- },
- addConfig: {
- type: Object,
- default: () => {
- return {}
- }
- }
- },
+ props: {},
mixins: [pageMixin],
components: { AddUserLevel },
computed: {},
@@ -123,6 +114,7 @@
],
showBottomCol: ["鐢ㄦ埛鍚�", "濮撳悕", "鎵嬫満鍙�", "宀椾綅鑱屽姟", "鐘舵��"],
isopen: false,
+ editRow: {},
editConfig: {
visible: false,
title: "鏂板缓",
@@ -138,13 +130,58 @@
},
created() {
this.setTable()
+ this.getData()
},
methods: {
+ // 瑙掕壊鍒楄〃
+ async getData(val) {
+ this.data.page = this.pagerOptions.currPage
+ this.data.pageSize = this.pagerOptions.pageSize
+ const res = await getListRole(this.data)
+ console.log(res)
+ this.tableList.tableInfomation = res.data.list
+ this.pagerOptions.totalCount = res.data.total
+
+ if (this.pagerOptions.totalCount > 0) {
+ let row = this.tableList.tableInfomation[0]
+ this.selectRow = this.tableList.tableInfomation.length > 0 ? this.tableList.tableInfomation[0] : {}
+ this.getUserList(row.id)
+ }
+ if (val !== "search") {
+ // this.overview();
+ }
+ },
+ // 鐢ㄦ埛鍒楄〃
+ async getUserList(id) {
+ let params = {
+ page: 0,
+ pageSize: 0,
+ id: id
+ }
+ const res = await getUserList(params)
+ if (res.data.list && res.data.list.length > 0) {
+ const list = res.data.list.map((item) => {
+ let dutyList = []
+ item.dutyIDs.forEach((val) => {
+ dutyList.push(val.dutyName)
+ })
+ return {
+ ...item,
+ dutyNames: dutyList.join(", ")
+ }
+ })
+ this.bottomTableList.tableInfomation = list || []
+ } else {
+ this.bottomTableList.tableInfomation = []
+ }
+ },
// 鏂板缓
addBtnClick() {
- this.editConfig.title = "鏂板缓"
- this.editConfig.infomation = { ...this.addConfig, currency: "浜烘皯甯�" }
- this.editConfig.visible = true
+ // this.editConfig.title = "鏂板缓"
+ // this.editConfig.visible = true
+ // this.editConfig.infomation = {}
+ this.isopen = true
+ this.editRow = {}
},
// 鎼滅储
searchClick(val) {
@@ -167,25 +204,28 @@
// 鍚敤 鍋滅敤璇锋眰
async getRoleChange(row) {
console.log(row)
- // await roleChange({
- // id: row.id,
- // status: !row.status,
- // }).then((reply) => {
- // if (reply && reply.code == 200) {
- // let tips = row.status ? "鍋滅敤鎴愬姛" : "鍚敤鎴愬姛";
- // this.getData();
- // this.$message({
- // type: "success",
- // message: tips,
- // });
- // }
- // });
+ await roleChange({
+ id: row.id,
+ status: !row.status
+ }).then((reply) => {
+ if (reply && reply.code == 200) {
+ let tips = row.status ? "鍋滅敤鎴愬姛" : "鍚敤鎴愬姛"
+ this.getData()
+ this.$message({
+ type: "success",
+ message: tips
+ })
+ }
+ })
},
// 缂栬緫
handleClick(val) {
- this.editConfig.title = "缂栬緫"
- this.editConfig.infomation = { ...val }
- this.editConfig.visible = true
+ console.log(val)
+ // this.editConfig.title = "缂栬緫"
+ // this.editConfig.infomation = { ...val }
+ // this.editConfig.visible = true
+ this.editRow = val
+ this.isopen = true
},
// 鍒犻櫎绛夌骇
delClick(row) {
@@ -196,17 +236,23 @@
type: "warning"
})
.then(() => {
- // deleteRole(row.id).then((reply) => {
- // if (reply && reply.code == 200) {
- // this.getData();
- // this.$message({
- // type: "success",
- // message: "鍒犻櫎鎴愬姛",
- // });
- // }
- // });
+ deleteRole(row.id).then((reply) => {
+ if (reply && reply.code == 200) {
+ this.getData()
+ this.$message({
+ type: "success",
+ message: "鍒犻櫎鎴愬姛"
+ })
+ }
+ })
})
.catch(() => {})
+ },
+ shutdown() {
+ this.isopen = false
+ setTimeout(() => {
+ this.getData()
+ }, 200)
},
// 琛岀偣鍑�
tableRowClick(row) {
@@ -245,15 +291,9 @@
// bottom
this.setBottomList()
},
- // 绛夌骇鍒楄〃
+ // 鍒楄〃
setTableList(tableList) {
tableList.allcol = tableList.tableColumn.filter((ele) => !ele.default).map((ele) => ele.label)
- this.searchOptions = []
- for (let i = 0; i < tableList.tableColumn.length; i++) {
- const label = tableList.tableColumn[i].label
- const value = tableList.tableColumn[i].prop
- this.searchOptions.push({ value: value, label: label })
- }
},
// bom 鍒楄〃
setBottomList() {
@@ -351,7 +391,7 @@
background-color: #fff;
border-radius: 12px;
min-height: 70px;
- height: calc(52% - 60px);
+ height: calc(52% - 50px);
margin-top: 10px;
// padding: 10px 20px;
.list-view {
diff --git a/src/views/unifiedManage/userManage/components/EditUserInfo.vue b/src/views/unifiedManage/userManage/components/EditUserInfo.vue
index 9dcbba9..144b745 100644
--- a/src/views/unifiedManage/userManage/components/EditUserInfo.vue
+++ b/src/views/unifiedManage/userManage/components/EditUserInfo.vue
@@ -9,16 +9,16 @@
custom-class="iframe-dialog"
>
<div class="drawerContent" style="overflow: auto">
- <el-form ref="form" :rules="rules" :model="form" label-position="right" label-width="100px">
+ <el-form ref="form" :rules="rules" :model="editConfig.form" label-position="right" label-width="100px">
<el-form-item label="鐢ㄦ埛鍚�:" prop="username">
- <el-input v-model="form.username" placeholder="璇疯緭鍏�" disabled></el-input>
+ <el-input v-model="editConfig.form.username" placeholder="--" disabled></el-input>
</el-form-item>
<el-form-item label="瀵嗙爜:" prop="password">
- <el-input v-model="form.password" placeholder="璇疯緭鍏�" disabled></el-input>
+ <el-input v-model="editConfig.form.password" placeholder="--" disabled></el-input>
</el-form-item>
<el-form-item label="鎵嬫満鍙�:" prop="phone">
<el-input-number
- v-model="form.phone"
+ v-model="editConfig.form.phone"
placeholder=""
:min="0"
:controls="false"
@@ -26,32 +26,25 @@
style="width: 100%"
></el-input-number>
</el-form-item>
- <el-form-item label="鍏徃鍚嶇О:" prop="company">
- <el-input v-model="form.company" placeholder="璇疯緭鍏�" disabled></el-input>
+ <el-form-item label="鍏徃鍚嶇О:" prop="companyName">
+ <el-input v-model="editConfig.form.company" placeholder="--" disabled></el-input>
</el-form-item>
- <el-form-item label="鑱旂郴浜哄悕绉�:" prop="contact">
- <el-input v-model="form.contact" placeholder="璇疯緭鍏�" disabled></el-input>
+ <el-form-item label="鑱旂郴浜哄悕绉�:" prop="nickName">
+ <el-input v-model="editConfig.form.contact" placeholder="--" disabled></el-input>
</el-form-item>
- <el-form-item label="閭:" prop="email">
- <el-input v-model="form.email" placeholder="璇疯緭鍏�" disabled></el-input>
+ <el-form-item label="閭:" prop="companyEmail">
+ <el-input v-model="editConfig.form.email" placeholder="--" disabled></el-input>
</el-form-item>
<el-form-item label="琛屼笟:" prop="industry">
- <el-input v-model="form.industry" placeholder="璇疯緭鍏�" disabled></el-input>
+ <el-input v-model="editConfig.form.industry" placeholder="--" disabled></el-input>
</el-form-item>
<el-form-item label="鍦板尯:" prop="region">
- <el-input v-model="form.region" placeholder="璇疯緭鍏�" disabled></el-input>
+ <el-input v-model="editConfig.form.region" placeholder="--" disabled></el-input>
</el-form-item>
- <el-form-item label="鐢ㄦ埛绛夌骇:" prop="level">
- <el-radio-group v-model="form.level" :disabled="editConfig.title == '鏌ョ湅' ? true : false">
- <div style="margin-top: 10px">
- <el-radio :label="1">涓夊悎涓�缁忓吀浼氬憳</el-radio>
- <el-radio :label="2">APS+WMS鏅�氫細鍛�</el-radio>
- </div>
- <div style="margin-top: 10px">
- <el-radio :label="3">鍥涘悎涓�瓒呯骇浼氬憳</el-radio>
- <el-radio :label="4">APS鏅�氫細鍛�</el-radio>
- </div>
- </el-radio-group>
+ <el-form-item label="鐢ㄦ埛绛夌骇:" prop="roleIDs">
+ <el-checkbox-group v-model="editConfig.form.roleIDs">
+ <el-checkbox v-for="role in roleList" :label="role.id" :key="role.id">{{ role.name }}</el-checkbox>
+ </el-checkbox-group>
</el-form-item>
</el-form>
</div>
@@ -66,6 +59,7 @@
</template>
<script>
+import { getRoleIDs } from "@/api/unifiedManage/userManage"
export default {
name: "EditUserInfo",
props: {
@@ -75,7 +69,7 @@
return {
visible: false,
title: "鏂板缓",
- infomation: {}
+ form: {}
}
}
}
@@ -86,26 +80,29 @@
return {
dialogWidth: "30%",
editConfig: this.editCommonConfig,
- form: {},
+ // form: {},
rules: {
username: [{ required: true, message: "璇疯緭鍏ョ敤鎴峰悕", trigger: "blur" }],
password: [{ required: true, message: "璇疯緭鍏ュ瘑鐮�", trigger: "blur" }],
phone: [{ required: true, message: "璇疯緭鍏ユ墜鏈哄彿", trigger: "blur" }],
- company: [{ required: true, message: "璇疯緭鍏ュ叕鍙稿悕绉�", trigger: "blur" }],
- contact: [{ required: true, message: "璇疯緭鍏ヨ仈绯讳汉鍚嶇О", trigger: "blur" }],
- level: [{ required: true, message: "璇烽�夋嫨鐢ㄦ埛绛夌骇", trigger: "change" }]
- }
+ companyName: [{ required: true, message: "璇疯緭鍏ュ叕鍙稿悕绉�", trigger: "blur" }],
+ nickName: [{ required: true, message: "璇疯緭鍏ヨ仈绯讳汉鍚嶇О", trigger: "blur" }],
+ roleIDs: [{ required: true, message: "璇烽�夋嫨鐢ㄦ埛绛夌骇", trigger: "change" }]
+ },
+ roleList: [] // 鐢ㄦ埛绛夌骇
}
},
watch: {
"editCommonConfig.visible"(val) {
+ console.log("sssssssssss")
if (val) {
- this.$refs.form.resetFields()
- // this.getDataInfo()
+ // this.formInfo()
+ console.log(val)
}
},
- "editCommonConfig.infomation"(val) {
- if (this.isopen) {
+ "editCommonConfig.form.username"(val) {
+ console.log(val)
+ if (this.editConfig.visible) {
this.$refs.form.resetFields()
if (val.id) {
// this.getDataInfo(val)
@@ -114,11 +111,18 @@
}
},
created() {
- // this.getDataInfo()
+ this.getDataInfo()
},
methods: {
handleClose() {
this.editConfig.visible = false
+ },
+ // 鑾峰彇绛夌骇淇℃伅
+ async getDataInfo() {
+ const rsp = await getRoleIDs({ useType: 1 })
+ if (rsp.code == 200) {
+ this.roleList = rsp.data ? rsp.data : []
+ }
}
}
}
@@ -146,5 +150,8 @@
text-align: right;
padding-right: 20px;
}
+ .el-input__inner {
+ text-align: left;
+ }
}
</style>
diff --git a/src/views/unifiedManage/userManage/index.vue b/src/views/unifiedManage/userManage/index.vue
index 64ad55d..13dbccd 100644
--- a/src/views/unifiedManage/userManage/index.vue
+++ b/src/views/unifiedManage/userManage/index.vue
@@ -21,7 +21,23 @@
<el-table-column label="鎿嶄綔" width="120">
<template slot-scope="scope">
<el-button @click="viewClick(scope.row)" type="text" size="small">鏌ョ湅</el-button>
- <el-button @click="approveClick(scope.row)" type="text" size="small">瀹℃牳</el-button>
+ <el-button
+ v-if="scope.row.status == 0 || scope.row.status == 3"
+ @click="changeStatusClick(scope.row, 1)"
+ type="text"
+ size="small"
+ >鍚敤</el-button
+ >
+ <el-button
+ v-else-if="scope.row.status == 1"
+ @click="changeStatusClick(scope.row, 0)"
+ type="text"
+ size="small"
+ >绂佺敤</el-button
+ >
+ <el-button v-else-if="scope.row.status == 2" @click="approveClick(scope.row)" type="text" size="small"
+ >瀹℃牳</el-button
+ >
<el-button @click="editClick(scope.row)" type="text" size="small">缂栬緫</el-button>
</template>
</el-table-column>
@@ -44,6 +60,8 @@
import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
import EditUserInfo from "@/views/unifiedManage/userManage/components/EditUserInfo"
import ReviewDialog from "@/views/unifiedManage/userManage/components/ReviewDialog"
+import { listUser, changeStatus } from "@/api/unifiedManage/userManage"
+
export default {
name: "UserManage",
props: {},
@@ -56,12 +74,12 @@
tableColumn: [
{ label: "鐢ㄦ埛鍚�", prop: "username", default: true },
{ label: "鎵嬫満鍙�", prop: "phone" },
- { label: "鍏徃鍚嶇О", prop: "company" },
- { label: "鑱旂郴浜哄鍚�", prop: "contact" },
- { label: "閭", prop: "email" },
+ { label: "鍏徃鍚嶇О", prop: "companyName" },
+ { label: "鑱旂郴浜哄鍚�", prop: "nickName" },
+ { label: "閭", prop: "companyEmail" },
{ label: "琛屼笟", prop: "industry" },
{ label: "鍦板尯", prop: "region" },
- { label: "鐘舵��", prop: "status" }
+ { label: "鐘舵��", prop: "status", isCallMethod: true, getCallMethod: this.getStatus }
],
showCol: ["鐢ㄦ埛鍚�", "鎵嬫満鍙�", "鍏徃鍚嶇О", "鑱旂郴浜哄鍚�", "閭", "琛屼笟", "鍦板尯", "鐘舵��"],
editConfig: {
@@ -72,37 +90,84 @@
reviewConfig: {
visible: false,
infomation: {}
+ },
+ obj: {
+ page: 1,
+ pageSize: 15,
+ keyword: "",
+ useType: 1
}
}
},
created() {
this.setTable()
+ this.getData()
},
methods: {
+ // 鑾峰彇鍒楄〃鍊�
+ getData() {
+ this.obj.pageSize = this.pagerOptions.pageSize
+ this.obj.page = this.pagerOptions.currPage
+ listUser(this.obj).then((res) => {
+ console.log(res)
+ this.tableList.tableInfomation = res.data.list || []
+ this.pagerOptions.totalCount = res.data.total
+ })
+ },
// 鎼滅储
onFilterSearch(val) {
- console.log(val)
+ this.obj.keyword = val
+ this.pagerOptions.currPage = 1
+ this.getData()
},
// 鏌ョ湅
viewClick(row) {
console.log(row)
this.editConfig.visible = true
this.editConfig.title = "鏌ョ湅"
- this.editConfig.tableInfomation = { ...row }
+ this.editConfig.form = row
},
// 瀹℃牳
approveClick(row) {
console.log(row)
this.reviewConfig.visible = true
this.reviewConfig.title = "鐢ㄦ埛瀹℃牳"
- this.reviewConfig.tableInfomation = { ...row }
+ this.reviewConfig.infomation = { ...row }
+ },
+ // 鍋滅敤
+ changeStatusClick(row, status) {
+ if (status === 0) {
+ this.$confirm("鏄惁绂佺敤姝ょ敤鎴�?", "鎻愮ず", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning"
+ })
+ .then(() => {
+ this.changeStatus(row, status)
+ })
+ .catch(() => {})
+ } else {
+ this.changeStatus(row, status)
+ }
+ },
+ // 鍚敤/绂佺敤
+ changeStatus(row, status) {
+ changeStatus({
+ status: status,
+ userId: row.id
+ }).then((res) => {
+ console.log(res)
+ let messageStr = status === 0 ? "绂佺敤鎴愬姛" : "鍚敤鎴愬姛"
+ this.$message.success(messageStr)
+ this.getData()
+ })
},
// 缂栬緫
editClick(row) {
console.log(row)
this.editConfig.visible = true
this.editConfig.title = "缂栬緫"
- this.editConfig.tableInfomation = { ...row }
+ this.editConfig.form = { ...row }
},
// 鍒楄〃鍒濆鍖�
setTable() {
@@ -110,7 +175,7 @@
selectIndex: true,
tableInfomation: [
{
- usename: "娴嬭瘯",
+ username: "娴嬭瘯",
status: 1
}
],
@@ -119,12 +184,6 @@
tableColumn: this.setColumnVisible(this.showCol)
}
this.tableList.allcol = this.tableList.tableColumn.filter((ele) => !ele.default).map((ele) => ele.label)
- this.searchOptions = []
- for (let i = 0; i < this.tableList.tableColumn.length; i++) {
- const label = this.tableList.tableColumn[i].label
- const value = this.tableList.tableColumn[i].prop
- this.searchOptions.push({ value: value, label: label })
- }
},
setColumnVisible(showCol) {
return this.tableColumn.map((ele) => {
@@ -137,6 +196,20 @@
selTableCol(val) {
this.showcol = val
this.tableList.tableColumn = this.setColumnVisible(val)
+ },
+ // 鐘舵��
+ getStatus(val) {
+ return val === 0
+ ? "绂佺敤"
+ : val === 1
+ ? "鍚敤涓�"
+ : val === 2
+ ? "寰呭鏍�"
+ : val === 3
+ ? "寰呭惎鐢�"
+ : val === 4
+ ? "宸叉嫆缁�"
+ : ""
}
}
}
@@ -163,7 +236,7 @@
.body-card {
background-color: #fff;
border-radius: 12px;
- height: 100%;
+ height: calc(100% - 10px);
overflow: hidden;
}
.list-view {
diff --git a/vue.config.js b/vue.config.js
index 2707782..cbe32b7 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -13,17 +13,10 @@
productionSourceMap: false, // 濡傛灉浣犱笉闇�瑕佺敓浜х幆澧冪殑source map, 鍙互灏嗗叾璁剧疆涓篺alse 浠ュ姞閫熺敓浜х幆澧冩瀯寤�
devServer: {
proxy: {
- "/api/menu": {
- target: "http://192.168.20.119:8001", // http://192.168.20.119:8002 http://fai365.com:30150/
- // 寤洪亾鏈湴鐜
- // target: "http://192.168.20.118:8002",
- ws: true,
- changeOrigin: true
- },
"/api": {
- target: "http://192.168.20.119:8002", // http://192.168.20.119:8002 http://fai365.com:30150/
+ target: "http://192.168.20.119:8001", // http://fai365.com:30150/
// 寤洪亾鏈湴鐜
- // target: "http://192.168.20.118:8002",
+ // target: "http://192.168.20.118:8001",
ws: true,
changeOrigin: true
}
--
Gitblit v1.8.0