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

暂存危大工程代码

Browse Source
This commit is contained in:
Vce 2024-05-08 14:36:13 +08:00
parent 2fde503cef
commit 497d3347fe
9 changed files with 152 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
pages/projectEnd/dangerBigProject/addConstructionStation.vue
View File

@ -7,13 +7,15 @@
</headers> </headers>
<view :style="{ 'padding-top': statusBarHeight + 45 + 'px' }"> <view :style="{ 'padding-top': statusBarHeight + 45 + 'px' }">
<view class="plan-form"> <view class="plan-form">
<view class="form-item b-bottom"> <!-- <view class="form-item b-bottom">
<view class="form-lable"><text class="tag">*</text>验收部位</view> <view class="form-lable"><text class="tag">*</text>旁站记录</view>
<input class="from-input" type="text" :value="formData.sideStationAddr" @blur="bindInputBlur" placeholder="请输入验收部位" /> <input class="from-input" type="text" :value="formData.sideStationAddr" @blur="bindInputBlur" placeholder="请输入旁站记录" />
</view> </view> -->
<view class="form-item f-column b-bottom"> <view class="form-item f-column b-bottom">
<view class="form-lable">施工情况</view> <!-- <view class="form-lable">施工情况</view> -->
<textarea class="form-textarea" @input="bindLength" @blur="bindTextAreaBlur" maxlength="50" :value="formData.buildSituation" placeholder="请输入施工情况" /> <view class="form-lable">旁站记录</view>
<!-- <textarea class="form-textarea" @input="bindLength" @blur="bindTextAreaBlur" maxlength="50" :value="formData.buildSituation" placeholder="请输入施工情况" /> -->
<textarea class="form-textarea" @input="bindLength" @blur="bindTextAreaBlur" maxlength="50" :value="formData.buildSituation" placeholder="请输入旁站记录" />
<view class="txt-length">{{textareaLengh}}/50</view> <view class="txt-length">{{textareaLengh}}/50</view>
</view> </view>
<view class="form-item f-column"> <view class="form-item f-column">
@ -146,14 +148,14 @@
arr.push(item.url) arr.push(item.url)
}) })
data.imageUrl = arr.join(',') data.imageUrl = arr.join(',')
if(data.sideStationAddr == ""){ // if(data.sideStationAddr == ""){
uni.showToast({ // uni.showToast({
title: '请输入验收部！', // title: '请输入验收部！',
icon: "none", // icon: "none",
duration: 2000 // duration: 2000
}); // });
return; // return;
} // }
console.log(data) console.log(data)
this.sendRequest({ this.sendRequest({
url:'xmgl/dangerousEngineeringSideStation/add', url:'xmgl/dangerousEngineeringSideStation/add',
@ -273,6 +275,9 @@
} }
.from-input{ .from-input{
text-align: right; text-align: right;
/deep/ .uni-input-placeholder{
font-size: 14px;
}
} }
} }
.txt-length{ .txt-length{
@ -300,6 +305,9 @@
overflow: auto; overflow: auto;
} }
} }
/deep/ .uni-textarea-placeholder{
font-size: 14px;
}
} }
} }
} }

3
pages/projectEnd/dangerBigProject/addFinallyAcceptance.vue
View File

@ -72,7 +72,8 @@
planTime: '', planTime: '',
statusBarHeight: 0, statusBarHeight: 0,
title: "下发验证任务", // title: "下发验证任务",
title: "验收申请",
inspectTime:'', inspectTime:'',
userInfo: {} userInfo: {}

3
pages/projectEnd/dangerBigProject/backlogList.vue
View File

@ -49,6 +49,9 @@
this.userInfo = JSON.parse(uni.getStorageSync('userInfo')) this.userInfo = JSON.parse(uni.getStorageSync('userInfo'))
this.initData() this.initData()
}, },
onShow() {
this.initData()
},
methods:{ methods:{
initData(){ initData(){
this.sendRequest({ this.sendRequest({

73
pages/projectEnd/dangerBigProject/backlogTrial/backlogTrial.vue
View File

@ -56,11 +56,15 @@
<u-button @click="closePopup">关闭弹窗</u-button> <u-button @click="closePopup">关闭弹窗</u-button>
</view> </view>
</u-popup> --> </u-popup> -->
<!-- 分包单位弹窗 -->
<!-- <view class="unitDialog" v-if="unitDialog" @click="unitDialog=false"> -->
<view class="dialog-container" v-if="unitDialog"> <view class="dialog-container" v-if="unitDialog" @click="unitDialog=false">
<!-- <view class="dialog-container" v-if="unitDialog"> -->
<view class="dialog-content"> <view class="dialog-content">
<view class="text-tip">
提示：最终验收通过后，将闭合整个危大任务计划，任何人不能再进行操作！
</view>
<view class="confirm-btn" @click="confirmClose">关闭危大工程</view>
</view> </view>
</view> </view>
</view> </view>
@ -183,8 +187,11 @@
}, },
saveForm() { saveForm() {
// console.log(this.formData) // console.log(this.formData)
this.isPopupVisible = true // this.isPopupVisible = true
this.unitDialog = true this.unitDialog = true
},
confirmClose(){
// this.unitDialog = true
let data = { let data = {
id: this.checkRecord.id, id: this.checkRecord.id,
acceptanceResult: this.formData.acceptanceResult, //验收结果 acceptanceResult: this.formData.acceptanceResult, //验收结果
@ -201,21 +208,22 @@
// }) // })
// data.imageUrl = arr.join(',') // data.imageUrl = arr.join(',')
// console.log(data) // console.log(data)
// this.sendRequest({ this.sendRequest({
// url:'xmgl/xzDangerousEngineeringAcceptance/edit', url:'xmgl/xzDangerousEngineeringAcceptance/edit',
// method:'post', method:'post',
// data: data, data: data,
// success:res=>{ success:res=>{
// uni.hideLoading() uni.hideLoading()
// if(res.code==200){ if(res.code==200){
// uni.showToast({ uni.showToast({
// title:'保存成功' title:'保存成功'
// }) })
// uni.navigateBack({}) this.unitDialog = false
// } uni.navigateBack({})
// console.log(res) }
// } console.log(res)
// }) }
})
}, },
bindPickerChange(e) { bindPickerChange(e) {
this.typeIndex = e.target.value this.typeIndex = e.target.value
@ -419,9 +427,32 @@
justify-content: center; justify-content: center;
align-items: center; align-items: center;
.dialog-content{ .dialog-content{
// padding: 10px 10px;
width: 80%; width: 80%;
height: 500rpx; height: 400rpx;
background-color: #fff; background-color: #fff;
// line-height: 32px;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
.text-tip{
font-size: 14px;
width: 93%;
height: 70%;
// position: absolute;
// background-color: darkred;
}
.confirm-btn{
width: auto;
height: 15%;
color: #fff;
background-color: #2b8df3;
display: flex;
align-items: center;
padding: 0 5px;
border-radius: 5px;
}
} }
} }
</style> </style>

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

@ -12,7 +12,8 @@
<view class="item-select-box flex j-between a-center" :class="{'b-bottom': index != (listData.length-1)}"> <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-lable">{{item.controlContent}}</view>
<view class="item-switch flex j-between a-center"> <view class="item-switch flex j-between a-center">
<switch :checked="item.chooseType == 1" style="transform: scale(0.7);" @change="changStatus(item)"/> <switch :disabled="dangerEngineering.finalAcceptanceStatus === 2" :checked="item.chooseType == 1" style="transform: scale(0.7);"
@change="changStatus(item)" @click="disabledTip"/>
{{item.chooseType == 1 ? item.yesShowName:item.noShowName}} {{item.chooseType == 1 ? item.yesShowName:item.noShowName}}
</view> </view>
</view> </view>
@ -27,15 +28,17 @@
<script> <script>
export default { export default {
props:['detailId'], props:['detailId','detailData'],
data(){ data(){
return{ return{
listData:[], listData:[],
checkNum: 0 checkNum: 0,
dangerEngineering: {}
} }
}, },
created(){ created(){
this.initData() this.initData()
this.getDEById()
}, },
methods:{ methods:{
initData(){ initData(){
@ -59,6 +62,19 @@
} }
}) })
}, },
getDEById(){
this.sendRequest({
url:'xmgl/dangerousEngineeringRecord/queryById',
method:'post',
data: {id: this.detailId},
success:res=>{
uni.hideLoading()
if(res.code==200){
this.dangerEngineering = res.result
}
}
})
},
changStatus(data){ changStatus(data){
if(data.chooseType != 1){ if(data.chooseType != 1){
data.chooseType = 1 data.chooseType = 1
@ -81,6 +97,16 @@
} }
} }
}) })
},
disabledTip(){
if(this.dangerEngineering.finalAcceptanceStatus === 2){
uni.showToast({
title: '该项危大工程已闭合，请勿操作',
icon: "none",
duration: 2000
});
return;
}
} }
} }
} }

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

@ -66,7 +66,7 @@
<finally-acceptance 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> </view>
<view class="add-btn" v-if="activeIndex != 7 && activeIndex != 2 && !(activeIndex == 1 && detailData.engineeringState == 3) && COMPANY != 'longguang'" @click="addForm"> <view class="add-btn" v-if="activeIndex != 7 && activeIndex != 2 && !(activeIndex == 1 && detailData.engineeringState == 3) && COMPANY != 'longguang' && detailData.finalAcceptanceStatus !== 2" @click="addForm">
<uni-icons v-if="activeIndex == 5" type="camera" size="30" color="#fff"></uni-icons> <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> <uni-icons v-else type="plusempty" size="30" color="#fff"></uni-icons>
<span>+</span> <span>+</span>

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

@ -1,17 +1,21 @@
<template> <template>
<view class="danger-project"> <view class="danger-project">
<view class="finally" v-if="finallyCheckList.length > 0"> <view class="" v-if="finallyCheckList.length > 0">
<view style="padding:10px;"> <view class="finally" v-for="item in finallyCheckList" :key="item.id">
<text style="font-weight: bold;">危大工程名称：</text>基坑 <view style="padding:10px;">
</view> <text style="font-weight: bold;">危大工程名称：</text>{{item.engineeringName}}
<view style="padding:10px;"> </view>
<text style="font-weight: bold;">计划时间：</text>基坑 <view style="padding:10px;">
</view> <text style="font-weight: bold;">计划时间：</text>{{item.planTime}}
<view style="padding:10px;"> </view>
<text style="font-weight: bold;">验收人：</text>基坑 <view style="padding:10px;">
</view> <text style="font-weight: bold;">验收人：</text>{{item.acceptanceUserName}}
<view style="padding:10px;"> </view>
<text style="font-weight: bold;">验收结果：</text>基坑 <view style="padding:10px;">
<text style="font-weight: bold;" v-if="item.acceptanceResult === null || item.acceptanceResult === undefined">验收结果：待确认</text>
<text style="font-weight: bold;" v-if="item.acceptanceResult === 1">验收结果：合格</text>
<text style="font-weight: bold;" v-if="item.acceptanceResult === 2">验收结果：不合格</text>
</view>
</view> </view>
</view> </view>
<view class="no-data" v-else> <view class="no-data" v-else>
@ -32,11 +36,14 @@
created() { created() {
this.initData() this.initData()
}, },
onLoad() { onLoad(val) {
},
onShow() {
}, },
methods:{ methods:{
initData(){ initData(){
let engineeringId = this.detailId
this.sendRequest({ this.sendRequest({
url:'xmgl/xzDangerousEngineeringAcceptance/list', url:'xmgl/xzDangerousEngineeringAcceptance/list',
method:'get', method:'get',

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

@ -21,6 +21,11 @@
} }
}, },
onLoad() {
console.log("==============safeLis,detailIdt===============");
console.log(this.detailId);
console.log("==============safeList,detailId===============");
},
methods:{ methods:{
previewData(val){ previewData(val){
if(val == 1){ if(val == 1){

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

@ -870,14 +870,14 @@
arr.push(item.url) arr.push(item.url)
}) })
data.imageUrl = arr.join(",") data.imageUrl = arr.join(",")
// if (this.addForm.typeId == "") { if (this.addForm.typeId == "") {
// uni.showToast({ uni.showToast({
// title: '请选择检查类型！', title: '请选择检查类型！',
// icon: "none", icon: "none",
// duration: 2000 duration: 2000
// }); });
// return; return;
// } }
if (this.addForm.status == 2) { if (this.addForm.status == 2) {
if (this.addForm.hiddenDangerInspectRegionName == "") { if (this.addForm.hiddenDangerInspectRegionName == "") {
uni.showToast({ uni.showToast({
@ -969,19 +969,19 @@
data: data, data: data,
success: (res) => { success: (res) => {
if (res.code == 200) { if (res.code == 200) {
uni.hideLoading()
uni.showToast({ uni.showToast({
title: '保存成功' title: '保存成功'
}) })
if (this.moduleType == 'safeCheck') { // if (this.moduleType == 'safeCheck') {
uni.navigateBack({ // uni.navigateBack({
delta: 3 // delta: 3
}) // })
} else { // } else {
uni.navigateTo({ // uni.navigateTo({
url: "./safeIndex" // url: "./safeIndex"
}) // })
} // }
} }
console.log(res.result) console.log(res.result)
} }