diff --git a/package.json b/package.json index 712be0e..fc91142 100644 --- a/package.json +++ b/package.json @@ -55,6 +55,7 @@ "screenfull": "5.0.2", "sortablejs": "1.10.2", "vue": "2.6.12", + "vue-clipboard2": "^0.3.3", "vue-count-to": "1.0.13", "vue-cropper": "0.5.5", "vue-meta": "2.4.0", diff --git a/src/api/form.js b/src/api/form.js index 50435bb..a3863b0 100644 --- a/src/api/form.js +++ b/src/api/form.js @@ -11,6 +11,20 @@ import { * */ export const common_api = { + // 查询所有代理商 + selectAgentListAll: () => { + return request({ + url: '/system/user/selectAgentListAll', + method: 'get', + }) + }, + // 所有国家 + getAllNation: () => { + return request({ + url: '/pay/getAllNation', + method: 'get', + }) + }, // 查询支付类型列表 payTypeAll: () => { return request({ @@ -238,6 +252,17 @@ export const payAgentUser = { }) }, + // 分配用户代理商 + assignAgents: (data) => { + return request({ + url: '/system/user/assignAgents?'+qs.stringify(data), + method: 'post', + headers: { + Authorization: "Bearer " + getToken(), + }, + }) +}, + } @@ -276,7 +301,6 @@ export const card_order_list = { }, }) }, - // 补发异步通知 reissueNotice: (data) => { return request({ @@ -522,6 +546,13 @@ export const platform_payment_list = { * 资金清算模块 */ export const payMoneyCalcu = { + // 人工修改余额接口 + updateBalance: (data) => { + return request({ + url: '/order/updateBalance?' + qs.stringify(data), + method: 'post', + }) + }, // 获取资金管理金额 amountCount: (query) => { return request({ @@ -1295,45 +1326,15 @@ export const payBankPaymentFormList = { /** - * 用户列表 + * 余额修改记录 */ -export const pkUserInfo = { - // 获取用户列表 +export const pkUpdateBalanceRecord = { + // 获取余额修改记录列表 listInfo: (query) => { return request({ - url: '/test/user/list', + url: '/order/getUpdateBalanceRecord', method: 'get', params: query }) }, - // 更新用户 - updateInfo: (data) => { - return request({ - url: '/test/user/update', - method: 'put', - data: data - }) - }, - // 获取用户详细 - getInfo: (id) => { - return request({ - url: '/test/user/' + id, - method: 'get' - }) - }, - // 新增用户 - addInfo: (data) => { - return request({ - url: '/test/user/save', - method: 'post', - data: data - }) - }, - // 删除用户信息 - delInfo: (id) => { - return request({ - url: '/test/user/' + id, - method: 'delete' - }) - }, } diff --git a/src/main.js b/src/main.js index c63d23a..7ee43ad 100644 --- a/src/main.js +++ b/src/main.js @@ -37,7 +37,9 @@ import DictTag from '@/components/DictTag' import VueMeta from 'vue-meta' // 字典数据组件 import DictData from '@/components/DictData' +import VueClipboard from 'vue-clipboard2' +Vue.use(VueClipboard) // 全局方法挂载 Vue.prototype.getDicts = getDicts Vue.prototype.getConfigKey = getConfigKey diff --git a/src/utils/request.js b/src/utils/request.js index bd88a61..43e36b9 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -67,7 +67,8 @@ service.interceptors.request.use(config => { if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) { const message = '数据正在处理，请勿重复提交'; console.warn(`[${s_url}]: ` + message) - // return Promise.reject(new Error(message)) + // new Error(message) + return Promise.reject() } else { cache.session.setJSON('sessionObj', requestObj) } diff --git a/src/utils/ruoyi.js b/src/utils/ruoyi.js index 59556ef..4d1b386 100644 --- a/src/utils/ruoyi.js +++ b/src/utils/ruoyi.js @@ -1,6 +1,21 @@ /** * 通用js方法封装处理 * Copyright (c) 2019 ruoyi + * + * + * + * + * + * pay_channel_name，key_id, user_id, store_id, order_no, out_trade_no, + * transaction_id, tran_amt, pay_amt, pay_type, channel_type, pay_time, order_status, + * rate, channel_rate, mch_id, mch_name, notify_url, back_url, store_no, bank_code, + * bank_id, card_type, product_name, product_desc, qrcode_img, qrcode_url, user_key, source_type, attach, + * version, charset, sign_type, create_time, update_time, order_msg, media_type + * name, mobile,store_settle_time,store_settle, + real_amt,rate_amt,poundage_rate,poundage_amt, + store_name,store_type,type_name pay_type_name, + channel_name pay_channel_name + * */ const baseURL = process.env.VUE_APP_BASE_API @@ -29,17 +44,17 @@ export function download(fileName) { //获取当前年月日 export function today() { - let nowDate = new Date(); - let date = { - year: nowDate.getFullYear(), - month: nowDate.getMonth() + 1, - date: nowDate.getDate(), - } - if (date.date <= 9) { - return date.year + '-' + 0 + date.month + '-' + 0 + date.date; - } else { - return date.year + '-' + 0 + date.month + '-' + date.date; - } + let nowDate = new Date(); + let date = { + year: nowDate.getFullYear(), + month: nowDate.getMonth() + 1, + date: nowDate.getDate(), + } + if (date.date <= 9) { + return date.year + '-' + 0 + date.month + '-' + 0 + date.date; + } else { + return date.year + '-' + 0 + date.month + '-' + date.date; + } } diff --git a/src/views/monitor/job/index.vue b/src/views/monitor/job/index.vue index 3a46288..d251bae 100644 --- a/src/views/monitor/job/index.vue +++ b/src/views/monitor/job/index.vue @@ -6,7 +6,50 @@
定时任务
- + + + + + +
+ + + + + + + + + + + + + + + +
+ + 搜索 + 重置 + + + + 日志 - - -
+ +
-
- - - - - - - - - - - - - - - - 搜索 - 重置 - + diff --git a/src/views/monitor/logininfor/index.vue b/src/views/monitor/logininfor/index.vue index 326a455..645d3f0 100644 --- a/src/views/monitor/logininfor/index.vue +++ b/src/views/monitor/logininfor/index.vue @@ -7,54 +7,13 @@
登陆日志
- - 删除 - - - 清空 - - - 解锁 - - - 导出 - +
- + - 搜索 - 重置 - +
+ + 搜索 + 重置 + + + + + 删除 + + + 清空 + + + 解锁 + + + 导出 + + +
+ + diff --git a/src/views/monitor/operlog/index.vue b/src/views/monitor/operlog/index.vue index 092933c..0d8e8f5 100644 --- a/src/views/monitor/operlog/index.vue +++ b/src/views/monitor/operlog/index.vue @@ -1,165 +1,112 @@ @@ -199,6 +418,12 @@ export default { dicts: ['pay_status'], data() { return { + // 详情 + detailInfoList: { + rate: '', + poundageRate: '', + agentRate: '', + }, pickerOptions: { shortcuts: [ { @@ -302,8 +527,6 @@ export default { value: 'part', }, ], - // 选中数组 - ids: [], // 非单个禁用 single: true, // 非多个禁用 @@ -344,7 +567,7 @@ export default { mchId: null, mchName: null, orderStatus: null, - name: null, + storeName: null, settleStatus: null, payType: null, channelType: null, @@ -354,12 +577,14 @@ export default { form: {}, // 表单校验 rules: { - positionName: [ - { required: true, message: "请输入广告名称", trigger: "blur" }, - ] }, detailData: {}, isShowDetail: false, + // 详情 + isShowDetailMy: false, + detailTitle: '', + // 预览 + srcList: ['https://fuss10.elemecdn.com/8/27/f01c15bb73e1ef3793e64e6b7bbccjpeg.jpeg'], }; }, created() { @@ -367,6 +592,17 @@ export default { this.init(); }, methods: { + // 预览图片 + previewImage(abUrl) { + this.srcList[0] = abUrl; + }, + // 查看详情 + handleViewMy(row) { + this.reset(); + this.detailInfoList = row; + this.isShowDetailMy = true; + this.detailTitle = "订单流水详情"; + }, /** 手工处理 */ handleOrder(row) { this.reset() @@ -412,7 +648,7 @@ export default { }, // 多选框选中数据 handleSelectionChange(selection) { - this.ids = selection.map(item => item.storeId) + this.ids = selection.map(item => item.keyId) this.single = selection.length != 1 this.multiple = !selection.length }, @@ -429,6 +665,7 @@ export default { // 取消按钮 cancel() { this.open = false; + this.isShowDetail=false this.reset(); }, // 表单重置 @@ -479,32 +716,12 @@ export default { } }); }, - /** 删除按钮操作 */ - handleDelete(row) { - const ids = row.id || this.ids; - this.$confirm( - '是否确认删除广告位名称为"' + row.positionName + '"的数据项?', - "警告", - { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", - } - ) - .then(function () { - return pkUserInfo.delInfo(ids); - }) - .then(() => { - this.getList(); - this.msgSuccess("删除成功"); - }) - .catch(() => { }); - } + }, }; \ No newline at end of file diff --git a/src/views/pay/payOrder/pkCouponScopeRangeStoreList.vue b/src/views/pay/payOrder/pkCouponScopeRangeStoreList.vue index 239661e..d11375d 100644 --- a/src/views/pay/payOrder/pkCouponScopeRangeStoreList.vue +++ b/src/views/pay/payOrder/pkCouponScopeRangeStoreList.vue @@ -2,7 +2,7 @@
-
+
在途总金额(元)：{{ sum.onRouteAmount }}
@@ -50,13 +50,15 @@ - + @@ -68,7 +70,7 @@ - + {{ detailData.accountNo }} @@ -91,8 +93,8 @@
- 确 定 - 取 消 + 确 定 + 取 消
@@ -100,7 +102,7 @@ - + {{ detailData.accountNo }} @@ -122,7 +124,8 @@ {{ detailData.useCapital }}（元） - + @@ -132,7 +135,7 @@
- 确 定 + 确 定 取 消
@@ -141,7 +144,7 @@ - +
代付银行卡 @@ -176,7 +179,8 @@ {{ detailData.useCapital }}元 - + @@ -186,10 +190,43 @@
- 确 定 + 确 定 + 取 消 +
+ + + + + + + {{ detailData.accountNo }} + + + {{ detailData.useCapital }}元 + + + + {{ dict.label }} + + + + + + + + + + + + +
+ 确 定 取 消
+
@@ -219,6 +256,16 @@ export default { } } return { + type: [ + { + label: '增加', + value: 'yes' + }, + { + label: '减少', + value: 'no' + }, + ], // 用户默认的出金通道 userWithdrawalChannel: {}, accountCon: [], @@ -246,7 +293,7 @@ export default { open: false, openTransfer: false, openBank: false, - + openBalance: false, // 查询参数 queryParams: { pageNum: 1, @@ -267,6 +314,9 @@ export default { }, // 表单校验 rules: { + afterAmt: [ + { required: true, message: "请输入本次修改金额", trigger: "blur" }, + ], paymentAmount: [ { required: true, message: "请输入本次代付金额", trigger: "blur" }, ], @@ -343,12 +393,11 @@ export default { }) }, // 私户 - handlePrivateTransfer(row) { - this.reset(); + handlePrivateTransfer(row,v) { + this.reset(v); this.loading = true; // 获取用户出金 this.getUserWithdrawalChannel(); - payMoneyCalcu.getWithdrawalChannel({ channelType: row.channelType, flagCard: 'private_account' @@ -363,15 +412,14 @@ export default { storeId: this.queryParams.storeId }) .then((response) => { + this.form.accountNo=row.accountNo this.detailData = response.data - - }); }); }, // 资金划转 - handleTransfer(row) { - this.reset(); + handleTransfer(row,v) { + this.reset(v); this.form.storeId = this.pkCouponStore.storeId this.loading = true; // 获取虚拟资金 @@ -393,15 +441,48 @@ export default { }); }, + // 余额修改 + subUpdateBalance(a,v){ + var googleCode=this.form.googleCode + this.$refs[v].validate((valid) => { + if (valid) { + const loading = this.$loading({ + lock: true, + text: `正在修改`, + spinner: "el-icon-loading", + background: "rgba(0, 0, 0, 0.7)", + }); + payMoneyCalcu + .updateBalance({ + accountNo:this.form.accountNo, + googleCode:googleCode, + updateUserId:this.form.updateUserId, + isIncome:this.form.isIncome, + tranAmt:this.form.afterAmt, + }) + .then((response) => { + loading.close(); + if (response.code == 200) { + this.$message.success('修改成功') + this.getList(); + } + this.openBalance = false + }) + .catch(() => { + loading.close(); + }); + } + }); + }, /** 提交按钮 */ - submitForm(type) { + submitForm(type,val) { if (type == 'private') { this.form.storeId = this.pkCouponStore.storeId if (this.form.paymentAmount > this.detailData.useCapital) { this.$message.error('余额不足') return; } - this.$refs["form"].validate((valid) => { + this.$refs[val].validate((valid) => { if (valid) { const loading = this.$loading({ lock: true, @@ -429,8 +510,8 @@ export default { this.$message.error('余额不足') return; } - - this.$refs["form"].validate((valid) => { + + this.$refs[val].validate((valid) => { if (valid) { const loading = this.$loading({ lock: true, @@ -438,7 +519,7 @@ export default { spinner: "el-icon-loading", background: "rgba(0, 0, 0, 0.7)", }); - this.form.accountNo=this.detailData.accountNo + this.form.accountNo = this.detailData.accountNo payMoneyCalcu .transferCapitalSave(this.form) .then((response) => { @@ -458,7 +539,7 @@ export default { this.$message.error('余额不足') return; } - this.$refs["form"].validate((valid) => { + this.$refs[val].validate((valid) => { if (valid) { const loading = this.$loading({ lock: true, @@ -483,9 +564,18 @@ export default { } }, + // 手动修改余额 + updateBalance(row,v) { + this.reset(v); + this.detailData = row + this.form.accountNo = row.accountNo + this.form.updateUserId = row.userId + this.form.isIncome = 'yes' + this.openBalance = true; + }, // 资金冻结 - handleFrozen(row) { - this.reset(); + handleFrozen(row,v) { + this.reset(v); this.detailData = row this.form.storeId = this.pkCouponStore.storeId this.form.accountNo = this.detailData.accountNo @@ -502,13 +592,13 @@ export default { this.total = Number(response.data.total) this.loading = false; }); - payMoneyCalcu.amountCount({ - storeId:this.pkCouponStore.storeId, - channelType:'', - payType:'', - }) + payMoneyCalcu.amountCount({ + storeId: this.pkCouponStore.storeId, + channelType: '', + payType: '', + }) .then((response) => { - this.sum=response.data + this.sum = response.data }); }, init() { @@ -520,17 +610,18 @@ export default { }); }, // 取消按钮 - cancel() { + cancel(type) { this.open = false; this.openTransfer = false; this.openBank = false - this.reset(); + this.openBalance = false + this.reset(type); }, // 表单重置 - reset() { + reset(type) { this.form = {}; this.detailData = {}; - this.resetForm("form"); + this.resetForm(type); }, /** 搜索按钮操作 */ handleQuery() { @@ -549,6 +640,9 @@ export default { this.open = true; this.title = "添加适用商家"; }, + change() { + this.$forceUpdate() + }, selectChange(data) { this.$set(this.form, 'storeName', data.storeName) this.form.pkStoreId = data.id; diff --git a/src/views/pay/payOrder/singleNeiChong.vue b/src/views/pay/payOrder/singleNeiChong.vue index dbbe856..138b449 100644 --- a/src/views/pay/payOrder/singleNeiChong.vue +++ b/src/views/pay/payOrder/singleNeiChong.vue @@ -15,13 +15,13 @@ @keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" /> - 搜索 + 搜索 重置 - + @@ -33,12 +33,12 @@
- - {{ form.channelContent }} + + {{ form.channelContent }} + @change="getValue" v-hasPermi="['record:manual_query_bank']"> @@ -56,9 +56,9 @@ - + + @change="change" v-hasPermi="['record:manual_query_bank_user']"> @@ -86,7 +86,7 @@ oninput="value=value.replace(/[^\d.]/g,'').replace(/^\./g, '').replace(/\.{2,}/g, '').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').match(/^\d*(\.?\d{0,4})/g)[0] || null" />
- 提交 + 提交 取消
diff --git a/src/views/pay/payTest/payCode.vue b/src/views/pay/payTest/payCode.vue index 74c5ae4..9109ed1 100644 --- a/src/views/pay/payTest/payCode.vue +++ b/src/views/pay/payTest/payCode.vue @@ -17,10 +17,10 @@ - + - + @@ -66,7 +66,7 @@ 获取签名 + @click="handleSay" v-hasPermi="['pay:test:paySign']">获取签名 { + // savePayConfig() { + // if (!this.infoList.googleCode) { + // this.$message.error("请填写谷歌动态验证码"); + // return; + // } + // this.loading = true + // this.infoList.storeId = this.val; + // this.infoList.id = this.infoList.id < 1 ? null : this.infoList.id; + // payAgentUser + // .updateStoreConfig(this.infoList) + // .then((response) => { - this.msgSuccess("编辑成功"); - this.getList(this.val) - this.loading = false; - }) - .catch((err) => { - this.loading = false; - }); - }, + // this.msgSuccess("编辑成功"); + // this.getList(this.val) + // this.loading = false; + // }) + // .catch((err) => { + // this.loading = false; + // }); + // }, }, }; diff --git a/src/views/pay/payTest/payDai.vue b/src/views/pay/payTest/payDai.vue index ceb0847..3abcf50 100644 --- a/src/views/pay/payTest/payDai.vue +++ b/src/views/pay/payTest/payDai.vue @@ -17,10 +17,10 @@ - + - + @@ -64,7 +64,7 @@ 获取签名 + @click="handleSay" v-hasPermi="['pay:test:paymentSign']">获取签名 内充银行配置
- - 新增 - +
@@ -35,8 +33,19 @@ - 搜索 - 重置 +
+ + 搜索 + 重置 + + + + + 新增 + + +
+ @@ -70,7 +79,7 @@ @@ -79,7 +88,7 @@ diff --git a/src/views/pay/payType/payChannelDefult.vue b/src/views/pay/payType/payChannelDefult.vue index c2c1482..4d1d869 100644 --- a/src/views/pay/payType/payChannelDefult.vue +++ b/src/views/pay/payType/payChannelDefult.vue @@ -23,7 +23,7 @@
- 确 定 + 确 定 取 消
diff --git a/src/views/pay/payType/payChannelOut.vue b/src/views/pay/payType/payChannelOut.vue index f099105..f84b71b 100644 --- a/src/views/pay/payType/payChannelOut.vue +++ b/src/views/pay/payType/payChannelOut.vue @@ -6,9 +6,7 @@
出金渠道配置
- - 新增 - + @@ -33,8 +31,19 @@ - 搜索 - 重置 +
+ + 搜索 + 重置 + + + + + 新增 + + +
+ @@ -62,9 +71,9 @@ diff --git a/src/views/pay/payType/payTypeChannel.vue b/src/views/pay/payType/payTypeChannel.vue index b4ca376..0448fa4 100644 --- a/src/views/pay/payType/payTypeChannel.vue +++ b/src/views/pay/payType/payTypeChannel.vue @@ -6,9 +6,7 @@
渠道类型管理
- - 新增 - + @@ -20,19 +18,37 @@ @keyup.enter.native="handleQuery" style="width: 215px;border-color: #E6F1FF;" /> - 搜索 - 重置 - +
+ + 搜索 + 重置 + + + + + 新增 + + +
+ + + + + + + @@ -49,6 +65,14 @@ + + + + + + +
确 定 @@ -68,7 +92,7 @@ export default { name: "PkAdWeiList", data() { return { - + nation:[], dateRange: [], // 新增广告图片地址 imageUrl: "", @@ -100,7 +124,9 @@ export default { }, // 表单校验 rules: { - + nationCode: [ + { required: true, message: "请选择国家", trigger: "blur" }, + ], channelName: [ { required: true, message: "请输入渠道名称", trigger: "blur" }, ], @@ -128,6 +154,11 @@ export default { this.total = Number(response.total); this.loading = false; }); + common_api + .getAllNation() + .then((response) => { + this.nation= response.data + }); }, // 取消按钮 cancel() { diff --git a/src/views/pay/payType/payTypeChannelManage.vue b/src/views/pay/payType/payTypeChannelManage.vue index 07989a5..94c6d1d 100644 --- a/src/views/pay/payType/payTypeChannelManage.vue +++ b/src/views/pay/payType/payTypeChannelManage.vue @@ -6,9 +6,7 @@
通道配置管理
- - 新增 - + @@ -42,8 +40,20 @@ - 搜索 - 重置 +
+ + 搜索 + 重置 + + + + + 新增 + + +
+ @@ -78,14 +88,14 @@ {{ NumberMul(scope.row.poundageRate, 100) }}% - - - + + + @@ -95,7 +105,8 @@ @@ -200,6 +211,7 @@ + diff --git a/src/views/pay/payType/payTypeManage.vue b/src/views/pay/payType/payTypeManage.vue index 35a183d..bedc1c3 100644 --- a/src/views/pay/payType/payTypeManage.vue +++ b/src/views/pay/payType/payTypeManage.vue @@ -6,31 +6,33 @@
支付类型管理
- - 新增 - +
- + + +
+ + + 新增 + + +
+ + + diff --git a/src/views/pay/payType/payTypeSettleConfig.vue b/src/views/pay/payType/payTypeSettleConfig.vue index 16fdab9..1024ee7 100644 --- a/src/views/pay/payType/payTypeSettleConfig.vue +++ b/src/views/pay/payType/payTypeSettleConfig.vue @@ -6,9 +6,7 @@
结算配置管理
- - 新增 - + @@ -33,8 +31,19 @@ - 搜索 - 重置 +
+ + 搜索 + 重置 + + + + + 新增 + + +
+ @@ -72,9 +81,9 @@ diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue index 9f2c073..da9e6ce 100644 --- a/src/views/system/config/index.vue +++ b/src/views/system/config/index.vue @@ -6,7 +6,60 @@
参数设置
- + + + + +
+ + + + + + + + + + + + + + + + +
+ + 搜索 + 重置 + + + + 刷新缓存 - - -
-
- - - - - - - - - - - - - - - - - 搜索 - 重置 - + +
+ + diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue index aa5f137..663bc6a 100644 --- a/src/views/system/dept/index.vue +++ b/src/views/system/dept/index.vue @@ -6,101 +6,68 @@
部门管理
- - 新增 - - - 展开/折叠 - - - + + +
- - - - - - - - - - - 搜索 - 重置 - - - - - - - - - - - - - - - -
+ + + + + + + + + + +
+ + 搜索 + 重置 + + + + + 新增 + + + 展开/折叠 + + +
+ + + + + + + + + + + + + + + + + @@ -145,11 +112,8 @@ - {{dict.label}} + {{ dict.label }} @@ -313,7 +277,7 @@ export default { }); }, /** 提交按钮 */ - submitForm: function() { + submitForm: function () { this.$refs["form"].validate(valid => { if (valid) { if (this.form.deptId != undefined) { @@ -334,12 +298,12 @@ export default { }, /** 删除按钮操作 */ handleDelete(row) { - this.$modal.confirm('是否确认删除名称为"' + row.deptName + '"的数据项？').then(function() { + this.$modal.confirm('是否确认删除名称为"' + row.deptName + '"的数据项？').then(function () { return delDept(row.deptId); }).then(() => { this.getList(); this.$modal.msgSuccess("删除成功"); - }).catch(() => {}); + }).catch(() => { }); } } }; diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue index 0162215..069a770 100644 --- a/src/views/system/dict/index.vue +++ b/src/views/system/dict/index.vue @@ -6,58 +6,7 @@
字典管理
- - 新增 - - - 修改 - - - 删除 - - - 导出 - - - 刷新缓存 - + @@ -111,9 +60,69 @@ > - 搜索 - 重置 - +
+ + 搜索 + 重置 + + + + + 新增 + + + 修改 + + + 删除 + + + 导出 + + + 刷新缓存 + + +
+ + @@ -272,7 +281,7 @@ export default { this.loading = true; listType(this.addDateRange(this.queryParams, this.dateRange)).then(response => { this.typeList = response.rows; - this.total = response.total; + this.total = Number(response.total); this.loading = false; } ); diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue index dc0f675..25333a4 100644 --- a/src/views/system/menu/index.vue +++ b/src/views/system/menu/index.vue @@ -7,111 +7,79 @@
菜单管理
- - 新增 - - - 展开/折叠 - - - + + +
- - - - - - - - - - - 搜索 - 重置 - - + + + + + + + + + + +
+ + 搜索 + 重置 + - + + + 新增 + + + 展开/折叠 + + +
- - - - - - - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + + + + + + + + + + @@ -119,13 +87,8 @@ - + @@ -139,21 +102,11 @@ - + - + @@ -173,7 +126,7 @@ - + 是否外链 @@ -187,7 +140,7 @@ - + 路由地址 @@ -198,7 +151,7 @@ - + 组件路径 @@ -210,7 +163,7 @@ - + 权限字符 @@ -221,7 +174,7 @@ - + 路由参数 @@ -231,7 +184,7 @@ - + 是否缓存 @@ -245,16 +198,13 @@ - + 显示状态 - {{dict.label}} + {{ dict.label }} @@ -262,16 +212,13 @@ - + 菜单状态 - {{dict.label}} + {{ dict.label }} @@ -431,7 +378,7 @@ export default { }); }, /** 提交按钮 */ - submitForm: function() { + submitForm: function () { this.$refs["form"].validate(valid => { if (valid) { if (this.form.menuId != undefined) { @@ -452,12 +399,12 @@ export default { }, /** 删除按钮操作 */ handleDelete(row) { - this.$modal.confirm('是否确认删除名称为"' + row.menuName + '"的数据项？').then(function() { + this.$modal.confirm('是否确认删除名称为"' + row.menuName + '"的数据项？').then(function () { return delMenu(row.menuId); }).then(() => { this.getList(); this.$modal.msgSuccess("删除成功"); - }).catch(() => {}); + }).catch(() => { }); } } }; diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue index 5020cc0..565e760 100644 --- a/src/views/system/notice/index.vue +++ b/src/views/system/notice/index.vue @@ -7,38 +7,7 @@
通知公告
- - 新增 - - - 修改 - - - 删除 - + @@ -71,9 +40,49 @@ - 搜索 - 重置 - +
+ + 搜索 + 重置 + + + + + 新增 + + + 修改 + + + 删除 + + +
+ + diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue index 1c2c788..8208e81 100644 --- a/src/views/system/post/index.vue +++ b/src/views/system/post/index.vue @@ -6,22 +6,7 @@
岗位管理
- - 新增 - - - 修改 - - - 删除 - - - 导出 - + @@ -40,9 +25,33 @@ - 搜索 - 重置 - +
+ + 搜索 + 重置 + + + + + 新增 + + + 修改 + + + 删除 + + + 导出 + + +
+ + diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue index bf1bc34..5b9b1e4 100644 --- a/src/views/system/role/index.vue +++ b/src/views/system/role/index.vue @@ -7,76 +7,87 @@
角色管理
- - 新增 - - - 修改 - - - 删除 - - - 导出 - +
- - - - - - - - - - - - - - - - - 搜索 - 重置 - - - - - - - - - - - - - - - - - - + + + - -
+ + @@ -114,8 +125,8 @@ - {{ dict.label }} + {{ dict.label + }} diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 9e6bb7d..b288b48 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -73,7 +73,7 @@ @@ -83,7 +83,7 @@ :show-overflow-tooltip="true" /> -