-
-
投诉对象：
+ 被投诉对象：
-
@@ -102,7 +102,7 @@
-
-
+
@@ -220,7 +220,7 @@
columns: [
{
field : 'complaintDepartment',
- title : '投诉对象'
+ title : '被投诉对象'
},
{
field : 'complaintType',
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/deptStatic/deptStatic.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/deptStatic/deptStatic.html
index 6bd4cf0e..d3b2b3c9 100644
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/deptStatic/deptStatic.html
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/deptStatic/deptStatic.html
@@ -83,7 +83,7 @@
},*/
{
field : 'zfdw',
- title : '执法部门'
+ title : '部门名称'
},
{
field : 'name',
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/staticRegistration.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/staticRegistration.html
index 360faea9..28a08b44 100644
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/staticRegistration.html
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/staticRegistration.html
@@ -91,13 +91,16 @@
-
+
+
-
+
+
+ 自定义时间：
+
+ -
+
搜索
- 重置
+ 重置
下载
@@ -171,9 +180,12 @@
var prefix = ctx + "code/registration";
var searchType;
window.onload = function () {
+ /*$("#quarter").hide();
+ $("#month").hide();
+ $("#custom").hide();*/
$("#quarter").hide();
$("#month").hide();
- $("#custom").hide();
+ $("#select-time").hide();
$("#showDetail").hide();
};
$(function() {
@@ -286,7 +298,7 @@
};
$.table.init(options);
});
- function timeType() {
+ /*function timeType() {
var dateSearch = document.getElementById("dateSearch");
if(dateSearch.value =="quarter"){
$("#quarter").show();
@@ -325,6 +337,54 @@
$("#quarter").val("");
$("#month").val("");
}
+ }*/
+
+ function timeType() {
+ var dateSearch = document.getElementById("dateSearch");
+ console.log(dateSearch.value);
+ if(dateSearch.value=="quarter"){
+ $("#year").show();
+ if(document.getElementById("year").value==''){
+ document.getElementById("year").value=currentYear;
+ }
+ $("#select-time").hide();
+ document.getElementById("startTime").value="";
+ document.getElementById("endTime").value="";
+ $("#quarter").show();
+ $("#month").hide();
+ document.getElementById("month").value="";
+ }else if(dateSearch.value=="month"){
+ $("#year").show();
+ if(document.getElementById("year").value==''){
+ document.getElementById("year").value=currentYear;
+ }
+ $("#select-time").hide();
+ document.getElementById("startTime").value="";
+ document.getElementById("endTime").value="";
+ $("#quarter").hide();
+ document.getElementById("quarter").value="";
+ $("#month").show();
+ }else if(dateSearch.value=="select-time"){
+ $("#select-time").show();
+ $("#year").hide();
+ document.getElementById("year").value="";
+ $("#quarter").hide();
+ document.getElementById("quarter").value="";
+ $("#month").hide();
+ document.getElementById("month").value="";
+ }else {
+ $("#year").show();
+ if(document.getElementById("year").value==''){
+ document.getElementById("year").value=currentYear;
+ }
+ $("#select-time").hide();
+ document.getElementById("startTime").value="";
+ document.getElementById("endTime").value="";
+ $("#quarter").hide();
+ document.getElementById("quarter").value="";
+ $("#month").hide();
+ document.getElementById("month").value="";
+ }
}
function search1 (formId) {
var currentId = $.common.isEmpty(formId) ? $('form').attr('id') : formId;
@@ -424,14 +484,14 @@
var encodedUri=encodeURI(csvContent);
var link=do*/
- layui.use('laydate', function(){
+ /*layui.use('laydate', function(){
var laydate = layui.laydate;
laydate.render({
elem: '#year',
type: 'year',
trigger: 'click'
});
- });
+ });*/
function openStaticDetail(enterpriseNumber) {
$("#enterpriseNumber").val(enterpriseNumber);
@@ -467,6 +527,12 @@
function closeDetail() {
$("#showDetail").hide();
}
+
+ function resetR(){
+ $('form').eq(0).trigger("reset");
+ search1();
+ timeType();
+ }