From e560658211f76edab68a54a0c5af2cda75e9e637 Mon Sep 17 00:00:00 2001 From: Lx <935448346@qq.com> Date: Thu, 17 Oct 2024 12:50:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E5=8F=B0=E7=B3=BB=E7=BB=9F=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E9=83=A8=E5=88=86Bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/setting/banner/index.vue | 10 ++- fuintAdmin_zt/src/views/setting/message.vue | 58 +++++++++++++---- fuintAdmin_zt/src/views/setting/pay/index.vue | 10 ++- .../src/views/system/notify/page/record.vue | 64 ++++++++++++++----- .../xml/PaymentParameterConfigMapper.xml | 2 +- .../business/sys/mapper/xml/SysAppMapper.xml | 1 + .../sys/mapper/xml/SysBannerMapper.xml | 2 +- .../sys/mapper/xml/SysNotifyMapper.xml | 1 + .../system/dept/mapper/xml/SysDeptMapper.xml | 16 ++--- 9 files changed, 121 insertions(+), 43 deletions(-) diff --git a/fuintAdmin_zt/src/views/setting/banner/index.vue b/fuintAdmin_zt/src/views/setting/banner/index.vue index e544599a2..fb76cf446 100644 --- a/fuintAdmin_zt/src/views/setting/banner/index.vue +++ b/fuintAdmin_zt/src/views/setting/banner/index.vue @@ -120,8 +120,8 @@ - - + + @@ -219,7 +219,8 @@ - + + 取消 提交 @@ -401,6 +402,9 @@ export default { this.open = true this.title = '新增banner图' }, + handleReset() { + this.open = false + }, edit(e) { this.clean() this.open = true diff --git a/fuintAdmin_zt/src/views/setting/message.vue b/fuintAdmin_zt/src/views/setting/message.vue index 3e2608c6d..043ff883f 100644 --- a/fuintAdmin_zt/src/views/setting/message.vue +++ b/fuintAdmin_zt/src/views/setting/message.vue @@ -93,8 +93,8 @@ - - + + @@ -135,7 +135,8 @@ - + + 取消 提交 @@ -235,25 +236,53 @@ export default { } }); }, + // submitDeviceInfo() { + // // 在这里调用接口提交设备信息数据 + // console.log('提交设备信息数据:', this.form); + // if (this.form.id) { + // updateApi(this.form).then(res=>{ + // if(res.code === 200) { + // this.getList() + // this.open = false + // } + // }) + // }else { + // saveApi(this.form).then(res=>{ + // if(res.code === 200) { + // this.getList() + // this.open = false + // } + // }) + // } + // }, + submitDeviceInfo() { // 在这里调用接口提交设备信息数据 - console.log('提交设备信息数据:', this.form); + console.log('提交短信模板数据:', this.form); if (this.form.id) { - updateApi(this.form).then(res=>{ - if(res.code === 200) { - this.getList() - this.open = false + updateApi(this.form).then(res => { + if (res.code === 200) { + this.getList(); + this.open = false; + this.$message.success('短信模板更新成功'); + } else { + this.$message.error('短信模板更新失败'); } }) - }else { - saveApi(this.form).then(res=>{ - if(res.code === 200) { - this.getList() - this.open = false + } else { + saveApi(this.form).then(res => { + if (res.code === 200) { + this.getList(); + this.open = false; + this.$message.success('短信模板提交成功'); + } else { + this.$message.error('短信模板提交失败'); } }) } }, + + changeStatus(data){ updateApi(data).then(res=>{ if(res.code === 200) { @@ -329,6 +358,9 @@ export default { createByName: '', // } }, + handleReset() { + this.open = false + }, } }; diff --git a/fuintAdmin_zt/src/views/setting/pay/index.vue b/fuintAdmin_zt/src/views/setting/pay/index.vue index 01e471767..d9c8d35ba 100644 --- a/fuintAdmin_zt/src/views/setting/pay/index.vue +++ b/fuintAdmin_zt/src/views/setting/pay/index.vue @@ -191,8 +191,10 @@ inactive-color="#ff4949"> - - 提交 + + 取消 + 保存 + @@ -399,6 +401,10 @@ export default { status:'qy' } }, + handleReset() { + this.open = false + + }, } }; diff --git a/fuintAdmin_zt/src/views/system/notify/page/record.vue b/fuintAdmin_zt/src/views/system/notify/page/record.vue index 1a66c2192..7c4d90a5d 100644 --- a/fuintAdmin_zt/src/views/system/notify/page/record.vue +++ b/fuintAdmin_zt/src/views/system/notify/page/record.vue @@ -108,15 +108,15 @@ - - + + - + - + @@ -126,19 +126,19 @@ - + - + - + - +
@@ -157,14 +157,14 @@ - + - - - 确定 +
+ 确定 取消 +
@@ -181,7 +181,7 @@ -
+
确定 取消
@@ -244,6 +244,26 @@ export default { linshicunshu: [], getroleStaff:[], + + rules: { + notificationName: [ + {required: true, message: '请输入通知名称', trigger: 'blur'}, + ], + notificationType: [ + {required: true, message: '请选择通知类型', trigger: 'blur'}, + ], + templateContent: [ + {required: true, message: '请输入通知模版', trigger: 'blur'}, + ], + recipientRoles: [ + {required: true, message: '请选择接收角色', trigger: 'change'}, + ], + recipientUser: [ + {required: true, message: '请选择接收用户', trigger: 'change'}, + ], + + + } }; }, created() { @@ -353,8 +373,21 @@ export default { }, this.getList() }, + cleanForm() { + this.form = { + notificationName: '', + notificationType: '', + templateContent: '', + recipientRoles: [], + templateStatus: true, + recipientUser: [] + }; + this.$nextTick(() => { + this.$refs['form'].resetFields(); + }); + }, handleAdd(e) { - this.clean() + this.cleanForm() this.open = true; this.getDutyList() @@ -389,10 +422,11 @@ export default { this.clean() this.open = true; this.title = "编辑通知" + this.getDutyList() + this.form = e this.form.recipientUser = JSON.parse(this.form.recipientUser) this.form.recipientRoles = JSON.parse(this.form.recipientRoles) - this.getDutyList() console.log('提交设备信息数据:', this.deviceInfo); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/mapper/xml/PaymentParameterConfigMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/mapper/xml/PaymentParameterConfigMapper.xml index 4d5953059..a6ec0877e 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/mapper/xml/PaymentParameterConfigMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/mapper/xml/PaymentParameterConfigMapper.xml @@ -26,7 +26,7 @@ and ppc.status = #{entity.status} - order by ppc.dept_id,ppc.create_time desc + order by ppc.create_time desc diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/mapper/xml/SysBannerMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/mapper/xml/SysBannerMapper.xml index 7a179bc9a..e4b1416c9 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/mapper/xml/SysBannerMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/mapper/xml/SysBannerMapper.xml @@ -54,7 +54,7 @@ id,banner_name,product_image,system_position,sort_order,banner_link,banner_statu and note = #{sysBanner.note} - order by sort_order ASC,create_time desc + order by create_time desc diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/mapper/xml/SysNotifyMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/mapper/xml/SysNotifyMapper.xml index 98e013962..d38f0c255 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/mapper/xml/SysNotifyMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/mapper/xml/SysNotifyMapper.xml @@ -47,6 +47,7 @@ and template_status = #{entity.templateStatus} + order by create_time desc diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/mapper/xml/SysDeptMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/mapper/xml/SysDeptMapper.xml index 254419c4a..8a9eb2c88 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/mapper/xml/SysDeptMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/mapper/xml/SysDeptMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + - + - + - + - + @@ -115,7 +115,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - +