diff --git a/ruoyi-admin/src/main/resources/templates/system/checkReport/add.html b/ruoyi-admin/src/main/resources/templates/system/checkReport/add.html index 1f51b5d..e33434e 100644 --- a/ruoyi-admin/src/main/resources/templates/system/checkReport/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/checkReport/add.html @@ -28,16 +28,32 @@ - - - - - + + + + + + + + + + + + + + + + @@ -143,8 +159,10 @@ adduser: [[${user.userName}]], depart: [[${user.dept.deptName}]], checkStartTime: '', + checkType: '', }, reportCheckList: [], + checkTypeList:[], rules: { adduser: [ { required: true, message: '报告人员不能为空!' } @@ -181,6 +199,14 @@ this.reportCheckList = res.rows }) }) + $.ajax({ + url:'/system/dict/data/list', + type:'POST', + data:{dictType: 'sys_check_type'}, + success:((res)=>{ + this.checkTypeList = res.rows + }) + }) var date = new Date(); this.postForm.checkStartTime = this.formatDateToCustomString(date); }, diff --git a/ruoyi-admin/src/main/resources/templates/system/checkReport/edit.html b/ruoyi-admin/src/main/resources/templates/system/checkReport/edit.html index f9f6925..b034ecd 100644 --- a/ruoyi-admin/src/main/resources/templates/system/checkReport/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/checkReport/edit.html @@ -29,15 +29,32 @@ - - - - + + + + + + + + + + + + + + + + @@ -143,8 +160,10 @@ adduser: [[${tdCheckReportDTO.adduser}]], depart: [[${tdCheckReportDTO.depart}]], checkStartTime: '', + checkType: '', }, reportCheckList: [], + checkTypeList:[], rules: { adduser: [ { required: true, message: '报告人员不能为空!' } @@ -187,6 +206,14 @@ this.reportCheckList = res.rows }) }) + $.ajax({ + url:'/system/dict/data/list', + type:'POST', + data:{dictType: 'sys_check_type'}, + success:((res)=>{ + this.checkTypeList = res.rows + }) + }) var date = new Date(); this.postForm.checkStartTime = this.formatDateToCustomString(date); this.postForm.createTime = this.formatISO8601ToDateTime([[${tdCheckReportDTO}]].createTime); diff --git a/ruoyi-admin/src/main/resources/templates/system/checkReport/selfcheck.html b/ruoyi-admin/src/main/resources/templates/system/checkReport/selfcheck.html index 0520c32..aa92e7b 100644 --- a/ruoyi-admin/src/main/resources/templates/system/checkReport/selfcheck.html +++ b/ruoyi-admin/src/main/resources/templates/system/checkReport/selfcheck.html @@ -28,28 +28,32 @@ - - - - - - - - - {{item.dictLabel}} - - - + + + + + + + + + + + + + + + +
@@ -84,7 +88,7 @@ diff --git a/ruoyi-admin/src/main/resources/templates/system/checkresult/docheck.html b/ruoyi-admin/src/main/resources/templates/system/checkresult/docheck.html index a3d95c3..757debe 100644 --- a/ruoyi-admin/src/main/resources/templates/system/checkresult/docheck.html +++ b/ruoyi-admin/src/main/resources/templates/system/checkresult/docheck.html @@ -56,16 +56,15 @@ - - + - {{item.dictLabel}} - - + +