diff --git a/pages/projectEnd/dangerBigProject/control.vue b/pages/projectEnd/dangerBigProject/control.vue
index 3fceccc3..772696d0 100644
--- a/pages/projectEnd/dangerBigProject/control.vue
+++ b/pages/projectEnd/dangerBigProject/control.vue
@@ -12,7 +12,7 @@
{{item.controlContent}}
-
{{item.chooseType == 1 ? item.yesShowName:item.noShowName}}
@@ -33,12 +33,14 @@
return{
listData:[],
checkNum: 0,
- dangerEngineering: {}
+ dangerEngineering: {},
+ isDisabled: false
}
},
created(){
this.initData()
this.getDEById()
+ this.getApply()
},
methods:{
initData(){
@@ -62,6 +64,28 @@
}
})
},
+ getApply(){
+ this.sendRequest({
+ url:'xmgl/xzDangerousEngineeringAcceptance/list',
+ method:'get',
+ data:{
+ engineeringId: this.detailId,
+ projectSn: JSON.parse(uni.getStorageSync('projectDetail')).projectSn,
+ },
+ success:res=>{
+ uni.hideLoading()
+ console.log("xmgl/xzDangerousEngineeringAcceptance/list",res);
+ let result = res.result
+ if(res.result.length>0){
+ if(res.result[0].acceptanceResult === null) this.isDisabled = true
+ if(res.result[0].acceptanceResult === 1) this.isDisabled = true
+ if(res.result[0].acceptanceResult === 2) this.isDisabled = false
+ }else{
+ this.isDisabled = false
+ }
+ }
+ })
+ },
getDEById(){
this.sendRequest({
url:'xmgl/dangerousEngineeringRecord/queryById',
@@ -101,7 +125,15 @@
disabledTip(){
if(this.dangerEngineering.finalAcceptanceStatus === 2){
uni.showToast({
- title: '该项危大工程已闭合，请勿操作',
+ title: '该项危大工程已闭合，请勿重复操作',
+ icon: "none",
+ duration: 2000
+ });
+ return;
+ }
+ if(this.isDisabled){
+ uni.showToast({
+ title: '等待验收中，请勿重复操作',
icon: "none",
duration: 2000
});
diff --git a/pages/projectEnd/dangerBigProject/details.vue b/pages/projectEnd/dangerBigProject/details.vue
index 95771b9b..41be6b2c 100644
--- a/pages/projectEnd/dangerBigProject/details.vue
+++ b/pages/projectEnd/dangerBigProject/details.vue
@@ -27,9 +27,9 @@
计划时间：{{detailData.planStartTime}}~{{detailData.planEndTime}}
-
+
负责人：{{detailData.personLiable ? detailData.personLiable : "无"}}
@@ -63,11 +63,11 @@
-
+
@@ -133,7 +133,7 @@
activeIndex: 1,
detailId: "",
detailData:{},
- isShowBtn: null
+ isShowBtn: null,
}
},
onReachBottom() {
@@ -154,13 +154,9 @@
// if(val.)
// this.initData()
},
+ mounted() {
+ },
methods:{
- handleMessage(message){
- this.isShowBtn = message
- console.log("============message===============");
- console.log(this.isShowBtn);
- console.log("============message===============");
- },
initData(){
this.sendRequest({
url:'xmgl/dangerousEngineeringRecord/queryById',
@@ -186,6 +182,31 @@
this.detailData.describeName = str;
}
console.log(this.detailData)
+ this.getApply()
+ }
+ })
+ },
+ getApply(){
+ console.log("=====================================================detail");
+ console.log(this.detailData);
+ this.sendRequest({
+ url:'xmgl/xzDangerousEngineeringAcceptance/list',
+ method:'get',
+ data:{
+ engineeringId: this.detailData.id,
+ projectSn: JSON.parse(uni.getStorageSync('projectDetail')).projectSn,
+ },
+ success:res=>{
+ uni.hideLoading()
+ console.log("xmgl/xzDangerousEngineeringAcceptance/list",res);
+ let result = res.result
+ if(res.result.length>0){
+ if(res.result[0].acceptanceResult === null) this.isShowBtn = false
+ if(res.result[0].acceptanceResult === 1) this.isShowBtn = false
+ if(res.result[0].acceptanceResult === 2) this.isShowBtn = true
+ }else{
+ this.isShowBtn = true
+ }
}
})
},
@@ -238,9 +259,17 @@
})
}
else if(this.activeIndex == 8){
- uni.navigateTo({
- url:'./addFinallyAcceptance?id='+this.detailId+'&name='+this.detailData.engineeringName
- })
+ if(this.isShowBtn){
+ uni.navigateTo({
+ url:'./addFinallyAcceptance?id='+this.detailId+'&name='+this.detailData.engineeringName
+ })
+ }else{
+ uni.showToast({
+ title: '请勿重复操作',
+ icon: "none",
+ duration: 2000
+ });
+ }
}
}
}
diff --git a/pages/projectEnd/dangerBigProject/finallyAcceptance.vue b/pages/projectEnd/dangerBigProject/finallyAcceptance.vue
index fc822a00..ccda0f3b 100644
--- a/pages/projectEnd/dangerBigProject/finallyAcceptance.vue
+++ b/pages/projectEnd/dangerBigProject/finallyAcceptance.vue
@@ -55,11 +55,6 @@
uni.hideLoading()
console.log("xmgl/xzDangerousEngineeringAcceptance/list",res);
this.finallyCheckList = res.result;
- if(this.finallyCheckList[0].acceptanceResult === 2){
- this.sendMessage(true)
- }else{
- this.sendMessage(false)
- }
}
})
},
diff --git a/pages/projectEnd/safeManage/addExamine.vue b/pages/projectEnd/safeManage/addExamine.vue
index f215e7f1..6d81eb0b 100644
--- a/pages/projectEnd/safeManage/addExamine.vue
+++ b/pages/projectEnd/safeManage/addExamine.vue
@@ -964,7 +964,8 @@
console.log('this.addForm2--------------', this.addForm)
let _this = this
this.sendRequest({
- url: 'xmgl/hiddenDangerInspectRecord/add',
+ // url: 'xmgl/hiddenDangerInspectRecord/add',
+ url: 'xmgl/xzSecurityQualityInspectionRecord/add',
method: 'post',
data: data,
success: (res) => {
diff --git a/pages/projectEnd/safeManage/dangerList.vue b/pages/projectEnd/safeManage/dangerList.vue
index 80d31bbb..6c729e90 100644
--- a/pages/projectEnd/safeManage/dangerList.vue
+++ b/pages/projectEnd/safeManage/dangerList.vue
@@ -144,7 +144,8 @@
}
console.log(this.userId)
this.sendRequest({
- url: 'xmgl/hiddenDangerInspectRecord/list',
+ // url: 'xmgl/hiddenDangerInspectRecord/list',
+ url: 'xmgl/xzSecurityQualityInspectionRecord/list',
method: 'post',
data: data,
success: res => {