hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-07-16 20:15:06 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp

Browse Source 
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/notify/PayNotifyServiceImpl.java
#	yudao-ui-admin/src/views/mall/trade/order/index.vue
This commit is contained in:
YunaiV
2022-12-23 19:12:45 +08:00
parent 7a4a6a3046 893b6cf4f2
commit 92632c046c
498 changed files with 15699 additions and 14537 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
yudao-ui-admin/src/views/system/notice/index.vue
View File

@ -4,12 +4,9 @@
<el-form-item label="公告标题" prop="title">
<el-input v-model="queryParams.title" placeholder="请输入公告标题" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="操作人员" prop="createBy">
<el-input v-model="queryParams.createBy" placeholder="请输入操作人员" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="类型" prop="type">
<el-select v-model="queryParams.type" placeholder="公告类型" clearable>
<el-option v-for="dict in noticeTypeDictDatas" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
<el-form-item label="公告状态" prop="status">
<el-select v-model="queryParams.status" placeholder="公告状态" clearable>
<el-option v-for="dict in statusDictDatas" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
</el-select>
</el-form-item>
<el-form-item>
@ -136,7 +133,6 @@ export default {
pageNo: 1,
pageSize: 10,
title: undefined,
createBy: undefined,
status: undefined
},
// 表单参数

6
yudao-ui-admin/src/views/system/oauth2/token/index.vue
View File

@ -6,6 +6,9 @@
<el-form-item label="用户编号" prop="userId">
<el-input v-model="queryParams.userId" placeholder="请输入用户编号" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="客户端编号" prop="clientId">
<el-input v-model="queryParams.clientId" placeholder="请输入客户端编号" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="用户类型" prop="userType">
<el-select v-model="queryParams.userType" placeholder="请选择用户类型" clearable>
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.USER_TYPE)"
@ -68,7 +71,8 @@ export default {
pageNo: 1,
pageSize: 10,
userId: undefined,
userType: undefined
userType: undefined,
clientId: undefined
}
};
},

2
yudao-ui-admin/src/views/system/sms/smsChannel.vue
View File

@ -231,7 +231,7 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
this.$modal.confirm('是否确认删除短信渠道编号为"' + row.id + '"的数据项?').then(function() {
return deleteSmsChannel(id);
return deleteSmsChannel(row.id);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");