暂存危大工程代码
This commit is contained in:
parent
2fde503cef
commit
497d3347fe
@ -7,13 +7,15 @@
|
||||
</headers>
|
||||
<view :style="{ 'padding-top': statusBarHeight + 45 + 'px' }">
|
||||
<view class="plan-form">
|
||||
<view class="form-item b-bottom">
|
||||
<view class="form-lable"><text class="tag">*</text>验收部位</view>
|
||||
<input class="from-input" type="text" :value="formData.sideStationAddr" @blur="bindInputBlur" placeholder="请输入验收部位" />
|
||||
</view>
|
||||
<!-- <view class="form-item b-bottom">
|
||||
<view class="form-lable"><text class="tag">*</text>旁站记录</view>
|
||||
<input class="from-input" type="text" :value="formData.sideStationAddr" @blur="bindInputBlur" placeholder="请输入旁站记录" />
|
||||
</view> -->
|
||||
<view class="form-item f-column b-bottom">
|
||||
<view class="form-lable">施工情况</view>
|
||||
<textarea class="form-textarea" @input="bindLength" @blur="bindTextAreaBlur" maxlength="50" :value="formData.buildSituation" placeholder="请输入施工情况" />
|
||||
<!-- <view class="form-lable">施工情况</view> -->
|
||||
<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>
|
||||
<view class="form-item f-column">
|
||||
@ -146,14 +148,14 @@
|
||||
arr.push(item.url)
|
||||
})
|
||||
data.imageUrl = arr.join(',')
|
||||
if(data.sideStationAddr == ""){
|
||||
uni.showToast({
|
||||
title: '请输入验收部!',
|
||||
icon: "none",
|
||||
duration: 2000
|
||||
});
|
||||
return;
|
||||
}
|
||||
// if(data.sideStationAddr == ""){
|
||||
// uni.showToast({
|
||||
// title: '请输入验收部!',
|
||||
// icon: "none",
|
||||
// duration: 2000
|
||||
// });
|
||||
// return;
|
||||
// }
|
||||
console.log(data)
|
||||
this.sendRequest({
|
||||
url:'xmgl/dangerousEngineeringSideStation/add',
|
||||
@ -273,6 +275,9 @@
|
||||
}
|
||||
.from-input{
|
||||
text-align: right;
|
||||
/deep/ .uni-input-placeholder{
|
||||
font-size: 14px;
|
||||
}
|
||||
}
|
||||
}
|
||||
.txt-length{
|
||||
@ -300,6 +305,9 @@
|
||||
overflow: auto;
|
||||
}
|
||||
}
|
||||
/deep/ .uni-textarea-placeholder{
|
||||
font-size: 14px;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -72,7 +72,8 @@
|
||||
planTime: '',
|
||||
|
||||
statusBarHeight: 0,
|
||||
title: "下发验证任务",
|
||||
// title: "下发验证任务",
|
||||
title: "验收申请",
|
||||
inspectTime:'',
|
||||
|
||||
userInfo: {}
|
||||
|
||||
@ -49,6 +49,9 @@
|
||||
this.userInfo = JSON.parse(uni.getStorageSync('userInfo'))
|
||||
this.initData()
|
||||
},
|
||||
onShow() {
|
||||
this.initData()
|
||||
},
|
||||
methods:{
|
||||
initData(){
|
||||
this.sendRequest({
|
||||
|
||||
@ -56,11 +56,15 @@
|
||||
<u-button @click="closePopup">关闭弹窗</u-button>
|
||||
</view>
|
||||
</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="text-tip">
|
||||
提示:最终验收通过后,将闭合整个危大任务计划,任何人不能再进行操作!
|
||||
</view>
|
||||
<view class="confirm-btn" @click="confirmClose">关闭危大工程</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@ -183,8 +187,11 @@
|
||||
},
|
||||
saveForm() {
|
||||
// console.log(this.formData)
|
||||
this.isPopupVisible = true
|
||||
// this.isPopupVisible = true
|
||||
this.unitDialog = true
|
||||
},
|
||||
confirmClose(){
|
||||
// this.unitDialog = true
|
||||
let data = {
|
||||
id: this.checkRecord.id,
|
||||
acceptanceResult: this.formData.acceptanceResult, //验收结果
|
||||
@ -201,21 +208,22 @@
|
||||
// })
|
||||
// data.imageUrl = arr.join(',')
|
||||
// console.log(data)
|
||||
// this.sendRequest({
|
||||
// url:'xmgl/xzDangerousEngineeringAcceptance/edit',
|
||||
// method:'post',
|
||||
// data: data,
|
||||
// success:res=>{
|
||||
// uni.hideLoading()
|
||||
// if(res.code==200){
|
||||
// uni.showToast({
|
||||
// title:'保存成功'
|
||||
// })
|
||||
// uni.navigateBack({})
|
||||
// }
|
||||
// console.log(res)
|
||||
// }
|
||||
// })
|
||||
this.sendRequest({
|
||||
url:'xmgl/xzDangerousEngineeringAcceptance/edit',
|
||||
method:'post',
|
||||
data: data,
|
||||
success:res=>{
|
||||
uni.hideLoading()
|
||||
if(res.code==200){
|
||||
uni.showToast({
|
||||
title:'保存成功'
|
||||
})
|
||||
this.unitDialog = false
|
||||
uni.navigateBack({})
|
||||
}
|
||||
console.log(res)
|
||||
}
|
||||
})
|
||||
},
|
||||
bindPickerChange(e) {
|
||||
this.typeIndex = e.target.value
|
||||
@ -419,9 +427,32 @@
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
.dialog-content{
|
||||
// padding: 10px 10px;
|
||||
width: 80%;
|
||||
height: 500rpx;
|
||||
height: 400rpx;
|
||||
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>
|
||||
@ -12,7 +12,8 @@
|
||||
<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 :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}}
|
||||
</view>
|
||||
</view>
|
||||
@ -27,15 +28,17 @@
|
||||
|
||||
<script>
|
||||
export default {
|
||||
props:['detailId'],
|
||||
props:['detailId','detailData'],
|
||||
data(){
|
||||
return{
|
||||
listData:[],
|
||||
checkNum: 0
|
||||
checkNum: 0,
|
||||
dangerEngineering: {}
|
||||
}
|
||||
},
|
||||
created(){
|
||||
this.initData()
|
||||
this.getDEById()
|
||||
},
|
||||
methods:{
|
||||
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){
|
||||
if(data.chooseType != 1){
|
||||
data.chooseType = 1
|
||||
@ -81,6 +97,16 @@
|
||||
}
|
||||
}
|
||||
})
|
||||
},
|
||||
disabledTip(){
|
||||
if(this.dangerEngineering.finalAcceptanceStatus === 2){
|
||||
uni.showToast({
|
||||
title: '该项危大工程已闭合,请勿操作',
|
||||
icon: "none",
|
||||
duration: 2000
|
||||
});
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -66,7 +66,7 @@
|
||||
<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'" @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-else type="plusempty" size="30" color="#fff"></uni-icons>
|
||||
<span>+</span>
|
||||
|
||||
@ -1,17 +1,21 @@
|
||||
<template>
|
||||
<view class="danger-project">
|
||||
<view class="finally" v-if="finallyCheckList.length > 0">
|
||||
<view style="padding:10px;">
|
||||
<text style="font-weight: bold;">危大工程名称:</text>基坑
|
||||
</view>
|
||||
<view style="padding:10px;">
|
||||
<text style="font-weight: bold;">计划时间:</text>基坑
|
||||
</view>
|
||||
<view style="padding:10px;">
|
||||
<text style="font-weight: bold;">验收人:</text>基坑
|
||||
</view>
|
||||
<view style="padding:10px;">
|
||||
<text style="font-weight: bold;">验收结果:</text>基坑
|
||||
<view class="" v-if="finallyCheckList.length > 0">
|
||||
<view class="finally" v-for="item in finallyCheckList" :key="item.id">
|
||||
<view style="padding:10px;">
|
||||
<text style="font-weight: bold;">危大工程名称:</text>{{item.engineeringName}}
|
||||
</view>
|
||||
<view style="padding:10px;">
|
||||
<text style="font-weight: bold;">计划时间:</text>{{item.planTime}}
|
||||
</view>
|
||||
<view style="padding:10px;">
|
||||
<text style="font-weight: bold;">验收人:</text>{{item.acceptanceUserName}}
|
||||
</view>
|
||||
<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 class="no-data" v-else>
|
||||
@ -32,11 +36,14 @@
|
||||
created() {
|
||||
this.initData()
|
||||
},
|
||||
onLoad() {
|
||||
onLoad(val) {
|
||||
},
|
||||
onShow() {
|
||||
|
||||
},
|
||||
methods:{
|
||||
initData(){
|
||||
let engineeringId = this.detailId
|
||||
this.sendRequest({
|
||||
url:'xmgl/xzDangerousEngineeringAcceptance/list',
|
||||
method:'get',
|
||||
|
||||
@ -21,6 +21,11 @@
|
||||
|
||||
}
|
||||
},
|
||||
onLoad() {
|
||||
console.log("==============safeLis,detailIdt===============");
|
||||
console.log(this.detailId);
|
||||
console.log("==============safeList,detailId===============");
|
||||
},
|
||||
methods:{
|
||||
previewData(val){
|
||||
if(val == 1){
|
||||
|
||||
@ -870,14 +870,14 @@
|
||||
arr.push(item.url)
|
||||
})
|
||||
data.imageUrl = arr.join(",")
|
||||
// if (this.addForm.typeId == "") {
|
||||
// uni.showToast({
|
||||
// title: '请选择检查类型!',
|
||||
// icon: "none",
|
||||
// duration: 2000
|
||||
// });
|
||||
// return;
|
||||
// }
|
||||
if (this.addForm.typeId == "") {
|
||||
uni.showToast({
|
||||
title: '请选择检查类型!',
|
||||
icon: "none",
|
||||
duration: 2000
|
||||
});
|
||||
return;
|
||||
}
|
||||
if (this.addForm.status == 2) {
|
||||
if (this.addForm.hiddenDangerInspectRegionName == "") {
|
||||
uni.showToast({
|
||||
@ -969,19 +969,19 @@
|
||||
data: data,
|
||||
success: (res) => {
|
||||
if (res.code == 200) {
|
||||
|
||||
uni.hideLoading()
|
||||
uni.showToast({
|
||||
title: '保存成功'
|
||||
})
|
||||
if (this.moduleType == 'safeCheck') {
|
||||
uni.navigateBack({
|
||||
delta: 3
|
||||
})
|
||||
} else {
|
||||
uni.navigateTo({
|
||||
url: "./safeIndex"
|
||||
})
|
||||
}
|
||||
// if (this.moduleType == 'safeCheck') {
|
||||
// uni.navigateBack({
|
||||
// delta: 3
|
||||
// })
|
||||
// } else {
|
||||
// uni.navigateTo({
|
||||
// url: "./safeIndex"
|
||||
// })
|
||||
// }
|
||||
}
|
||||
console.log(res.result)
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user