|
|
@@ -105,13 +105,14 @@
|
|
|
</view>
|
|
|
<!--拆旧管-->
|
|
|
<view class="background">
|
|
|
- <view v-if="objValue.enginClassValue=='dismantling_old_pipe'">
|
|
|
+ <view v-if="objValue.enginClassValue=='拆旧管'">
|
|
|
<view class="uni-list">
|
|
|
<view style="font-size: 16px;margin-left: 10px;margin-top: 10px;">
|
|
|
拆旧管
|
|
|
|
|
|
<span
|
|
|
- style="color: blue;font-size: 14px; display: flex;justify-content:flex-end; margin-right: 15px;">历史</span>
|
|
|
+ style="color: blue;font-size: 14px; display: flex;justify-content:flex-end; margin-right: 15px;"
|
|
|
+ @click="history">历史</span>
|
|
|
</view>
|
|
|
|
|
|
<view class="container" style="margin-bottom: 20PX;">
|
|
|
@@ -130,13 +131,14 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
<!--立杠-->
|
|
|
- <view v-else-if="objValue.enginClassValue=='vertical_bar'">
|
|
|
+ <view v-else-if="objValue.enginClassValue=='立杠'">
|
|
|
<view class="uni-list" style="margin-bottom: 20px;">
|
|
|
<view style="font-size: 16px;margin-left: 10px;margin-top: 10px;">
|
|
|
立杠
|
|
|
|
|
|
<span
|
|
|
- style="color: blue;font-size: 14px; display: flex;justify-content:flex-end; margin-right: 15px;">历史</span>
|
|
|
+ style="color: blue;font-size: 14px; display: flex;justify-content:flex-end; margin-right: 15px;"
|
|
|
+ @click="history">历史</span>
|
|
|
</view>
|
|
|
|
|
|
<view class="container">
|
|
|
@@ -174,13 +176,14 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
<!--挂表-->
|
|
|
- <view v-else-if="objValue.enginClassValue=='pocket_watch'">
|
|
|
+ <view v-else-if="objValue.enginClassValue=='挂表'">
|
|
|
<view class="uni-list" style="margin-bottom: 20px;">
|
|
|
<view style="font-size: 16px;margin-left: 10px;margin-top: 10px;">
|
|
|
挂表
|
|
|
|
|
|
<span
|
|
|
- style="color: blue;font-size: 14px; display: flex;justify-content:flex-end; margin-right: 15px;">历史</span>
|
|
|
+ style="color: blue;font-size: 14px; display: flex;justify-content:flex-end; margin-right: 15px;"
|
|
|
+ @click="history">历史</span>
|
|
|
</view>
|
|
|
|
|
|
<view class="container">
|
|
|
@@ -206,13 +209,14 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
<!--表后管-->
|
|
|
- <view v-else-if="objValue.enginClassValue=='posterior_tube'">
|
|
|
+ <view v-else-if="objValue.enginClassValue=='表后管'">
|
|
|
<view class="uni-list" style="margin-bottom: 20px;">
|
|
|
<view style="font-size: 16px;margin-left: 10px;margin-top: 10px;">
|
|
|
表后管
|
|
|
|
|
|
<span
|
|
|
- style="color: blue;font-size: 14px; display: flex;justify-content:flex-end; margin-right: 15px;">历史</span>
|
|
|
+ style="color: blue;font-size: 14px; display: flex;justify-content:flex-end; margin-right: 15px;"
|
|
|
+ @click="history">历史</span>
|
|
|
</view>
|
|
|
|
|
|
<view class="container">
|
|
|
@@ -250,13 +254,14 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
<!--阀管-->
|
|
|
- <view v-else-if="objValue.enginClassValue=='valve_tube'">
|
|
|
+ <view v-else-if="objValue.enginClassValue=='阀管'">
|
|
|
<view class="uni-list" style="margin-bottom: 20px;">
|
|
|
<view style="font-size: 16px;margin-left: 10px;margin-top: 10px;">
|
|
|
阀管
|
|
|
|
|
|
<span
|
|
|
- style="color: blue;font-size: 14px; display: flex;justify-content:flex-end; margin-right: 15px;">历史</span>
|
|
|
+ style="color: blue;font-size: 14px; display: flex;justify-content:flex-end; margin-right: 15px;"
|
|
|
+ @click="history">历史</span>
|
|
|
</view>
|
|
|
<view class="container">
|
|
|
|
|
|
@@ -345,6 +350,8 @@
|
|
|
<view class="action-btn">
|
|
|
<button @click="submit" class="btn cu-btn block bg-blue lg round">确认上传</button>
|
|
|
</view>
|
|
|
+
|
|
|
+ <bottom-sheet ref="refShare" :data="historyList"></bottom-sheet>
|
|
|
</view>
|
|
|
</template>
|
|
|
|
|
|
@@ -352,6 +359,7 @@
|
|
|
|
|
|
<script>
|
|
|
import SelectPicker from '../../../components/selectPicker/select_picker.vue'
|
|
|
+ import bottomSheet from '../../../components/bottomSheet/bottomSheet.vue'
|
|
|
|
|
|
import uniIcons from '../../../uni_modules/uni-icons/components/uni-icons/uni-icons.vue'
|
|
|
import {
|
|
|
@@ -365,6 +373,8 @@
|
|
|
addTearOldPipe,
|
|
|
getEnginMaterialQualityList,
|
|
|
getEnginSpecificationsList,
|
|
|
+ getRoomProjectList,
|
|
|
+ getRoomProjectId,
|
|
|
} from '@/api/common'
|
|
|
import {
|
|
|
getToken
|
|
|
@@ -373,7 +383,8 @@
|
|
|
export default {
|
|
|
components: {
|
|
|
SelectPicker,
|
|
|
- uniIcons
|
|
|
+ uniIcons,
|
|
|
+ bottomSheet
|
|
|
},
|
|
|
data() {
|
|
|
|
|
|
@@ -411,6 +422,7 @@
|
|
|
isCheck: true, //是否按照施工图纸施工
|
|
|
inputNumberValue: '',
|
|
|
title: '',
|
|
|
+ historyList: {} //历史数据
|
|
|
|
|
|
}
|
|
|
},
|
|
|
@@ -445,6 +457,15 @@
|
|
|
return (!str || 0 === str.length);
|
|
|
|
|
|
},
|
|
|
+
|
|
|
+ // 显示历史弹窗
|
|
|
+ handleShowSheet() {
|
|
|
+ this.shareState = true;
|
|
|
+ },
|
|
|
+ // 隐藏历史弹窗
|
|
|
+ handleHiddenShare() {
|
|
|
+ this.shareState = false;
|
|
|
+ },
|
|
|
showPhoto(index) {
|
|
|
uni.previewImage({
|
|
|
current: index,
|
|
|
@@ -627,7 +648,7 @@
|
|
|
|
|
|
} else if (e == 'cz') { //材质
|
|
|
this.open = true;
|
|
|
- getEnginMaterialQualityList("0").then(response => {
|
|
|
+ getEnginMaterialQualityList("民用工程").then(response => {
|
|
|
this.selectList = response.data;
|
|
|
});
|
|
|
|
|
|
@@ -706,7 +727,7 @@
|
|
|
|
|
|
|
|
|
switchChange(e) {
|
|
|
- console.log('switch2 发生 change 事件，携带值为', e.detail.value)
|
|
|
+ //'switch 发生 change 事件，携带值为', e.detail.value)
|
|
|
this.isCheck = e.detail.value;
|
|
|
},
|
|
|
changeSelectDict(item, index) {
|
|
|
@@ -747,9 +768,7 @@
|
|
|
this.materialValue = item;
|
|
|
this.specificationValue = ''; //重置规格
|
|
|
//根据材质ID 获取规格数据
|
|
|
- console.log('材质id', item.id)
|
|
|
getEnginSpecificationsList(item.id).then(res => {
|
|
|
- console.log("规格数据", res.data)
|
|
|
this.materialList = res.data
|
|
|
})
|
|
|
} else if (this.type == 'gg') {
|
|
|
@@ -810,14 +829,14 @@
|
|
|
this.$modal.msg("请选择单元")
|
|
|
} else if (this.isEmpty(this.FJValue.id)) {
|
|
|
this.$modal.msg("请选择房间")
|
|
|
- } else if (this.objValue.enginClassValue == 'dismantling_old_pipe') {
|
|
|
+ } else if (this.objValue.enginClassValue == '拆旧管') {
|
|
|
|
|
|
if (this.isEmpty(this.LevelValue.dictValue)) {
|
|
|
this.$modal.msg("请选择腐蚀等级") //拆旧管 判断腐蚀等级
|
|
|
} else {
|
|
|
this.onsubmit();
|
|
|
}
|
|
|
- } else if (this.objValue.enginClassValue == 'vertical_bar') {
|
|
|
+ } else if (this.objValue.enginClassValue == '立杠') {
|
|
|
//立杠 判断 材质 规格 数量
|
|
|
if (this.isEmpty(this.materialValue.id)) {
|
|
|
this.$modal.msg("请选择材质")
|
|
|
@@ -828,7 +847,7 @@
|
|
|
} else {
|
|
|
this.onsubmit();
|
|
|
}
|
|
|
- } else if (this.objValue.enginClassValue == 'pocket_watch') {
|
|
|
+ } else if (this.objValue.enginClassValue == '挂表') {
|
|
|
//挂表 判断 品牌 数量
|
|
|
if (this.isEmpty(this.brandValue.dictValue)) {
|
|
|
this.$modal.msg("请选择品牌")
|
|
|
@@ -838,7 +857,7 @@
|
|
|
this.onsubmit();
|
|
|
}
|
|
|
|
|
|
- } else if (this.objValue.enginClassValue == 'posterior_tube') {
|
|
|
+ } else if (this.objValue.enginClassValue == '表后管') {
|
|
|
//表后管 判断 材质 规格 数量 （为必须有一张照片和一个视频）
|
|
|
if (this.isEmpty(this.materialValue.id)) {
|
|
|
this.$modal.msg("请选择材质")
|
|
|
@@ -874,7 +893,7 @@
|
|
|
zEngiineeringPhotoBoList: this.imgArr, //照片集合
|
|
|
|
|
|
zEngineeringMaterialBo: [{
|
|
|
- materialQuality: this.materialValue.dictValue, //材质
|
|
|
+ materialQuality: this.materialValue.id, //材质
|
|
|
specifications: this.specificationValue.id, //规格
|
|
|
number: this.inputNumberValue //数量
|
|
|
}]
|
|
|
@@ -898,7 +917,7 @@
|
|
|
this.$modal.msg('请至少上传一张照片和一个视频')
|
|
|
}
|
|
|
}
|
|
|
- } else if (this.objValue.enginClassValue == 'valve_tube') {
|
|
|
+ } else if (this.objValue.enginClassValue == '阀管') {
|
|
|
//阀管 判断 材质 规格 数量
|
|
|
if (this.isEmpty(this.doorValue.dictValue)) {
|
|
|
this.$modal.msg("请选择上门类型")
|
|
|
@@ -926,7 +945,7 @@
|
|
|
} else {
|
|
|
//提交
|
|
|
let param = ';'
|
|
|
- if (this.objValue.enginClassValue == 'dismantling_old_pipe') { //拆旧管
|
|
|
+ if (this.objValue.enginClassValue == '拆旧管') { //拆旧管
|
|
|
param = {
|
|
|
district: this.XZQValue.dictValue,
|
|
|
areaId: this.XQValue.id,
|
|
|
@@ -943,14 +962,14 @@
|
|
|
zEngiineeringPhotoBoList: this.imgArr, //照片集合
|
|
|
|
|
|
zEngineeringMaterialBo: [{
|
|
|
- corrosionLevel: this.LevelValue.id //腐蚀等级
|
|
|
+ corrosionLevel: this.LevelValue.dictValue //腐蚀等级
|
|
|
}]
|
|
|
}
|
|
|
}
|
|
|
|
|
|
}
|
|
|
//this.onsubmit(param)
|
|
|
- } else if (this.objValue.enginClassValue == 'vertical_bar') { //立杠
|
|
|
+ } else if (this.objValue.enginClassValue == '立杠') { //立杠
|
|
|
param = {
|
|
|
district: this.XZQValue.dictValue,
|
|
|
areaId: this.XQValue.id,
|
|
|
@@ -967,7 +986,7 @@
|
|
|
zEngiineeringPhotoBoList: this.imgArr, //照片集合
|
|
|
|
|
|
zEngineeringMaterialBo: [{
|
|
|
- materialQuality: this.materialValue.dictValue, //材质
|
|
|
+ materialQuality: this.materialValue.id, //材质
|
|
|
specifications: this.specificationValue.id, //规格
|
|
|
number: this.inputNumberValue //数量
|
|
|
}]
|
|
|
@@ -977,7 +996,7 @@
|
|
|
}
|
|
|
|
|
|
|
|
|
- } else if (this.objValue.enginClassValue == 'pocket_watch') { //挂表
|
|
|
+ } else if (this.objValue.enginClassValue == '挂表') { //挂表
|
|
|
param = {
|
|
|
district: this.XZQValue.dictValue,
|
|
|
areaId: this.XQValue.id,
|
|
|
@@ -1001,7 +1020,7 @@
|
|
|
}
|
|
|
|
|
|
}
|
|
|
- } else if (this.objValue.enginClassValue == 'valve_tube') { //自闭阀
|
|
|
+ } else if (this.objValue.enginClassValue == '阀管') { //自闭阀
|
|
|
param = {
|
|
|
district: this.XZQValue.dictValue,
|
|
|
areaId: this.XQValue.id,
|
|
|
@@ -1020,7 +1039,7 @@
|
|
|
zEngineeringMaterialBo: [{
|
|
|
visitType: this.doorValue.dictValue, //上门类型
|
|
|
selfClosingValveType: this.SelfClosValve.dictValue, //自闭阀类型
|
|
|
- materialQuality: this.materialValue.dictValue, //材质
|
|
|
+ materialQuality: this.materialValue.id, //材质
|
|
|
specifications: this.specificationValue.id, //规格
|
|
|
number: this.inputNumberValue //数量
|
|
|
}]
|
|
|
@@ -1032,18 +1051,70 @@
|
|
|
|
|
|
addTearOldPipe(param).then(res => {
|
|
|
if (res.code == '200') {
|
|
|
-
|
|
|
uni.showToast({
|
|
|
title: res.msg,
|
|
|
icon: 'none',
|
|
|
- //显示持续时间为 1秒
|
|
|
- duration: 1000
|
|
|
+ //显示持续时间为 3秒
|
|
|
+ duration: 2000
|
|
|
});
|
|
|
- uni.navigateBack();
|
|
|
+ setTimeout(function() {
|
|
|
+ uni.navigateBack();
|
|
|
+ }, 1000)
|
|
|
+
|
|
|
}
|
|
|
})
|
|
|
}
|
|
|
|
|
|
+ },
|
|
|
+ history() {
|
|
|
+ if (this.isEmpty(this.projectValue.dictValue)) {
|
|
|
+ this.$modal.msg("请选择工程周期")
|
|
|
+ } else if (this.isEmpty(this.XZQValue.dictValue)) {
|
|
|
+ this.$modal.msg("请选择行政区")
|
|
|
+ } else if (this.isEmpty(this.XQValue.id)) {
|
|
|
+ this.$modal.msg("请选择小区")
|
|
|
+ } else if (this.isEmpty(this.LDValue.id)) {
|
|
|
+ this.$modal.msg("请选择楼栋")
|
|
|
+ } else if (this.isEmpty(this.DYValue.id)) {
|
|
|
+ this.$modal.msg("请选择单元")
|
|
|
+ } else if (this.isEmpty(this.FJValue.id)) {
|
|
|
+ this.$modal.msg("请选择房间")
|
|
|
+ } else {
|
|
|
+ let param = {
|
|
|
+ areaId: this.XQValue.id, // 小区id
|
|
|
+ buildingId: this.LDValue.id, // 楼宇id
|
|
|
+ unitId: this.DYValue.id, // 单元id
|
|
|
+ houseId: this.FJValue.id, // 房间id
|
|
|
+ enginCycle: this.projectValue.dictValue // 工程周期
|
|
|
+ }
|
|
|
+ getRoomProjectId(param).then(res => {
|
|
|
+
|
|
|
+ if (res.code == '200') {
|
|
|
+
|
|
|
+ if (res.data != null) {
|
|
|
+
|
|
|
+ getRoomProjectList(res.data.id, this.objValue.enginClassValue).then(res => {
|
|
|
+
|
|
|
+ this.historyList = res.data
|
|
|
+ if (res.data.zEngineeringNodeBo != null) {
|
|
|
+ this.showHistoryList();
|
|
|
+ } else {
|
|
|
+ this.$modal.msg("暂无历史信息")
|
|
|
+ }
|
|
|
+
|
|
|
+ })
|
|
|
+
|
|
|
+ } else {
|
|
|
+ this.$modal.msg("暂无工程信息")
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ this.$modal.msg(res.msg)
|
|
|
+ }
|
|
|
+ })
|
|
|
+ }
|
|
|
+ },
|
|
|
+ showHistoryList() {
|
|
|
+ this.$refs.refShare.handleShowShare();
|
|
|
}
|
|
|
|
|
|
}
|
zhnghongrui