修改bug

components/bottomSheet/bottomSheet.vue

@@ -53,7 +53,7 @@
 										   v-show="title=='报警器切断阀'">
 										<view class="tit-text">厂家:</view>{{value.zEngineeringMaterialBo[0].brand}}</view>
 								<view class="uni-media-list-text-top"
-									   v-show="title=='立杠'||title=='表后管'||title=='挂表'||title=='阀管'">
+									   v-show="title=='立杠'||title=='表后管'||title=='阀管'">
 									<view class="tit-text">数量:</view>{{value.zEngineeringMaterialBo[0].number}}</view>
 								<view class="uni-media-list-text-top"
 									  >

components/mypopup/mypopup.vue

@@ -46,9 +46,7 @@
 			}
 		},
 		data() {
-			return {
-				show: this.show,
-			};
+			return {};
 		},
 		methods: {
 			close() {

config.js

@@ -2,10 +2,8 @@
 module.exports = {
 
   // baseUrl: 'http://192.168.4.11:8080',
-  // baseUrl: 'http://192.168.4.20:8080',
-    baseUrl: 'http://192.168.4.6:8080',
-	// baseUrl: 'http://192.168.4.20:8080',
-	// baseUrl: 'http://192.168.4.6:8080',
+    //baseUrl: 'http://192.168.4.6:8080',
+	 baseUrl: 'http://192.168.4.20:8080',
 
 	// baseUrl: 'http://192.168.4.14:8089',
 	// 应用信息

pages/enginproject/enginproject.vue

@@ -9,13 +9,11 @@
 						<view v-if="this.isEmpty(this.projectType.dictValue)" style="margin-top: 10;"
 							@click="pickerShow('gclx',0)">
 							<span style="color: darkgray;">请选择工程类型</span>
-							<image :src="loadImgSrc('icon_right.png')"
-								class="to-right-icon"></image>
+							<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('gclx',0)">
 							<span style="color: black;">{{projectType.dictLabel}}</span>
-							<image :src="loadImgSrc('icon_right.png')"
-								class="to-right-icon"></image>
+							<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
 						</view>
 					</view>
 				</view>
@@ -27,13 +25,11 @@
 						<view v-if="this.isEmpty(this.projectName.id)" style="margin-top: 10;"
 							@click="pickerShow('gcmc',0)">
 							<span style="color: darkgray;">请选择工程名称</span>
-							<image :src="loadImgSrc('icon_right.png')"
-								class="to-right-icon"></image>
+							<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('gcmc',0)">
 							<span style="color: black;">{{projectName.name}}</span>
-							<image :src="loadImgSrc('icon_right.png')"
-								class="to-right-icon"></image>
+							<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
 						</view>
 					</view>
 
@@ -152,7 +148,8 @@
 			<view class="background">
 				<view>
 					<view class="uni-list">
-						<view style="font-size: 16px;margin-left: 10px;margin-top: 10px;display: flex; justify-content: space-between;margin-bottom: 10px;">
+						<view
+							style="font-size: 16px;margin-left: 10px;margin-top: 10px;display: flex; justify-content: space-between;margin-bottom: 10px;">
 							{{objValue.value}}
 
 							<span
@@ -166,8 +163,7 @@
 							</view>
 							<view @click="openDatetimePicker()">
 								<span style="color: black;">{{time}}</span>
-								<image :src="loadImgSrc('icon_right.png')"
-									class="to-right-icon"></image>
+								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
 							</view>
 						</view>
 
@@ -181,8 +177,7 @@
 								</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>
+									<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
 								</view>
 
 							</view>
@@ -194,8 +189,7 @@
 
 								<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>
+									<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
 								</view>
 							</view>
 							<view class="container" style="border-bottom: 1px solid #f8f8f8;">
@@ -203,13 +197,12 @@
 								<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>
+								<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>
-						<button
-							@click="this.czggslList.push({cz:{id: '',name: ''},gg:{id: '',name: ''},sl:''})" class="tj-btn">添加</button>
+						<button @click="this.czggslList.push({cz:{id: '',name: ''},gg:{id: '',name: ''},sl:''})"
+							class="tj-btn">添加</button>
 
 					</view>
 
@@ -690,11 +683,12 @@
 							this.enginId = response.data.id; //工程id
 							this.fileArr = response.data.pics
 							this.createTime = response.data.createTime;
-							this.infonId = response.data.zEngineeringNodeBoList[0].zEngineeringInfoBoList[0].id
+							//this.infonId = response.data.zEngineeringNodeBoList[0].zEngineeringInfoBoList[0].id
 							this.fileArr.forEach((list, index) => {
 								if (list.picUrl.substring(list.picUrl.length - 3) == 'png' || list.picUrl
 									.substring(list.picUrl.length - 3) == 'jpg' || list.picUrl.substring(list
 										.picUrl.length - 4) == 'jpeg') {
+									console.log("ressss", list.picUrl)
 									this.fileImageArr.push(list.picUrl)
 								}
 
@@ -907,10 +901,10 @@
 						supervisionPhone: this.jlPhoneValue, // 监理联系电话
 						enginClassification: this.objValue.value, // 工程分类  上一页面传过来的
 						zEngineeringNodeBo: {
-							createTime: this.createTime,
+							//createTime: this.createTime,
 							type: '工业工程', // 写死
 							zEngineeringInfoBo: {
-								engInfoId: this.infonId,
+								//engInfoId: this.infonId,
 								constructTime: this.time, //施工时间
 								zEngiineeringPhotoBoList: this.imgArr, //照片集合
 								zEngineeringMaterialBo: this.zEngineeringMaterialBo // 用料对象
@@ -947,13 +941,13 @@
 			justify-content: space-between;
 			padding: 10px;
 			position: relative;
-	
+
 		}
-	
+
 		.uni-list {
 			border: 1xp solid #eee;
 		}
-	
+
 		.to-right-icon {
 			width: 15px;
 			height: 15px;
@@ -961,12 +955,12 @@
 			top: 50%;
 			transform: translateY(-50%);
 		}
-	
+
 		.text {
 			font-size: 16px;
 			color: #333;
 		}
-	
+
 		.background {
 			// border: 15px solid hsla(0, 0%, 100%, .5);
 			background: white;
@@ -975,11 +969,11 @@
 			border-radius: 20rpx;
 			margin: 20rpx;
 			/*从padding开始往外面裁剪背景*/
-	
-	
+
+
 		}
-	
-	
+
+
 		.btn {
 			width: 715rpx;
 			height: 69rpx;
@@ -993,7 +987,7 @@
 			margin-top: 40rpx;
 			margin-bottom: 100rpx;
 		}
-	
+
 		.number {
 			display: flex;
 			/* 水平居中显示子元素 */
@@ -1004,7 +998,7 @@
 			padding: 10px;
 			/* 设置padding以提高视觉效果 */
 		}
-	
+
 		.textarea {
 			margin-top: 10upx;
 			width: 100%;
@@ -1012,7 +1006,7 @@
 			min-height: 100upx;
 			line-height: 20px;
 		}
-	
+
 		.tj-btn {
 			height: 69rpx;
 			background: #3184f0;
@@ -1022,9 +1016,9 @@
 			color: #FFFFFF;
 			line-height: 69rpx;
 			margin: 40rpx 70rpx;
-	
+
 		}
-	
+
 		.sc-btn {
 			height: 69rpx;
 			background: #f0686b;
@@ -1034,9 +1028,9 @@
 			color: #FFFFFF;
 			line-height: 69rpx;
 			margin: 40rpx;
-	
+
 		}
-	
+
 		.num-style {
 			background: #e8f4f9;
 			margin: 20rpx;

pages/municipal/municipal.vue

@@ -682,7 +682,7 @@
 							this.enginId = response.data.id; //工程id
 							this.fileArr = response.data.pics
 							this.createTime = response.data.createTime;
-							this.infonId = response.data.zEngineeringNodeBoList[0].zEngineeringInfoBoList[0].id
+							//this.infonId = response.data.zEngineeringNodeBoList[0].zEngineeringInfoBoList[0].id
 							this.fileArr.forEach((list, index) => {
 								if (list.picUrl.substring(list.picUrl.length - 3) == 'png' || list.picUrl
 									.substring(list.picUrl.length - 3) == 'jpg' || list.picUrl.substring(list
@@ -902,7 +902,7 @@
 							createTime: this.createTime,
 							type: '市政工程', // 写死
 							zEngineeringInfoBo: {
-								engInfoId: this.infonId,
+								//engInfoId: this.infonId,
 								constructTime: this.time, //施工时间
 								zEngiineeringPhotoBoList: this.imgArr, //照片集合
 								zEngineeringMaterialBo: this.zEngineeringMaterialBo // 用料对象

pages/oldrenovation/indoor/indoor.vue

@@ -285,12 +285,7 @@
 							</view>
 						</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>
+						
 					</view>
 				</view>
 				<!--表后管-->
@@ -1022,11 +1017,9 @@
 							this.onsubmit();
 						}
 					} else if (this.objValue.enginClassValue == '挂表') {
-						//挂表  判断  品牌  数量
+						//挂表  判断  品牌  
 						if (this.isEmpty(this.brandValue.dictValue)) {
 							this.$modal.msg("请选择品牌")
-						} else if (this.isEmpty(this.inputNumberValue)) {
-							this.$modal.msg("请输入数量")
 						} else {
 							this.onsubmit();
 						}
@@ -1220,7 +1213,7 @@
 
 										zEngineeringMaterialBo: [{
 											brand: this.brandValue.dictValue, //品牌
-											number: this.inputNumberValue //数量
+											//number: this.inputNumberValue //数量
 										}]
 									}
 								}