diff --git a/ruoyi-admin/src/main/resources/templates/system/checkresult/checkresult.html b/ruoyi-admin/src/main/resources/templates/system/checkresult/checkresult.html index 98dd9fc..645a2b9 100644 --- a/ruoyi-admin/src/main/resources/templates/system/checkresult/checkresult.html +++ b/ruoyi-admin/src/main/resources/templates/system/checkresult/checkresult.html @@ -4,7 +4,7 @@ -
+
@@ -16,11 +16,21 @@
  • - +
  • - +
  • @@ -66,7 +76,15 @@ var checkcontentryxmsjjtDatas = [[${@dict.getType('sys_check_state')}]]; var checkcontentryxmsjotherjtDatas = [[${@dict.getType('sys_check_state')}]]; var prefix = ctx + "system/checkresult"; - + let datas = [] + $.ajax({ + url: ctx + "system/area/getAllList", + type: 'GET', + data:{parentId:''} , + success:((res)=>{ + datas = res.data + }) , + }); $(function() { var options = { url: prefix + "/list", @@ -82,12 +100,18 @@ visible: false }, { - field: 'area', - title: '所属区县' + field: 'framework', + title: '所属市州', + formatter: function(value, row, index) { + return getCity(datas, value) + } }, { - field: 'framework', - title: '所属市州' + field: 'area', + title: '所属区县', + formatter: function(value, row, index) { + return getCity(datas, value) + } }, { field: 'user', @@ -122,6 +146,48 @@ }; $.table.init(options); }); + var app = new Vue({ + el: '#app', + data: { + CityList: [], + AreaList:[], + City:'', + Area:'', + params:{ + parentId:'', + } + }, + mounted(){ + // 初始化地市列表 + this.getCityList(); + if (this.City){ + this.getAreaList() + } + }, + methods:{ + getCityList(){ + $.ajax({ + url: ctx + "system/area/getSysAreaList", + type: 'GET', + data:this.params , + success:((res)=>{ + this.CityList = res.data + }) , + }); + }, + getAreaList(){ + this.params.parentId = this.City + $.ajax({ + url: ctx + "system/area/getSysAreaList", + type: 'GET', + data:this.params, + success:((res)=>{ + this.AreaList = res.data + }) , + }); + } + } + }) function resultCheck(id) { var url ='/system/checkresult/checkresult/' + id; $.modal.open("检查管理", url); diff --git a/ruoyi-admin/src/main/resources/templates/system/checkresult/checkresultprint.html b/ruoyi-admin/src/main/resources/templates/system/checkresult/checkresultprint.html index 0fcd744..cd360e1 100644 --- a/ruoyi-admin/src/main/resources/templates/system/checkresult/checkresultprint.html +++ b/ruoyi-admin/src/main/resources/templates/system/checkresult/checkresultprint.html @@ -1546,7 +1546,11 @@ var day = String(date.getDate()).padStart(2, '0'); // 日可能是个位数，需要补零 return year + '-' + month + '-' + day } - document.querySelector('#entryDate').innerHTML ='检查日期：' + conversionDate(new Date(document.querySelector('#entryDate').innerHTML)) + if(document.querySelector('#entryDate').innerHTML){ + document.querySelector('#entryDate').innerHTML ='检查日期：' + conversionDate(new Date(document.querySelector('#entryDate').innerHTML)) + }else{ + document.querySelector('#entryDate').innerHTML ='检查日期：' + } 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 13e8adf..e6cac1c 100644 --- a/ruoyi-admin/src/main/resources/templates/system/checkresult/docheck.html +++ b/ruoyi-admin/src/main/resources/templates/system/checkresult/docheck.html @@ -15,23 +15,33 @@ } -
    +
    - +
    - +
    - +
    - +
    @@ -287,7 +297,48 @@ $.operate.save(prefix + "/checkresult", $('#form-check-edit').serialize()); } } - + var app = new Vue({ + el: '#app', + data: { + CityList: [], + AreaList:[], + City:[[${tdCheck.framework}]], + Area:[[${tdCheck.area}]], + params:{ + parentId:'', + } + }, + mounted(){ + // 初始化地市列表 + this.getCityList(); + if (this.City){ + this.getAreaList() + } + }, + methods:{ + getCityList(){ + $.ajax({ + url: ctx + "system/area/getSysAreaList", + type: 'GET', + data:this.params , + success:((res)=>{ + this.CityList = res.data + }) , + }); + }, + getAreaList(){ + this.params.parentId = this.City + $.ajax({ + url: ctx + "system/area/getSysAreaList", + type: 'GET', + data:this.params, + success:((res)=>{ + this.AreaList = res.data + }) , + }); + } + } + }) $("input[name='checkStartTime']").datetimepicker({ format: "yyyy-mm-dd", minView: "month",