|
|
@@ -33,13 +33,11 @@
|
|
|
<view v-if="this.isEmpty(this.XZQValue.dictValue)" style="margin-top: 10;"
|
|
|
@click="pickerShow('xzq')">
|
|
|
<span style="color: darkgray;">请选择行政区</span>
|
|
|
- <uni-icons style=" position: absolute;" type="right" color="darkgray"
|
|
|
- size="15"></uni-icons>
|
|
|
+ <uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
|
|
|
</view>
|
|
|
<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('xzq')">
|
|
|
<span style="color: black;">{{XZQValue.dictLabel}}</span>
|
|
|
- <uni-icons style=" position: absolute;" type="right" color="darkgray"
|
|
|
- size="15"></uni-icons>
|
|
|
+ <uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
|
|
|
</view>
|
|
|
|
|
|
</view>
|
|
|
@@ -53,13 +51,11 @@
|
|
|
<view v-if="this.isEmpty(this.XQValue.id)" class="uni-list-cell-db" style="margin-top: 10;"
|
|
|
@click="pickerShow('xq')">
|
|
|
<span style="color: darkgray;">请选择小区</span>
|
|
|
- <uni-icons style=" position: absolute;" type="right" color="darkgray"
|
|
|
- size="15"></uni-icons>
|
|
|
+ <uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
|
|
|
</view>
|
|
|
<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('xq')">
|
|
|
<span style="color: black;">{{XQValue.name}}</span>
|
|
|
- <uni-icons style=" position: absolute;" type="right" color="darkgray"
|
|
|
- size="15"></uni-icons>
|
|
|
+ <uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -71,13 +67,11 @@
|
|
|
<view v-if="this.isEmpty(this.LDValue.id)" class="uni-list-cell-db" style="margin-top: 10;"
|
|
|
@click="pickerShow('ld')">
|
|
|
<span style="color: darkgray;">请选择楼栋</span>
|
|
|
- <uni-icons style=" position: absolute;" type="right" color="darkgray"
|
|
|
- size="15"></uni-icons>
|
|
|
+ <uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
|
|
|
</view>
|
|
|
<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('ld')">
|
|
|
<span style="color: black;">{{LDValue.name}}</span>
|
|
|
- <uni-icons style=" position: absolute;" type="right" color="darkgray"
|
|
|
- size="15"></uni-icons>
|
|
|
+ <uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -89,13 +83,11 @@
|
|
|
<view v-if="this.isEmpty(this.DYValue.id)" class="uni-list-cell-db" style="margin-top: 10;"
|
|
|
@click="pickerShow('dy')">
|
|
|
<span style="color: darkgray;">请选择单元</span>
|
|
|
- <uni-icons style=" position: absolute;" type="right" color="darkgray"
|
|
|
- size="15"></uni-icons>
|
|
|
+ <uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
|
|
|
</view>
|
|
|
<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('dy')">
|
|
|
<span style="color: black;">{{DYValue.name}}</span>
|
|
|
- <uni-icons style=" position: absolute;" type="right" color="darkgray"
|
|
|
- size="15"></uni-icons>
|
|
|
+ <uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -107,13 +99,11 @@
|
|
|
<view v-if="this.isEmpty(this.FJValue.id)" class="uni-list-cell-db" style="margin-top: 10;"
|
|
|
@click="pickerShow('fj')">
|
|
|
<span style="color: darkgray;">请选择房间</span>
|
|
|
- <uni-icons style=" position: absolute;" type="right" color="darkgray"
|
|
|
- size="15"></uni-icons>
|
|
|
+ <uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
|
|
|
</view>
|
|
|
<view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('fj')">
|
|
|
<span style="color: black;">{{FJValue.name}}</span>
|
|
|
- <uni-icons style=" position: absolute;" type="right" color="darkgray"
|
|
|
- size="15"></uni-icons>
|
|
|
+ <uni-icons style=" position: absolute;" type="right" color="darkgray" size="15"></uni-icons>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -132,8 +122,38 @@
|
|
|
<SelectPicker :list="dictOptions" @change="changeSelectDict" v-if="openDict" @close="closeDict"
|
|
|
titleKey="dictLabel" subtitleKey="dictValue" v-model="dictLabel"></SelectPicker>
|
|
|
</view>
|
|
|
- <!--拆旧管-->
|
|
|
+ <!--报警器切断阀-->
|
|
|
<view class="background">
|
|
|
+ <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;"
|
|
|
+ @click="history">历史</span>
|
|
|
+ </view>
|
|
|
+
|
|
|
+ <view class="container">
|
|
|
+
|
|
|
+ <text>厂 家</text>
|
|
|
+ <view v-if="this.isEmpty(this.brandValue.dictValue)" style="margin-top: 10;"
|
|
|
+ @click="pickerShow('brand')">
|
|
|
+ <span style="color: darkgray;">请选择厂家</span>
|
|
|
+ <uni-icons style=" position: absolute;" type="right" color="darkgray"
|
|
|
+ size="15"></uni-icons>
|
|
|
+ </view>
|
|
|
+ <view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('brand')">
|
|
|
+ <span style="color: black;">{{brandValue.dictLabel}}</span>
|
|
|
+ <uni-icons style=" position: absolute;" type="right" color="darkgray"
|
|
|
+ size="15"></uni-icons>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+
|
|
|
+ </view>
|
|
|
+ <!--拆旧管-->
|
|
|
+
|
|
|
<view v-if="objValue.enginClassValue=='拆旧管'">
|
|
|
<view class="uni-list">
|
|
|
<view style="font-size: 16px;margin-left: 10px;margin-top: 10px;">
|
|
|
@@ -928,6 +948,13 @@
|
|
|
this.$modal.msg("请选择单元")
|
|
|
} else if (this.isEmpty(this.FJValue.id)) {
|
|
|
this.$modal.msg("请选择房间")
|
|
|
+ } else if (this.objValue.enginClassValue == '报警器切断阀') {
|
|
|
+ if (this.isEmpty(this.brandValue.dictValue)) {
|
|
|
+ this.$modal.msg("请选择厂家")
|
|
|
+ } else {
|
|
|
+ this.onsubmit();
|
|
|
+ }
|
|
|
+
|
|
|
} else if (this.objValue.enginClassValue == '打孔') {
|
|
|
if (this.isEmpty(this.LevelValue.dictValue)) {
|
|
|
this.$modal.msg("请选择孔距") //打孔 判断孔距
|
|
|
@@ -1074,6 +1101,31 @@
|
|
|
|
|
|
}
|
|
|
//this.onsubmit(param)
|
|
|
+ } else if (this.objValue.enginClassValue == '报警器切断阀') { //报警器切断阀
|
|
|
+ param = {
|
|
|
+ district: this.XZQValue.dictValue,
|
|
|
+ areaId: this.XQValue.id,
|
|
|
+ buildingId: this.LDValue.id,
|
|
|
+ unitId: this.DYValue.id,
|
|
|
+ houseId: this.FJValue.id,
|
|
|
+ enginType: this.objValue.enginType, //写死 上一页面传过来的
|
|
|
+ enginClassification: this.objValue.enginClassification, //写死 上一页面传过来的 //室内 - 庭院 - 架空
|
|
|
+ enginCycle: this.projectValue.dictValue, //工程周期
|
|
|
+ zEngineeringNodeBo: {
|
|
|
+ type: this.objValue.enginClassValue, //写死 上一页面传过来的 (拆旧管等 字典值)
|
|
|
+ zEngineeringInfoBo: {
|
|
|
+ constructAccordingDrawings: this.isCheck, //是否按图纸施工
|
|
|
+ zEngiineeringPhotoBoList: this.imgArr, //照片集合
|
|
|
+
|
|
|
+ zEngineeringMaterialBo: [{
|
|
|
+ brand: this.brandValue.dictValue, //品牌
|
|
|
+ // number: this.inputNumberValue //数量
|
|
|
+ }]
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
} else if (this.objValue.enginClassValue == '立杠') { //立杠
|
|
|
param = {
|
|
|
district: this.XZQValue.dictValue,
|
|
|
@@ -1174,51 +1226,62 @@
|
|
|
history() {
|
|
|
if (this.isEmpty(this.projectValue.dictValue)) {
|
|
|
this.$modal.msg("请选择工程周期")
|
|
|
- } else if (this.isEmpty(this.XZQValue.dictValue)) {
|
|
|
+ return
|
|
|
+ }
|
|
|
+ if (this.isEmpty(this.XZQValue.dictValue)) {
|
|
|
this.$modal.msg("请选择行政区")
|
|
|
- } else if (this.isEmpty(this.XQValue.id)) {
|
|
|
+ return
|
|
|
+ }
|
|
|
+ if (this.isEmpty(this.XQValue.id)) {
|
|
|
this.$modal.msg("请选择小区")
|
|
|
- } else if (this.isEmpty(this.LDValue.id)) {
|
|
|
+ return
|
|
|
+ }
|
|
|
+ if (this.isEmpty(this.LDValue.id)) {
|
|
|
this.$modal.msg("请选择楼栋")
|
|
|
- } else if (this.isEmpty(this.DYValue.id)) {
|
|
|
+ return
|
|
|
+ }
|
|
|
+ if (this.isEmpty(this.DYValue.id)) {
|
|
|
this.$modal.msg("请选择单元")
|
|
|
- } else if (this.isEmpty(this.FJValue.id)) {
|
|
|
+ return
|
|
|
+ }
|
|
|
+ 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, // 工程周期
|
|
|
- enginType: this.objValue.enginType, //写死 上一页面传过来的
|
|
|
- enginClassification: this.objValue.enginClassification, //写死 上一页面传过来的 //室内 - 庭院 - 架空
|
|
|
- }
|
|
|
- getRoomProjectId(param).then(res => {
|
|
|
+ return
|
|
|
+ }
|
|
|
+ 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, // 工程周期
|
|
|
+ enginType: this.objValue.enginType, //写死 上一页面传过来的
|
|
|
+ enginClassification: this.objValue.enginClassification, //写死 上一页面传过来的 //室内 - 庭院 - 架空
|
|
|
+ }
|
|
|
+ getRoomProjectId(param).then(res => {
|
|
|
|
|
|
- if (res.code == '200') {
|
|
|
+ if (res.code == '200') {
|
|
|
|
|
|
- if (res.data != null) {
|
|
|
+ if (res.data != null) {
|
|
|
|
|
|
- getRoomProjectList(res.data.id, this.objValue.enginClassValue).then(res => {
|
|
|
+ getRoomProjectList(res.data.id, this.objValue.enginClassValue).then(res => {
|
|
|
|
|
|
- this.historyList = res.data
|
|
|
- if (res.data.zEngineeringNodeBo != null) {
|
|
|
- this.showHistoryList();
|
|
|
- } else {
|
|
|
- this.$modal.msg("暂无历史信息")
|
|
|
- }
|
|
|
+ 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)
|
|
|
+ this.$modal.msg("暂无工程信息")
|
|
|
}
|
|
|
- })
|
|
|
- }
|
|
|
+ } else {
|
|
|
+ this.$modal.msg(res.msg)
|
|
|
+ }
|
|
|
+ })
|
|
|
+
|
|
|
},
|
|
|
showHistoryList() {
|
|
|
this.$refs.refShare.handleShowShare();
|
zhnghongrui