dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: dianliang:a9727156f77111cad9ceb950b078c21ce6f20232
Branches Tags
dianliang:main
dianliang:master
...
compare: dianliang:eabfb9bd1f456359ebbdb3e9daa532eae078da93
Branches Tags
dianliang:main
dianliang:master

2 Commits
a9727156f7 ... eabfb9bd1f

Author SHA1 Message Date
Lx
eabfb9bd1f 中台系统设置部分Bug 2024-10-17 18:13:21 +08:00
Lx
e560658211 中台系统设置部分Bug 2024-10-17 18:13:21 +08:00
11 changed files with 237 additions and 113 deletions
Show Stats Expand all files Collapse all files

21
fuintAdmin_zt/src/views/setting/banner/index.vue
View File

@ -120,8 +120,8 @@
</div>
<el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="55%" append-to-body>
<el-form ref="form" :model="deviceInfo" label-width="80px" :rules="rules">
<el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="30%" append-to-body>
<el-form ref="form" :model="deviceInfo" label-width="80px" :rules="rules" style="margin-left: 30px">
<el-form :model="deviceInfo" ref="deviceForm" label-width="120px" :rules="rules">
<el-form-item label="banner名称" prop="bannerName">
<el-input v-model="deviceInfo.bannerName" style="width: 300px"></el-input>
@ -219,7 +219,8 @@
<el-form-item label="备注" prop="note">
<el-input v-model="deviceInfo.note" style="width: 300px"></el-input>
</el-form-item>
<el-form-item>
<el-form-item style="margin-left: 30px;">
<el-button style="margin-right: 20px;" @click="handleReset">取消</el-button>
<el-button type="primary" @click="submitForm('deviceForm')">提交</el-button>
</el-form-item>
</el-form>
@ -276,7 +277,7 @@ export default {
{ required: true, message: '请填写banner名称', trigger: 'blur' }
],
systemPosition: [
{ required: true, message: '请填写系统位置', trigger: '' }
{ required: true, message: '请填写系统位置', trigger: 'blur' }
],
sortOrder: [
{ required: true, message: '请填写排序号', trigger: 'blur' }
@ -393,7 +394,7 @@ export default {
pageSize: 10,
deviceName: '',
systemPosition: '系统首页'
},
}
this.getList()
},
handleAdd(e) {
@ -401,6 +402,9 @@ export default {
this.open = true
this.title = '新增banner图'
},
handleReset() {
this.open = false
},
edit(e) {
this.clean()
this.open = true
@ -454,10 +458,11 @@ export default {
bannerStatus: false, // Banner状态
note: '', // 备注
createByName: '' //
}
};
this.uploadFiles = []
if (this.$refs.deviceForm) {
this.$refs.deviceForm.resetFields();
}
}
}
}

61
fuintAdmin_zt/src/views/setting/message.vue
View File

@ -93,8 +93,8 @@
</div>
<el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="35%" append-to-body>
<el-form ref="form" :rules="rules" :model="form" label-width="120px">
<el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="30%" append-to-body>
<el-form ref="form" :rules="rules" :model="form" label-width="120px" style="margin-left: 25px;">
<el-form-item label="短信模板ID" prop="messageId">
<el-input v-model="form.messageId" style="width: 300px"></el-input>
@ -135,7 +135,8 @@
<el-form-item label="短信内容" prop="content" >
<el-input type="textarea" v-model="form.content" style="width: 300px"></el-input>
</el-form-item>
<el-form-item>
<el-form-item style="margin-left: 40px; margin-top: 40px">
<el-button style="margin-right: 20px;" @click="handleReset">取消</el-button>
<el-button type="primary" @click="submitForm('form')">提交</el-button>
</el-form-item>
</el-form>
@ -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) {
@ -327,8 +356,14 @@ export default {
bannerStatus: false, // Banner状态
note: '', // 备注
createByName: '', //
};
if (this.$refs.form) {
this.$refs.form.resetFields();
}
},
handleReset() {
this.open = false
},
}
};
</script>

15
fuintAdmin_zt/src/views/setting/pay/index.vue
View File

@ -134,7 +134,7 @@
</div>
<el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="30%" append-to-body>
<el-form :model="deviceInfo" ref="deviceForm" label-width="120px" :rules="rules">
<el-form :model="deviceInfo" ref="deviceForm" label-width="120px" :rules="rules" style="margin-left: 20px;">
<el-form-item label="机构名称" prop="deptId" >
<el-select v-model="deviceInfo.deptId" placeholder="请选择机构" @change="chooseDept(deviceInfo.deptId)" style="width: 300px">
@ -191,8 +191,10 @@
inactive-color="#ff4949">
</el-switch>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="submitForm('deviceForm')">提交</el-button>
<el-form-item style="margin-left: 55px">
<el-button @click="handleReset" style="margin-right: 20px;">取消</el-button>
<el-button type="primary" @click="submitForm('deviceForm')">保存</el-button>
</el-form-item>
</el-form>
</el-dialog>
@ -398,6 +400,13 @@ export default {
information:'',
status:'qy'
}
if (this.$refs.deviceForm) {
this.$refs.deviceForm.resetFields();
}
},
handleReset() {
this.open = false
},
}
};

111
fuintAdmin_zt/src/views/system/notify/page/mode.vue
View File

@ -96,14 +96,14 @@
</div>
<el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="32%" append-to-body>
<el-form :model="form" label-width="120px">
<el-form :model="form" ref="form" :rules="rules" label-width="120px">
<!-- 通知名称 -->
<el-form-item label="通知名称" :required="true">
<el-form-item label="通知名称" prop="notificationName">
<el-input v-model="form.notificationName" placeholder="请输入通知名称" style="width: 300px" ></el-input>
</el-form-item>
<!-- 通知类型 -->
<el-form-item label="通知类型" :required="true">
<el-form-item label="通知类型" prop="notificationType">
<el-select v-model="form.notificationType" placeholder="请选择通知类型" style="width: 300px">
<el-option label="到期提醒" value="到期提醒"></el-option>
<el-option label="系统升级" value="系统升级"></el-option>
@ -112,7 +112,7 @@
</el-form-item>
<!-- 通知模板 -->
<el-form-item label="通知模板" :required="true">
<el-form-item label="通知模板" prop="templateContent">
<el-input type="textarea" v-model="form.templateContent" :rows="3" placeholder="请输入通知内容" :maxlength="200" show-word-limit style="width: 300px"></el-input>
<div>
<span @click = "insertText('{系统到期日期}')">{系统到期日期}</span>
@ -123,19 +123,19 @@
</el-form-item>
<!-- 接收角色 -->
<el-form-item label="接收角色" :required="true">
<el-form-item label="接收角色" prop="recipientRoles">
<el-select v-model="form.recipientRoles" multiple placeholder="请选择角色" style="width: 300px">
<el-option v-for="item in dutyList1" :label="item.dutyName" :value="item.dutyId" ></el-option>
</el-select>
</el-form-item>
<!-- 模板状态 -->
<el-form-item label="模板状态" :required="true">
<el-form-item label="模板状态" prop="templateStatus">
<el-switch v-model="form.templateStatus" active-color="#13ce66" inactive-color="#ff4949"></el-switch>
</el-form-item>
<!-- 发送条件 -->
<el-form-item label="发送条件" style="margin-bottom: 10px" :required="true">
<el-form-item label="发送条件" style="margin-bottom: 10px" prop="conditions">
<div v-for="(condition, index) in form.conditions" :key="index" class="condition-group" style="margin-bottom: 10px">
<el-select v-model="condition.field" placeholder="请选择条件" style="width: 150px;margin-right: 10px" @change="changeField(index)">
<el-option label="系统到期日期" value="系统到期日期"></el-option>
@ -154,7 +154,7 @@
</el-input>
<el-button @click="removeCondition(index)" type="danger" icon="el-icon-delete" circle></el-button>
</div>
<el-button @click="addCondition(index)" type="primary" icon="el-icon-plus">添加条件</el-button>
<el-button @click="addCondition" type="primary" icon="el-icon-plus">添加条件</el-button>
</el-form-item>
<!-- 操作按钮 -->
@ -163,7 +163,7 @@
<!-- </el-form-item>-->
</el-form>
<div style="display: flex; justify-content: center; align-items: center;margin-top: 30px">
<el-button type="primary" @click="handleSubmit">保存</el-button>
<el-button type="primary" @click="handleSubmit('form')">保存</el-button>
<el-button @click="handleReset">取消</el-button>
</div>
@ -200,7 +200,7 @@ export default {
conditions: [
]
},
// { field: '', operator: '', value: '' }
// { field: '', operator: '', value: '' }
deviceInfo: {
id: null, // 自增id
@ -223,6 +223,26 @@ export default {
legalRepresentativeContact:'',
appStatus:'',
},
rules: {
notificationName: [
{required: true, message: '请输入通知名称', trigger: 'blur'},
],
notificationType: [
{required: true, message: '请选择通知类型', trigger: 'change'},
],
templateContent: [
{required: true, message: '请输入通知模版', trigger: 'blur'},
],
recipientRoles: [
{required: true, message: '请选择接收角色', trigger: 'change'},
],
templateStatus: [
{required: true, message: '请选择模版状态', trigger: 'change'},
],
conditions: [
{required: true, message: '请添加发送条件', trigger: 'change'},
],
},
};
},
created() {
@ -267,38 +287,47 @@ export default {
// });
// },
handleSubmit() {
this.open = false
handleSubmit(form) {
this.$refs[form].validate(valid =>{
if (valid) {
// 表单验证通过，可以提交数据
if ( this.form.conditions.length === 0 || this.form.conditions[0].field == '') {
this.form.conditions = ''
this.$message({
type: 'error',
message: '请选择发送条件!'
});
return
} else {
this.form.conditions = JSON.stringify(this.form.conditions)
}
this.form.recipientRoles = JSON.stringify(this.form.recipientRoles)
// 在这里调用接口提交设备信息数据
if (this.form.id) {
updateSysNotifyApi(this.form).then(res=>{
if(res.code === 200) {
this.form.conditions = []
this.getList()
this.open = false
}
})
}else {
saveSysNotifyApi(this.form).then(res=>{
if(res.code === 200) {
this.form.conditions = []
this.getList()
this.open = false
}
})
}
} else {
// 表单验证失败，不执行任何操作
return false
}
})
// 在这里调用接口提交设备信息数据
console.log('提交设备信息数据:', this.form);
if ( this.form.conditions.length === 0 || this.form.conditions[0].field == '') {
this.form.conditions = ''
this.$message({
type: 'info',
message: '请选择发送条件!'
});
return
} else {
this.form.conditions = JSON.stringify(this.form.conditions)
}
this.form.recipientRoles = JSON.stringify(this.form.recipientRoles)
if (this.form.id) {
updateSysNotifyApi(this.form).then(res=>{
if(res.code === 200) {
this.getList()
this.open = false
}
})
}else {
saveSysNotifyApi(this.form).then(res=>{
if(res.code === 200) {
this.getList()
this.open = false
}
})
}
},
handleReset() {
this.open = false
@ -363,6 +392,7 @@ export default {
},
insertText(data) {
this.form.templateContent = this.form.templateContent+data
console.log("Test",this.form.templateContent+data)
},
addCondition() {
if (this.form.conditions.length > 2) {
@ -443,6 +473,9 @@ export default {
{ field: '', operator: '', value: '' }
]
}
if (this.$refs.form) {
this.$refs.form.resetFields();
}
},
}
};

116
fuintAdmin_zt/src/views/system/notify/page/record.vue
View File

@ -108,15 +108,15 @@
</div>
<el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="35%" append-to-body>
<el-form ref="form" :model="form" label-width="80px">
<el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="27%" append-to-body>
<el-form ref="form" :model="form" label-width="120px" :rules="rules" >
<!-- 通知名称 -->
<el-form-item label="通知名称" :required="true">
<el-form-item label="通知名称" prop="notificationName">
<el-input v-model="form.notificationName" placeholder="请输入通知名称" style="width: 300px;"></el-input>
</el-form-item>
<!-- 通知类型 -->
<el-form-item label="通知类型" :required="true">
<el-form-item label="通知类型" prop="notificationType" >
<el-select v-model="form.notificationType" placeholder="请选择通知类型" style="width: 300px;">
<el-option label="到期提醒" value="到期提醒"></el-option>
<el-option label="系统升级" value="系统升级"></el-option>
@ -126,19 +126,19 @@
</el-form-item>
<!-- 通知模板 -->
<el-form-item label="通知模板" :required="true">
<el-form-item label="通知模板" prop="templateContent">
<el-input type="textarea" v-model="form.templateContent" placeholder="请输入通知内容" :maxlength="200"
show-word-limit style="width: 300px;"></el-input>
</el-form-item>
<!-- 接收角色 -->
<el-form-item label="接收角色" :required="true">
<el-form-item label="接收角色" prop="recipientRoles">
<el-select v-model="form.recipientRoles" multiple placeholder="请选择角色" @change="getUserByRoles"
style="width: 300px;">
<el-option v-for="item in dutyList1" :label="item.dutyName" :value="item.dutyId"></el-option>
<el-option v-for="item in dutyList1" :key="item.id" :label="item.dutyName" :value="item.dutyId"></el-option>
</el-select>
</el-form-item>
<el-form-item label="接收用户" :required="true">
<el-form-item label="接收用户" prop="recipientUser">
<div
style="border: 1px solid #DCDFE6;width: 300px;height: 100px; border-radius: 4px; flex-wrap: wrap;overflow-y: scroll;">
<div style="display: flex;margin: 10px;">
@ -157,14 +157,14 @@
</el-form-item>
<!-- 模板状态 -->
<el-form-item label="模板状态" :required="true">
<el-form-item label="模板状态" prop="templateStatus">
<el-switch v-model="form.templateStatus" active-color="#13ce66" inactive-color="#ff4949"></el-switch>
</el-form-item>
</el-form>
<el-button type="primary" @click="userEnter1">确定</el-button>
<div style="margin-left: 160px;">
<el-button style="margin-right: 20px" type="primary" @click="userEnter1('form')">确定</el-button>
<el-button @click="userCe2">取消</el-button>
</div>
</el-dialog>
<el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open1" width="50%" append-to-body>
<el-table v-loading="" :data="userList" @selection-change="handleSelectionChange" border>
@ -181,7 +181,7 @@
</el-table-column>
</el-table>
<div style="display: flex; justify-content: center; align-items: center;margin-top: 30px">
<div style="margin-left: 30px">
<el-button type="primary" @click="userEnter">确定</el-button>
<el-button @click="userCe();open1 = false">取消</el-button>
</div>
@ -244,6 +244,24 @@ 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() {
@ -271,8 +289,6 @@ export default {
},
// 发送通知
send(data) {
this.$confirm('是否发送本条通知信息', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@ -353,46 +369,69 @@ export default {
},
this.getList()
},
cleanForm() {
this.form = {
notificationName: '',
notificationType: '',
templateContent: '',
recipientRoles: [],
templateStatus: false,
recipientUser: []
};
if (this.$refs.form) {
this.$refs.form.resetFields();
}
},
handleAdd(e) {
this.clean()
this.cleanForm()
this.open = true;
this.getDutyList()
this.title = "新增通知"
},
userEnter1() {
// 在这里调用接口提交设备信息数据
userEnter1(form) {
this.$refs[form].validate(valid =>{
if (valid) {
// 表单验证通过，可以提交数据
this.form.recipientUser = JSON.stringify(this.form.recipientUser)
this.form.recipientRoles = JSON.stringify(this.form.recipientRoles)
if (this.form.id) {
updateSysNotifyApi(this.form).then(res => {
if (res.code === 200) {
this.getList()
this.open = false
}
})
} else {
saveSysNotifyApi(this.form).then(res => {
if (res.code === 200) {
this.getList()
this.open = false
}
})
}
} else {
// 表单验证失败，不执行任何操作
return false
}
})
// 在这里调用接口提交设备信息数据
console.log('提交设备信息数据:', this.form);
this.form.recipientUser = JSON.stringify(this.form.recipientUser)
this.form.recipientRoles = JSON.stringify(this.form.recipientRoles)
if (this.form.id) {
updateSysNotifyApi(this.form).then(res => {
if (res.code === 200) {
this.getList()
this.open = false
}
})
} else {
saveSysNotifyApi(this.form).then(res => {
if (res.code === 200) {
this.getList()
this.open = false
}
})
}
},
userCe2() {
this.open = false;
},
edit(e) {
this.clean()
this.cleanForm()
this.open = true;
this.title = "编辑通知"
this.form = e
this.getDutyList()
this.form = JSON.parse(JSON.stringify(e));
this.form.recipientUser = JSON.parse(this.form.recipientUser)
this.form.recipientRoles = JSON.parse(this.form.recipientRoles)
this.getDutyList()
console.log('提交设备信息数据:', this.deviceInfo);
@ -461,6 +500,7 @@ export default {
// this.addDateRange(this.queryParams, this.dateRange)
listUser(this.queryParamsUser).then(response => {
this.userList = response.data.records;
console.log("name", response.data.records)
// this.total = response.data.total;
// this.total = response.data.total;
// this.loading = false;

2
fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/mapper/xml/PaymentParameterConfigMapper.xml
View File

@ -26,7 +26,7 @@
and ppc.status = #{entity.status}
</if>
</where>
order by ppc.dept_id,ppc.create_time desc
order by ppc.create_time desc
</select>
<select id="selectInfoById" resultType="com.fuint.api.fuyou.vo.PaymentParameterConfigVo">
SELECT ppc.*,sd.dept_name,sd.dept_type,ta.real_name FROM `payment_parameter_config` ppc

1
fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/mapper/xml/SysAppMapper.xml
View File

@ -60,6 +60,7 @@ legal_representative_id,legal_representative_contact,app_status,create_time,crea
and app_status = #{sysApp.appStatus}
</if>
</where>
order by create_time desc
</select>
<!--统计总行数-->

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/mapper/xml/SysBannerMapper.xml
View File

@ -54,7 +54,7 @@ id,banner_name,product_image,system_position,sort_order,banner_link,banner_statu
and note = #{sysBanner.note}
</if>
</where>
order by sort_order ASC,create_time desc
order by create_time desc
</select>

1
fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/mapper/xml/SysNotifyMapper.xml
View File

@ -47,6 +47,7 @@
and template_status = #{entity.templateStatus}
</if>
</where>
order by create_time desc
</select>
<!--统计总行数-->

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/service/impl/SysNotifyServiceImpl.java
View File

@ -72,7 +72,7 @@ public class SysNotifyServiceImpl extends ServiceImpl<SysNotifyMapper, SysNotif
@Autowired
ILJDutyService dutyService;
/**
* 分页查询
*
@ -310,7 +310,7 @@ public class SysNotifyServiceImpl extends ServiceImpl<SysNotifyMapper, SysNotif
this.baseMapper.updateById(sysNotify);
}
}
return false;
return true;
}
// 根据dutyId查询员工id

16
fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/mapper/xml/SysDeptMapper.xml
View File

@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.fuint.system.dept.mapper.SysDeptMapper">
<select id="selectDeptList" resultType="com.fuint.system.dept.entity.SysDept">
select *
from sys_dept d
@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if>
order by d.parent_id, d.order_num
</select>
<select id="selectDeptById" parameterType="Long" resultType="com.fuint.system.dept.entity.SysDept">
select d.*,
(select dept_name from sys_dept where dept_id = d.parent_id) parent_name
@ -51,16 +51,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="checkDeptExistUser" parameterType="Long" resultType="int">
select count(1) from t_account where dept_id = #{deptId} and account_status = 1
</select>
<select id="hasChildByDeptId" parameterType="Long" resultType="int">
select count(1) from sys_dept
where parent_id = #{deptId} and if_delete = 0 limit 1
</select>
<select id="selectChildrenDeptById" resultType="com.fuint.system.dept.entity.SysDept">
select * from sys_dept where find_in_set(#{deptId}, ancestors)
</select>
@ -115,7 +115,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectStatusByParentId" resultType="java.lang.Integer">
select count(*) from sys_dept where status = 'jy' and dept_id= #{parentId} and if_delete = 0
</select>
<select id="checkDeptNameUnique" resultType="com.fuint.system.dept.entity.SysDept">
select *
from sys_dept
@ -135,7 +135,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{item.deptId}
</foreach>
</update>
<update id="updateDeptStatusNormal" parameterType="String">
update sys_dept set status = 'jy' where ancestors like concat(#{ancestor},'%')
</update>
@ -194,4 +194,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
</update>
</mapper>
</mapper>