|
|
@@ -90,18 +90,70 @@
|
|
|
<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
|
|
|
</view>
|
|
|
</view>
|
|
|
+
|
|
|
+ <view class="container" style="border-bottom: 1px solid #f8f8f8;">
|
|
|
+ <view class="uni-common-mt" style="width: 100%;">
|
|
|
+ <text class="uni-title uni-common-pl">施工内容</text>
|
|
|
+ <view style="width: 100%;box-sizing: border-box;">
|
|
|
+ <textarea class="textarea" placeholder="请输入施工内容" maxlength="255"
|
|
|
+ placeholder-style="padding: 10rpx;"
|
|
|
+ style="width: 100%;height: 100%;border: 1rpx solid #cccccc; border-radius: 15rpx;padding: 10rpx;line-height:normal;"
|
|
|
+ auto-height v-model="projectContent"></textarea>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+
|
|
|
+ <view class="container" style="border-bottom: 1px solid #f8f8f8;">
|
|
|
+ <view class="uni-list-cell-left">
|
|
|
+ 施工位置
|
|
|
+ </view>
|
|
|
+ <view v-if="this.isEmpty(this.positionKey)" class="uni-list-cell-db" style="margin-top: 10;"
|
|
|
+ @click="pickerShow('position')">
|
|
|
+ <span style="color: darkgray;">请选择施工位置</span>
|
|
|
+ </view>
|
|
|
+ <view v-else class="uni-list-cell-db" style="margin-top: 10;" @click="pickerShow('position')">
|
|
|
+ <span style="color: black;">{{positionValue}}</span>
|
|
|
+ </view>
|
|
|
+ 第
|
|
|
+ <input class="uni-input" type="number" v-model="inputNumberValue" maxlength="6"
|
|
|
+ style="text-align: center; border: 1px solid #cccccc; border-radius: 20rpx;width: 60px;"></input>
|
|
|
+ 根
|
|
|
+ </view>
|
|
|
+
|
|
|
</view>
|
|
|
- <view class="container" style="border-bottom: 1px solid #f8f8f8;">
|
|
|
+ <!-- <view class="container" style="border-bottom: 1px solid #f8f8f8;">
|
|
|
<text>米 数</text>
|
|
|
- <!-- style="margin-left: 10px;text-align: right;" -->
|
|
|
<view style="display: flex; justify-content: right; width: 70%;">
|
|
|
- <input class="uni-input" type="number" v-model="inputIntegerNumberValue" maxlength="6"
|
|
|
- style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx"></input>
|
|
|
- <text style="font-weight:bold;margin-left: 10px;margin-right: 10px;">.</text>
|
|
|
- <input class="uni-input" type="number" v-model="inputDecimalNumberValue" maxlength="1"
|
|
|
- style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
|
|
|
+ <input class="uni-input" type="number" v-model="inputIntegerNumberValue" maxlength="6"
|
|
|
+ style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx"></input>
|
|
|
+ <text style="font-weight:bold;margin-left: 10px;margin-right: 10px;">.</text>
|
|
|
+ <input class="uni-input" type="number" v-model="inputDecimalNumberValue" maxlength="1"
|
|
|
+ style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
|
|
|
+ </view>
|
|
|
+ </view> -->
|
|
|
+ <view class="container" style="color: #b2b2b2;">*沟上部分照片</view>
|
|
|
+ <view style="display: flex; flex-wrap: wrap;margin-top: 10px; margin-left: 10px;">
|
|
|
+ <image :src="loadImgSrc('updateimg.png')" mode=""
|
|
|
+ style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="chooseimage(0)"
|
|
|
+ v-show="reviewStatus!='1'"></image>
|
|
|
+ <view v-for="(item,index) in imgArr0" :key="index" style="position: relative;">
|
|
|
+ <view
|
|
|
+ v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'||item.substring(item.length-4)=='jpeg' ">
|
|
|
+ <image :src="item" mode="" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
|
|
|
+ @click="showPhoto(index,1)">
|
|
|
+ </image>
|
|
|
+ </view>
|
|
|
+ <view v-else>
|
|
|
+ <video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
|
|
|
+ </view>
|
|
|
+ <view @click="remove(index,0)"
|
|
|
+ style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
|
|
|
+ <image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
|
|
|
+ </image>
|
|
|
+ </view>
|
|
|
</view>
|
|
|
</view>
|
|
|
+
|
|
|
<view class="container" style="color: #b2b2b2;">*开挖前照片</view>
|
|
|
<view style="display: flex; flex-wrap: wrap;margin-top: 10px; margin-left: 10px;">
|
|
|
<image :src="loadImgSrc('updateimg.png')" mode=""
|
|
|
@@ -124,6 +176,7 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
+
|
|
|
<view class="container" style="color: #b2b2b2;">*下沟照片</view>
|
|
|
<view style="display: flex; flex-wrap: wrap;margin-top: 10px; margin-left: 10px;">
|
|
|
<image :src="loadImgSrc('updateimg.png')" mode=""
|
|
|
@@ -146,6 +199,7 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
+
|
|
|
<view class="container" style="color: #b2b2b2;">*回填照片</view>
|
|
|
<view style="display: flex; flex-wrap: wrap;margin-top: 10px; margin-left: 10px;">
|
|
|
<image :src="loadImgSrc('updateimg.png')" mode=""
|
|
|
@@ -226,6 +280,9 @@
|
|
|
openDict: false,
|
|
|
selectList: [],
|
|
|
dictOptions: [],
|
|
|
+ positionKey: '',
|
|
|
+ positionValue: '',
|
|
|
+ imgArr0: [],
|
|
|
imgArr1: [],
|
|
|
imgArr2: [],
|
|
|
imgArr3: [],
|
|
|
@@ -237,6 +294,7 @@
|
|
|
LDValue: {},
|
|
|
DYValue: {},
|
|
|
time: '', //施工时间
|
|
|
+ projectContent: '', //施工内容
|
|
|
XQList: '',
|
|
|
LDList: '',
|
|
|
DYList: '',
|
|
|
@@ -245,8 +303,8 @@
|
|
|
loading: false,
|
|
|
historyList: {}, //历史数据
|
|
|
inputNumberValue: '',
|
|
|
- inputIntegerNumberValue: '',
|
|
|
- inputDecimalNumberValue: '',
|
|
|
+ // inputIntegerNumberValue: '',
|
|
|
+ // inputDecimalNumberValue: '',
|
|
|
}
|
|
|
},
|
|
|
|
|
|
@@ -309,8 +367,8 @@
|
|
|
getStatus() {
|
|
|
let param = {
|
|
|
areaId: this.XQValue.id, // 小区id
|
|
|
- buildingId: buildingId, // 楼宇id
|
|
|
- unitId: this.isEmpty(this.DYValue.id)?'':this.DYValue.id,
|
|
|
+ buildingId: this.LDValue.id, // 楼宇id
|
|
|
+ unitId: this.isEmpty(this.DYValue.id) ? '' : this.DYValue.id,
|
|
|
enginCycle: this.projectValue.dictValue, // 工程周期
|
|
|
enginType: this.objValue.enginType, //写死 上一页面传过来的
|
|
|
enginClassification: this.objValue.enginClassification, //写死 上一页面传过来的 //室内 - 庭院 - 架空
|
|
|
@@ -350,8 +408,16 @@
|
|
|
this.$modal.msg("请选择小区")
|
|
|
} else if (this.isEmpty(this.LDValue.id)) {
|
|
|
this.$modal.msg("请选择楼栋")
|
|
|
- } else if (this.isEmpty(this.inputIntegerNumberValue)) {
|
|
|
- this.$modal.msg("请输入米数")
|
|
|
+ } else if (this.isEmpty(this.positionKey)) {
|
|
|
+ this.$modal.msg("请选择施工位置")
|
|
|
+ } else if (this.isEmpty(this.inputNumberValue)) {
|
|
|
+ this.$modal.msg("请输入施工位置")
|
|
|
+ }
|
|
|
+ // else if (this.isEmpty(this.inputIntegerNumberValue)) {
|
|
|
+ // this.$modal.msg("请输入米数")
|
|
|
+ // }
|
|
|
+ else if (this.imgArr0.length <= 0) {
|
|
|
+ this.$modal.msg("请上传沟上部分照片")
|
|
|
} else if (this.imgArr1.length <= 0) {
|
|
|
this.$modal.msg("请上传开挖前照片")
|
|
|
} else if (this.imgArr2.length <= 0) {
|
|
|
@@ -359,18 +425,18 @@
|
|
|
} else if (this.imgArr3.length <= 0) {
|
|
|
this.$modal.msg("请上传回填照片")
|
|
|
} else {
|
|
|
- if (this.isEmpty(this.inputDecimalNumberValue)) {
|
|
|
- this.inputNumberValue = this.inputIntegerNumberValue;
|
|
|
- } else {
|
|
|
- this.inputNumberValue = this.inputIntegerNumberValue + "." + this.inputDecimalNumberValue;
|
|
|
- }
|
|
|
+ // if (this.isEmpty(this.inputDecimalNumberValue)) {
|
|
|
+ // this.inputNumberValue = this.inputIntegerNumberValue;
|
|
|
+ // } else {
|
|
|
+ // this.inputNumberValue = this.inputIntegerNumberValue + "." + this.inputDecimalNumberValue;
|
|
|
+ // }
|
|
|
|
|
|
uni.showLoading()
|
|
|
let param = {
|
|
|
district: this.XZQValue.dictValue,
|
|
|
areaId: this.XQValue.id,
|
|
|
buildingId: this.LDValue.id,
|
|
|
- unitId: this.isEmpty(this.DYValue.id)?'':this.DYValue.id,
|
|
|
+ unitId: this.isEmpty(this.DYValue.id) ? '' : this.DYValue.id,
|
|
|
enginType: this.objValue.enginType, //写死 上一页面传过来的
|
|
|
enginClassification: this.objValue
|
|
|
.enginClassification, //写死 上一页面传过来的 //室内 - 庭院 - 架空
|
|
|
@@ -379,12 +445,14 @@
|
|
|
type: this.objValue.enginClassValue, //写死 上一页面传过来的 (拆旧管等 字典值)
|
|
|
zEngineeringInfoBo: {
|
|
|
constructTime: this.time, //施工时间
|
|
|
+ onTheDitch: this.imgArr0, //照片集合
|
|
|
beforeBottom: this.imgArr1, //照片集合
|
|
|
legBackfilling: this.imgArr2, //照片集合
|
|
|
inferiorSulcus: this.imgArr3, //照片集合
|
|
|
-
|
|
|
+ constructAddre: this.positionKey,
|
|
|
zEngineeringMaterialBo: [{
|
|
|
- number: this.inputNumberValue //米数
|
|
|
+ number: this.inputNumberValue, //米数
|
|
|
+ remark: this.projectContent, //施工内容
|
|
|
}]
|
|
|
}
|
|
|
}
|
|
|
@@ -419,7 +487,12 @@
|
|
|
this.shareState = false;
|
|
|
},
|
|
|
showPhoto(index, type) {
|
|
|
- if (type == 1) {
|
|
|
+ if (type == 0) {
|
|
|
+ uni.previewImage({
|
|
|
+ current: index,
|
|
|
+ urls: this.imgArr0,
|
|
|
+ })
|
|
|
+ } else if (type == 1) {
|
|
|
uni.previewImage({
|
|
|
current: index,
|
|
|
urls: this.imgArr1,
|
|
|
@@ -437,7 +510,17 @@
|
|
|
}
|
|
|
},
|
|
|
remove(index, type) {
|
|
|
- if (type == 1) {
|
|
|
+ if (type == 0) {
|
|
|
+ uni.showModal({
|
|
|
+ title: '提示',
|
|
|
+ content: '是否删除该图片或视频？',
|
|
|
+ success: (res) => {
|
|
|
+ if (res.confirm) {
|
|
|
+ this.imgArr0.splice(index, 1)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ })
|
|
|
+ } else if (type == 1) {
|
|
|
uni.showModal({
|
|
|
title: '提示',
|
|
|
content: '是否删除该图片或视频？',
|
|
|
@@ -508,11 +591,13 @@
|
|
|
_this.$modal.msg(data.msg)
|
|
|
} else {
|
|
|
if (_this.progress === 100) {
|
|
|
- if (type == 1) {
|
|
|
+ if (type == 0) {
|
|
|
+ _this.imgArr0.push(data.data.url)
|
|
|
+ } else if (type == 1) {
|
|
|
_this.imgArr1.push(data.data.url)
|
|
|
} else if (type == 2) {
|
|
|
_this.imgArr2.push(data.data.url)
|
|
|
- } else {
|
|
|
+ } else if (type == 3) {
|
|
|
_this.imgArr3.push(data.data.url)
|
|
|
}
|
|
|
_this.$modal.msg('上传成功！')
|
|
|
@@ -591,6 +676,11 @@
|
|
|
this.open = true;
|
|
|
this.selectList = this.FJList;
|
|
|
}
|
|
|
+ } else if (e == 'position') {
|
|
|
+ this.openDict = true;
|
|
|
+ getDicts("construct_addre").then(response => {
|
|
|
+ this.dictOptions = response.data;
|
|
|
+ });
|
|
|
}
|
|
|
|
|
|
},
|
|
|
@@ -606,6 +696,9 @@
|
|
|
getAreaList(item.dictValue).then(res => {
|
|
|
this.XQList = res.data;
|
|
|
})
|
|
|
+ } else if (this.type == 'position') {
|
|
|
+ this.positionKey = item.dictValue;
|
|
|
+ this.positionValue = item.dictLabel;
|
|
|
}
|
|
|
|
|
|
},
|
|
|
@@ -675,7 +768,7 @@
|
|
|
let param = {
|
|
|
areaId: this.XQValue.id, // 小区id
|
|
|
buildingId: this.LDValue.id, // 楼宇id
|
|
|
- unitId: this.isEmpty(this.DYValue.id)?'':this.DYValue.id, // 单元id
|
|
|
+ unitId: this.isEmpty(this.DYValue.id) ? '' : this.DYValue.id, // 单元id
|
|
|
enginCycle: this.projectValue.dictValue, // 工程周期
|
|
|
enginType: this.objValue.enginType, //写死 上一页面传过来的 新建/旧改
|
|
|
enginClassification: this.objValue.enginClassification, //写死 上一页面传过来的 //室内 - 庭院 - 架空
|
