luoluo
/
ry_zhky
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交修改

Browse Source
pg_adapter
dshclm 8 months ago
parent f87f993b52
commit 008cfbb6d6
4 changed files with 105 additions and 49 deletions
Show Stats Download Patch File Download Diff File

46
ruoyi-admin/src/main/resources/templates/system/checkReport/add.html
Unescape View File

@ -28,16 +28,32 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row>
<el-form-item label="检查开始日期:" prop="checkStartTime"> <el-col :span="12">
<el-date-picker <el-form-item label="检查开始日期:" prop="checkStartTime">
type="date" <el-date-picker
placeholder="选择日期" type="date"
v-model="postForm.checkStartTime" placeholder="选择日期"
style="width: 100%;" v-model="postForm.checkStartTime"
disabled> style="width: 100%;"
</el-date-picker> disabled>
</el-form-item> </el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="检查类型:" prop="chackType">
<el-select v-model="postForm.checkType">
<el-option
v-for="item in checkTypeList"
:key="item.dictValue"
:label="item.dictLabel"
:value="item.dictValue"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="所属地市:" prop="framework"> <el-form-item label="所属地市:" prop="framework">
@ -143,8 +159,10 @@
adduser: [[${user.userName}]], adduser: [[${user.userName}]],
depart: [[${user.dept.deptName}]], depart: [[${user.dept.deptName}]],
checkStartTime: '', checkStartTime: '',
checkType: '',
}, },
reportCheckList: [], reportCheckList: [],
checkTypeList:[],
rules: { rules: {
adduser: [ adduser: [
{ required: true, message: '报告人员不能为空！' } { required: true, message: '报告人员不能为空！' }
@ -181,6 +199,14 @@
this.reportCheckList = res.rows 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(); var date = new Date();
this.postForm.checkStartTime = this.formatDateToCustomString(date); this.postForm.checkStartTime = this.formatDateToCustomString(date);
}, },

45
ruoyi-admin/src/main/resources/templates/system/checkReport/edit.html
Unescape View File

@ -29,15 +29,32 @@
</el-col> </el-col>
</el-row> </el-row>
<el-form-item label="检查开始日期:" prop="checkStartTime"> <el-row>
<el-date-picker <el-col :span="12">
type="date" <el-form-item label="检查开始日期:" prop="checkStartTime">
placeholder="选择日期" <el-date-picker
v-model="postForm.checkStartTime" type="date"
style="width: 100%;" placeholder="选择日期"
disabled> v-model="postForm.checkStartTime"
</el-date-picker> style="width: 100%;"
</el-form-item> disabled>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="检查类型:" prop="chackType">
<el-select v-model="postForm.checkType">
<el-option
v-for="item in checkTypeList"
:key="item.dictValue"
:label="item.dictLabel"
:value="item.dictValue"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="所属地市:" prop="framework"> <el-form-item label="所属地市:" prop="framework">
@ -143,8 +160,10 @@
adduser: [[${tdCheckReportDTO.adduser}]], adduser: [[${tdCheckReportDTO.adduser}]],
depart: [[${tdCheckReportDTO.depart}]], depart: [[${tdCheckReportDTO.depart}]],
checkStartTime: '', checkStartTime: '',
checkType: '',
}, },
reportCheckList: [], reportCheckList: [],
checkTypeList:[],
rules: { rules: {
adduser: [ adduser: [
{ required: true, message: '报告人员不能为空！' } { required: true, message: '报告人员不能为空！' }
@ -187,6 +206,14 @@
this.reportCheckList = res.rows 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(); var date = new Date();
this.postForm.checkStartTime = this.formatDateToCustomString(date); this.postForm.checkStartTime = this.formatDateToCustomString(date);
this.postForm.createTime = this.formatISO8601ToDateTime([[${tdCheckReportDTO}]].createTime); this.postForm.createTime = this.formatISO8601ToDateTime([[${tdCheckReportDTO}]].createTime);

50
ruoyi-admin/src/main/resources/templates/system/checkReport/selfcheck.html
Unescape View File

@ -28,28 +28,32 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row>
<el-form-item label="检查开始日期:" prop="checkStartTime"> <el-col :span="12">
<el-date-picker <el-form-item label="检查开始日期:" prop="checkStartTime">
type="date" <el-date-picker
placeholder="选择日期" type="date"
v-model="postForm.checkStartTime" placeholder="选择日期"
style="width: 100%;" v-model="postForm.checkStartTime"
disabled> style="width: 100%;"
</el-date-picker> disabled>
</el-form-item> </el-date-picker>
<el-form-item label="检查类型:" prop="chackType"> </el-form-item>
<el-radio-group v-model="postForm.checkType"> </el-col>
<el-radio <el-col :span="12">
v-for="item in checkTypeList" <el-form-item label="检查类型:" prop="chackType">
:key="item.dictValue" <el-select disabled v-model="postForm.checkType">
:label="item.dictValue" <el-option
disabled v-for="item in checkTypeList"
> :key="item.dictValue"
{{item.dictLabel}} :label="item.dictLabel"
</el-radio> :value="item.dictValue"
</el-radio-group> >
</el-form-item> </el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-card> </el-card>
<div class="filter-container" style="margin-top: 25px;height: 300px"> <div class="filter-container" style="margin-top: 25px;height: 300px">
<!-- <el-button class="filter-item" type="primary" icon="el-icon-plus" size="small" plain @click="handleAdd">--> <!-- <el-button class="filter-item" type="primary" icon="el-icon-plus" size="small" plain @click="handleAdd">-->
@ -84,7 +88,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="自查状态" label="状态"
align="center" align="center"
width="200px" width="200px"
> >

13
ruoyi-admin/src/main/resources/templates/system/checkresult/docheck.html
Unescape View File

@ -56,16 +56,15 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="检查类型:" prop="checkType"> <el-form-item label="检查类型:" prop="checkType">
<el-radio-group v-model="postForm.checkType"> <el-select style="width: 100%;" disabled v-model="postForm.checkType">
<el-radio <el-option
v-for="item in checkTypeList" v-for="item in checkTypeList"
:key="item.dictValue" :key="item.dictValue"
:label="item.dictValue" :label="item.dictLabel"
disabled :value="item.dictValue"
> >
{{item.dictLabel}} </el-option>
</el-radio> </el-select>
</el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>

Write Preview
Loading…
Cancel
Save