Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

暂存

Browse Source
This commit is contained in:
huangdeliang 2020-09-28 15:38:21 +08:00
parent f6ae2bccf9
commit b1bb07a0da
6 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/custom/SysOrderController.java
View File

@ -54,6 +54,7 @@ public class SysOrderController extends BaseController {
@GetMapping("/list")
public TableDataInfo list(SysOrder sysOrder) {
startPage();
// List<SysUser> users = userService.selectUserList();
List<SysOrder> list = sysOrderService.selectSysOrderList(sysOrder);
return getDataTable(list);
}

2
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
View File

@ -19,6 +19,8 @@ public interface SysUserMapper
*/
public List<SysUser> selectUserList(SysUser sysUser);
public List<SysUser> selectAllUser();
/**
* 通过用户名查询用户
*

2
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
View File

@ -18,6 +18,8 @@ public interface ISysUserService
*/
public List<SysUser> selectUserList(SysUser user);
public List<SysUser> selectAllUser();
/**
* 通过用户名查询用户
*

5
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
View File

@ -66,6 +66,11 @@ public class SysUserServiceImpl implements ISysUserService
return userMapper.selectUserList(user);
}
@Override
public List<SysUser> selectAllUser() {
return return userMapper.selectUserList();
}
/**
* 通过用户名查询用户
*

18
ruoyi-ui/src/views/custom/order/index.vue
View File

@ -735,15 +735,15 @@
// console.log(this.form)
this.form.payType = this.selectDictLabel(this.payTypeIdOptions, this.form.payTypeId);
this.form.preSale = this.selectDictLabel(this.preSaleIdOptions, this.form.preSaleId);
this.form.afterSale = this.selectDictLabel(this.afterSaleIdOptions, this.form.afterSaleId);
this.form.nutritionist = this.selectDictLabel(this.nutritionistIdOptions, this.form.nutritionistId);
this.form.nutriAssis = this.selectDictLabel(this.nutriAssisIdOptions, this.form.nutriAssisId);
this.form.account = this.selectDictLabel(this.accountIdOptions, this.form.accountId);
this.form.planner = this.selectDictLabel(this.plannerIdOptions, this.form.plannerId);
this.form.plannerAssis = this.selectDictLabel(this.plannerAssisIdOptions, this.form.plannerAssisId);
this.form.operator = this.selectDictLabel(this.operatorIdOptions, this.form.operatorId);
// this.form.payType = this.selectDictLabel(this.payTypeIdOptions, this.form.payTypeId);
// this.form.preSale = this.selectDictLabel(this.preSaleIdOptions, this.form.preSaleId);
// this.form.afterSale = this.selectDictLabel(this.afterSaleIdOptions, this.form.afterSaleId);
// this.form.nutritionist = this.selectDictLabel(this.nutritionistIdOptions, this.form.nutritionistId);
// this.form.nutriAssis = this.selectDictLabel(this.nutriAssisIdOptions, this.form.nutriAssisId);
// this.form.account = this.selectDictLabel(this.accountIdOptions, this.form.accountId);
// this.form.planner = this.selectDictLabel(this.plannerIdOptions, this.form.plannerId);
// this.form.plannerAssis = this.selectDictLabel(this.plannerAssisIdOptions, this.form.plannerAssisId);
// this.form.operator = this.selectDictLabel(this.operatorIdOptions, this.form.operatorId);
if (this.form.orderId != null) {
updateOrder(this.form).then(response => {

4
ruoyi-ui/src/views/login.vue
View File

@ -65,8 +65,8 @@ export default {
codeUrl: "",
cookiePassword: "",
loginForm: {
username: "admin",
password: "admin123",
username: "",
password: "",
rememberMe: false,
code: "",
uuid: ""