Your ROOT_URL in app.ini is http://git.zky.com/ but you are visiting http://61.178.84.89:8998/luoluo/ry_zhky/commit/64dee56212f36a1635b1daefb87f33824b13c808?style=split&whitespace=ignore-all You should set ROOT_URL correctly, otherwise the web may not work correctly.
luoluo
/
ry_zhky
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

检查结果管理

Browse Source
pg_adapter
dshclm 9 months ago
parent 573e359e1d
commit 64dee56212
2 changed files with 286 additions and 289 deletions

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

@ -189,8 +189,14 @@
} }
}) })
function resultCheck(id) { function resultCheck(id) {
var url ='/system/checkresult/checkresult/' + id; $.modal.openOptions({
$.modal.open("检查管理", url); title: '检查管理',
url: prefix + '/checkresult/' + id,
width: "1300",
height: "800",
showButtonPanel: false,
btn: 0,
})
} }
function checkResultPrint(id){ function checkResultPrint(id){
var url ='/system/checkresult/checkprint/' + id; var url ='/system/checkresult/checkprint/' + id;

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

@ -3,6 +3,7 @@
<head> <head>
<th:block th:include="include :: header('修改检查结果管理')" /> <th:block th:include="include :: header('修改检查结果管理')" />
<th:block th:include="include :: datetimepicker-css" /> <th:block th:include="include :: datetimepicker-css" />
<th:block th:include="include :: element-css" />
</head> </head>
<style> <style>
.checkResult{ .checkResult{
@ -16,276 +17,171 @@
</style> </style>
<body class="white-bg"> <body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content" id="app"> <div class="wrapper wrapper-content animated fadeInRight ibox-content" id="app">
<form class="form-horizontal m" id="form-check-edit" th:object="${tdCheck}"> <div class="app-container">
<input name="checkId" th:field="*{checkId}" type="hidden"> <el-form ref="postForm" :model="postForm" label-position="right" label-width="150px">
<div class="row"> <el-card>
<div class="col-sm-6"> <el-row>
<div class="form-group"> <el-col :span="12">
<label class="col-xs-4 control-label is-required">所属地市：</label> <el-form-item label="所属地市:" prop="framework">
<div class="col-xs-8"> <el-select disabled style="width: 100%;" @change="getAreaList()" v-model="postForm.framework">
<select id="City" name="framework" disabled required @change="getAreaList()" v-model="City" class="form-control m-b"> <el-option
<option value="">---请选择---</option> v-for="item in CityList"
<option v-for="option in CityList" :value="option.id" :key="option.id"> :key="item.id"
{{ option.name }} :label="item.name"
</option> :value="item.id"
</select> >
</div> </el-option>
</div> </el-select>
</div> </el-form-item>
<div class="col-sm-6"> </el-col>
<div class="form-group"> <el-col :span="12">
<label class="col-xs-4 control-label is-required">所属区县：</label> <el-form-item label="所属区县:" prop="area">
<div class="col-xs-8"> <el-select disabled style="width: 100%;" v-model="postForm.area">
<select id="Area" name="area" disabled required v-model="Area" class="form-control m-b"> <el-option
<option value="">---请选择---</option> v-for="item in AreaList"
<option v-for="option in AreaList" :value="option.id" :key="option.id"> :key="item.id"
{{ option.name }} :label="item.name"
</option> :value="item.id"
</select> >
</div> </el-option>
</div> </el-select>
</div> </el-form-item>
</div> </el-col>
<div class="row"> </el-row>
<div class="col-sm-6"> <el-row>
<div class="form-group"> <el-col :span="12">
<label class="col-xs-4 control-label">检查单位：</label> <el-form-item label="检查单位:" prop="checkAddress">
<div class="col-xs-8"> <el-input disabled v-model="postForm.checkAddress" type="text"></el-input>
<input name="checkAddress" readonly th:value="${sysuser.dept.deptName}" class="form-control" type="text"> </el-form-item>
</div> </el-col>
</div> <el-col :span="12">
</div> <el-form-item label="检查类型:" prop="checkType">
<div class="col-sm-6"> <el-radio-group v-model="postForm.checkType">
<div class="form-group"> <el-radio
<label class="col-xs-4 control-label is-required">检查类型：</label> v-for="item in checkTypeList"
<div class="col-xs-8"> :key="item.dictValue"
<select name="checkType" required class="form-control m-b" th:with="type=${@dict.getType('sys_check_type')}"> :label="item.dictValue"
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{checkType}"></option> disabled
</select> >
</div> {{item.dictLabel}}
</div> </el-radio>
</div> </el-radio-group>
</div> </el-form-item>
<div class="row"> </el-col>
<div class="col-sm-6"> </el-row>
<div class="form-group"> <el-row>
<label class="col-xs-4 control-label">开始时间：</label> <el-col :span="12">
<div class="col-xs-8"> <el-form-item label="检查开始日期:" prop="checkStartTime">
<div class="input-group date"> <el-date-picker
<input name="checkStartTime" disabled th:value="${#dates.format(tdCheck.checkStartTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text"> type="date"
<span class="input-group-addon"><i class="fa fa-calendar"></i></span> placeholder="选择日期"
</div> v-model="postForm.checkStartTime"
</div> style="width: 100%;"
</div> disabled>
</div> </el-date-picker>
<div class="col-sm-6"> </el-form-item>
<div class="form-group"> </el-col>
<label class="col-xs-4 control-label">结束时间：</label> <el-col :span="12">
<div class="col-xs-8"> <el-form-item label="检查结束日期:" prop="checkEndTime">
<div class="input-group date"> <el-date-picker
<input name="checkEndTime" disabled th:value="${#dates.format(tdCheck.checkEndTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text"> type="date"
<span class="input-group-addon"><i class="fa fa-calendar"></i></span> placeholder="选择日期"
</div> v-model="postForm.checkEndTime"
</div> style="width: 100%;"
</div> disabled>
</div> </el-date-picker>
</div> </el-form-item>
<div class="row"> </el-col>
<div class="col-sm-6"> </el-row>
<div class="form-group"> <el-row>
<label class="col-xs-4 control-label">报告人员：</label> <el-col :span="12">
<div class="col-xs-8"> <el-form-item label="报告人员:" prop="adduser">
<input name="adduser" readonly th:field="*{adduser}" class="form-control" type="text"> <el-input disabled v-model="postForm.adduser" type="text"></el-input>
</div> </el-form-item>
</div> </el-col>
</div> <el-col :span="12">
<div class="col-sm-6"> <el-form-item label="检查人员:" prop="checkName">
<div class="form-group"> <el-input disabled v-model="postForm.checkName" :precision="1" :max="999999" type="text"></el-input>
<label class="col-xs-4 control-label">检查人员：</label> </el-form-item>
<div class="col-xs-8"> </el-col>
<input name="checkName" readonly th:value="${sysuser.userName}" class="form-control" type="text"> </el-row>
</div> </el-card>
</div> <div class="filter-container" style="margin-top: 25px;height: 310px">
</div> <el-table
</div> :data="postForm.checkTypeDTOS"
<div class="row"> :border="true"
<div class="col-sm-12"> style="width: 100%;margin-top: 25px;height: 90%;overflow: auto"
<div class="form-group"> >
<label class="col-xs-2 control-label is-required">人员检查：</label> <el-table-column
<div class="col-xs-10"> label="检查项"
<div class="radio-box" th:each="dict : ${@dict.getType('sys_self_check')}"> width="300"
<input type="radio" th:id="${'checkresult1_' + dict.dictCode}" name="checkresult1" th:value="${dict.dictValue}" th:field="*{checkresult1}"> align="center"
<label th:for="${'checkresult1_' + dict.dictCode}" th:text="${dict.dictLabel}"></label> >
</div> <template v-slot="scope">
<span>自检结果： <el-select disabled v-model="scope.row.checkType" class="filter-item">
<span class="checkResult" th:if="${tdCheck.checkcontentryjt} == 0">合格</span> <el-option
<span class="checkResult1" th:if="${tdCheck.checkcontentryjt} == 1">不合格</span> v-for="item in reportCheckList"
</span> :key="item.dictValue"
</div> :label="item.dictLabel"
</div> :value="item.dictValue">
<div class="form-group"> </el-option>
<label class="col-xs-2 control-label"></label> </el-select>
<div class="col-xs-10"> </template>
<textarea name="checkcontentry" readonly th:field="*{checkcontentry}" class="form-control" ></textarea> </el-table-column>
</div> <el-table-column
</div> label="检查内容"
<div class="form-group"> align="center"
<label class="col-xs-2 control-label">批注：</label> >
<div class="col-xs-10"> <template v-slot="scope">
<textarea name="remark1" th:field="*{remark1}" class="form-control" ></textarea> <el-input disabled v-model="scope.row.typeContent" type="textarea" />
</div> </template>
</div> </el-table-column>
</div> <el-table-column
</div> label="批注"
<div class="row"> align="center"
<div class="col-sm-12"> >
<div class="form-group"> <template v-slot="scope">
<label class="col-xs-2 control-label is-required">文件检查：</label> <el-input v-model="scope.row.remark" type="textarea" />
<div class="col-xs-10"> </template>
<div class="radio-box" th:each="dict : ${@dict.getType('sys_self_check')}"> </el-table-column>
<input type="radio" th:id="${'checkresult2_' + dict.dictCode}" name="checkresult2" th:value="${dict.dictValue}" th:field="*{checkresult2}"> <el-table-column
<label th:for="${'checkresult2_' + dict.dictCode}" th:text="${dict.dictLabel}"></label> label="自检结果"
</div> align="center"
<span>自检结果： >
<span class="checkResult" th:if="${tdCheck.checkcontentrywjjt} == 0">合格</span> <template v-slot="scope">
<span class="checkResult1" th:if="${tdCheck.checkcontentrywjjt} == 1">不合格</span> <span style="color: green;font-weight: bold" v-if="scope.row.starts === '0'">合格</span>
</span> <span style="color: red;font-weight: bold" v-else>不合格</span>
</div> </template>
</div> </el-table-column>
<div class="form-group"> <el-table-column
<label class="col-xs-2 control-label"></label> label="检查结果"
<div class="col-xs-10"> align="center"
<textarea name="checkcontentrywj" readonly th:field="*{checkcontentrywj}" class="form-control" ></textarea> >
</div> <template v-slot="scope">
</div> <el-radio-group v-model="scope.row.resultStarts">
<div class="form-group"> <el-radio
<label class="col-xs-2 control-label">批注：</label> v-for="item in checkResultList"
<div class="col-xs-10"> :key="item.dictValue"
<textarea name="remark2" th:field="*{remark2}" class="form-control" ></textarea> :label="item.dictValue"
</div> >
</div> {{item.dictLabel}}
</div> </el-radio>
</div> </el-radio-group>
<div class="row"> </template>
<div class="col-sm-12"> </el-table-column>
<div class="form-group"> </el-table>
<label class="col-xs-2 control-label is-required">密品检查：</label>
<div class="col-xs-10">
<div class="radio-box" th:each="dict : ${@dict.getType('sys_self_check')}">
<input type="radio" th:id="${'checkresult3_' + dict.dictCode}" name="checkresult3" th:value="${dict.dictValue}" th:field="*{checkresult3}">
<label th:for="${'checkresult3_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div>
<span>自检结果：
<span class="checkResult" th:if="${tdCheck.checkcontentrysbjt} == 0">合格</span>
<span class="checkResult1" th:if="${tdCheck.checkcontentrysbjt} == 1">不合格</span>
</span>
</div>
</div>
<div class="form-group">
<label class="col-xs-2 control-label"></label>
<div class="col-xs-10">
<textarea name="checkcontentrysb" readonly th:field="*{checkcontentrysb}" class="form-control" ></textarea>
</div>
</div>
<div class="form-group">
<label class="col-xs-2 control-label">批注：</label>
<div class="col-xs-10">
<textarea name="remark3" th:field="*{remark3}" class="form-control" ></textarea>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-12">
<div class="form-group">
<label class="col-xs-2 control-label is-required">管理制度检查：</label>
<div class="col-xs-10">
<div class="radio-box" th:each="dict : ${@dict.getType('sys_self_check')}">
<input type="radio" th:id="${'checkresult4_' + dict.dictCode}" name="checkresult4" th:value="${dict.dictValue}" th:field="*{checkresult4}">
<label th:for="${'checkresult4_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div>
<span>自检结果：
<span class="checkResult" th:if="${tdCheck.checkcontentryglzdjt} == 0">合格</span>
<span class="checkResult1" th:if="${tdCheck.checkcontentryglzdjt} == 1">不合格</span>
</span>
</div>
</div>
<div class="form-group">
<label class="col-xs-2 control-label"></label>
<div class="col-xs-10">
<textarea name="checkcontentryglzd" readonly th:field="*{checkcontentryglzd}" class="form-control" ></textarea>
</div>
</div>
<div class="form-group">
<label class="col-xs-2 control-label">批注：</label>
<div class="col-xs-10">
<textarea name="remark4" th:field="*{remark4}" class="form-control" ></textarea>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-12">
<div class="form-group">
<label class="col-xs-2 control-label is-required">泄密事件检查：</label>
<div class="col-xs-10">
<div class="radio-box" th:each="dict : ${@dict.getType('sys_self_check')}">
<input type="radio" th:id="${'checkresult5_' + dict.dictCode}" name="checkresult5" th:value="${dict.dictValue}" th:field="*{checkresult5}">
<label th:for="${'checkresult5_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div>
<span>自检结果：
<span class="checkResult" th:if="${tdCheck.checkcontentryxmsjjt} == 0">合格</span>
<span class="checkResult1" th:if="${tdCheck.checkcontentryxmsjjt} == 1">不合格</span>
</span>
</div>
</div>
<div class="form-group">
<label class="col-xs-2 control-label"></label>
<div class="col-xs-10">
<textarea name="checkcontentryxmsj" readonly th:field="*{checkcontentryxmsj}" class="form-control" ></textarea>
</div>
</div>
<div class="form-group">
<label class="col-xs-2 control-label">批注：</label>
<div class="col-xs-10">
<textarea name="remark5" th:field="*{remark5}" class="form-control" ></textarea>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-12">
<div class="form-group">
<label class="col-xs-2 control-label is-required">其他内容检查：</label>
<div class="col-xs-10">
<div class="radio-box" th:each="dict : ${@dict.getType('sys_self_check')}">
<input type="radio" th:id="${'checkresult6_' + dict.dictCode}" name="checkresult6" th:value="${dict.dictValue}" th:field="*{checkresult6}">
<label th:for="${'checkresult6_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div>
<span>自检结果：
<span class="checkResult" th:if="${tdCheck.checkcontentryxmsjotherjt} == 0">合格</span>
<span class="checkResult1" th:if="${tdCheck.checkcontentryxmsjotherjt} == 1">不合格</span>
</span>
</div>
</div>
<div class="form-group">
<label class="col-xs-2 control-label"></label>
<div class="col-xs-10">
<textarea name="checkcontentryother" readonly th:field="*{checkcontentryother}" class="form-control" ></textarea>
</div>
</div>
<div class="form-group">
<label class="col-xs-2 control-label">批注：</label>
<div class="col-xs-10">
<textarea name="remark6" th:field="*{remark6}" class="form-control" ></textarea>
</div>
</div> </div>
<div style="position: fixed;bottom: -58px;right: 21px;">
<el-button type="primary" icon="el-icon-check" @click="submitForm">保存</el-button>
<el-button type="info" icon="el-icon-back" @click="closeItem()">返回</el-button>
</div> </div>
</el-form>
</div> </div>
</form>
</div> </div>
<th:block th:include="include :: footer" /> <th:block th:include="include :: footer" />
<th:block th:include="include :: datetimepicker-js" /> <th:block th:include="include :: datetimepicker-js" />
<th:block th:include="include :: element-js" />
<script th:inline="javascript"> <script th:inline="javascript">
var prefix = ctx + "system/checkresult"; var prefix = ctx + "system/checkresult";
$("#form-check-edit").validate({ $("#form-check-edit").validate({
@ -302,20 +198,92 @@
data: { data: {
CityList: [], CityList: [],
AreaList:[], AreaList:[],
City:[[${tdCheck.framework}]],
Area:[[${tdCheck.area}]],
params:{ params:{
parentId:'', parentId:'',
} },
quTypeDisabled: false,
itemImage: true,
postForm: {
checkTypeDTOS: [],
framework:'',
area:'',
adduser: [[${tdCheckReportDTO.adduser}]],
depart: [[${tdCheckReportDTO.depart}]],
checkStartTime: '',
checkType: '',
},
reportCheckList: [],
checkTypeList:[],
checkResultList:[],
}, },
mounted(){ mounted(){
if([[${tdCheckReportDTO}]].checkTypeDTOS){
this.postForm = [[${tdCheckReportDTO}]]
this.postForm.checkName = [[${sysuser.userName}]]
this.postForm.checkAddress = [[${sysuser.dept.deptName}]]
}else{
this.postForm = [[${tdCheckReportDTO}]]
this.postForm.checkName = [[${sysuser.userName}]]
this.postForm.checkAddress = [[${sysuser.dept.deptName}]]
this.postForm.checkTypeDTOS = []
}
this.postForm.checkType = '1'
// 初始化地市列表 // 初始化地市列表
this.getCityList(); this.getCityList();
if (this.City){ if (this.postForm.framework){
this.getAreaList() this.getAreaList()
} }
$.ajax({
url:'/system/dict/data/list',
type:'POST',
data:{dictType: 'sys_self_check'},
success:((res)=>{
this.checkResultList = res.rows
})
})
$.ajax({
url:'/system/dict/data/list',
type:'POST',
data:{dictType: 'sys_check_type_report'},
success:((res)=>{
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.checkEndTime = this.formatDateToCustomString(date);
this.postForm.checkStartTime = this.formatISO8601ToDateTime([[${tdCheckReportDTO}]].checkStartTime);
this.postForm.createTime = this.formatISO8601ToDateTime([[${tdCheckReportDTO}]].createTime);
}, },
methods:{ methods:{
formatISO8601ToDateTime(isoString) {
var date = new Date(isoString);
var year = date.getFullYear();
var month = (date.getMonth() + 1).toString().padStart(2, '0'); // 月份是从0开始的，所以需要+1
var day = date.getDate().toString().padStart(2, '0');
var hours = date.getHours().toString().padStart(2, '0');
var minutes = date.getMinutes().toString().padStart(2, '0');
var seconds = date.getSeconds().toString().padStart(2, '0');
return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
},
formatDateToCustomString(date) {
var year = date.getFullYear();
var month = String(date.getMonth() + 1).padStart(2, '0'); // 月份从0开始，所以加1
var day = String(date.getDate()).padStart(2, '0');
var hours = String(date.getHours()).padStart(2, '0');
var minutes = String(date.getMinutes()).padStart(2, '0');
var seconds = String(date.getSeconds()).padStart(2, '0');
return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
},
getCityList(){ getCityList(){
$.ajax({ $.ajax({
url: ctx + "system/area/getSysAreaList", url: ctx + "system/area/getSysAreaList",
@ -327,7 +295,7 @@
}); });
}, },
getAreaList(){ getAreaList(){
this.params.parentId = this.City this.params.parentId = this.postForm.framework
$.ajax({ $.ajax({
url: ctx + "system/area/getSysAreaList", url: ctx + "system/area/getSysAreaList",
type: 'GET', type: 'GET',
@ -336,26 +304,49 @@
this.AreaList = res.data this.AreaList = res.data
}) , }) ,
}); });
},
submitForm() {
this.$refs.postForm.validate((valid) => {
console.log(this.postForm)
if (!valid) {
return
} }
let that = this
axios.post(prefix + '/checkresult', this.postForm)
.then(function (response) {
if (response.data.code === 0) {
$.operate.successCallback(response.data);
}else{
$.modal.alertError(response.data.msg)
} }
}) })
$("input[name='checkStartTime']").datetimepicker({ .catch(function (error) {
format: "yyyy-mm-dd", console.log(error);
minView: "month",
autoclose: true
});
var now = new Date();
var year = now.getFullYear();
var month = ("0" + (now.getMonth() + 1)).slice(-2);
var day = ("0" + now.getDate()).slice(-2);
var formattedNow = year + "-" + month + "-" + day;
$("input[name='checkEndTime']").val(formattedNow);
$("input[name='checkownresulttime']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
}); });
})
},
closeItem(){
$.modal.close()
}
}
})
// $("input[name='checkStartTime']").datetimepicker({
// format: "yyyy-mm-dd",
// minView: "month",
// autoclose: true
// });
// var now = new Date();
// var year = now.getFullYear();
// var month = ("0" + (now.getMonth() + 1)).slice(-2);
// var day = ("0" + now.getDate()).slice(-2);
// var formattedNow = year + "-" + month + "-" + day;
// $("input[name='checkEndTime']").val(formattedNow);
//
// $("input[name='checkownresulttime']").datetimepicker({
// format: "yyyy-mm-dd",
// minView: "month",
// autoclose: true
// });
</script> </script>
</body> </body>
</html> </html>

Write Preview
Loading…
Cancel
Save