From f867c1a87123e0dae74ec36591433082df094b75 Mon Sep 17 00:00:00 2001
From: zhaoxiaoqiang <287285524@qq.com>
Date: Tue, 05 Sep 2023 16:25:42 +0800
Subject: [PATCH] 订单选择导出角色管理
---
src/views/qyp-project-order/index.vue | 18 +
/dev/null | 304 -------------------------
src/api/user.js | 7
src/components/table.vue | 6
src/views/qyp-project-order/admin.vue | 14
src/views/account-management/account-list.vue | 201 +++++++---------
src/api/listapi.js | 9
src/api/order.js | 71 ++---
src/views/qyp-project-management/index.vue | 12
src/api/latefee.js | 5
src/views/role-management/role-manager.vue | 26 +-
11 files changed, 172 insertions(+), 501 deletions(-)
diff --git a/src/api/latefee.js b/src/api/latefee.js
index ef0ebb7..40c6280 100644
--- a/src/api/latefee.js
+++ b/src/api/latefee.js
@@ -1,8 +1,8 @@
/*
* @Author: zxq
* @Date: 2021-12-23 15:19:23
- * @LastEditors: zxq
- * @LastEditTime: 2022-07-05 14:34:37
+ * @LastEditors: zhaoxiaoqiang 287285524@qq.com
+ * @LastEditTime: 2023-09-05 16:02:33
* @Description: Description
* @FilePath: \qyp-plat\src\api\latefee.js
*/
@@ -121,7 +121,6 @@
data
})
}
-// 放款机构初期服务费管理
// 放款机构初期服务费管支付
export function loanOrgEarlySerFeePay(data) {
return request({
diff --git a/src/api/listapi.js b/src/api/listapi.js
index 5d2d258..55dab5a 100644
--- a/src/api/listapi.js
+++ b/src/api/listapi.js
@@ -41,6 +41,7 @@
data,
});
},
+ // 管理员订单列表
orderList(data) {
return request({
url: "/qyp/order/orderList",
@@ -48,6 +49,14 @@
data,
});
},
+ // 订单列表
+ orderBaseList(data) {
+ return request({
+ url: "/qyp/order/orderBaseList",
+ method: "post",
+ data,
+ });
+ },
payList(data) {
return request({
url: "/qyp/order/payList",
diff --git a/src/api/order.js b/src/api/order.js
index b45eb9a..9f29ab6 100644
--- a/src/api/order.js
+++ b/src/api/order.js
@@ -1,63 +1,42 @@
/*
* @Author: zxq
* @Date: 2022-01-04 17:26:04
- * @LastEditors: zxq
- * @LastEditTime: 2022-01-07 10:39:56
+ * @LastEditors: zhaoxiaoqiang 287285524@qq.com
+ * @LastEditTime: 2023-09-05 16:12:38
* @Description: Description
* @FilePath: \comn_plat\src\api\order.js
*/
// 列表接口
import request from '@/utils/request';
-//放款机构管理 新增/编辑
-export function loanOrgSave(data) {
- return request({
- url: '/loanOrg/save',
- method: 'post',
- data
- })
-}
-//放款机构管理 详情
-export function loanOrgDtl(data) {
+// 订单导出
+export function orderBaseExport(params) {
return request({
- url: '/loanOrg/dtl',
+ url: '/qyp/order/orderBaseExport',
+ method: 'get',
+ params
+ })
+}
+// 管理员订单导出
+export function orderExport(params) {
+ return request({
+ url: '/qyp/order/orderExport',
+ method: 'get',
+ params
+ })
+}
+// 订单详情
+export function orderDtl(data) {
+ return request({
+ url: '/qyp/order/orderDtl',
method: 'post',
data
})
}
-
-//租赁机构管理 新增/编辑
-export function rentOrgSave(data) {
+// 初始化订单搜索条件
+export function orderInit(data) {
return request({
- url: '/rentOrg/save',
+ url: '/qyp/order/orderInit',
method: 'post',
data
})
-}
-
-//租赁机构管理 详情
-export function rentOrgDtl(data) {
- return request({
- url: '/rentOrg/dtl',
- method: 'post',
- data
- })
-}
-
-//金融产品管理 新增/编辑
-export function prodSave(data) {
- return request({
- url: '/prod/save',
- method: 'post',
- data
- })
-}
-
-//金融产品管理 详情
-export function prodDtl(data) {
- return request({
- url: '/prod/dtl',
- method: 'post',
- data
- })
-}
-
+}
\ No newline at end of file
diff --git a/src/api/user.js b/src/api/user.js
index b4541a9..adc2019 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -43,8 +43,9 @@
}
//新增用户
export function userAdd(data) {
+ data.sysType = 4;
return request({
- url: '/user/add',
+ url: '/user/addUser',
method: 'post',
data
})
@@ -52,7 +53,7 @@
//编辑保存用户信息/user/update
export function userUpdate(data) {
return request({
- url: '/user/update',
+ url: '/user/changeStatus',
method: 'post',
data
})
@@ -123,7 +124,7 @@
}
export function userManageDisabled(data) {
return request({
- url: '/user/disabledUser',
+ url: 'user/changeStatus',
method: 'post',
data
})
diff --git a/src/components/table.vue b/src/components/table.vue
index 606de18..0ded5c7 100644
--- a/src/components/table.vue
+++ b/src/components/table.vue
@@ -1,7 +1,7 @@
<!--
* @Author: zxq
* @Date: 2021-09-13 17:29:07
- * @LastEditTime: 2023-08-31 17:14:36
+ * @LastEditTime: 2023-09-05 15:30:33
* @LastEditors: zhaoxiaoqiang 287285524@qq.com
* @Description: In User Settings Edit
* @FilePath: \qyp_finlean_plat\src\components\table.vue
@@ -486,6 +486,7 @@
this.$emit("getDataList", body);
} else if (this.nameUrl == "roleGetRoleList") {
this.tableData = body;
+ console.log(this.tableData)
this.totals = body.total;
this.$emit("getDataList", body);
} else {
@@ -546,13 +547,12 @@
data[key] = data[key].join(',');
}
}
-
if(index==1){
if (this.exportUrl.query) {
data = { ...data, ...this.exportUrl.query };
}
this.exportLoading = true;
- request({
+ request({
url: this.exportUrl.url,
method: "get",
params: { ...data },
diff --git a/src/views/account-management/account-list.vue b/src/views/account-management/account-list.vue
index 00b3f01..e5cced7 100644
--- a/src/views/account-management/account-list.vue
+++ b/src/views/account-management/account-list.vue
@@ -2,7 +2,7 @@
* @Author: 小明丶
* @Date: 2020-05-11 17:38:01
* @LastEditors: zhaoxiaoqiang 287285524@qq.com
- * @LastEditTime: 2023-08-24 15:43:52
+ * @LastEditTime: 2023-09-05 15:48:52
* @Description: 账户管理
-->
<template>
@@ -15,7 +15,7 @@
</el-col>
<el-col :span="18">
<div style="float:right;">
- <button class="btn-creat" v-if="this.filterBtnById(140201)" @click="showPop(null,1)">+ 新建</button>
+ <button class="btn-creat" @click="showPop(null,1)">+ 新建</button>
<el-input
v-model="form.keyWord"
size="small"
@@ -34,38 +34,36 @@
<!-- 新增弹出层 -->
<el-dialog :title="title" width="480px" :visible.sync="dialogFormVisible">
<!-- :rules="rules" -->
- <el-form :model="creatForm" ref="ruleForm">
- <el-form-item label="用户名称：" :label-width="formLabelWidth" prop="name">
+ <el-form :model="creatForm" ref="ruleForm" size="small" :label-width="formLabelWidth" >
+ <el-form-item label="用户名称：" prop="name">
<el-input
v-model.trim="creatForm.name"
maxlength="20"
autocomplete="off"
placeholder="请输入用户名称"
- style="width:200px"
></el-input>
</el-form-item>
- <el-form-item label="用户手机号：" :label-width="formLabelWidth" prop="phone">
+ <el-form-item label="用户手机号：" prop="phone">
<el-input
v-if="isCreat"
v-model.trim="creatForm.phone"
maxlength="11"
autocomplete="off"
placeholder="请输入用户手机号"
- style="width:200px"
></el-input>
<span v-else>{{creatForm.phone}}</span>
</el-form-item>
- <el-form-item label="用户角色：" :label-width="formLabelWidth" prop="role">
+ <el-form-item label="用户角色：" prop="role">
<el-select v-model="creatForm.role" placeholder="请选择" style="width:200px">
<el-option
v-for="item in roleList"
- :key="item.code"
- :label="item.name"
- :value="item.code">
+ :key="item.roleId"
+ :label="item.roleName"
+ :value="item.roleId">
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="密码：" :label-width="formLabelWidth" v-show="title !== '编辑账户'" prop="password">
+ <el-form-item label="密码：" v-show="title !== '编辑账户'" prop="password">
<el-input
type = "password"
v-if="isCreat"
@@ -73,10 +71,9 @@
maxlength="20"
autocomplete="off"
placeholder="请输入密码"
- style="width:200px"
></el-input>
</el-form-item>
- <el-form-item label="密码确认：" :label-width="formLabelWidth" v-show="title !== '编辑账户'" prop="resPassword">
+ <el-form-item label="密码确认：" v-show="title !== '编辑账户'" prop="resPassword">
<el-input
type = "password"
v-if="isCreat"
@@ -84,7 +81,6 @@
maxlength="20"
autocomplete="off"
placeholder="再次输入密码"
- style="width:200px"
></el-input>
<span v-else>{{creatForm.resPassword}}</span>
</el-form-item>
@@ -100,12 +96,8 @@
import md5 from "blueimp-md5";
import Etable from "../../components/table.vue";
import {roleGetRoleList,userAdd,userUpdate,userManageDisabled} from '@/api/user';
-// import myTable from "../../components/myTable/myTable";
-// import myApi from "../../api/api";
export default {
- components:{
- Etable
- },
+ components:{ Etable },
data() {
return {
title: '',//弹出层title
@@ -114,9 +106,7 @@
isCreat: true,
dialogFormVisible: false,
formLabelWidth:'120px',
- form: {
- keyWord: null
- },
+ form: { keyWord: null},
creatForm:{
name:'',
phone:'',
@@ -126,86 +116,73 @@
},// 新建用户表单
defaultVal: {},
refresh: {},
- // tableData: {
- // url: "userManageList",
- // exportExcelUrl: {
- // url: "hbOrderExport",
- // fileName: "用户管理表格"
- // },
- // exportPower: {
- // show: false,
- // btnId: "120102"
- // },
- column: [
- {
- prop: "userName",
- lable: "用户名称",
- align: "center"
- },
- {
- prop: "userNo",
- lable: "用户手机号",
- align: "center"
- },
- {
- prop: "roleName",
- lable: "用户角色",
- align: "center"
- },
- {
- lable: "停启用",
- align: "center",
- render: (h, params) => {
- return h("div", [
- h("el-switch", {
- props: {
- value: params.row.status === 1,
- "active-color": "#66DD42",
- "inactive-color": "#eeeeee"
+ column: [
+ {
+ prop: "userName",
+ lable: "用户名称",
+ align: "center"
+ },
+ {
+ prop: "userNo",
+ lable: "用户手机号",
+ align: "center"
+ },
+ {
+ prop: "roleName",
+ lable: "用户角色",
+ align: "center"
+ },
+ {
+ lable: "停启用",
+ align: "center",
+ render: (h, params) => {
+ return h("div", [
+ h("el-switch", {
+ props: {
+ value: params.row.status === 1,
+ "active-color": "#66DD42",
+ "inactive-color": "#eeeeee"
+ },
+ on: {
+ change: () => {
+ params.row.status = params.row.status === 1 ? 0 : 1;
+ this.updateContract(params);
+ }
+ }
+ })
+ ]);
+ }
+ },
+ {
+ key: "",
+ name: "操作",
+ fixed: "right",
+ align: "center",
+ render: (h, params) => {
+ return h("div", [
+ h(
+ "span",
+ {
+ style: {
+ "font-size": "12px",
+ "font-family": "Microsoft YaHei",
+ "font-weight": 400,
+ "text-decoration": "underline",
+ color: "rgba(60,142,254,1)",
+ cursor: "pointer",
},
on: {
- change: () => {
- params.row.status = params.row.status === 1 ? 0 : 1;
- this.updateContract(params);
+ click: () => {
+ this.showPop(params.row,2);
}
}
- })
- ]);
- }
- },
- {
- key: "",
- name: "操作",
- fixed: "right",
- align: "center",
- render: (h, params) => {
- return h("div", [
- h(
- "span",
- {
- style: {
- "font-size": "12px",
- "font-family": "Microsoft YaHei",
- "font-weight": 400,
- "text-decoration": "underline",
- color: "rgba(60,142,254,1)",
- cursor: "pointer",
- display: this.filterBtnById(140202)
- ? "inline-block"
- : "none",
- },
- on: {
- click: () => {
- this.showPop(params.row,2);
- }
- }
- },
- "编辑"
- )
- ]);
- }
+ },
+ "编辑"
+ )
+ ]);
}
- ]
+ }
+ ]
// },// 表格数据
};
},
@@ -221,11 +198,11 @@
// }
},
created(){
- roleGetRoleList().then(res => {
- if (res) {
- this.roleList = res.body.roles
- }
- }).catch(err => {})
+ roleGetRoleList().then(res => {
+ if (res) {
+ this.roleList = res.body
+ }
+ }).catch(err => {})
},
methods: {
// 显示弹出层
@@ -233,8 +210,7 @@
if (params && item != 1) {
this.creatForm.phone = params.userNo;
this.creatForm.role = params.roleId;
- this.$set(this.creatForm,'role',params.roleId)
- // this.creatForm.name = params.userName;;
+ this.$set(this.creatForm,'role',params.roleId)
this.$set(this.creatForm,'name',params.userName)
this.creatForm.password = params.password;
this.creatForm.resPassword = params.resPassword;
@@ -245,7 +221,6 @@
if (item == 1) {
this.isCreat = true;
this.title = '新建账户'
-
}
this.dialogFormVisible = true;
},
@@ -322,6 +297,7 @@
} else if (this.title === '编辑账户') {
let data = {userName: this.creatForm.name, userId: this.rowsInfo.userId, roleId:this.creatForm.role}
userUpdate(data).then(res => {
+ console.log(res)
if(res) {
this.$notify({
title: '提示',
@@ -329,25 +305,20 @@
type: 'success'
})
this.dialogFormVisible = false
- this.qureys()
+ this.qureys();
}
- }).catch(err => {})
+ }).catch(err => {});
}
- // 提交请求关闭弹窗
-
},
/**取消新建、编辑账户**/
cancelCreat(){
- // this.creatForm.name = ''
- // this.creatForm.phone = ''
this.creatForm = {};
this.dialogFormVisible = false
},
/**更新用户状态**/
updateContract(params) {
- let data = {
- userId: params.row.userId
- };
+ let {userId,status} = params.row;
+ let data = { userId,status:status==1?0:1};
userManageDisabled(data).then(res => {
if(res) {
this.$notify({
diff --git a/src/views/qyp-project-management/index.vue b/src/views/qyp-project-management/index.vue
index b602ade..4fc164a 100644
--- a/src/views/qyp-project-management/index.vue
+++ b/src/views/qyp-project-management/index.vue
@@ -74,7 +74,7 @@
</div>
<el-dialog top="2vh" :title="title" :visible.sync="addProd" width="60%">
<!-- 新增商品名称 -->
- <el-form :model="ruleForm" :rules="rules" ref="ruleForm" size="small" label-width="100px" class="demo-ruleForm">
+ <el-form :model="ruleForm" :rules="rules" ref="ruleForm" size="small" label-width="120px" class="demo-ruleForm">
<el-form-item label="项目名称" prop="projName">
<el-input v-model="ruleForm.projName" :disabled="disabled" :maxlength="50"></el-input>
</el-form-item>
@@ -95,17 +95,21 @@
<el-form-item label="项目背景图" v-if="addProd" ref="backFilePath" prop="backFilePath">
<uploadImg v-if="addProd" @sendList="imgSet($event,'backFilePath')" :disabled="disabled" :defaultList="ruleForm.backFilePath"></uploadImg>
</el-form-item>
- <el-form-item label="项目logo" ref="logoFilePath" prop="logoFilePath">
+ <el-form-item label="项目宣传标语" ref="logoFilePath" prop="logoFilePath">
<uploadImg v-if="addProd" @sendList="imgSet($event,'logoFilePath')" :disabled="disabled" :defaultList="ruleForm.logoFilePath"></uploadImg>
</el-form-item>
- <el-form-item label="平台头图" ref="titleFilePath" prop="titleFilePath">
+ <el-form-item label="项目优惠券图片" ref="titleFilePath" prop="titleFilePath">
<uploadImg v-if="addProd" @sendList="imgSet($event,'titleFilePath')" :disabled="disabled" :defaultList="ruleForm.titleFilePath"></uploadImg>
</el-form-item>
<el-form-item label="会员权益" ref="qyFilePath" prop="qyFilePath">
<uploadImg v-if="addProd" @sendList="imgSet($event,'qyFilePath')" :disabled="disabled" :defaultList="ruleForm.qyFilePath"></uploadImg>
</el-form-item>
- <el-form-item label="活动规则" ref="ruleFilePath" prop="ruleFilePath">
+ <!-- <el-form-item label="活动规则" ref="ruleFilePath" prop="ruleFilePath">
<uploadImg v-if="addProd" @sendList="imgSet($event,'ruleFilePath')" :disabled="disabled" :defaultList="ruleForm.ruleFilePath"></uploadImg>
+ </el-form-item> -->
+ <el-form-item label="活动规则" prop="ruleContent">
+ <el-input type="textarea" v-model="ruleForm.ruleContent" :disabled="disabled"></el-input>
+ <!-- <uploadImg v-if="addProd" @sendList="imgSet($event,'ruleFilePath')" :disabled="disabled" :defaultList="ruleForm.ruleFilePath"></uploadImg> -->
</el-form-item>
<el-form-item style="text-align:right;" v-if="!disabled">
<el-button type="primary" @click="submitForm('ruleForm')">保存</el-button>
diff --git a/src/views/qyp-project-order/admin.vue b/src/views/qyp-project-order/admin.vue
index 7320164..5fcea8f 100644
--- a/src/views/qyp-project-order/admin.vue
+++ b/src/views/qyp-project-order/admin.vue
@@ -143,14 +143,15 @@
import history from './history.vue';
import plan from './plan.vue';
import draw from './draw.vue';
- import {orderInit,orderDtl} from "@/api/credit";
+ import {orderInit,orderDtl,orderExport} from "@/api/order";
import uploadImg from "@/components/upload.vue";
+ import downloadUrl from "@/utils/excelDownLoadConfig";
export default {
name: "order",
components: { Etable,uploadImg,history,plan,draw },
data() {
return {
- formInline: {status:"all"},
+ formInline: {promId:"all",orderStatus:"all",agencyName:'all'},
searchData: {},
columns: [
{
@@ -356,8 +357,11 @@
methods: {
addProduct(){
if(!this.exportExcelList.length){
- return this.$message.error("请选择订单后导出");
+ return this.$message.error("请选择订单后导出");
}
+ orderExport({orderIdList:this.exportExcelList.join(',')}).then((res) => {
+ downloadUrl.configDate2(res, '管理员订单列表');
+ });
},
keyupEvent(e) {
//只能输入整数
@@ -387,7 +391,9 @@
getDataList(e) {
},
handleSelectionChange(list){
- this.exportExcelList = list;
+ this.exportExcelList = list.map(d=>{
+ return d.orderId
+ });
},
getProductDetail(orderId){
orderDtl({orderId:orderId}).then(({body})=>{
diff --git a/src/views/qyp-project-order/index.vue b/src/views/qyp-project-order/index.vue
index 0a2c42f..ca6068c 100644
--- a/src/views/qyp-project-order/index.vue
+++ b/src/views/qyp-project-order/index.vue
@@ -90,7 +90,7 @@
hasIndex
hasSelection
rowKey="orderId"
- httpUrl="orderList"
+ httpUrl="orderBaseList"
:columns="columns"
:searchData="searchData"
@getDataList="getDataList"
@@ -119,15 +119,16 @@
</template>
<script>
- import Etable from "../../components/table.vue";
- import {orderInit,orderDtl} from "@/api/credit";
+ import Etable from "@/components/table.vue";
+ import {orderInit,orderDtl,orderBaseExport} from "@/api/order";
import uploadImg from "@/components/upload.vue";
+ import downloadUrl from "@/utils/excelDownLoadConfig";
export default {
name: "order",
components: { Etable,uploadImg },
data() {
return {
- formInline: {status:"all"},
+ formInline: {promId:"all",orderStatus:"all"},
searchData: {},
columns: [
{
@@ -224,8 +225,11 @@
methods: {
addProduct(){
if(!this.exportExcelList.length){
- return this.$message.error("请选择订单后导出");
+ return this.$message.error("请选择订单后导出");
}
+ orderBaseExport({orderIdList:this.exportExcelList.join(',')}).then((res) => {
+ downloadUrl.configDate2(res, '订单列表');
+ });
},
keyupEvent(e) {
//只能输入整数
@@ -255,7 +259,9 @@
getDataList(e) {
},
handleSelectionChange(list){
- this.exportExcelList = list;
+ this.exportExcelList = list.map(d=>{
+ return d.orderId
+ });
},
getProductDetail(orderId){
orderDtl({orderId:orderId}).then(({body})=>{
diff --git a/src/views/role-management/role-list.vue b/src/views/role-management/role-list.vue
deleted file mode 100644
index f145fe7..0000000
--- a/src/views/role-management/role-list.vue
+++ /dev/null
@@ -1,304 +0,0 @@
-<template>
- <div class="role-list">
- <el-card class="search-box">
- <el-form ref="formInline" :model="searchBox" :label-width="100" size="small" inline>
- <el-form-item label="日期" prop="time">
- <el-date-picker
- v-model="searchBox.time"
- type="daterange"
- range-separator="-"
- start-placeholder="开始日期"
- style="width: 240px"
- end-placeholder="结束日期"
- >
- </el-date-picker>
- </el-form-item>
- <el-form-item label="角色名" prop="Role">
- <el-select
- v-model="searchBox.Role"
- clearable
- style="width: 240px"
- placeholder="请输入角色"
- >
- <el-option
- v-for="item in roleList"
- clearable
- filterable
- :value="item.dataId + ''"
- :key="item.dataId + ''"
- v-text="item.dataName"
- ></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="状态" prop="Status">
- <el-select
- v-model="searchBox.Status"
- clearable
- style="width: 240px"
- placeholder="请输入状态"
- >
- <el-option
- v-for="item in statusList"
- clearable
- filterable
- :value="item.dataId + ''"
- :key="item.dataId + ''"
- v-text="item.statusText"
- ></el-option>
- </el-select>
- </el-form-item>
- <el-form-item prop="Status">
-
- <el-button
- type="primary"
- class="tablePageBtnStyle"
- @click.native="searchFn"
- >查询</el-button>
- <el-button
- type="primary"
- class="tablePageBtnStyle"
- @click.native="newAdd"
- >+新增</el-button>
-
- <el-button @click="userEdit">取消</el-button>
- </el-form-item>
-
- </el-form>
- <!-- <div class="btnbox">
- <el-button
- type="primary"
- class="tablePageBtnStyle"
- @click.native="searchFn"
- >查询</el-button
- >
- <el-button
- type="primary"
- class="tablePageBtnStyle"
- @click.native="newAdd"
- >+新增</el-button
- >
- </div> -->
-
- </el-card>
- <Etable
- :columns="columns"
- :defaultValue="defaultVal"
- @changed="tableCall"
- ></Etable>
- <!--新增模态窗 -->
- <el-dialog v-model="addModel" width="500px" :title="modelName">
- <el-form :model="formModelDat" :label-width="80">
- <el-form-item label="角色名">
- <el-input
- v-model="formModelData.roleName"
- placeholder="请输入角色名"
- ></el-input>
- </el-form-item>
- <el-form-item label="状态">
- <el-select v-model="formModelData.statusCheckbox">
- <el-option value="all">全部</el-option>
- <el-option value="on">启用</el-option>
- <el-option value="off">停用</el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="菜单权限">
- <el-radio-group v-model="formModelData.menuCheckbox">
- <el-radio label="0">订单查询</el-radio>
- <el-radio label="1">财务管理</el-radio>
- <el-radio label="2">订单处理</el-radio>
- <el-radio label="3">门店管理</el-radio>
- </el-radio-group>
- </el-form-item>
- <el-form-item label="操作权限">
- <el-radio-group v-model="formModelData.operationCheckbox">
- <el-radio label="0">导出</el-radio>
- <el-radio label="1">对账</el-radio>
- <el-radio label="2">结算</el-radio>
- <el-radio label="3">商户新增及审核</el-radio><br />
- <el-radio label="4">结算查询</el-radio>
- <el-radio label="5">提前结清</el-radio>
- <el-radio label="6">对账查询</el-radio>
- <el-radio label="7">商户编辑及密码重置</el-radio>
- </el-radio-group>
- </el-form-item>
- </el-form>
- <div slot="footer">
- <el-button @click="addModel = false">取消</el-button>
- <el-button v-if="!showSave" type="primary" @click.native="newAdd"
- >新增</el-button
- >
- <el-button v-if="showSave" type="primary" @click.native="userEdit"
- >保存</el-button
- >
- </div>
- </el-dialog>
- </div>
-</template>
-<script>
-import Etable from "../../components/table.vue";
-export default {
- name: "role-list",
- components:{Etable},
- data() {
- return {
- // 模态框的数据
- formModelData: {
- statusCheckbox: "all",
- roleName: "",
- operationCheckbox: [],
- menuCheckbox: []
- },
- //查询的数据盒子
- searchBox: {
- // merId: Cookies.get('clouds2_plat_merId'),
- time: [],
- Status: "all",
- Role: ""
- },
- showSave: false,
- addModel: false,
- modelName: "新增角色",
- roleList: [], //角色列表
- statusList: [
- {
- dataId: "all",
- statusText: "全部"
- },
- {
- dataId: "on",
- statusText: "启用"
- },
- {
- dataId: "off",
- statusText: "停用"
- }
- ], //状态列表
-
- columns: [
- // {
- // title: "序号",
- // align: "center",
- // key: "orderId",
- // width: 200
- // },
- {
- lable: "创建日期",
- align: "center",
- prop: "prodName",
- width: 200
- },
- {
- lable: "角色名",
- align: "center",
- prop: "nodeStatus",
- width: 180
- },
- {
- lable: "状态",
- align: "center",
- prop: "cusMblNo",
- width: 200
- },
- {
- lable: "",
- align: "center"
- },
- {
- lable: "操作",
- prop: "action",
- width: 110,
- fixed: "right",
- align: "center",
- render: (h, params) => {
- let result = [];
- result.push(
- h(
- "a",
- {
- style: {
- color: "#357eff"
- },
- on: {
- click: () => {
- this.userEdit();
- }
- }
- },
- "编辑"
- )
- );
- return h("div", result);
- }
- }
- ]
- };
- },
- methods: {
- searchFn() {
- let obj = { ...this.searchBox };
- this.filt = { ...this.defaultVal };
- },
- newAdd() {
- this.addModel = true;
- let obj = this.formModelData;
- },
- userEdit() {
- this.addModel = true;
- this.modelName = "编辑用户";
- this.showSave = true;
- }
- }
-};
-</script>
-
-<style lang="scss">
-.role-list {
- padding: 16px;
- .search-box {
- display: flex;
- justify-content: lex-start;
- align-items: lex-start;
- flex-direction: row;
- padding-top: 24px;
- padding-right: 24px;
- background-color: #ffffff;
- margin-bottom: 15px;
- }
- .btnbox {
- display: flex;
- justify-content: center;
- align-items: center;
- flex-direction: column;
- .ivu-btn {
- &:last-child {
- margin-top: 20px;
- }
- }
- }
-}
-
-.user-num {
- display: flex;
- margin-bottom: 16px;
- .user-num-title {
- width: 80px;
- text-align: right;
- vertical-align: middle;
- float: left;
- font-size: 12px;
- color: #495060;
- line-height: 1;
- padding: 10px 12px 10px 0;
- box-sizing: border-box;
- }
- .user-number {
- vertical-align: middle;
- float: left;
- font-size: 12px;
- color: #495060;
- line-height: 1;
- padding: 10px 12px 10px 0;
- box-sizing: border-box;
- }
-}
-</style>
diff --git a/src/views/role-management/role-manager.vue b/src/views/role-management/role-manager.vue
index 44311d8..a26c600 100644
--- a/src/views/role-management/role-manager.vue
+++ b/src/views/role-management/role-manager.vue
@@ -1,8 +1,8 @@
<!--
* @Author: 小明丶
* @Date: 2019-10-25 10:17:56
- * @LastEditors: zxq
- * @LastEditTime: 2023-04-25 15:34:05
+ * @LastEditors: zhaoxiaoqiang 287285524@qq.com
+ * @LastEditTime: 2023-09-05 15:31:32
* @Description:
-->
<template>
@@ -15,7 +15,7 @@
<el-button type="primary" @click="addRoleModel = true" size="small">新增</el-button>
</div>
<div class="role-list-table">
- <Etable isFind httpUrl="roleGetRoleList" itemsArr="roles" highlightCurrentRow :columns="columns" :searchData="searchData" :hasPagination="false" @operateDo="operateDo" @cellClick="powerInit" border></Etable>
+ <Etable isFind httpUrl="roleGetRoleList" nameUrl="roleGetRoleList" itemsArr="roles" highlightCurrentRow :columns="columns" :searchData="searchData" :hasPagination="false" @operateDo="operateDo" @cellClick="powerInit" border></Etable>
</div>
</el-card>
</el-col>
@@ -116,7 +116,7 @@
columns: [
{
lable: "角色名称",
- prop: "name",
+ prop: "roleName",
},
{
lable: "",
@@ -134,10 +134,11 @@
"div",
{
on: {
- click: () => {
- this.editRoleVal = params.row.name;
+ click: (e) => {
+ e.stopPropagation();
+ this.editRoleVal = params.row.roleName;
this.editRoleModel = true;
- this.roleId = params.row.code;
+ this.roleId = params.row.roleId;
},
},
},
@@ -153,7 +154,8 @@
"div",
{
on: {
- click: () => {
+ click: (e) => {
+ e.stopPropagation();
this.removeModel = true;
this.roleId = params.row.roleId;
},
@@ -203,10 +205,8 @@
},
//选择角色
powerInit(params) {
- this.roleId = params.code;
- let obj = {
- roleId: params.code,
- };
+ this.roleId = params.roleId;
+ let obj = { roleId: params.roleId };
setInit(obj).then((res) => {
if (res.body.btnList) {
this.btnList = res.body.btnList;
@@ -417,7 +417,7 @@
}
}
});
- console.log(this.initList);
+ // console.log(this.initList);
this.loading = true;
},
operateDo() { },
--
Gitblit v1.8.0