From 9ad43194fced8652315a82172da41622bf111e60 Mon Sep 17 00:00:00 2001
From: zhoucong <123456>
Date: 星期五, 22 四月 2022 11:19:14 +0800
Subject: [PATCH] 众泰接口查询
---
src/views/hiddenDangerReview/recheckCancellationNumber.vue | 134 ++++--
src/api/sgyhpczl/initSelect.js | 25 +
src/api/sgyhpczl/recheckCancellationNumber.js | 78 +++
src/api/sgyhpczl/hiddenDangerRegistration.js | 76 +++
src/views/hiddenDangerManagement/index.vue | 105 +++-
src/api/sgyhpczl/hiddenDangerRectification.js | 70 +++
src/api/sgyhpczl/majorHidden.js | 81 +++
src/views/hiddenDangerRegistration/index.vue | 107 +++-
src/api/sgyhpczl/hiddenDangerManagement.js | 64 +++
src/views/accidentHidden/majorHidden.vue | 102 +++-
src/views/delayHiddenDangerRectification/index.vue | 134 ++++--
src/api/sgyhpczl/delayHiddenDangerRectification.js | 79 +++
src/views/hiddenDangerRectification/index.vue | 94 +++-
13 files changed, 927 insertions(+), 222 deletions(-)
diff --git a/src/api/sgyhpczl/delayHiddenDangerRectification.js b/src/api/sgyhpczl/delayHiddenDangerRectification.js
index d405237..d458b62 100644
--- a/src/api/sgyhpczl/delayHiddenDangerRectification.js
+++ b/src/api/sgyhpczl/delayHiddenDangerRectification.js
@@ -2,14 +2,85 @@
import {getTokenAndVerify} from "@/api/sgyhpczl/auth";
-export function getPageList(params) {
+
+
+export function getPageList(data) {
+ var arr=[]
+ /*编号*/
+ if(data.form.number!=null && data.form.number!=''){
+ arr.push({field:"number",value:data.form.number,type:'TXT'})
+ }
+ /*检查单位*/
+ if(data.form.check_main_branch!=null && data.form.check_main_branch!=''){
+ arr.push({field:"check_main_branch",value:data.form.check_main_branch,type:'OPT'})
+ }
+ /*检查部门*/
+ if(data.form.check_branch!=null && data.form.check_branch!=''){
+ arr.push({field:"check_branch",value:data.form.check_branch,type:'OPT'})
+ }
+ /*检查人*/
+ if(data.form.check_man!=null && data.form.check_man!=''){
+ arr.push({field:"check_man",value:data.form.check_man,type:'TXT'})
+ }
+ /*隐患单位*/
+ if(data.form.ht_community!=null && data.form.ht_community!=''){
+ arr.push({field:"ht_community",value:data.form.ht_community,type:'TXT'})
+ }
+ /*隐患部门*/
+ if(data.form.ht_branch!=null && data.form.ht_branch!=''){
+ arr.push({field:"ht_branch",value:data.form.ht_branch,type:'OPT'})
+ }
+ /*隐患类别*/
+ if(data.form.ht_typesub!=null && data.form.ht_typesub!=''){
+ arr.push({field:"ht_typesub",value:data.form.ht_typesub,type:'OPT'})
+ }
+ /*隐患级别*/
+ if(data.form.ht_level!=null && data.form.ht_level!=''){
+ arr.push({field:"ht_level",value:data.form.ht_level,type:'OPT'})
+ }
+ /*检查类型*/
+ if(data.form.checktype!=null && data.form.checktype!=''){
+ arr.push({field:"checktype",value:data.form.checktype,type:'OPT'})
+ }
+ /*隐患地点*/
+ if(data.form.address!=null && data.form.address!=''){
+ arr.push({field:"address",value:data.form.address,type:'TXT'})
+ }
+ /*隐患内容*/
+ if(data.form.ht_content!=null && data.form.ht_content!=''){
+ arr.push({field:"ht_content",value:data.form.ht_content,type:'TXT'})
+ }
+ /*班次*/
+ if(data.form.check_class!=null && data.form.check_class!=''){
+ arr.push({field:"check_class",value:data.form.check_class,type:'OPT'})
+ }
+ /*是否关联*/
+ if(data.form.DTRisk_bankId!=null && data.form.DTRisk_bankId!=''){
+ arr.push({field:"DTRisk_bankId",value:data.form.DTRisk_bankId,type:'OPT'})
+ }
+ /*录入人*/
+ if(data.form.createBy!=null && data.form.createBy!=''){
+ arr.push({field:"Created_by",value:data.form.createBy,type:'OPT'})
+ }
+ /*检查时间*/
+ if(data.form.check_dateStart!=null && data.form.check_dateStart!='' && data.form.check_dateEnd!=null && data.form.check_dateEnd!=''){
+ arr.push({field:"check_date",value:data.form.check_dateStart+"至"+data.form.check_dateEnd,type:'DAT'})
+
+ }
+ /*限改时间*/
+ if(data.form.alter_timeStart!=null && data.form.alter_timeStart!='' && data.form.alter_timeEnd!=null && data.form.alter_timeEnd!=''){
+ arr.push({field:"alter_time",value:data.form.alter_timeStart+"至"+data.form.alter_timeEnd,type:'DAT'})
+
+ }
+ data.query_condition=arr
return request({
headers:{
'token': getTokenAndVerify().token,
'verify':getTokenAndVerify().verify
},
- contentType: "multipart/form-data",
- url: "/taboi/danger/delay_list?page="+1+"&limit="+10,
- method: 'GET',
+ url: "/taboi/danger/delay_list",
+ contentType: "application/json",
+ method: 'POST',
+ data
});
}
diff --git a/src/api/sgyhpczl/hiddenDangerManagement.js b/src/api/sgyhpczl/hiddenDangerManagement.js
index 97f91fa..4e08db9 100644
--- a/src/api/sgyhpczl/hiddenDangerManagement.js
+++ b/src/api/sgyhpczl/hiddenDangerManagement.js
@@ -2,14 +2,70 @@
import {getTokenAndVerify} from "@/api/sgyhpczl/auth";
-export function getPageList(params) {
+
+export function getPageList(data) {
+ var arr=[]
+ /*编号*/
+ if(data.form.number!=null && data.form.number!=''){
+ arr.push({field:"number",value:data.form.number,type:'TXT'})
+ }
+ /*检查人*/
+ if(data.form.check_man!=null && data.form.check_man!=''){
+ arr.push({field:"check_man",value:data.form.check_man,type:'TXT'})
+ }
+ /*隐患单位*/
+ if(data.form.ht_branch!=null && data.form.ht_branch!=''){
+ arr.push({field:"ht_branch",value:data.form.ht_branch,type:'TXT'})
+ }
+ /*隐患类别*/
+ if(data.form.ht_typesub!=null && data.form.ht_typesub!=''){
+ arr.push({field:"ht_typesub",value:data.form.ht_typesub,type:'OPT'})
+ }
+ /*隐患级别*/
+ if(data.form.ht_level!=null && data.form.ht_level!=''){
+ arr.push({field:"ht_level",value:data.form.ht_level,type:'OPT'})
+ }
+ /*隐患来源*/
+
+ /*隐患地点*/
+ if(data.form.address!=null && data.form.address!=''){
+ arr.push({field:"address",value:data.form.address,type:'TXT'})
+ }
+ /*隐患内容*/
+ if(data.form.ht_content!=null && data.form.ht_content!=''){
+ arr.push({field:"ht_content",value:data.form.ht_content,type:'TXT'})
+ }
+ /*班次*/
+ if(data.form.check_class!=null && data.form.check_class!=''){
+ arr.push({field:"check_class",value:data.form.check_class,type:'OPT'})
+ }
+ /*整改状态*/
+ if(data.form.alter_status!=null && data.form.alter_status!=''){
+ arr.push({field:"alter_status",value:data.form.alter_status,type:'OPT'})
+ }
+ /*是否关联*/
+ if(data.form.DTRisk_bankId!=null && data.form.DTRisk_bankId!=''){
+ arr.push({field:"DTRisk_bankId",value:data.form.DTRisk_bankId,type:'OPT'})
+ }
+ /*检查时间*/
+ if(data.form.check_dateStart!=null && data.form.check_dateStart!='' && data.form.check_dateEnd!=null && data.form.check_dateEnd!=''){
+ arr.push({field:"check_date",value:data.form.check_dateStart+"至"+data.form.check_dateEnd,type:'DAT'})
+
+ }
+ /*限改时间*/
+ if(data.form.alter_timeStart!=null && data.form.alter_timeStart!='' && data.form.alter_timeEnd!=null && data.form.alter_timeEnd!=''){
+ arr.push({field:"alter_time",value:data.form.alter_timeStart+"至"+data.form.alter_timeEnd,type:'DAT'})
+
+ }
+ data.query_condition=arr
return request({
headers:{
'token': getTokenAndVerify().token,
'verify':getTokenAndVerify().verify
},
- contentType: "multipart/form-data",
- url: "/taboi/danger/self_list?page="+1+"&limit="+10,
- method: 'GET',
+ url: "/taboi/danger/self_list",
+ contentType: "application/json",
+ method: 'POST',
+ data
});
}
diff --git a/src/api/sgyhpczl/hiddenDangerRectification.js b/src/api/sgyhpczl/hiddenDangerRectification.js
index a6d22bc..914812c 100644
--- a/src/api/sgyhpczl/hiddenDangerRectification.js
+++ b/src/api/sgyhpczl/hiddenDangerRectification.js
@@ -2,14 +2,76 @@
import {getTokenAndVerify} from "@/api/sgyhpczl/auth";
-export function getPageList(params) {
+
+export function getPageList(data) {
+ var arr=[]
+ /*编号*/
+ if(data.form.number!=null && data.form.number!=''){
+ arr.push({field:"number",value:data.form.number,type:'TXT'})
+ }
+ /*检查单位*/
+ if(data.form.check_main_branch!=null && data.form.check_main_branch!=''){
+ arr.push({field:"check_main_branch",value:data.form.check_main_branch,type:'OPT'})
+ }
+ /*检查部门*/
+ if(data.form.check_branch!=null && data.form.check_branch!=''){
+ arr.push({field:"check_branch",value:data.form.check_branch,type:'OPT'})
+ }
+ /*检查人*/
+ if(data.form.check_man!=null && data.form.check_man!=''){
+ arr.push({field:"check_man",value:data.form.check_man,type:'TXT'})
+ }
+ /*隐患单位*/
+ if(data.form.ht_community!=null && data.form.ht_community!=''){
+ arr.push({field:"ht_community",value:data.form.ht_community,type:'TXT'})
+ }
+ /*隐患部门*/
+ if(data.form.ht_branch!=null && data.form.ht_branch!=''){
+ arr.push({field:"ht_branch",value:data.form.ht_branch,type:'OPT'})
+ }
+ /*隐患类别*/
+ if(data.form.ht_typesub!=null && data.form.ht_typesub!=''){
+ arr.push({field:"ht_typesub",value:data.form.ht_typesub,type:'OPT'})
+ }
+ /*隐患级别*/
+ if(data.form.ht_level!=null && data.form.ht_level!=''){
+ arr.push({field:"ht_level",value:data.form.ht_level,type:'OPT'})
+ }
+ /*检查类型*/
+ if(data.form.checktype!=null && data.form.checktype!=''){
+ arr.push({field:"checktype",value:data.form.checktype,type:'OPT'})
+ }
+ /*隐患地点*/
+ if(data.form.address!=null && data.form.address!=''){
+ arr.push({field:"address",value:data.form.address,type:'TXT'})
+ }
+ /*隐患内容*/
+ if(data.form.ht_content!=null && data.form.ht_content!=''){
+ arr.push({field:"ht_content",value:data.form.ht_content,type:'TXT'})
+ }
+ /*班次*/
+ if(data.form.check_class!=null && data.form.check_class!=''){
+ arr.push({field:"check_class",value:data.form.check_class,type:'OPT'})
+ }
+ /*检查时间*/
+ if(data.form.check_dateStart!=null && data.form.check_dateStart!='' && data.form.check_dateEnd!=null && data.form.check_dateEnd!=''){
+ arr.push({field:"check_date",value:data.form.check_dateStart+"至"+data.form.check_dateEnd,type:'DAT'})
+
+ }
+ /*限改时间*/
+ if(data.form.alter_timeStart!=null && data.form.alter_timeStart!='' && data.form.alter_timeEnd!=null && data.form.alter_timeEnd!=''){
+ arr.push({field:"alter_time",value:data.form.alter_timeStart+"至"+data.form.alter_timeEnd,type:'DAT'})
+
+ }
+ data.query_condition=arr
return request({
headers:{
'token': getTokenAndVerify().token,
'verify':getTokenAndVerify().verify
},
- contentType: "multipart/form-data",
- url: "/taboi/danger/control_list?page="+1+"&limit="+10,
- method: 'GET',
+ url: "/taboi/danger/control_list",
+ contentType: "application/json",
+ method: 'POST',
+ data
});
}
diff --git a/src/api/sgyhpczl/hiddenDangerRegistration.js b/src/api/sgyhpczl/hiddenDangerRegistration.js
index 84a246e..8fba519 100644
--- a/src/api/sgyhpczl/hiddenDangerRegistration.js
+++ b/src/api/sgyhpczl/hiddenDangerRegistration.js
@@ -1,15 +1,83 @@
import request from '@/utils/request';
import {getTokenAndVerify} from "@/api/sgyhpczl/auth";
+export function getPageList(data) {
+ var arr=[]
+ /*编号*/
+ if(data.form.number!=null && data.form.number!=''){
+ arr.push({field:"number",value:data.form.number,type:'TXT'})
+ }
+ /*检查单位*/
+ if(data.form.check_main_branch!=null && data.form.check_main_branch!=''){
+ arr.push({field:"check_main_branch",value:data.form.check_main_branch,type:'OPT'})
+ }
+ /*检查部门*/
+ if(data.form.check_branch!=null && data.form.check_branch!=''){
+ arr.push({field:"check_branch",value:data.form.check_branch,type:'OPT'})
+ }
+ /*检查人*/
+ if(data.form.check_man!=null && data.form.check_man!=''){
+ arr.push({field:"check_man",value:data.form.check_man,type:'TXT'})
+ }
+ /*隐患单位*/
+ if(data.form.ht_community!=null && data.form.ht_community!=''){
+ arr.push({field:"ht_community",value:data.form.ht_community,type:'TXT'})
+ }
+ /*隐患部门*/
+ if(data.form.ht_branch!=null && data.form.ht_branch!=''){
+ arr.push({field:"ht_branch",value:data.form.ht_branch,type:'OPT'})
+ }
+ /*隐患类别*/
+ if(data.form.ht_typesub!=null && data.form.ht_typesub!=''){
+ arr.push({field:"ht_typesub",value:data.form.ht_typesub,type:'OPT'})
+ }
+ /*隐患级别*/
+ if(data.form.ht_level!=null && data.form.ht_level!=''){
+ arr.push({field:"ht_level",value:data.form.ht_level,type:'OPT'})
+ }
+ /*检查类型*/
+ if(data.form.checktype!=null && data.form.checktype!=''){
+ arr.push({field:"checktype",value:data.form.checktype,type:'OPT'})
+ }
+ /*隐患地点*/
+ if(data.form.address!=null && data.form.address!=''){
+ arr.push({field:"address",value:data.form.address,type:'TXT'})
+ }
+ /*隐患内容*/
+ if(data.form.ht_content!=null && data.form.ht_content!=''){
+ arr.push({field:"ht_content",value:data.form.ht_content,type:'TXT'})
+ }
+ /*班次*/
+ if(data.form.check_class!=null && data.form.check_class!=''){
+ arr.push({field:"check_class",value:data.form.check_class,type:'OPT'})
+ }
+ /*是否关联*/
+ if(data.form.DTRisk_bankId!=null && data.form.DTRisk_bankId!=''){
+ arr.push({field:"DTRisk_bankId",value:data.form.DTRisk_bankId,type:'OPT'})
+ }
+ /*录入人*/
+ if(data.form.createBy!=null && data.form.createBy!=''){
+ arr.push({field:"Created_by",value:data.form.createBy,type:'OPT'})
+ }
+ /*检查时间*/
+ if(data.form.check_dateStart!=null && data.form.check_dateStart!='' && data.form.check_dateEnd!=null && data.form.check_dateEnd!=''){
+ arr.push({field:"check_date",value:data.form.check_dateStart+"至"+data.form.check_dateEnd,type:'DAT'})
-export function getPageList(params) {
+ }
+ /*限改时间*/
+ if(data.form.alter_timeStart!=null && data.form.alter_timeStart!='' && data.form.alter_timeEnd!=null && data.form.alter_timeEnd!=''){
+ arr.push({field:"alter_time",value:data.form.alter_timeStart+"至"+data.form.alter_timeEnd,type:'DAT'})
+
+ }
+ data.query_condition=arr
return request({
headers:{
'token': getTokenAndVerify().token,
'verify':getTokenAndVerify().verify
},
- contentType: "multipart/form-data",
- url: "/taboi/danger/register_list?page="+1+"&limit="+10,
- method: 'GET',
+ url: "/taboi/danger/register_list",
+ contentType: "application/json",
+ method: 'POST',
+ data
});
}
diff --git a/src/api/sgyhpczl/initSelect.js b/src/api/sgyhpczl/initSelect.js
index d4c653f..2766f49 100644
--- a/src/api/sgyhpczl/initSelect.js
+++ b/src/api/sgyhpczl/initSelect.js
@@ -81,3 +81,28 @@
method: 'GET',
});
}
+
+//录入人
+export function initLlr() {
+ return request({
+ headers:{
+ 'token': getTokenAndVerify().token,
+ 'verify':getTokenAndVerify().verify
+ },
+ contentType: "multipart/form-data",
+ url: "/taboi/user/create_by_do",
+ method: 'GET',
+ });
+}
+//整改状态
+export function initReformStatus() {
+ return request({
+ headers:{
+ 'token': getTokenAndVerify().token,
+ 'verify':getTokenAndVerify().verify
+ },
+ contentType: "multipart/form-data",
+ url: "/taboi/user/option_alter_status",
+ method: 'GET',
+ });
+}
diff --git a/src/api/sgyhpczl/majorHidden.js b/src/api/sgyhpczl/majorHidden.js
index 57f9163..bd20148 100644
--- a/src/api/sgyhpczl/majorHidden.js
+++ b/src/api/sgyhpczl/majorHidden.js
@@ -2,14 +2,87 @@
import {getTokenAndVerify} from "@/api/sgyhpczl/auth";
-export function getPageList(params) {
+export function getPageList(data) {
+ var arr=[]
+ /*编号*/
+ if(data.form.number!=null && data.form.number!=''){
+ arr.push({field:"number",value:data.form.number,type:'TXT'})
+ }
+ /*检查单位*/
+ if(data.form.check_main_branch!=null && data.form.check_main_branch!=''){
+ arr.push({field:"check_main_branch",value:data.form.check_main_branch,type:'OPT'})
+ }
+ /*检查部门*/
+ if(data.form.check_branch!=null && data.form.check_branch!=''){
+ arr.push({field:"check_branch",value:data.form.check_branch,type:'OPT'})
+ }
+ /*检查人*/
+ if(data.form.check_man!=null && data.form.check_man!=''){
+ arr.push({field:"check_man",value:data.form.check_man,type:'TXT'})
+ }
+ /*隐患单位*/
+ if(data.form.ht_community!=null && data.form.ht_community!=''){
+ arr.push({field:"ht_community",value:data.form.ht_community,type:'TXT'})
+ }
+ /*隐患部门*/
+ if(data.form.ht_branch!=null && data.form.ht_branch!=''){
+ arr.push({field:"ht_branch",value:data.form.ht_branch,type:'OPT'})
+ }
+ /*整改状态*/
+ if(data.form.alter_status!=null && data.form.alter_status!=''){
+ arr.push({field:"alter_status",value:data.form.alter_status,type:'OPT'})
+ }
+ /*隐患类别*/
+ if(data.form.ht_typesub!=null && data.form.ht_typesub!=''){
+ arr.push({field:"ht_typesub",value:data.form.ht_typesub,type:'OPT'})
+ }
+ /*隐患级别*/
+ if(data.form.ht_level!=null && data.form.ht_level!=''){
+ arr.push({field:"ht_level",value:data.form.ht_level,type:'OPT'})
+ }
+ /*检查类型*/
+ if(data.form.checktype!=null && data.form.checktype!=''){
+ arr.push({field:"checktype",value:data.form.checktype,type:'OPT'})
+ }
+ /*隐患地点*/
+ if(data.form.address!=null && data.form.address!=''){
+ arr.push({field:"address",value:data.form.address,type:'TXT'})
+ }
+ /*隐患内容*/
+ if(data.form.ht_content!=null && data.form.ht_content!=''){
+ arr.push({field:"ht_content",value:data.form.ht_content,type:'TXT'})
+ }
+ /*班次*/
+ if(data.form.check_class!=null && data.form.check_class!=''){
+ arr.push({field:"check_class",value:data.form.check_class,type:'OPT'})
+ }
+ /*是否关联*/
+ if(data.form.DTRisk_bankId!=null && data.form.DTRisk_bankId!=''){
+ arr.push({field:"DTRisk_bankId",value:data.form.DTRisk_bankId,type:'OPT'})
+ }
+ /*录入人*/
+ if(data.form.createBy!=null && data.form.createBy!=''){
+ arr.push({field:"Created_by",value:data.form.createBy,type:'OPT'})
+ }
+ /*检查时间*/
+ if(data.form.check_dateStart!=null && data.form.check_dateStart!='' && data.form.check_dateEnd!=null && data.form.check_dateEnd!=''){
+ arr.push({field:"check_date",value:data.form.check_dateStart+"至"+data.form.check_dateEnd,type:'DAT'})
+
+ }
+ /*限改时间*/
+ if(data.form.alter_timeStart!=null && data.form.alter_timeStart!='' && data.form.alter_timeEnd!=null && data.form.alter_timeEnd!=''){
+ arr.push({field:"alter_time",value:data.form.alter_timeStart+"至"+data.form.alter_timeEnd,type:'DAT'})
+
+ }
+ data.query_condition=arr
return request({
headers:{
'token': getTokenAndVerify().token,
'verify':getTokenAndVerify().verify
},
- contentType: "multipart/form-data",
- url: "/taboi/danger/major_list?page="+1+"&limit="+10,
- method: 'GET',
+ url: "/taboi/danger/major_list",
+ contentType: "application/json",
+ method: 'POST',
+ data
});
}
diff --git a/src/api/sgyhpczl/recheckCancellationNumber.js b/src/api/sgyhpczl/recheckCancellationNumber.js
index f8dcace..5a99ec2 100644
--- a/src/api/sgyhpczl/recheckCancellationNumber.js
+++ b/src/api/sgyhpczl/recheckCancellationNumber.js
@@ -2,14 +2,84 @@
import {getTokenAndVerify} from "@/api/sgyhpczl/auth";
-export function getPageList(params) {
+
+export function getPageList(data) {
+ var arr=[]
+ /*编号*/
+ if(data.form.number!=null && data.form.number!=''){
+ arr.push({field:"number",value:data.form.number,type:'TXT'})
+ }
+ /*检查单位*/
+ if(data.form.check_main_branch!=null && data.form.check_main_branch!=''){
+ arr.push({field:"check_main_branch",value:data.form.check_main_branch,type:'OPT'})
+ }
+ /*检查部门*/
+ if(data.form.check_branch!=null && data.form.check_branch!=''){
+ arr.push({field:"check_branch",value:data.form.check_branch,type:'OPT'})
+ }
+ /*检查人*/
+ if(data.form.check_man!=null && data.form.check_man!=''){
+ arr.push({field:"check_man",value:data.form.check_man,type:'TXT'})
+ }
+ /*隐患单位*/
+ if(data.form.ht_community!=null && data.form.ht_community!=''){
+ arr.push({field:"ht_community",value:data.form.ht_community,type:'TXT'})
+ }
+ /*隐患部门*/
+ if(data.form.ht_branch!=null && data.form.ht_branch!=''){
+ arr.push({field:"ht_branch",value:data.form.ht_branch,type:'OPT'})
+ }
+ /*隐患类别*/
+ if(data.form.ht_typesub!=null && data.form.ht_typesub!=''){
+ arr.push({field:"ht_typesub",value:data.form.ht_typesub,type:'OPT'})
+ }
+ /*隐患级别*/
+ if(data.form.ht_level!=null && data.form.ht_level!=''){
+ arr.push({field:"ht_level",value:data.form.ht_level,type:'OPT'})
+ }
+ /*检查类型*/
+ if(data.form.checktype!=null && data.form.checktype!=''){
+ arr.push({field:"checktype",value:data.form.checktype,type:'OPT'})
+ }
+ /*隐患地点*/
+ if(data.form.address!=null && data.form.address!=''){
+ arr.push({field:"address",value:data.form.address,type:'TXT'})
+ }
+ /*隐患内容*/
+ if(data.form.ht_content!=null && data.form.ht_content!=''){
+ arr.push({field:"ht_content",value:data.form.ht_content,type:'TXT'})
+ }
+ /*班次*/
+ if(data.form.check_class!=null && data.form.check_class!=''){
+ arr.push({field:"check_class",value:data.form.check_class,type:'OPT'})
+ }
+ /*是否关联*/
+ if(data.form.DTRisk_bankId!=null && data.form.DTRisk_bankId!=''){
+ arr.push({field:"DTRisk_bankId",value:data.form.DTRisk_bankId,type:'OPT'})
+ }
+ /*录入人*/
+ if(data.form.createBy!=null && data.form.createBy!=''){
+ arr.push({field:"Created_by",value:data.form.createBy,type:'OPT'})
+ }
+ /*检查时间*/
+ if(data.form.check_dateStart!=null && data.form.check_dateStart!='' && data.form.check_dateEnd!=null && data.form.check_dateEnd!=''){
+ arr.push({field:"check_date",value:data.form.check_dateStart+"至"+data.form.check_dateEnd,type:'DAT'})
+
+ }
+ /*限改时间*/
+ if(data.form.alter_timeStart!=null && data.form.alter_timeStart!='' && data.form.alter_timeEnd!=null && data.form.alter_timeEnd!=''){
+ arr.push({field:"alter_time",value:data.form.alter_timeStart+"至"+data.form.alter_timeEnd,type:'DAT'})
+
+ }
+ data.query_condition=arr
return request({
headers:{
'token': getTokenAndVerify().token,
'verify':getTokenAndVerify().verify
},
- contentType: "multipart/form-data",
- url: "/taboi/danger/review_list?page="+1+"&limit="+10,
- method: 'GET',
+ url: "/taboi/danger/review_list",
+ contentType: "application/json",
+ method: 'POST',
+ data
});
}
diff --git a/src/views/accidentHidden/majorHidden.vue b/src/views/accidentHidden/majorHidden.vue
index e5d8dbb..8206c1f 100644
--- a/src/views/accidentHidden/majorHidden.vue
+++ b/src/views/accidentHidden/majorHidden.vue
@@ -29,22 +29,23 @@
<el-input v-model="listQuery.form.check_man" style="width:202px" placeholder="请输入内容"></el-input>
</el-form-item>
<el-form-item label="隐患单位">
- <el-select v-model="listQuery.form.ht_community" placeholder="请选择" @change="changeYHDW">
+ <el-input v-model="listQuery.form.ht_community" style="width:202px" :disabled="true"></el-input>
+ <!--<el-select v-model="listQuery.form.ht_community" placeholder="请选择" @change="changeYHDW">
<el-option
- v-for="item in options"
+ v-for="item in JCDWList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
- </el-select>
+ </el-select>-->
</el-form-item>
<el-form-item label="隐患部门">
<el-select v-model="listQuery.form.ht_branch" placeholder="请选择">
<el-option
v-for="item in YHBMList"
- :key="item.value"
- :label="item.value"
- :value="item.value">
+ :key="item.branch_id"
+ :label="item.branch_name"
+ :value="item.branch_id">
</el-option>
</el-select>
</el-form-item>
@@ -95,9 +96,9 @@
</el-select>
</el-form-item>
<el-form-item label="是否关联">
- <el-select v-model="listQuery.form.number" placeholder="请选择">
+ <el-select v-model="listQuery.form.DTRisk_bankId" placeholder="请选择">
<el-option
- v-for="item in options"
+ v-for="item in reList"
:key="item.value"
:label="item.label"
:value="item.value">
@@ -105,31 +106,31 @@
</el-select>
</el-form-item>
<el-form-item label="录入人">
- <el-select v-model="listQuery.form.number" placeholder="请选择">
+ <el-select v-model="listQuery.form.createBy" placeholder="请选择">
<el-option
- v-for="item in options"
- :key="item.value"
- :label="item.value"
- :value="item.value">
+ v-for="item in llrList"
+ :key="item.id"
+ :label="item.realName"
+ :value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="检查时间">
<el-col :span="11">
- <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+ <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.check_dateStart" style="width: 100%;" value-format="yyyy-MM-dd"></el-date-picker>
</el-col>
<el-col style="text-align:center" :span="2">-</el-col>
<el-col :span="11">
- <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+ <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.check_dateEnd" style="width: 100%;" value-format="yyyy-MM-dd"></el-date-picker>
</el-col>
</el-form-item>
<el-form-item label="限改时间">
<el-col :span="11">
- <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+ <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.alter_timeStart" value-format="yyyy-MM-dd" style="width: 100%;"></el-date-picker>
</el-col>
<el-col style="text-align:center" :span="2">-</el-col>
<el-col :span="11">
- <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+ <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.alter_timeEnd" value-format="yyyy-MM-dd" style="width: 100%;"></el-date-picker>
</el-col>
</el-form-item>
<el-form-item style="text-align:center;padding:0 50px">
@@ -141,9 +142,9 @@
<el-row class="title-center">
<el-col :span="10">
<el-radio-group v-model="listQuery.form.alter_status" style="border:none">
- <el-radio-button label="2">正在整改</el-radio-button>
- <el-radio-button label="3">正在复查</el-radio-button>
- <el-radio-button label="end">整改完成</el-radio-button>
+ <el-radio-button label="正在整改">正在整改</el-radio-button>
+ <el-radio-button label="正在复查">正在复查</el-radio-button>
+ <el-radio-button label="整改完成">整改完成</el-radio-button>
</el-radio-group>
</el-col>
<el-col :offset="4" :span="10" style="text-align:right;">
@@ -191,13 +192,14 @@
</template>
<script>
import {getPageList} from "@/api/sgyhpczl/majorHidden";
-import {initJCBM ,initYHLX, initBC ,initJCLB ,initYHBM ,initYHJB} from "@/api/sgyhpczl/initSelect";
+import {initJCBM ,initYHLX, initBC ,initJCLB ,initYHBM ,initYHJB,initLlr} from "@/api/sgyhpczl/initSelect";
export default {
data() {
return {
+ reList:[{label:"未关联",value:0}],
options: [],
form:{},
-
+ llrList:[],
JCDWList:[{label:"众泰",value:0},{label:"上级单位",value:1}],
JCBMList:[],
YHLXList:[],
@@ -210,6 +212,7 @@
page:1,
limit:10,
form:{
+ ht_community:"众泰煤焦化"
},
},
currentPage: 1,
@@ -223,9 +226,19 @@
this.initYHJB()
this.initBC()
this.initJCLB()
+ this.initLlr()
+ //this.changeJCDW()
},
methods:{
-
+ initLlr(){
+ initLlr().then(res=>{
+ if (res.data.ok==1){
+ this.llrList=res.data.data
+ } else{
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
+ },
changeYHDW(val){
initYHBM().then(res=>{
if (res.data.ok==1){
@@ -244,19 +257,52 @@
}
})
},
+ checkTime(){
+ if(this.listQuery.form.check_dateStart!=null && this.listQuery.form.check_dateStart!=''){
+ if(this.listQuery.form.check_dateEnd!=null && this.listQuery.form.check_dateEnd!=''){
+ }else {
+ this.$message({type:'error', message:"请选择检查结束时间", duration:3000})
+ return
+ }
+
+ }
+ if(this.listQuery.form.check_dateEnd!=null && this.listQuery.form.check_dateEnd!=''){
+ if(this.listQuery.form.check_dateStart!=null && this.listQuery.form.check_dateStart!=''){
+ }else {
+ this.$message({type:'error', message:"请选择检查开始时间", duration:3000})
+ return
+ }
+ }
+ if(this.listQuery.form.alter_timeStart!=null && this.listQuery.form.alter_timeStart!=''){
+ if(this.listQuery.form.alter_timeEnd!=null && this.listQuery.form.alter_timeEnd!=''){
+ }else {
+ this.$message({type:'error', message:"请选择限改结束时间", duration:3000})
+ return
+ }
+
+ }
+ if(this.listQuery.form.alter_timeEnd!=null && this.listQuery.form.alter_timeEnd!=''){
+ if(this.listQuery.form.alter_timeStart!=null && this.listQuery.form.alter_timeStart!=''){
+ }else {
+ this.$message({type:'error', message:"请选择改开始时间", duration:3000})
+ return
+ }
+ }
+ },
getPageList(){
this.listQuery.page=1
+ this.checkTime()
getPageList(this.listQuery).then(res=>{
if (res.data.ok==1) {
- this.tableData = res.data.data
- // this.recordTotal=res.data.data.length
+ this.tableData = res.data.data.items
+ this.recordTotal=res.data.data.total
}else{
this.$message({type:'error', message:res.data.msg, duration:3000})
}
})
},
reset(){
- this.listQuery.form={}
+ this.listQuery.form={ht_community:"众泰煤焦化"}
this.getPageList()
},
handleSizeChange(val){
@@ -268,9 +314,11 @@
this.getPageListForPagination();
},
getPageListForPagination(){
+ this.checkTime()
getPageList(this.listQuery).then(res=>{
if (res.data.ok==1) {
- this.tableData = res.data.data
+ this.tableData = res.data.data.items
+ this.recordTotal=res.data.data.total
}else{
this.$message({type:'error', message:res.data.msg, duration:3000})
}
diff --git a/src/views/delayHiddenDangerRectification/index.vue b/src/views/delayHiddenDangerRectification/index.vue
index 35257bf..856814a 100644
--- a/src/views/delayHiddenDangerRectification/index.vue
+++ b/src/views/delayHiddenDangerRectification/index.vue
@@ -29,22 +29,23 @@
<el-input v-model="listQuery.form.check_man" style="width:202px" placeholder="请输入内容"></el-input>
</el-form-item>
<el-form-item label="隐患单位">
- <el-select v-model="listQuery.form.ht_community" placeholder="请选择" @change="changeYHDW">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value">
- </el-option>
- </el-select>
+ <el-input v-model="listQuery.form.ht_community" style="width:202px" :disabled="true"></el-input>
+ <!--<el-select v-model="listQuery.form.ht_community" placeholder="请选择" @change="changeYHDW">
+ <el-option
+ v-for="item in JCDWList"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>-->
</el-form-item>
<el-form-item label="隐患部门">
<el-select v-model="listQuery.form.ht_branch" placeholder="请选择">
<el-option
v-for="item in YHBMList"
- :key="item.value"
- :label="item.value"
- :value="item.value">
+ :key="item.branch_id"
+ :label="item.branch_name"
+ :value="item.branch_id">
</el-option>
</el-select>
</el-form-item>
@@ -94,42 +95,42 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="是否关联">
- <el-select v-model="listQuery.form.number" placeholder="请选择">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value">
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="录入人">
- <el-select v-model="listQuery.form.number" placeholder="请选择">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.value"
- :value="item.value">
- </el-option>
- </el-select>
- </el-form-item>
+ <el-form-item label="是否关联">
+ <el-select v-model="listQuery.form.DTRisk_bankId" placeholder="请选择">
+ <el-option
+ v-for="item in reList"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="录入人">
+ <el-select v-model="listQuery.form.createBy" placeholder="请选择">
+ <el-option
+ v-for="item in llrList"
+ :key="item.id"
+ :label="item.realName"
+ :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
<el-form-item label="检查时间">
<el-col :span="11">
- <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+ <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.check_dateStart" style="width: 100%;" value-format="yyyy-MM-dd"></el-date-picker>
</el-col>
<el-col style="text-align:center" :span="2">-</el-col>
<el-col :span="11">
- <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+ <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.check_dateEnd" style="width: 100%;" value-format="yyyy-MM-dd"></el-date-picker>
</el-col>
</el-form-item>
<el-form-item label="限改时间">
<el-col :span="11">
- <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+ <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.alter_timeStart" value-format="yyyy-MM-dd" style="width: 100%;"></el-date-picker>
</el-col>
<el-col style="text-align:center" :span="2">-</el-col>
<el-col :span="11">
- <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+ <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.alter_timeEnd" value-format="yyyy-MM-dd" style="width: 100%;"></el-date-picker>
</el-col>
</el-form-item>
<el-form-item style="text-align:center;padding:0 50px">
@@ -210,14 +211,15 @@
</template>
<script>
import {getPageList} from "@/api/sgyhpczl/delayHiddenDangerRectification";
- import {initJCBM ,initYHLX, initBC ,initJCLB ,initYHBM ,initYHJB} from "@/api/sgyhpczl/initSelect";
+ import {initJCBM ,initYHLX, initBC ,initJCLB ,initYHBM ,initYHJB,initLlr} from "@/api/sgyhpczl/initSelect";
export default {
data() {
return {
options: [],
form:{},
value1:"",
-
+ reList:[{label:"未关联",value:0}],
+ llrList:[],
JCDWList:[{label:"众泰",value:0},{label:"上级单位",value:1}],
JCBMList:[],
YHLXList:[],
@@ -229,7 +231,9 @@
listQuery:{
page:1,
limit:10,
- form:{},
+ form:{
+ ht_community:"众泰煤焦化"
+ },
},
currentPage: 1,
pageSize: 10,
@@ -242,9 +246,18 @@
this.initYHJB()
this.initBC()
this.initJCLB()
+ this.initLlr()
},
methods:{
-
+ initLlr(){
+ initLlr().then(res=>{
+ if (res.data.ok==1){
+ this.llrList=res.data.data
+ } else{
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
+ },
changeYHDW(val){
initYHBM().then(res=>{
if (res.data.ok==1){
@@ -263,19 +276,52 @@
}
})
},
+ checkTime(){
+ if(this.listQuery.form.check_dateStart!=null && this.listQuery.form.check_dateStart!=''){
+ if(this.listQuery.form.check_dateEnd!=null && this.listQuery.form.check_dateEnd!=''){
+ }else {
+ this.$message({type:'error', message:"请选择检查结束时间", duration:3000})
+ return
+ }
+
+ }
+ if(this.listQuery.form.check_dateEnd!=null && this.listQuery.form.check_dateEnd!=''){
+ if(this.listQuery.form.check_dateStart!=null && this.listQuery.form.check_dateStart!=''){
+ }else {
+ this.$message({type:'error', message:"请选择检查开始时间", duration:3000})
+ return
+ }
+ }
+ if(this.listQuery.form.alter_timeStart!=null && this.listQuery.form.alter_timeStart!=''){
+ if(this.listQuery.form.alter_timeEnd!=null && this.listQuery.form.alter_timeEnd!=''){
+ }else {
+ this.$message({type:'error', message:"请选择限改结束时间", duration:3000})
+ return
+ }
+
+ }
+ if(this.listQuery.form.alter_timeEnd!=null && this.listQuery.form.alter_timeEnd!=''){
+ if(this.listQuery.form.alter_timeStart!=null && this.listQuery.form.alter_timeStart!=''){
+ }else {
+ this.$message({type:'error', message:"请选择改开始时间", duration:3000})
+ return
+ }
+ }
+ },
getPageList(){
this.listQuery.page=1
+ this.checkTime()
getPageList(this.listQuery).then(res=>{
if (res.data.ok==1) {
- this.tableData = res.data.data
- // this.recordTotal=res.data.data.length
+ this.tableData = res.data.data.items
+ this.recordTotal=res.data.data.total
}else{
this.$message({type:'error', message:res.data.msg, duration:3000})
}
})
},
reset(){
- this.listQuery.form={}
+ this.listQuery.form={ht_community:"众泰煤焦化"}
this.getPageList()
},
handleSizeChange(val){
@@ -287,9 +333,11 @@
this.getPageListForPagination();
},
getPageListForPagination(){
+ this.checkTime()
getPageList(this.listQuery).then(res=>{
if (res.data.ok==1) {
- this.tableData = res.data.data
+ this.tableData = res.data.data.items
+ this.recordTotal=res.data.data.total
}else{
this.$message({type:'error', message:res.data.msg, duration:3000})
}
diff --git a/src/views/hiddenDangerManagement/index.vue b/src/views/hiddenDangerManagement/index.vue
index 864724c..9d8dbca 100644
--- a/src/views/hiddenDangerManagement/index.vue
+++ b/src/views/hiddenDangerManagement/index.vue
@@ -8,14 +8,7 @@
<el-input v-model="listQuery.form.check_man" style="width:202px" placeholder="请输入内容"></el-input>
</el-form-item>
<el-form-item label="隐患单位">
- <el-select v-model="listQuery.form.ht_community" placeholder="请选择" @change="changeYHDW">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value">
- </el-option>
- </el-select>
+ <el-input v-model="listQuery.form.ht_branch" style="width:202px" ></el-input>
</el-form-item>
<el-form-item label="隐患类别">
<el-select v-model="listQuery.form.ht_typesub" placeholder="请选择">
@@ -63,32 +56,32 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="是否关联">
- <el-select v-model="listQuery.form.number" placeholder="请选择">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value">
- </el-option>
- </el-select>
- </el-form-item>
+ <el-form-item label="是否关联">
+ <el-select v-model="listQuery.form.DTRisk_bankId" placeholder="请选择">
+ <el-option
+ v-for="item in reList"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
<el-form-item label="检查时间">
<el-col :span="11">
- <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+ <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.check_dateStart" style="width: 100%;" value-format="yyyy-MM-dd"></el-date-picker>
</el-col>
<el-col style="text-align:center" :span="2">-</el-col>
<el-col :span="11">
- <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+ <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.check_dateEnd" style="width: 100%;" value-format="yyyy-MM-dd"></el-date-picker>
</el-col>
</el-form-item>
<el-form-item label="限改时间">
<el-col :span="11">
- <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+ <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.alter_timeStart" value-format="yyyy-MM-dd" style="width: 100%;"></el-date-picker>
</el-col>
<el-col style="text-align:center" :span="2">-</el-col>
<el-col :span="11">
- <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+ <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.alter_timeEnd" value-format="yyyy-MM-dd" style="width: 100%;"></el-date-picker>
</el-col>
</el-form-item>
<el-form-item style="text-align:center;padding:0 50px">
@@ -99,9 +92,8 @@
</el-form>
<el-row class="title-center">
<el-col :span="7">
- <el-radio-group v-model="radio1">
- <el-radio-button label="未整改"></el-radio-button>
- <el-radio-button label="整改完成"></el-radio-button>
+ <el-radio-group v-model="listQuery.form.alter_status">
+ <el-radio-button v-for="item in statusList" :label="item.value"></el-radio-button>
</el-radio-group>
</el-col>
<el-col :span="10">
@@ -157,7 +149,7 @@
<el-table :data="tableData" style="width: 100%">
<el-table-column type="selection" width="55" align="center"></el-table-column>
<el-table-column prop="number" label="编号" align="center" width="120"></el-table-column>
- <el-table-column prop="check_branch" label="隐患单位" align="center" width="120"></el-table-column>
+ <el-table-column prop="ht_branch" label="隐患单位" align="center" width="120"></el-table-column>
<el-table-column prop="check_man" label="检查人" align="center" width="120"></el-table-column>
<el-table-column label="隐患项目" align="center">
<el-table-column prop="check_date" label="检查时间" width="120" align="center"></el-table-column>
@@ -209,15 +201,16 @@
</template>
<script>
import {getPageList} from "@/api/sgyhpczl/hiddenDangerManagement";
- import {initJCBM ,initYHLX, initBC ,initJCLB ,initYHBM ,initYHJB} from "@/api/sgyhpczl/initSelect";
+ import {initJCBM ,initYHLX, initBC ,initJCLB ,initYHBM ,initYHJB,initReformStatus} from "@/api/sgyhpczl/initSelect";
export default {
data() {
return {
+ statusList:[],
options: [],
form:{},
value1:"",
radio1:"未整改",
-
+ reList:[{label:"未关联",value:0}],
JCDWList:[{label:"众泰",value:0},{label:"上级单位",value:1}],
JCBMList:[],
YHLXList:[],
@@ -230,7 +223,9 @@
listQuery:{
page:1,
limit:10,
- form:{},
+ form:{
+ alter_status:'未整改'
+ },
},
currentPage: 1,
pageSize: 10,
@@ -242,9 +237,18 @@
this.initYHJB()
this.initBC()
this.initJCLB()
+ this.initReformStatus()
},
methods:{
-
+ initReformStatus(){
+ initReformStatus().then(res=>{
+ if (res.data.ok==1){
+ this.statusList=res.data.data
+ } else{
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
+ },
changeYHDW(val){
initYHBM().then(res=>{
if (res.data.ok==1){
@@ -263,12 +267,45 @@
}
})
},
+ checkTime(){
+ if(this.listQuery.form.check_dateStart!=null && this.listQuery.form.check_dateStart!=''){
+ if(this.listQuery.form.check_dateEnd!=null && this.listQuery.form.check_dateEnd!=''){
+ }else {
+ this.$message({type:'error', message:"请选择检查结束时间", duration:3000})
+ return
+ }
+
+ }
+ if(this.listQuery.form.check_dateEnd!=null && this.listQuery.form.check_dateEnd!=''){
+ if(this.listQuery.form.check_dateStart!=null && this.listQuery.form.check_dateStart!=''){
+ }else {
+ this.$message({type:'error', message:"请选择检查开始时间", duration:3000})
+ return
+ }
+ }
+ if(this.listQuery.form.alter_timeStart!=null && this.listQuery.form.alter_timeStart!=''){
+ if(this.listQuery.form.alter_timeEnd!=null && this.listQuery.form.alter_timeEnd!=''){
+ }else {
+ this.$message({type:'error', message:"请选择限改结束时间", duration:3000})
+ return
+ }
+
+ }
+ if(this.listQuery.form.alter_timeEnd!=null && this.listQuery.form.alter_timeEnd!=''){
+ if(this.listQuery.form.alter_timeStart!=null && this.listQuery.form.alter_timeStart!=''){
+ }else {
+ this.$message({type:'error', message:"请选择改开始时间", duration:3000})
+ return
+ }
+ }
+ },
getPageList(){
this.listQuery.page=1
+ this.checkTime()
getPageList(this.listQuery).then(res=>{
if (res.data.ok==1) {
- this.tableData = res.data.data
- // this.recordTotal=res.data.data.length
+ this.tableData = res.data.data.items
+ this.recordTotal=res.data.data.total
}else{
this.$message({type:'error', message:res.data.msg, duration:3000})
}
@@ -287,9 +324,11 @@
this.getPageListForPagination();
},
getPageListForPagination(){
+ this.checkTime()
getPageList(this.listQuery).then(res=>{
if (res.data.ok==1) {
- this.tableData = res.data.data
+ this.tableData = res.data.data.items
+ this.recordTotal=res.data.data.total
}else{
this.$message({type:'error', message:res.data.msg, duration:3000})
}
diff --git a/src/views/hiddenDangerRectification/index.vue b/src/views/hiddenDangerRectification/index.vue
index cae61f9..03e832a 100644
--- a/src/views/hiddenDangerRectification/index.vue
+++ b/src/views/hiddenDangerRectification/index.vue
@@ -29,22 +29,23 @@
<el-input v-model="listQuery.form.check_man" style="width:202px" placeholder="请输入内容"></el-input>
</el-form-item>
<el-form-item label="隐患单位">
- <el-select v-model="listQuery.form.ht_community" placeholder="请选择" @change="changeYHDW">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value">
- </el-option>
- </el-select>
+ <el-input v-model="listQuery.form.ht_community" style="width:202px" :disabled="true"></el-input>
+ <!--<el-select v-model="listQuery.form.ht_community" placeholder="请选择" @change="changeYHDW">
+ <el-option
+ v-for="item in JCDWList"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>-->
</el-form-item>
<el-form-item label="隐患部门">
<el-select v-model="listQuery.form.ht_branch" placeholder="请选择">
<el-option
v-for="item in YHBMList"
- :key="item.value"
- :label="item.value"
- :value="item.value">
+ :key="item.branch_id"
+ :label="item.branch_name"
+ :value="item.branch_id">
</el-option>
</el-select>
</el-form-item>
@@ -116,20 +117,20 @@
</el-form-item>-->
<el-form-item label="检查时间">
<el-col :span="11">
- <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+ <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.check_dateStart" style="width: 100%;" value-format="yyyy-MM-dd"></el-date-picker>
</el-col>
<el-col style="text-align:center" :span="2">-</el-col>
<el-col :span="11">
- <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+ <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.check_dateEnd" style="width: 100%;" value-format="yyyy-MM-dd"></el-date-picker>
</el-col>
</el-form-item>
<el-form-item label="限改时间">
<el-col :span="11">
- <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+ <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.alter_timeStart" value-format="yyyy-MM-dd" style="width: 100%;"></el-date-picker>
</el-col>
<el-col style="text-align:center" :span="2">-</el-col>
<el-col :span="11">
- <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+ <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.alter_timeEnd" value-format="yyyy-MM-dd" style="width: 100%;"></el-date-picker>
</el-col>
</el-form-item>
<el-form-item style="text-align:center;padding:0 50px">
@@ -256,14 +257,15 @@
</template>
<script>
import {getPageList} from "@/api/sgyhpczl/hiddenDangerRectification";
- import {initJCBM ,initYHLX, initBC ,initJCLB ,initYHBM ,initYHJB} from "@/api/sgyhpczl/initSelect";
+ import {initJCBM ,initYHLX, initBC ,initJCLB ,initYHBM ,initYHJB,initLlr} from "@/api/sgyhpczl/initSelect";
export default {
data() {
return {
+ reList:[{label:"未关联",value:0}],
options: [],
form:{},
value1:"",
-
+ llrList:[],
JCDWList:[{label:"众泰",value:0},{label:"上级单位",value:1}],
JCBMList:[],
YHLXList:[],
@@ -275,7 +277,9 @@
listQuery:{
page:1,
limit:10,
- form:{},
+ form:{
+ ht_community:"众泰煤焦化"
+ },
},
dialogVisible: false,
@@ -303,10 +307,19 @@
this.initYHJB()
this.initBC()
this.initJCLB()
+ this.initLlr()
},
methods:{
-
+ initLlr(){
+ initLlr().then(res=>{
+ if (res.data.ok==1){
+ this.llrList=res.data.data
+ } else{
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
+ },
changeYHDW(val){
initYHBM().then(res=>{
if (res.data.ok==1){
@@ -325,19 +338,52 @@
}
})
},
+ checkTime(){
+ if(this.listQuery.form.check_dateStart!=null && this.listQuery.form.check_dateStart!=''){
+ if(this.listQuery.form.check_dateEnd!=null && this.listQuery.form.check_dateEnd!=''){
+ }else {
+ this.$message({type:'error', message:"请选择检查结束时间", duration:3000})
+ return
+ }
+
+ }
+ if(this.listQuery.form.check_dateEnd!=null && this.listQuery.form.check_dateEnd!=''){
+ if(this.listQuery.form.check_dateStart!=null && this.listQuery.form.check_dateStart!=''){
+ }else {
+ this.$message({type:'error', message:"请选择检查开始时间", duration:3000})
+ return
+ }
+ }
+ if(this.listQuery.form.alter_timeStart!=null && this.listQuery.form.alter_timeStart!=''){
+ if(this.listQuery.form.alter_timeEnd!=null && this.listQuery.form.alter_timeEnd!=''){
+ }else {
+ this.$message({type:'error', message:"请选择限改结束时间", duration:3000})
+ return
+ }
+
+ }
+ if(this.listQuery.form.alter_timeEnd!=null && this.listQuery.form.alter_timeEnd!=''){
+ if(this.listQuery.form.alter_timeStart!=null && this.listQuery.form.alter_timeStart!=''){
+ }else {
+ this.$message({type:'error', message:"请选择改开始时间", duration:3000})
+ return
+ }
+ }
+ },
getPageList(){
this.listQuery.page=1
+ this.checkTime()
getPageList(this.listQuery).then(res=>{
if (res.data.ok==1) {
- this.tableData = res.data.data
- // this.recordTotal=res.data.data.length
+ this.tableData = res.data.data.items
+ this.recordTotal=res.data.data.total
}else{
this.$message({type:'error', message:res.data.msg, duration:3000})
}
})
},
reset(){
- this.listQuery.form={}
+ this.listQuery.form={ht_community:"众泰煤焦化"}
this.getPageList()
},
handleSizeChange(val){
@@ -349,9 +395,11 @@
this.getPageListForPagination();
},
getPageListForPagination(){
+ this.checkTime()
getPageList(this.listQuery).then(res=>{
if (res.data.ok==1) {
- this.tableData = res.data.data
+ this.tableData = res.data.data.items
+ this.recordTotal=res.data.data.total
}else{
this.$message({type:'error', message:res.data.msg, duration:3000})
}
diff --git a/src/views/hiddenDangerRegistration/index.vue b/src/views/hiddenDangerRegistration/index.vue
index cdce91e..5cae3cc 100644
--- a/src/views/hiddenDangerRegistration/index.vue
+++ b/src/views/hiddenDangerRegistration/index.vue
@@ -29,22 +29,23 @@
<el-input v-model="listQuery.form.check_man" style="width:202px" placeholder="请输入内容"></el-input>
</el-form-item>
<el-form-item label="隐患单位">
- <el-select v-model="listQuery.form.ht_community" placeholder="请选择" @change="changeYHDW">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value">
- </el-option>
- </el-select>
+ <el-input v-model="listQuery.form.ht_community" style="width:202px" :disabled="true"></el-input>
+ <!--<el-select v-model="listQuery.form.ht_community" placeholder="请选择" @change="changeYHDW">
+ <el-option
+ v-for="item in JCDWList"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>-->
</el-form-item>
<el-form-item label="隐患部门">
<el-select v-model="listQuery.form.ht_branch" placeholder="请选择">
<el-option
v-for="item in YHBMList"
- :key="item.value"
- :label="item.value"
- :value="item.value">
+ :key="item.branch_id"
+ :label="item.branch_name"
+ :value="item.branch_id">
</el-option>
</el-select>
</el-form-item>
@@ -95,9 +96,9 @@
</el-select>
</el-form-item>
<el-form-item label="是否关联">
- <el-select v-model="listQuery.form.number" placeholder="请选择">
+ <el-select v-model="listQuery.form.DTRisk_bankId" placeholder="请选择">
<el-option
- v-for="item in options"
+ v-for="item in reList"
:key="item.value"
:label="item.label"
:value="item.value">
@@ -105,31 +106,31 @@
</el-select>
</el-form-item>
<el-form-item label="录入人">
- <el-select v-model="listQuery.form.number" placeholder="请选择">
+ <el-select v-model="listQuery.form.createBy" placeholder="请选择">
<el-option
- v-for="item in options"
- :key="item.value"
- :label="item.value"
- :value="item.value">
+ v-for="item in llrList"
+ :key="item.id"
+ :label="item.realName"
+ :value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="检查时间">
<el-col :span="11">
- <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+ <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.check_dateStart" style="width: 100%;" value-format="yyyy-MM-dd"></el-date-picker>
</el-col>
<el-col style="text-align:center" :span="2">-</el-col>
<el-col :span="11">
- <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+ <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.check_dateEnd" style="width: 100%;" value-format="yyyy-MM-dd"></el-date-picker>
</el-col>
</el-form-item>
<el-form-item label="限改时间">
<el-col :span="11">
- <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+ <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.alter_timeStart" value-format="yyyy-MM-dd" style="width: 100%;"></el-date-picker>
</el-col>
<el-col style="text-align:center" :span="2">-</el-col>
<el-col :span="11">
- <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+ <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.alter_timeEnd" value-format="yyyy-MM-dd" style="width: 100%;"></el-date-picker>
</el-col>
</el-form-item>
<el-form-item style="text-align:center;padding:0 50px">
@@ -243,10 +244,12 @@
</template>
<script>
import {getPageList} from "@/api/sgyhpczl/hiddenDangerRegistration";
-import {initJCBM ,initYHLX, initBC ,initJCLB ,initYHBM ,initYHJB} from "@/api/sgyhpczl/initSelect";
+import {initJCBM ,initYHLX, initBC ,initJCLB ,initYHBM ,initYHJB,initLlr} from "@/api/sgyhpczl/initSelect";
export default {
data() {
return {
+ reList:[{label:"未关联",value:0}],
+ llrList:[],
options: [],
form:{},
@@ -261,7 +264,9 @@
listQuery:{
page:1,
limit:10,
- form:{},
+ form:{
+ ht_community:"众泰煤焦化"
+ },
},
currentPage: 1,
pageSize: 10,
@@ -274,9 +279,18 @@
this.initYHJB()
this.initBC()
this.initJCLB()
+ this.initLlr()
},
methods:{
-
+ initLlr(){
+ initLlr().then(res=>{
+ if (res.data.ok==1){
+ this.llrList=res.data.data
+ } else{
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
+ },
changeYHDW(val){
initYHBM().then(res=>{
if (res.data.ok==1){
@@ -295,19 +309,52 @@
}
})
},
+ checkTime(){
+ if(this.listQuery.form.check_dateStart!=null && this.listQuery.form.check_dateStart!=''){
+ if(this.listQuery.form.check_dateEnd!=null && this.listQuery.form.check_dateEnd!=''){
+ }else {
+ this.$message({type:'error', message:"请选择检查结束时间", duration:3000})
+ return
+ }
+
+ }
+ if(this.listQuery.form.check_dateEnd!=null && this.listQuery.form.check_dateEnd!=''){
+ if(this.listQuery.form.check_dateStart!=null && this.listQuery.form.check_dateStart!=''){
+ }else {
+ this.$message({type:'error', message:"请选择检查开始时间", duration:3000})
+ return
+ }
+ }
+ if(this.listQuery.form.alter_timeStart!=null && this.listQuery.form.alter_timeStart!=''){
+ if(this.listQuery.form.alter_timeEnd!=null && this.listQuery.form.alter_timeEnd!=''){
+ }else {
+ this.$message({type:'error', message:"请选择限改结束时间", duration:3000})
+ return
+ }
+
+ }
+ if(this.listQuery.form.alter_timeEnd!=null && this.listQuery.form.alter_timeEnd!=''){
+ if(this.listQuery.form.alter_timeStart!=null && this.listQuery.form.alter_timeStart!=''){
+ }else {
+ this.$message({type:'error', message:"请选择改开始时间", duration:3000})
+ return
+ }
+ }
+ },
getPageList(){
this.listQuery.page=1
+ this.checkTime()
getPageList(this.listQuery).then(res=>{
if (res.data.ok==1) {
- this.tableData = res.data.data
- // this.recordTotal=res.data.data.length
+ this.tableData = res.data.data.items
+ this.recordTotal=res.data.data.total
}else{
this.$message({type:'error', message:res.data.msg, duration:3000})
}
})
},
reset(){
- this.listQuery.form={}
+ this.listQuery.form={ht_community:"众泰煤焦化"}
this.getPageList()
},
handleSizeChange(val){
@@ -319,9 +366,11 @@
this.getPageListForPagination();
},
getPageListForPagination(){
+ this.checkTime()
getPageList(this.listQuery).then(res=>{
if (res.data.ok==1) {
- this.tableData = res.data.data
+ this.tableData = res.data.data.items
+ this.recordTotal=res.data.data.total
}else{
this.$message({type:'error', message:res.data.msg, duration:3000})
}
diff --git a/src/views/hiddenDangerReview/recheckCancellationNumber.vue b/src/views/hiddenDangerReview/recheckCancellationNumber.vue
index 08c61fd..982cfad 100644
--- a/src/views/hiddenDangerReview/recheckCancellationNumber.vue
+++ b/src/views/hiddenDangerReview/recheckCancellationNumber.vue
@@ -29,22 +29,23 @@
<el-input v-model="listQuery.form.check_man" style="width:202px" placeholder="请输入内容"></el-input>
</el-form-item>
<el-form-item label="隐患单位">
- <el-select v-model="listQuery.form.ht_community" placeholder="请选择" @change="changeYHDW">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value">
- </el-option>
- </el-select>
+ <el-input v-model="listQuery.form.ht_community" style="width:202px" :disabled="true"></el-input>
+ <!--<el-select v-model="listQuery.form.ht_community" placeholder="请选择" @change="changeYHDW">
+ <el-option
+ v-for="item in JCDWList"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>-->
</el-form-item>
<el-form-item label="隐患部门">
<el-select v-model="listQuery.form.ht_branch" placeholder="请选择">
<el-option
v-for="item in YHBMList"
- :key="item.value"
- :label="item.value"
- :value="item.value">
+ :key="item.branch_id"
+ :label="item.branch_name"
+ :value="item.branch_id">
</el-option>
</el-select>
</el-form-item>
@@ -94,42 +95,42 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="是否关联">
- <el-select v-model="listQuery.form.number" placeholder="请选择">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value">
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="录入人">
- <el-select v-model="listQuery.form.number" placeholder="请选择">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.value"
- :value="item.value">
- </el-option>
- </el-select>
- </el-form-item>
+ <el-form-item label="是否关联">
+ <el-select v-model="listQuery.form.DTRisk_bankId" placeholder="请选择">
+ <el-option
+ v-for="item in reList"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="录入人">
+ <el-select v-model="listQuery.form.createBy" placeholder="请选择">
+ <el-option
+ v-for="item in llrList"
+ :key="item.id"
+ :label="item.realName"
+ :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
<el-form-item label="检查时间">
<el-col :span="11">
- <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+ <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.check_dateStart" style="width: 100%;" value-format="yyyy-MM-dd"></el-date-picker>
</el-col>
<el-col style="text-align:center" :span="2">-</el-col>
<el-col :span="11">
- <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+ <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.check_dateEnd" style="width: 100%;" value-format="yyyy-MM-dd"></el-date-picker>
</el-col>
</el-form-item>
<el-form-item label="限改时间">
<el-col :span="11">
- <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+ <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.alter_timeStart" value-format="yyyy-MM-dd" style="width: 100%;"></el-date-picker>
</el-col>
<el-col style="text-align:center" :span="2">-</el-col>
<el-col :span="11">
- <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+ <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.alter_timeEnd" value-format="yyyy-MM-dd" style="width: 100%;"></el-date-picker>
</el-col>
</el-form-item>
<el-form-item style="text-align:center;padding:0 50px">
@@ -204,14 +205,15 @@
</template>
<script>
import {getPageList} from "@/api/sgyhpczl/recheckCancellationNumber";
- import {initJCBM ,initYHLX, initBC ,initJCLB ,initYHBM ,initYHJB} from "@/api/sgyhpczl/initSelect";
+ import {initJCBM ,initYHLX, initBC ,initJCLB ,initYHBM ,initYHJB,initLlr} from "@/api/sgyhpczl/initSelect";
export default {
data() {
return {
+ reList:[{label:"未关联",value:0}],
options: [],
form:{},
value1:"",
-
+ llrList:[],
JCDWList:[{label:"众泰",value:0},{label:"上级单位",value:1}],
JCBMList:[],
YHLXList:[],
@@ -223,7 +225,9 @@
listQuery:{
page:1,
limit:10,
- form:{},
+ form:{
+ ht_community:"众泰煤焦化"
+ },
},
currentPage: 1,
pageSize: 10,
@@ -236,9 +240,18 @@
this.initYHJB()
this.initBC()
this.initJCLB()
+ this.initLlr()
},
methods:{
-
+ initLlr(){
+ initLlr().then(res=>{
+ if (res.data.ok==1){
+ this.llrList=res.data.data
+ } else{
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
+ },
changeYHDW(val){
initYHBM().then(res=>{
if (res.data.ok==1){
@@ -257,19 +270,52 @@
}
})
},
+ checkTime(){
+ if(this.listQuery.form.check_dateStart!=null && this.listQuery.form.check_dateStart!=''){
+ if(this.listQuery.form.check_dateEnd!=null && this.listQuery.form.check_dateEnd!=''){
+ }else {
+ this.$message({type:'error', message:"请选择检查结束时间", duration:3000})
+ return
+ }
+
+ }
+ if(this.listQuery.form.check_dateEnd!=null && this.listQuery.form.check_dateEnd!=''){
+ if(this.listQuery.form.check_dateStart!=null && this.listQuery.form.check_dateStart!=''){
+ }else {
+ this.$message({type:'error', message:"请选择检查开始时间", duration:3000})
+ return
+ }
+ }
+ if(this.listQuery.form.alter_timeStart!=null && this.listQuery.form.alter_timeStart!=''){
+ if(this.listQuery.form.alter_timeEnd!=null && this.listQuery.form.alter_timeEnd!=''){
+ }else {
+ this.$message({type:'error', message:"请选择限改结束时间", duration:3000})
+ return
+ }
+
+ }
+ if(this.listQuery.form.alter_timeEnd!=null && this.listQuery.form.alter_timeEnd!=''){
+ if(this.listQuery.form.alter_timeStart!=null && this.listQuery.form.alter_timeStart!=''){
+ }else {
+ this.$message({type:'error', message:"请选择改开始时间", duration:3000})
+ return
+ }
+ }
+ },
getPageList(){
this.listQuery.page=1
+ this.checkTime()
getPageList(this.listQuery).then(res=>{
if (res.data.ok==1) {
- this.tableData = res.data.data
- // this.recordTotal=res.data.data.length
+ this.tableData = res.data.data.items
+ this.recordTotal=res.data.data.total
}else{
this.$message({type:'error', message:res.data.msg, duration:3000})
}
})
},
reset(){
- this.listQuery.form={}
+ this.listQuery.form={ht_community:"众泰煤焦化"}
this.getPageList()
},
handleSizeChange(val){
@@ -281,9 +327,11 @@
this.getPageListForPagination();
},
getPageListForPagination(){
+ this.checkTime()
getPageList(this.listQuery).then(res=>{
if (res.data.ok==1) {
- this.tableData = res.data.data
+ this.tableData = res.data.data.items
+ this.recordTotal=res.data.data.total
}else{
this.$message({type:'error', message:res.data.msg, duration:3000})
}
--
Gitblit v1.9.2