admin/zhgdyunapp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

暂存代码

Browse Source
This commit is contained in:
Vce 2024-05-09 01:11:09 +08:00
parent 1421c714aa
commit 11957c4d12
5 changed files with 82 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
pages/projectEnd/dangerBigProject/control.vue
View File

@ -12,7 +12,7 @@
<view class="item-select-box flex j-between a-center" :class="{'b-bottom': index != (listData.length-1)}">
<view class="item-lable">{{item.controlContent}}</view>
<view class="item-switch flex j-between a-center">
<switch :disabled="dangerEngineering.finalAcceptanceStatus === 2" :checked="item.chooseType == 1" style="transform: scale(0.7);"
<switch :disabled="dangerEngineering.finalAcceptanceStatus === 2 || isDisabled" :checked="item.chooseType == 1" style="transform: scale(0.7);"
@change="changStatus(item)" @click="disabledTip"/>
{{item.chooseType == 1 ? item.yesShowName:item.noShowName}}
</view>
@ -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
});

57
pages/projectEnd/dangerBigProject/details.vue
View File

@ -27,9 +27,9 @@
<view class="list-info">
计划时间：<text class="detail-data">{{detailData.planStartTime}}~{{detailData.planEndTime}}</text>
</view>
<view class="list-info">
<!-- <view class="list-info">
施工时间：<text class="detail-data">{{detailData.buildStartTime}}~{{detailData.buildEndTime}}</text>
</view>
</view> -->
<view class="list-info">
负责人：<text class="detail-data">{{detailData.personLiable ? detailData.personLiable : "无"}}</text>
</view>
@ -63,11 +63,11 @@
<ordinaryAcceptance ref="list" v-if="componentName == 'ordinaryAcceptance'" :detailId="detailId" :info="detailData"></ordinaryAcceptance>
<engineeringData ref="list" v-if="componentName == 'engineeringData'" :detailId="detailId" :info="detailData"></engineeringData>
<verifyTableList ref="list" v-if="componentName == 'verifyTableList'" :detailId="detailId" :info="detailData"></verifyTableList>
<finally-acceptance @message="handleMessage()" ref="list" v-if="componentName =='finallyAcceptance'" :detailId="detailId" :info="detailData" ></finally-acceptance>
<finally-acceptance ref="list" v-if="componentName =='finallyAcceptance'" :detailId="detailId" :info="detailData" ></finally-acceptance>
</view>
</view>
<view class="add-btn" v-if="activeIndex != 7 && activeIndex != 2 && !(activeIndex == 1 && detailData.engineeringState == 3)
&& COMPANY != 'longguang' && detailData.finalAcceptanceStatus !== 2"
&& COMPANY != 'longguang' && detailData.finalAcceptanceStatus !== 2 && isShowBtn"
@click="addForm">
<uni-icons v-if="activeIndex == 5" type="camera" size="30" color="#fff"></uni-icons>
<uni-icons v-else type="plusempty" size="30" color="#fff"></uni-icons>
@ -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
});
}
}
}
}

5
pages/projectEnd/dangerBigProject/finallyAcceptance.vue
View File

@ -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)
}
}
})
},

3
pages/projectEnd/safeManage/addExamine.vue
View File

@ -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) => {

3
pages/projectEnd/safeManage/dangerList.vue
View File

@ -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 => {