sync

pages/open_bolt/open_bolt.vue

@@ -154,28 +154,19 @@
 				</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="100"
-								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="barTestValue"></textarea>
-						</view>
-					</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="100"
-								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="singleValue"></textarea>
+							<checkbox-group @change="checkboxChange">
+								<checkbox style="margin-right: 30rpx;" v-for="(item, index) in checkItems" :key="index"
+									:value="item.dictValue" :checked="item.checked">{{ item.dictLabel }}</checkbox>
+							</checkbox-group>
+
 						</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=""
@@ -227,28 +218,38 @@
 							style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
 					</view>
 				</view>
+
+
 				<view class="container" style="border-bottom: 1px solid #f8f8f8;">
 					<view class="uni-list-cell-left">
 						品牌
 					</view>
-
-					<view class="uni-list-cell-db" style="margin-top: 10;">
-						<input class="uni-input" type="text" v-model="brankValue" maxlength="50" placeholder="请输入品牌"
-							style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
+					<view v-if="this.isEmpty(this.brankValue.dictValue)" class="uni-list-cell-db" style="margin-top: 10;"
+						@click="pickerShow('brank')">
+						<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" style="margin-top: 10;" @click="pickerShow('brank')">
+						<span style="color: black;">{{brankValue.dictLabel}}</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-list-cell-left">
 						型号
 					</view>
-
-					<view class="uni-list-cell-db" style="margin-top: 10;">
-						<input class="uni-input" type="text" v-model="tableModel" maxlength="50" placeholder="请输入型号"
-							style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
+					<view v-if="this.isEmpty(this.tableModel.dictValue)" class="uni-list-cell-db" style="margin-top: 10;"
+						@click="pickerShow('Model')">
+						<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" style="margin-top: 10;" @click="pickerShow('Model')">
+						<span style="color: black;">{{tableModel.dictLabel}}</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-list-cell-left">
 						进气方向
@@ -564,6 +565,8 @@
 			},
 			data() {
 				return {
+					checkItems: [],
+					checkedValues: [],
 					title: '',
 					name: '开栓',
 					headers: {
@@ -644,6 +647,16 @@
 				uni.setNavigationBarTitle({
 					title: '开栓'
 				})
+				getDicts("vertical_bar").then(response => {
+
+
+					response.data.forEach((obj, index) => {
+						obj.checked = false;
+					});
+					this.checkItems = response.data;
+
+
+				});
 				if ('params' in options) {
 					let e = JSON.parse(decodeURIComponent(options.params));
 
@@ -675,15 +688,32 @@
 							this.imgArr = response.gasCylinderPic;
 
 
-							this.barTestValue = response.verticalBarTest;
-							this.singleValue = response.householdTest;
+							// this.barTestValue = response.verticalBarTest;
+							// this.singleValue = response.householdTest;
+
+
+							var arr = response.verticalBarTest.split(",");
+							arr.forEach((obj, index) => {
+								this.checkItems.forEach((item, index2) => {
+
+									if (obj == item.dictLabel) {
+										this.checkItems[index2].checked = true;
+									}
+
+								});
+							});
 							this.imgArr2 = response.pressureTestPic;
 
 							this.tableNumber = response.gasMeterNumber;
 							this.tableCharacters = response.gasMeterCount;
-							this.brankValue = response.gasMeterBrand;
-							this.tableModel = response.gasMeterType;
-
+							this.brankValue = {
+								dictValue: response.gasMeterBrand,
+								dictLabel: response.gasMeterBrand
+							};
+							this.tableModel = {
+								dictValue: response.gasMeterType,
+								dictLabel: response.gasMeterType
+							};
 							this.direction = {
 								dictValue: response.gasMeterDirection,
 								dictLabel: response.gasMeterDirectionName
@@ -738,6 +768,9 @@
 				isEmpty(str) {
 					return (!str || 0 === str.length);
 				},
+				checkboxChange(e) {
+					this.checkedValues = e.detail.value;
+				},
 				submit() {
 					if (this.isEmpty(this.XZQValue.dictValue)) {
 						this.$modal.msg("请选择行政区")
@@ -756,11 +789,15 @@
 					} else if (this.imgArr.length <= 0) {
 						this.$modal.msg("请上传燃气立杠照片")
 
-					} else if (this.isEmpty(this.barTestValue)) {
-						this.$modal.msg("请输入立杠气密测试")
-					} else if (this.isEmpty(this.singleValue)) {
-						this.$modal.msg("请输入单户气密测试")
-					} else if (this.imgArr2.length <= 0) {
+					} else if (this.isEmpty(this.checkedValues)) {
+						this.$modal.msg("请选择气密测试")
+					}
+					// else if (this.isEmpty(this.barTestValue)) {
+					// 	this.$modal.msg("请输入立杠气密测试")
+					// } else if (this.isEmpty(this.singleValue)) {
+					// 	this.$modal.msg("请输入单户气密测试")
+					// }
+					else if (this.imgArr2.length <= 0) {
 						this.$modal.msg("请上传气密测试照片")
 					} else if (this.imgArr3.length <= 0) {
 						this.$modal.msg("请上传燃气表照片")
@@ -792,14 +829,14 @@
 							gasCylinderPic: this.imgArr,
 
 
-							verticalBarTest: this.barTestValue,
-							householdTest: this.singleValue,
+							verticalBarTest: this.checkedValues.toString(),
+							//householdTest: this.singleValue,
 							pressureTestPic: this.imgArr2,
 
 							gasMeterNumber: this.tableNumber,
 							gasMeterCount: this.tableCharacters,
-							gasMeterBrand: this.brankValue,
-							gasMeterType: this.tableModel,
+							gasMeterBrand: this.brankValue.dictValue,
+							gasMeterType: this.tableModel.dictValue,
 							gasMeterDirection: this.direction.dictValue,
 							gasMeterPic: this.imgArr3,
 
@@ -859,16 +896,22 @@
 									this.openBoltValue = this.dictOptions[res.tapIndex].dictLabel;
 								} else if (type == 'barClamptKey') {
 									this.barClamptKey = this.dictOptions[res.tapIndex].dictValue;
-									this.barClamptValue = this.dictOptions[res.tapIndex].dictLabel;
+									this.barClamptValue = this.dictOptions[res.tapIndex]
+										.dictLabel;
 								} else if (type == 'isFixationId') {
 									this.isFixationId = this.dictOptions[res.tapIndex].dictValue;
-									this.isFixationValue = this.dictOptions[res.tapIndex].dictLabel;
+									this.isFixationValue = this.dictOptions[res.tapIndex]
+										.dictLabel;
 								} else if (type == 'isPipeChangeId') {
-									this.isPipeChangeId = this.dictOptions[res.tapIndex].dictValue;
-									this.isPipeChangeValue = this.dictOptions[res.tapIndex].dictLabel;
+									this.isPipeChangeId = this.dictOptions[res.tapIndex]
+										.dictValue;
+									this.isPipeChangeValue = this.dictOptions[res.tapIndex]
+										.dictLabel;
 								} else if (type == 'isUseWindproofId') {
-									this.isUseWindproofId = this.dictOptions[res.tapIndex].dictValue;
-									this.isUseWindproofValue = this.dictOptions[res.tapIndex].dictLabel;
+									this.isUseWindproofId = this.dictOptions[res.tapIndex]
+										.dictValue;
+									this.isUseWindproofValue = this.dictOptions[res.tapIndex]
+										.dictLabel;
 								}
 							},
 							fail: (err) => {
@@ -902,7 +945,8 @@
 					}
 
 					typeArr.forEach((item, index) => {
-						if (item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg' ||
+						if (item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) ==
+							'jpg' ||
 							item.substring(item.length - 4) == 'jpeg') {
 							newArr.push(item)
 						}
@@ -1099,7 +1143,17 @@
 				},
 				pickerShow(e) {
 					this.type = e; //赋值类型
-					if (e == 'fglx') {
+					if (e == 'Model') {
+						this.openDict = true;
+						getDicts("gas_meter_type").then(response => {
+							this.dictOptions = response.data;
+						});
+					} else if (e == 'brank') {
+						this.openDict = true;
+						getDicts("gas_meter_brand").then(response => {
+							this.dictOptions = response.data;
+						});
+					} else if (e == 'fglx') {
 
 						this.openDict = true;
 						getDicts("gas_change_type").then(response => {
@@ -1125,17 +1179,17 @@
 					} else if (e == 'xq') { //小区
 						// if (this.isEmpty(this.XZQValue.dictValue)) {
 						// 	this.$modal.msg('请选择行政区')
-            //
+						//
 						// } else {
-            //根据行政区id获取小区数据
-            this.XQValue = ''; //重置小区数据
-            this.LDValue = ''; //重置楼栋数据
-            this.DYValue = ''; //重置单元数据
-            getAreaList('').then(res => {
-              this.XQList = res.data;
-              this.open = true;
-              this.selectList = this.XQList;
-            })
+						//根据行政区id获取小区数据
+						this.XQValue = ''; //重置小区数据
+						this.LDValue = ''; //重置楼栋数据
+						this.DYValue = ''; //重置单元数据
+						getAreaList('').then(res => {
+							this.XQList = res.data;
+							this.open = true;
+							this.selectList = this.XQList;
+						})
 
 						// }
 					} else if (e == 'ld') { //楼栋
@@ -1184,6 +1238,10 @@
 						getAreaList(item.dictValue).then(res => {
 							this.XQList = res.data;
 						})
+					} else if (this.type == 'brank') {
+						this.brankValue = item;
+					} else if (this.type == 'Model') {
+						this.tableModel = item
 					}
 
 				},
@@ -1191,7 +1249,10 @@
 					this.open = false;
 
 					if (this.type == 'xq') {
-            this.XZQValue = {dictValue:item.district,dictLabel:item.districtName};
+						this.XZQValue = {
+							dictValue: item.district,
+							dictLabel: item.districtName
+						};
 						this.XQValue = item;
 						//根据小区id 获取楼栋数据
 						this.LDValue = '';
@@ -1303,4 +1364,19 @@
 			min-height: 100upx;
 			line-height: 20px;
 		}
-	</style>
+
+	
+
+		checkbox .wx-checkbox-input {
+			// border-radius: 50%;
+			border-color: #AAAAAA !important;
+			width: 30rpx;
+			height: 30rpx;
+		}
+
+		checkbox .wx-checkbox-input.wx-checkbox-input-checked {
+			background: #2D6EFC;
+			border-color: #2D6EFC !important;
+			color: #fff;
+		}
+	</style>

pages/surge_tank/surge_tank.vue

@@ -97,22 +97,22 @@
 					</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('Box')"
+								style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="choose()"
 								v-show="reviewStatus!='1'"></image>
-							<view v-for="(item,index) in imgBoxArr" :key="index" style="position: relative;">
+							<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,'Box')">
+										@click="showPhoto(index)">
 									</image>
 								</view>
 								<view v-else>
 									<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
 								</view>
-								<view @click="remove(index,'Box')"
+								<view @click="remove(index)"
 									style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
 									<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
 									</image>
@@ -120,110 +120,10 @@
 							</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('Sfht')"
-								v-show="reviewStatus!='1'"></image>
-							<view v-for="(item,index) in imgSfhtArr" :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,'Sfht')">
-									</image>
-								</view>
-								<view v-else>
-									<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
-								</view>
-								<view @click="remove(index,'Sfht')"
-									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('Fljd')"
-									v-show="reviewStatus!='1'"></image>
-								<view v-for="(item,index) in imgFljdArr" :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,'Fljd')">
-										</image>
-									</view>
-									<view v-else>
-										<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
-									</view>
-									<view @click="remove(index,'Fljd')"
-										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('Dtlj')"
-										v-show="reviewStatus!='1'"></image>
-									<view v-for="(item,index) in imgDtljArr" :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,'Dtlj')">
-											</image>
-										</view>
-										<view v-else>
-											<video :src="item"
-												style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
-										</view>
-										<view @click="remove(index,'Dtlj')"
-											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 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('Hldmyh')"
-										v-show="reviewStatus!='1'"></image>
-									<view v-for="(item,index) in imgHldmyhArr" :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,'Hldmyh')">
-											</image>
-										</view>
-										<view v-else>
-											<video :src="item"
-												style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
-										</view>
-										<view @click="remove(index,'Hldmyh')"
-											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>
+			</view>
+			</view>
 			<view class="action-btn" v-show="reviewStatus!='1'">
 				<button @click="submit" class="btn cu-btn block bg-blue lg round">确认上传</button>
 			</view>
@@ -238,7 +138,7 @@
 
 	<script>
 		import SelectPicker from '../../components/selectPicker/select_picker.vue'
-		import bottomSheet from '../../components/bottomSheet/bottomSheetMore.vue'
+		import bottomSheet from '../../components/bottomSheet/bottomSheetMoreNew.vue'
 
 		import {
 			getDicts
@@ -277,11 +177,7 @@
 					selectList: [],
 					dictOptions: [],
 
-					imgSfhtArr: [],
-					imgFljdArr: [],
-					imgBoxArr: [],
-					imgDtljArr: [],
-					imgHldmyhArr: [],
+					imgArr: [],
 
 					videoArr: [],
 					XQValue: {},
@@ -392,22 +288,10 @@
 				handleHiddenShare() {
 					this.shareState = false;
 				},
-				showPhoto(index, type) {
-					let typeArr = [];
-					let newArr = [];
-					if (type == 'Box') {
-						typeArr = this.imgBoxArr;
-					} else if (type == 'Sfht') {
-						typeArr = this.imgSfhtArr;
-					} else if (type == 'Fljd') {
-						typeArr = this.imgFljdArr;
-					} else if (type == 'Dtlj') {
-						typeArr = this.imgDtljArr;
-					} else if (type == 'Hldmyh') {
-						typeArr = this.imgHldmyhArr;
-					}
+				showPhoto(index) {
 
-					typeArr.forEach((item, index) => {
+					let newArr = [];
+					this.imgArr.forEach((item, index) => {
 						if (item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg' ||
 							item.substring(item.length - 4) == 'jpeg') {
 							newArr.push(item)
@@ -419,32 +303,20 @@
 					})
 
 				},
-				remove(index, e) {
+				remove(index) {
 
 					uni.showModal({
 						title: '提示',
 						content: '是否删除该图片或视频',
 						success: (res) => {
 							if (res.confirm) {
-
-								if (e == 'Box') {
-									this.imgBoxArr.splice(index, 1)
-								} else if (e == 'Sfht') {
-									this.imgSfhtArr.splice(index, 1)
-								} else if (e == 'Fljd') {
-									this.imgFljdArr.splice(index, 1)
-								} else if (e == 'Dtlj') {
-									this.imgDtljArr.splice(index, 1)
-								} else if (e == 'Hldmyh') {
-									this.imgHldmyhArr.splice(index, 1)
-								}
-
+								this.imgArr.splice(index, 1)
 
 							}
 						}
 					})
 				},
-				choose(e) {
+				choose() {
 
 
 					uni.showActionSheet({
@@ -452,14 +324,14 @@
 						itemList: ['图片', '视频'],
 						success: (res) => {
 							if (res.tapIndex == 0) {
-								this.chooseimage(e)
+								this.chooseimage()
 							} else {
-								this.choosevideo(e)
+								this.choosevideo()
 							}
 						}
 					})
 				},
-				chooseimage(e) {
+				chooseimage() {
 
 					let _this = this;
 					uni.chooseImage({
@@ -480,18 +352,7 @@
 											_this.$modal.msg(data.msg)
 										} else {
 											if (_this.progress === 100) {
-												if (e == 'Box') {
-													_this.imgBoxArr.push(data.data.url)
-												} else if (e == 'Sfht') {
-													_this.imgSfhtArr.push(data.data.url)
-												} else if (e == 'Fljd') {
-													_this.imgFljdArr.push(data.data.url)
-												} else if (e == 'Dtlj') {
-													_this.imgDtljArr.push(data.data.url)
-												} else if (e == 'Hldmyh') {
-													_this.imgHldmyhArr.push(data.data.url)
-												}
-
+												_this.imgArr.push(data.data.url)
 												_this.$modal.msg('上传成功！')
 											}
 										}
@@ -524,7 +385,7 @@
 					})
 				},
 
-				choosevideo(e) {
+				choosevideo() {
 					let _this = this;
 					uni.chooseVideo({
 						sourceType: ['album', 'camera'],
@@ -544,17 +405,7 @@
 									} else {
 										//上传成功
 										if (_this.progress === 100) {
-											if (e == 'Box') {
-												_this.imgBoxArr.push(data.data.url)
-											} else if (e == 'Sfht') {
-												_this.imgSfhtArr.push(data.data.url)
-											} else if (e == 'Fljd') {
-												_this.imgFljdArr.push(data.data.url)
-											} else if (e == 'Dtlj') {
-												_this.imgDtljArr.push(data.data.url)
-											} else if (e == 'Hldmyh') {
-												_this.imgHldmyhArr.push(data.data.url)
-											}
+											_this.imgArr.push(data.data.url)
 											_this.$modal.msg('上传成功！')
 										}
 									}
@@ -783,24 +634,8 @@
 
 
 
-					if (this.imgBoxArr.length <= 0) {
-						this.$modal.msg('请上传调压箱名牌照片')
-						return
-					}
-					if (this.imgSfhtArr.length <= 0) {
-						this.$modal.msg('请上传调压箱内石粉回填照片')
-						return
-					}
-					if (this.imgFljdArr.length <= 0) {
-						this.$modal.msg('请上传调压箱防雷接地照片')
-						return
-					}
-					if (this.imgDtljArr.length <= 0) {
-						this.$modal.msg('请上传调压箱底腿连接照片')
-						return
-					}
-					if (this.imgHldmyhArr.length <= 0) {
-						this.$modal.msg('请上传调压箱护栏及地面硬化（远景）照片')
+					if (this.imgArr.length <= 0) {
+						this.$modal.msg('请上传照片')
 						return
 					}
 
@@ -841,11 +676,7 @@
 
 								constructTime: this.time, //施工时间
 								remark: this.projectContent, //施工内容
-								boxBrand: this.imgBoxArr,
-								stonePowder: this.imgSfhtArr,
-								lightning: this.imgFljdArr,
-								bottomLeg: this.imgDtljArr,
-								groundHardening: this.imgHldmyhArr,
+								zEngiineeringPhotoBoList: this.imgArr,
 
 							}
 

pages/work/index.vue

@@ -37,9 +37,9 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 					<view class="line2 btn-grp">
 						<view class="btn-grp-item" v-for="(item, index) in OldProjectList" :key="index"
 							@click="OldProject(item)">
-							<image :src="loadImgSrc('sn.png')" class="line2-btn-big" v-if="item.dictLabel == '室内工程'">
+							<image :src="loadImgSrc('sn.png')" class="line2-btn-big" v-if="item.dictLabel == '室内'">
 							</image>
-							<image :src="loadImgSrc('ty.png')" class="line2-btn-big" v-if="item.dictLabel == '庭院工程'">
+							<image :src="loadImgSrc('ty.png')" class="line2-btn-big" v-if="item.dictLabel == '庭院'">
 							</image>
 							<image :src="loadImgSrc('jk.png')" class="line2-btn-big" v-if="item.dictLabel == '架空'">
 							</image>
@@ -66,9 +66,9 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 					<view class="line2 btn-grp">
 						<view class="btn-grp-item" v-for="(item, index) in NewProjectList" :key="index"
 							@click="NewProject(item)">
-							<image :src="loadImgSrc('sn2.png')" class="line2-btn-big" v-if="item.dictLabel == '室内工程'">
+							<image :src="loadImgSrc('sn2.png')" class="line2-btn-big" v-if="item.dictLabel == '室内'">
 							</image>
-							<image :src="loadImgSrc('ty2.png')" class="line2-btn-big" v-if="item.dictLabel == '庭院工程'">
+							<image :src="loadImgSrc('ty2.png')" class="line2-btn-big" v-if="item.dictLabel == '庭院'">
 							</image>
 							<image :src="loadImgSrc('jk2.png')" class="line2-btn-big" v-if="item.dictLabel == '架空'">
 							</image>
@@ -302,18 +302,10 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 
 				} else if (e.dictValue == 'pressure_regulating') {
 					//调压柜
-					const obj = {
-						enginClassValue: this.enginClassValue, //(拆旧管等 字典值)
-						enginType: this.enginType, //旧改 还是新建  写死
-						enginClassification: this.enginClassification //室内  庭院  架空
-
-					};
-					console.log("===", obj)
-					uni.navigateTo({
-						url: '/pages/surge_tank/surge_tank?params=' + encodeURIComponent(JSON
-							.stringify(
-								obj))
-					})
+					getDicts("gy_tyg").then(response => {
+						this.typeList = response.data;
+					});
+					this.handleShowSheet();
 				}
 
 			},
@@ -373,17 +365,11 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 					})
 				} else if (e.dictValue == 'pressure_regulating') {
 					//调压柜
-					const obj = {
-						enginClassValue: this.enginClassValue, //(拆旧管等 字典值)
-						enginType: this.enginType, //旧改 还是新建  写死
-						enginClassification: this.enginClassification //室内  庭院  架空
+					getDicts("gy_tyg").then(response => {
+						this.typeList = response.data;
+					});
+					this.handleShowSheet();
 
-					};
-					uni.navigateTo({
-						url: '/pages/surge_tank/surge_tank?params=' + encodeURIComponent(JSON
-							.stringify(
-								obj))
-					})
 				}
 
 			},
@@ -438,6 +424,13 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 										obj))
 							})
 						}
+					} else {
+						//调压柜
+						uni.navigateTo({
+							url: '/pages/surge_tank/surge_tank?params=' + encodeURIComponent(JSON
+								.stringify(
+									obj))
+						})
 					}
 				} else if (this.projectType == 'ShiZheng') {
 					let obj = {

uni_modules/uni-combox/changelog.md

@@ -1,15 +0,0 @@
-## 1.0.1（2021-11-23）
-- 优化 label、label-width 属性
-## 1.0.0（2021-11-19）
-- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
-- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-combox](https://uniapp.dcloud.io/component/uniui/uni-combox)
-## 0.1.0（2021-07-30）
-- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
-## 0.0.6（2021-05-12）
-- 新增 组件示例地址
-## 0.0.5（2021-04-21）
-- 优化 添加依赖 uni-icons, 导入后自动下载依赖
-## 0.0.4（2021-02-05）
-- 优化 组件引用关系，通过uni_modules引用组件
-## 0.0.3（2021-02-04）
-- 调整为uni_modules目录规范

uni_modules/uni-combox/components/uni-combox/uni-combox.vue

@@ -1,294 +0,0 @@
-<template>
-	<view class="uni-combox" :class="border ? '' : 'uni-combox__no-border'">
-		<view v-if="label" class="uni-combox__label" :style="labelStyle">
-			<text>{{label}}</text>
-		</view>
-		<view class="uni-combox__input-box">
-			<input class="uni-combox__input" type="text" :placeholder="placeholder"
-				placeholder-class="uni-combox__input-plac" v-model="inputVal" @input="onInput" @focus="onFocus" @blur="onBlur" />
-			<uni-icons :type="showSelector? 'top' : 'bottom'" size="14" color="#999" @click="toggleSelector">
-			</uni-icons>
-		</view>
-		<view class="uni-combox__selector" v-if="showSelector">
-			<view class="uni-popper__arrow"></view>
-			<scroll-view scroll-y="true" class="uni-combox__selector-scroll" @scroll="onScroll">
-				<view class="uni-combox__selector-empty" v-if="filterCandidatesLength === 0">
-					<text>{{emptyTips}}</text>
-				</view>
-				<view class="uni-combox__selector-item" v-for="(item,index) in filterCandidates" :key="index" @click="onSelectorClick(index)">
-					<text>{{item}}</text>
-				</view>
-			</scroll-view>
-		</view>
-		<!-- 新增蒙层，点击蒙层时关闭选项显示 -->
-		<view class="uni-combox__mask" v-show="showSelector" @click="showSelector = false"></view>
-	</view>
-</template>
-
-<script>
-	/**
-	 * Combox 组合输入框
-	 * @description 组合输入框一般用于既可以输入也可以选择的场景
-	 * @tutorial https://ext.dcloud.net.cn/plugin?id=1261
-	 * @property {String} label 左侧文字
-	 * @property {String} labelWidth 左侧内容宽度
-	 * @property {String} placeholder 输入框占位符
-	 * @property {Array} candidates 候选项列表
-	 * @property {String} emptyTips 筛选结果为空时显示的文字
-	 * @property {String} value 组合框的值
-	 */
-	export default {
-		name: 'uniCombox',
-		emits: ['input', 'update:modelValue'],
-		props: {
-			border: {
-				type: Boolean,
-				default: true
-			},
-			label: {
-				type: String,
-				default: ''
-			},
-			labelWidth: {
-				type: String,
-				default: 'auto'
-			},
-			placeholder: {
-				type: String,
-				default: ''
-			},
-			candidates: {
-				type: Array,
-				default () {
-					return []
-				}
-			},
-			emptyTips: {
-				type: String,
-				default: '无匹配项'
-			},
-			// #ifndef VUE3
-			value: {
-				type: [String, Number],
-				default: ''
-			},
-			// #endif
-			// #ifdef VUE3
-			modelValue: {
-				type: [String, Number],
-				default: ''
-			},
-			// #endif
-		},
-		data() {
-			return {
-				showSelector: false,
-				inputVal: '',
-				blurTimer:null,
-			}
-		},
-		computed: {
-			labelStyle() {
-				if (this.labelWidth === 'auto') {
-					return ""
-				}
-				return `width: ${this.labelWidth}`
-			},
-			filterCandidates() {
-				if (this.inputVal !== 0 && !this.inputVal) {
-					return this.candidates
-				}
-				return this.candidates.filter((item) => {
-					return item.toString().indexOf(this.inputVal) > -1
-				})
-			},
-			filterCandidatesLength() {
-				return this.filterCandidates.length
-			}
-		},
-		watch: {
-			// #ifndef VUE3
-			value: {
-				handler(newVal) {
-					this.inputVal = newVal
-				},
-				immediate: true
-			},
-			// #endif
-			// #ifdef VUE3
-			modelValue: {
-				handler(newVal) {
-					this.inputVal = newVal
-				},
-				immediate: true
-			},
-			// #endif
-		},
-		methods: {
-			toggleSelector() {
-				this.showSelector = !this.showSelector
-			},
-			onFocus() {
-				this.showSelector = true
-			},
-			onBlur() {
-				this.blurTimer = setTimeout(() => {
-					this.showSelector = false
-				}, 153)
-			},
-			onScroll(){ // 滚动时将blur的定时器关掉
-				if(this.blurTimer) {
-					clearTimeout(this.blurTimer)
-					this.blurTimer = null
-				}
-			},
-			onSelectorClick(index) {
-				this.inputVal = this.filterCandidates[index]
-				this.showSelector = false
-				this.$emit('input', this.inputVal)
-				this.$emit('update:modelValue', this.inputVal)
-			},
-			onInput() {
-				setTimeout(() => {
-					this.$emit('input', this.inputVal)
-					this.$emit('update:modelValue', this.inputVal)
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.uni-combox {
-		font-size: 14px;
-		border: 1px solid #DCDFE6;
-		border-radius: 4px;
-		padding: 6px 10px;
-		position: relative;
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		// height: 40px;
-		flex-direction: row;
-		align-items: center;
-		// border-bottom: solid 1px #DDDDDD;
-	}
-
-	.uni-combox__label {
-		font-size: 16px;
-		line-height: 22px;
-		padding-right: 10px;
-		color: #999999;
-	}
-
-	.uni-combox__input-box {
-		position: relative;
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex: 1;
-		flex-direction: row;
-		align-items: center;
-	}
-
-	.uni-combox__input {
-		flex: 1;
-		font-size: 14px;
-		height: 22px;
-		line-height: 22px;
-	}
-
-	.uni-combox__input-plac {
-		font-size: 14px;
-		color: #999;
-	}
-
-	.uni-combox__selector {
-		/* #ifndef APP-NVUE */
-		box-sizing: border-box;
-		/* #endif */
-		position: absolute;
-		top: calc(100% + 12px);
-		left: 0;
-		width: 100%;
-		background-color: #FFFFFF;
-		border: 1px solid #EBEEF5;
-		border-radius: 6px;
-		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
-		z-index: 3;
-		padding: 4px 0;
-	}
-
-	.uni-combox__selector-scroll {
-		/* #ifndef APP-NVUE */
-		max-height: 200px;
-		box-sizing: border-box;
-		/* #endif */
-	}
-
-	.uni-combox__selector-empty,
-	.uni-combox__selector-item {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		cursor: pointer;
-		/* #endif */
-		line-height: 36px;
-		font-size: 14px;
-		text-align: center;
-		// border-bottom: solid 1px #DDDDDD;
-		padding: 0px 10px;
-	}
-
-	.uni-combox__selector-item:hover {
-		background-color: #f9f9f9;
-	}
-
-	.uni-combox__selector-empty:last-child,
-	.uni-combox__selector-item:last-child {
-		/* #ifndef APP-NVUE */
-		border-bottom: none;
-		/* #endif */
-	}
-
-	// picker 弹出层通用的指示小三角
-	.uni-popper__arrow,
-	.uni-popper__arrow::after {
-		position: absolute;
-		display: block;
-		width: 0;
-		height: 0;
-		border-color: transparent;
-		border-style: solid;
-		border-width: 6px;
-	}
-
-	.uni-popper__arrow {
-		filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03));
-		top: -6px;
-		left: 10%;
-		margin-right: 3px;
-		border-top-width: 0;
-		border-bottom-color: #EBEEF5;
-	}
-
-	.uni-popper__arrow::after {
-		content: " ";
-		top: 1px;
-		margin-left: -6px;
-		border-top-width: 0;
-		border-bottom-color: #fff;
-	}
-
-	.uni-combox__no-border {
-		border: none;
-	}
-
-	.uni-combox__mask {
-		width:100%;
-		height:100%;
-		position: fixed;
-		top: 0;
-		left: 0;
-    z-index: 1;
-	}
-</style>

uni_modules/uni-combox/package.json

@@ -1,90 +0,0 @@
-{
-  "id": "uni-combox",
-  "displayName": "uni-combox 组合框",
-  "version": "1.0.1",
-  "description": "可以选择也可以输入的表单项 ",
-  "keywords": [
-    "uni-ui",
-    "uniui",
-    "combox",
-    "组合框",
-    "select"
-],
-  "repository": "https://github.com/dcloudio/uni-ui",
-  "engines": {
-    "HBuilderX": ""
-  },
-  "directories": {
-    "example": "../../temps/example_temps"
-  },
-  "dcloudext": {
-    "category": [
-      "前端组件",
-      "通用组件"
-    ],
-    "sale": {
-      "regular": {
-        "price": "0.00"
-      },
-      "sourcecode": {
-        "price": "0.00"
-      }
-    },
-    "contact": {
-      "qq": ""
-    },
-    "declaration": {
-      "ads": "无",
-      "data": "无",
-      "permissions": "无"
-    },
-    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
-  },
-  "uni_modules": {
-    "dependencies": [
-			"uni-scss",
-			"uni-icons"
-		],
-    "encrypt": [],
-    "platforms": {
-      "cloud": {
-        "tcb": "y",
-        "aliyun": "y"
-      },
-      "client": {
-        "App": {
-          "app-vue": "y",
-          "app-nvue": "n"
-        },
-        "H5-mobile": {
-          "Safari": "y",
-          "Android Browser": "y",
-          "微信浏览器(Android)": "y",
-          "QQ浏览器(Android)": "y"
-        },
-        "H5-pc": {
-          "Chrome": "y",
-          "IE": "y",
-          "Edge": "y",
-          "Firefox": "y",
-          "Safari": "y"
-        },
-        "小程序": {
-          "微信": "y",
-          "阿里": "y",
-          "百度": "y",
-          "字节跳动": "y",
-          "QQ": "y"
-        },
-        "快应用": {
-          "华为": "u",
-          "联盟": "u"
-        },
-        "Vue": {
-            "vue2": "y",
-            "vue3": "y"
-        }
-      }
-    }
-  }
-}

uni_modules/uni-combox/readme.md

@@ -1,11 +0,0 @@
-
-
-## Combox 组合框
-> **组件名：uni-combox**
-> 代码块： `uCombox`
-
-
-组合框组件。
-
-### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-combox)
-#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839