|
|
@@ -1,32 +1,17 @@
|
|
|
<template>
|
|
|
<scroll-view>
|
|
|
<view class="background">
|
|
|
- <!-- <view class="uni-list">
|
|
|
- <view class="container" style="border-bottom: 1px solid #f8f8f8;">
|
|
|
- <view>
|
|
|
- 工程周期
|
|
|
- </view>
|
|
|
- <view v-if="this.isEmpty(this.projectValue.dictValue)" @click="pickerShow('gczq')">
|
|
|
- <span style="color: darkgray;">请选择工程周期</span>
|
|
|
- <image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
|
|
|
- </view>
|
|
|
- <view v-else class="uni-list-cell-db" @click="pickerShow('gczq')">
|
|
|
- <span style="color: black;">{{projectValue.dictLabel}}</span>
|
|
|
- <image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
|
|
|
- </view>
|
|
|
-
|
|
|
- </view>
|
|
|
- </view> -->
|
|
|
+
|
|
|
<view class="uni-list">
|
|
|
<view class="container" style="border-bottom: 1px solid #f8f8f8;">
|
|
|
<view>
|
|
|
行政区
|
|
|
</view>
|
|
|
- <view v-if="this.isEmpty(this.XZQValue.dictValue)" @click="pickerShow('xzq')">
|
|
|
+ <view v-if="this.isEmpty(this.XZQValue.dictValue)" @click="pickerShow('xzq',0)">
|
|
|
<span style="color: darkgray;">请选择行政区</span>
|
|
|
<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
|
|
|
</view>
|
|
|
- <view v-else class="uni-list-cell-db" @click="pickerShow('xzq')">
|
|
|
+ <view v-else class="uni-list-cell-db" @click="pickerShow('xzq',0)">
|
|
|
<span style="color: black;">{{XZQValue.dictLabel}}</span>
|
|
|
<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
|
|
|
</view>
|
|
|
@@ -39,11 +24,11 @@
|
|
|
小区
|
|
|
</view>
|
|
|
|
|
|
- <view v-if="this.isEmpty(this.XQValue.id)" class="uni-list-cell-db" @click="pickerShow('xq')">
|
|
|
+ <view v-if="this.isEmpty(this.XQValue.id)" class="uni-list-cell-db" @click="pickerShow('xq',0)">
|
|
|
<span style="color: darkgray;">请选择小区</span>
|
|
|
<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
|
|
|
</view>
|
|
|
- <view v-else class="uni-list-cell-db" @click="pickerShow('xq')">
|
|
|
+ <view v-else class="uni-list-cell-db" @click="pickerShow('xq',0)">
|
|
|
<span style="color: black;">{{XQValue.name}}</span>
|
|
|
<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
|
|
|
</view>
|
|
|
@@ -54,11 +39,11 @@
|
|
|
<view class="uni-list-cell-left">
|
|
|
楼栋
|
|
|
</view>
|
|
|
- <view v-if="this.isEmpty(this.LDValue.id)" class="uni-list-cell-db" @click="pickerShow('ld')">
|
|
|
+ <view v-if="this.isEmpty(this.LDValue.id)" class="uni-list-cell-db" @click="pickerShow('ld',0)">
|
|
|
<span style="color: darkgray;">请选择楼栋</span>
|
|
|
<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
|
|
|
</view>
|
|
|
- <view v-else class="uni-list-cell-db" @click="pickerShow('ld')">
|
|
|
+ <view v-else class="uni-list-cell-db" @click="pickerShow('ld',0)">
|
|
|
<span style="color: black;">{{LDValue.name}}</span>
|
|
|
<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
|
|
|
</view>
|
|
|
@@ -97,30 +82,7 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
|
|
|
- <view class="container" v-if="objValue.enginClassValue=='回填'">
|
|
|
-
|
|
|
- <view>
|
|
|
- 回填时间
|
|
|
- </view>
|
|
|
- <view @click="openDatetimePicker('ht')">
|
|
|
- <span style="color: black;">{{BackfillingTime ? BackfillingTime:'请选择回填时间'}}</span>
|
|
|
- <image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
|
|
|
- </view>
|
|
|
- </view>
|
|
|
- <view class="container" v-else-if="objValue.enginClassValue=='打压'">
|
|
|
|
|
|
- <view>
|
|
|
- 分段打压是否合格
|
|
|
- </view>
|
|
|
- <view v-if="this.isEmpty(this.isOkValue)" @click="showActionsheet()">
|
|
|
- <span style="color: darkgray;">请选择分段打压是否合格</span>
|
|
|
- <image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
|
|
|
- </view>
|
|
|
- <view v-else class="uni-list-cell-db" @click="showActionsheet()">
|
|
|
- <span style="color: black;">{{isOkLabel}}</span>
|
|
|
- <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>
|
|
|
@@ -133,66 +95,110 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
|
|
|
- <view class="container" style="border-bottom: 1px solid #f8f8f8;">
|
|
|
+ <view v-for="(a,index) in czggslList" :key="index" class="num-style">
|
|
|
+ <view class="container" style="border-bottom: 1px solid #f8f8f8;">
|
|
|
+ <view>
|
|
|
+ 材质
|
|
|
+ </view>
|
|
|
+ <view class="uni-list-cell-db" @click="pickerShow('cz',index)">
|
|
|
+ <span style="color: black;">{{a.cz.id==''?'请选择材质':a.cz.name}}</span>
|
|
|
+ <image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
|
|
|
+ </view>
|
|
|
|
|
|
- <view>
|
|
|
- 材 质
|
|
|
</view>
|
|
|
- <view v-if="this.isEmpty(this.materialValue.id)" @click="pickerShow('cz')">
|
|
|
- <span style="color: darkgray;">请选择材质</span>
|
|
|
- <image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
|
|
|
- </view>
|
|
|
- <view v-else class="uni-list-cell-db" @click="pickerShow('cz')">
|
|
|
- <span style="color: black;">{{materialValue.name}}</span>
|
|
|
- <image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
|
|
|
- </view>
|
|
|
- </view>
|
|
|
- <view class="container" style="border-bottom: 1px solid #f8f8f8;">
|
|
|
+ <view class="container" style="border-bottom: 1px solid #f8f8f8;">
|
|
|
|
|
|
- <view>
|
|
|
- 规 格
|
|
|
- </view>
|
|
|
- <view v-if="this.isEmpty(this.specificationValue.id)" @click="pickerShow('gg')">
|
|
|
- <span style="color: darkgray;">请选择规格</span>
|
|
|
- <image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
|
|
|
+ <view>
|
|
|
+ 规格
|
|
|
+ </view>
|
|
|
+
|
|
|
+ <view class="uni-list-cell-db" @click="pickerShow('gg',index)">
|
|
|
+ <span style="color: black;">{{a.gg.id==''?'请选择规格':a.gg.name}}</span>
|
|
|
+ <image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
|
|
|
+ </view>
|
|
|
</view>
|
|
|
- <view v-else class="uni-list-cell-db" @click="pickerShow('gg')">
|
|
|
- <span style="color: black;">{{specificationValue.name}}</span>
|
|
|
+ <view class="container" style="border-bottom: 1px solid #f8f8f8;">
|
|
|
+
|
|
|
+ <text>数量</text>
|
|
|
+ <input class="uni-input" type="number" v-model="a.sl" placeholder="请填写数量" maxlength="11"
|
|
|
+ style="margin-left: 10px;text-align: right;"></input>
|
|
|
<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
|
|
|
</view>
|
|
|
+ <button v-if="index!=0" @click="this.czggslList.splice(index,1)" class="sc-btn">删除</button>
|
|
|
</view>
|
|
|
- <view class="container" style="border-bottom: 1px solid #f8f8f8;">
|
|
|
-
|
|
|
- <text>数 量</text>
|
|
|
- <input class="uni-input" type="number" v-model="inputNumberValue" placeholder="请填写数量"
|
|
|
- maxlength="11" style="margin-left: 10px;text-align: right;"></input>
|
|
|
- </view>
|
|
|
+ <button @click="this.czggslList.push({cz:{id: '',name: ''},gg:{id: '',name: ''},sl:''})"
|
|
|
+ class="tj-btn">添加</button>
|
|
|
|
|
|
</view>
|
|
|
|
|
|
<view class="align-items" style="margin-top: 20px;margin-bottom: 20px;">
|
|
|
- <view class="container" style="color: #b2b2b2;">*请上传照片</view>
|
|
|
+ <view class="container" style="color: #b2b2b2;">*请上传管上皮深度测量照片</view>
|
|
|
<view class="" 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="choose()"
|
|
|
+ style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose('gspsdcl')"
|
|
|
v-show="reviewStatus!='1'"></image>
|
|
|
- <view v-for="(item,index) in imgArr" :key="index" style="position: relative;">
|
|
|
+ <view v-for="(item,index) in imgGuanArr" :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)">
|
|
|
+ @click="showPhoto(index,'gspsdcl')">
|
|
|
</image>
|
|
|
</view>
|
|
|
<view v-else>
|
|
|
<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
|
|
|
</view>
|
|
|
- <view @click="remove(index)"
|
|
|
+ <view @click="remove(index,'gspsdcl')"
|
|
|
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="align-items" style="margin-top: 20px;margin-bottom: 20px;">
|
|
|
+ <view class="container" style="color: #b2b2b2;">*请上传管沟远景照片</view>
|
|
|
+ <view class="" 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="choose('ggyj')"
|
|
|
+ v-show="reviewStatus!='1'"></image>
|
|
|
+ <view v-for="(item,index) in imgArr" :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,'ggyj')">
|
|
|
+ </image>
|
|
|
+ </view>
|
|
|
+ <view v-else>
|
|
|
+ <video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
|
|
|
+ </view>
|
|
|
+ <view @click="remove(index,'ggyj')"
|
|
|
+ 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="align-items" style="margin-top: 20px;margin-bottom: 20px;">
|
|
|
+ <view class="container" style="color: #b2b2b2;">*请上传视频</view>
|
|
|
+ <view class="" 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="choose('video')"
|
|
|
+ v-show="reviewStatus!='1'"></image>
|
|
|
+ <view v-for="(item,index) in videoArr" :key="index" style="position: relative;">
|
|
|
+
|
|
|
+
|
|
|
+ <video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
|
|
|
+
|
|
|
+ <view @click="remove(index,'video')"
|
|
|
+ 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>
|
|
|
+ </view>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -200,7 +206,7 @@
|
|
|
<button @click="submit" class="btn cu-btn block bg-blue lg round">确认上传</button>
|
|
|
</view>
|
|
|
|
|
|
- <bottom-sheet ref="refShare" :data="historyList"></bottom-sheet>
|
|
|
+ <bottom-sheet ref="refShare" :data="historyList" :TitleType="objValue.enginClassValue"></bottom-sheet>
|
|
|
<yt-dateTimePicker ref="myPicker" @submit="handleSubmit" :start-year="2024" :end-year="2099"
|
|
|
:time-hide="[true, true, true, true, true, true]" :time-label="['年', '月', '日', '时', '分', '秒']" />
|
|
|
</scroll-view>
|
|
|
@@ -210,7 +216,7 @@
|
|
|
|
|
|
<script>
|
|
|
import SelectPicker from '../../../components/selectPicker/select_picker.vue'
|
|
|
- import bottomSheet from '../../../components/bottomSheet/bottomSheet.vue'
|
|
|
+ import bottomSheet from '../../../components/bottomSheet/bottomSheetMore.vue'
|
|
|
|
|
|
import {
|
|
|
getDicts
|
|
|
@@ -240,7 +246,18 @@
|
|
|
headers: {
|
|
|
Authorization: "Bearer " + getToken()
|
|
|
},
|
|
|
-
|
|
|
+ zEngineeringMaterialBo: [], //给后台传的值 用料列表
|
|
|
+ czggslList: [{
|
|
|
+ cz: {
|
|
|
+ id: '',
|
|
|
+ name: ''
|
|
|
+ },
|
|
|
+ gg: {
|
|
|
+ id: '',
|
|
|
+ name: ''
|
|
|
+ },
|
|
|
+ sl: ''
|
|
|
+ }, ],
|
|
|
type: '',
|
|
|
reviewStatus: '', //是否可以点击
|
|
|
open: false,
|
|
|
@@ -249,9 +266,14 @@
|
|
|
selectList: [],
|
|
|
dictOptions: [],
|
|
|
imgArr: [],
|
|
|
+ imgGuanArr: [],
|
|
|
+ videoArr: [],
|
|
|
XQValue: {},
|
|
|
XZQValue: {},
|
|
|
- projectValue: {'dictValue':'1'},
|
|
|
+ SelectIndex: '', //选择的索引值
|
|
|
+ projectValue: {
|
|
|
+ 'dictValue': '0'
|
|
|
+ },
|
|
|
LevelValue: {},
|
|
|
isOkValue: '', //分段打压是否合格
|
|
|
isOkLabel: '', //分段打压是否合格label
|
|
|
@@ -354,47 +376,58 @@
|
|
|
handleHiddenShare() {
|
|
|
this.shareState = false;
|
|
|
},
|
|
|
- showPhoto(index) {
|
|
|
+ showPhoto(index, type) {
|
|
|
+ let typeArr = [];
|
|
|
+ if (type == 'gspsdcl') {
|
|
|
+ typeArr = this.imgGuanArr;
|
|
|
+ } else {
|
|
|
+ typeArr = this.imgArr;
|
|
|
+ }
|
|
|
uni.previewImage({
|
|
|
current: index,
|
|
|
- urls: this.imgArr,
|
|
|
+ urls: typeArr,
|
|
|
})
|
|
|
|
|
|
},
|
|
|
- remove(index) {
|
|
|
+ remove(index, type) {
|
|
|
+ let content = '';
|
|
|
+ if (type == 'video') {
|
|
|
+ content = '是否删除该视频？'
|
|
|
+ } else {
|
|
|
+ content = '是否删除该图片？'
|
|
|
+ }
|
|
|
uni.showModal({
|
|
|
title: '提示',
|
|
|
- content: '是否删除该图片或视频？',
|
|
|
+ content: content,
|
|
|
success: (res) => {
|
|
|
if (res.confirm) {
|
|
|
- this.imgArr.splice(index, 1)
|
|
|
- console.log('this.imgarr', this.imgArr)
|
|
|
- if (this.imgArr.length <= 0) {
|
|
|
- this.photo = true;
|
|
|
+ if (type == 'video') {
|
|
|
+ this.videoArr.splice(index, 1)
|
|
|
+
|
|
|
+ } else if (type == 'gspsdcl') {
|
|
|
+ this.imgGuanArr.splice(index, 1)
|
|
|
+ } else if (type == 'ggyj') {
|
|
|
+ this.imgArr.splice(index, 1)
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
- choose() {
|
|
|
+ choose(e) {
|
|
|
let _this = this;
|
|
|
- uni.showActionSheet({
|
|
|
- title: '上传',
|
|
|
- itemList: ['图片', '视频'],
|
|
|
- success: (res) => {
|
|
|
- console.log(res)
|
|
|
- if (res.tapIndex == 0) {
|
|
|
- this.chooseimage()
|
|
|
- } else {
|
|
|
- this.choosevideo()
|
|
|
- }
|
|
|
- }
|
|
|
- })
|
|
|
+
|
|
|
+ if (e == 'video') {
|
|
|
+ this.choosevideo()
|
|
|
+ } else {
|
|
|
+ this.chooseimage(e)
|
|
|
+
|
|
|
+ }
|
|
|
},
|
|
|
- chooseimage() {
|
|
|
+ chooseimage(e) {
|
|
|
|
|
|
let _this = this;
|
|
|
- console.log('图片', _this.headers)
|
|
|
uni.chooseImage({
|
|
|
sizeType: ['album', 'camera'],
|
|
|
success(resp) {
|
|
|
@@ -409,21 +442,18 @@
|
|
|
success: res => {
|
|
|
// 判断是否json字符串，将其转为json格式
|
|
|
console.log("结果", res)
|
|
|
- // let data = _this.$u.test.jsonString(res
|
|
|
- // .data) ? JSON.parse(res.data) : res.data;
|
|
|
let data = JSON.parse(res.data);
|
|
|
if (![200].includes(data.code)) {
|
|
|
- // this.uploadError(index, data);
|
|
|
_this.$modal.msg(data.msg)
|
|
|
} else {
|
|
|
if (_this.progress === 100) {
|
|
|
- console.log('_this.progress', _this.progress)
|
|
|
- //console.log('data----', data)data
|
|
|
- console.log('res--', res)
|
|
|
- _this.imgArr.push(data.data.url)
|
|
|
- console.log('imgArr', _this.imgArr)
|
|
|
+ if (e == 'ggyj') {
|
|
|
+ _this.imgArr.push(data.data.url)
|
|
|
+ } else if (e == 'gspsdcl') {
|
|
|
+ _this.imgGuanArr.push(data.data.url)
|
|
|
+ }
|
|
|
+
|
|
|
_this.$modal.msg('上传成功！')
|
|
|
- _this.photo = false;
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
@@ -440,17 +470,13 @@
|
|
|
});
|
|
|
task.onProgressUpdate(res => {
|
|
|
_this.progress = res.progress;
|
|
|
- console.log('onProgressUpdate', res)
|
|
|
- console.log('task.onProgressUpdate', _this.progress)
|
|
|
uni.showLoading({
|
|
|
title: '上传中'
|
|
|
})
|
|
|
if (_this.progress != 100) {
|
|
|
_this.loading = false
|
|
|
- console.log('_this.loading false', _this.loading)
|
|
|
} else {
|
|
|
_this.loading = true
|
|
|
- console.log('_this.loading true', _this.loading)
|
|
|
}
|
|
|
});
|
|
|
|
|
|
@@ -462,7 +488,6 @@
|
|
|
|
|
|
choosevideo() {
|
|
|
let _this = this;
|
|
|
- console.log('视频')
|
|
|
uni.chooseVideo({
|
|
|
sourceType: ['album', 'camera'],
|
|
|
maxDuration: 30,
|
|
|
@@ -481,11 +506,8 @@
|
|
|
} else {
|
|
|
//上传成功
|
|
|
if (_this.progress === 100) {
|
|
|
- console.log('_this.progress', _this.progress)
|
|
|
- _this.imgArr.push(data.data.url)
|
|
|
- console.log('imgArr', _this.imgArr)
|
|
|
+ _this.videoArr.push(data.data.url)
|
|
|
_this.$modal.msg('上传成功！')
|
|
|
- _this.photo = false;
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
@@ -500,16 +522,13 @@
|
|
|
});
|
|
|
task.onProgressUpdate(res => {
|
|
|
_this.progress = res.progress;
|
|
|
- console.log('onProgressUpdate', res)
|
|
|
uni.showLoading({
|
|
|
title: '上传中'
|
|
|
})
|
|
|
if (_this.progress != 100) {
|
|
|
_this.loading = false
|
|
|
- console.log('_this.loading false', _this.loading)
|
|
|
} else {
|
|
|
_this.loading = true
|
|
|
- console.log('_this.loading true', _this.loading)
|
|
|
}
|
|
|
});
|
|
|
|
|
|
@@ -518,45 +537,22 @@
|
|
|
|
|
|
},
|
|
|
|
|
|
- showActionsheet() {
|
|
|
- //分段打压是否合格
|
|
|
-
|
|
|
- getDicts("sys_yes_no").then(response => {
|
|
|
-
|
|
|
- this.dictOptions = response.data;
|
|
|
- let array = [];
|
|
|
- this.dictOptions.forEach((item, index) => {
|
|
|
- array.push(item.dictLabel)
|
|
|
-
|
|
|
- });
|
|
|
-
|
|
|
- uni.showActionSheet({
|
|
|
- itemList: array,
|
|
|
- success: (res) => {
|
|
|
- // console.log('选择了第' + (res.tapIndex + 1) + '个选项');
|
|
|
- // console.log(this.dictOptions[res.tapIndex].dictValue)
|
|
|
- this.isOkValue = this.dictOptions[res.tapIndex].dictValue;
|
|
|
- this.isOkLabel = this.dictOptions[res.tapIndex].dictLabel;
|
|
|
- },
|
|
|
- fail: (err) => {
|
|
|
- console.log('弹窗取消');
|
|
|
- }
|
|
|
- });
|
|
|
|
|
|
- });
|
|
|
- },
|
|
|
- pickerShow(e) {
|
|
|
+ pickerShow(e, index) {
|
|
|
+ this.SelectIndex = index;
|
|
|
this.type = e; //赋值类型
|
|
|
if (e == 'cz') { //材质
|
|
|
this.open = true;
|
|
|
- getEnginMaterialQualityList("民用工程").then(response => {
|
|
|
- this.selectList = response.data;
|
|
|
- });
|
|
|
+ getEnginMaterialQualityList("民用工程", this.objValue.enginType, this.objValue.enginClassification).then(
|
|
|
+ response => {
|
|
|
+ this.selectList = response.data;
|
|
|
+ });
|
|
|
|
|
|
} else if (e == 'gg') { //规格
|
|
|
- if (this.isEmpty(this.materialValue.id)) {
|
|
|
- this.$modal.msg('请选择材质')
|
|
|
|
|
|
+ if (this.isEmpty(this.czggslList[index].cz.id)) {
|
|
|
+ this.$modal.msg('请选择材质')
|
|
|
+ // this.czggslList[index].cz = this.materialValue.id
|
|
|
} else {
|
|
|
this.open = true;
|
|
|
this.selectList = this.materialList;
|
|
|
@@ -631,20 +627,25 @@
|
|
|
}
|
|
|
},
|
|
|
changeSelect(item, index) {
|
|
|
- // this.index = index;
|
|
|
- // this.address = item.communityName;
|
|
|
+
|
|
|
this.open = false;
|
|
|
|
|
|
+
|
|
|
if (this.type == 'cz') {
|
|
|
this.materialValue = item;
|
|
|
this.specificationValue = ''; //重置规格
|
|
|
+ this.czggslList[this.SelectIndex].gg.id = ''
|
|
|
+ this.czggslList[this.SelectIndex].gg.name = ''
|
|
|
//根据材质ID 获取规格数据
|
|
|
getEnginSpecificationsList(item.id).then(res => {
|
|
|
this.materialList = res.data
|
|
|
+ this.czggslList[this.SelectIndex].cz.id = this.materialValue.id
|
|
|
+ this.czggslList[this.SelectIndex].cz.name = this.materialValue.name
|
|
|
})
|
|
|
} else if (this.type == 'gg') {
|
|
|
this.specificationValue = item;
|
|
|
-
|
|
|
+ this.czggslList[this.SelectIndex].gg.id = this.specificationValue.id
|
|
|
+ this.czggslList[this.SelectIndex].gg.name = this.specificationValue.name
|
|
|
} else if (this.type == 'xq') {
|
|
|
this.XQValue = item;
|
|
|
if (!this.isEmpty(this.projectValue.dictValue)) {
|
|
|
@@ -746,28 +747,57 @@
|
|
|
// }
|
|
|
|
|
|
|
|
|
- if (this.objValue.enginClassValue == '回填' && this.isEmpty(this.BackfillingTime)) {
|
|
|
- this.$modal.msg("请选择回填时间")
|
|
|
- return
|
|
|
- }
|
|
|
- if (this.objValue.enginClassValue == '打压' && this.isEmpty(this.isOkValue)) {
|
|
|
- this.$modal.msg("请选择分段打压是否合格")
|
|
|
- return
|
|
|
- }
|
|
|
- if (this.isEmpty(this.materialValue.id)) {
|
|
|
- this.$modal.msg("请选择材质")
|
|
|
- return
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ try {
|
|
|
+ //console.log("刚开始", this.czggslList);
|
|
|
+ this.czggslList.forEach((list) => {
|
|
|
+ if (this.isEmpty(list.cz.id)) {
|
|
|
+ this.$modal.msg('材质不能为空')
|
|
|
+
|
|
|
+
|
|
|
+ throw new Error('End Loop')
|
|
|
+
|
|
|
+ }
|
|
|
+ if (this.isEmpty(list.gg.id)) {
|
|
|
+ this.$modal.msg('规格不能为空')
|
|
|
+ throw new Error('End Loop')
|
|
|
+
|
|
|
+ }
|
|
|
+ if (this.isEmpty(list.sl)) {
|
|
|
+ this.$modal.msg('数量不能为空')
|
|
|
+
|
|
|
+ throw new Error('End Loop')
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ })
|
|
|
+ } catch (e) {
|
|
|
+ if (e.message === 'End Loop') throw e
|
|
|
}
|
|
|
- if (this.isEmpty(this.specificationValue.id)) {
|
|
|
- this.$modal.msg("请选择规格")
|
|
|
+ this.zEngineeringMaterialBo = [];
|
|
|
+ this.czggslList.forEach((list) => {
|
|
|
+ this.zEngineeringMaterialBo.push({
|
|
|
+ materialQuality: list.cz.id,
|
|
|
+ specifications: list.gg.id,
|
|
|
+ number: list.sl
|
|
|
+ })
|
|
|
+ }),
|
|
|
+
|
|
|
+ console.log("数据", this.zEngineeringMaterialBo)
|
|
|
+ if (this.imgGuanArr.length <= 0) {
|
|
|
+ this.$modal.msg('请上传管上皮深度测量照片')
|
|
|
return
|
|
|
}
|
|
|
- if (this.isEmpty(this.inputNumberValue)) {
|
|
|
- this.$modal.msg("请输入数量")
|
|
|
+ if (this.imgArr.length <= 0) {
|
|
|
+ this.$modal.msg('请上传管沟远景照片')
|
|
|
return
|
|
|
}
|
|
|
- if (this.imgArr.length <= 0) {
|
|
|
- this.$modal.msg('请上传照片或视频')
|
|
|
+ if (this.videoArr.length <= 0) {
|
|
|
+ this.$modal.msg('请上传视频')
|
|
|
return
|
|
|
}
|
|
|
if (this.loading == false) {
|
|
|
@@ -804,19 +834,12 @@
|
|
|
zEngineeringNodeBo: {
|
|
|
type: this.objValue.enginClassValue, //写死 上一页面传过来的 (拆旧管等 字典值)
|
|
|
zEngineeringInfoBo: {
|
|
|
- //constructAccordingDrawings: this.isCheck, //是否按图纸施工
|
|
|
- segmentedCompressionQualified: this.isOkValue, // 分段打压是否台格
|
|
|
- zEngiineeringPhotoBoList: this.imgArr, //照片集合
|
|
|
+ ductalEpithelium: this.imgGuanArr, //照片集合
|
|
|
+ trenchProspect: this.imgArr,
|
|
|
+ video: this.videoArr,
|
|
|
constructTime: this.time, //施工时间
|
|
|
- backfillTime: this.BackfillingTime, // 回填时间
|
|
|
remark: this.projectContent, //施工内容
|
|
|
- // headName: this.user.nickName, // 负责人名称
|
|
|
- // headPhone: this.user.phonenumber, // 负责人电话
|
|
|
- zEngineeringMaterialBo: [{
|
|
|
- materialQuality: this.materialValue.id, //材质
|
|
|
- specifications: this.specificationValue.id, //规格
|
|
|
- number: this.inputNumberValue //数量
|
|
|
- }]
|
|
|
+ zEngineeringMaterialBo: this.zEngineeringMaterialBo
|
|
|
}
|
|
|
|
|
|
}
|
