数量改米数

components/bottomSheet/bottomSheet.vue

@@ -63,11 +63,11 @@
 							</view>
 
 							<view
-								v-if="title=='开挖前'||title=='开挖后'||title=='焊口照片'||title=='隐蔽工程'||title=='除锈刷油'||title=='打磨'">
+								v-if="title=='开挖前'||title=='开挖后'||title=='焊口照片'||title=='隐蔽工程'||title=='除锈刷油'||title=='打磨'||title=='管道施工记录'">
 								<view class="uni-media-list-text-top">
 									<view class="tit-text">施工时间:</view>{{value.constructTime}}
 								</view>
-								<view class="uni-media-list-text-top">
+								<view class="uni-media-list-text-top" v-if="title!='管道施工记录'">
 									<view class="uni-common-mt" style="width: 100%;">
 										<text class="uni-title uni-common-pl" style=" font-size: 13px;color:
 											#000;margin-top: 5px;">施工内容:</text>
@@ -257,7 +257,7 @@
 									</view>
 								</view>
 							</view>
-							<view v-if="title=='管道施工记录'">
+							<!-- 	<view v-if="title=='管道施工记录'">
 								<view class="uni-media-list-text-top">
 
 									<view class="tit-text">负责人:</view>
@@ -294,7 +294,7 @@
 
 									</view>
 								</view>
-							</view>
+							</view> -->
 							<view v-else>
 								<view class="uni-media-list-text-top">
 

pages/enginproject/enginproject.vue

@@ -192,17 +192,28 @@
 									<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;">
 
 								<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> -->
+							<view class="container" style="border-bottom: 1px solid #f8f8f8;">
+								<text>米 数</text>
+								<!-- style="margin-left: 10px;text-align: right;" -->
+								<input class="uni-input" type="number" v-model="a.sl.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="a.sl.inputDecimalNumberValue" maxlength="1"
+									style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
 							</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: {
+							inputIntegerNumberValue: '',
+							inputDecimalNumberValue: ''
+						}})" class="tj-btn">添加</button>
 
 					</view>
 
@@ -297,7 +308,10 @@
 							id: '',
 							name: ''
 						},
-						sl: ''
+						sl: {
+							inputIntegerNumberValue: '',
+							inputDecimalNumberValue: ''
+						}
 					}, ],
 					conLists: [],
 					headers: {
@@ -754,8 +768,7 @@
 											title: '下载成功'
 										})
 									},
-									fail: error => {
-									}
+									fail: error => {}
 								})
 							}
 						}
@@ -813,11 +826,15 @@
 								throw new Error('End Loop')
 
 							}
-							if (this.isEmpty(list.sl)) {
-								this.$modal.msg('数量不能为空')
+							// if (this.isEmpty(list.sl)) {
+							// 	this.$modal.msg('数量不能为空')
 
-								throw new Error('End Loop')
+							// 	throw new Error('End Loop')
 
+							// }
+							if (this.isEmpty(list.sl.inputIntegerNumberValue)) {
+								this.$modal.msg("请输入米数")
+								throw new Error('End Loop')
 							}
 
 
@@ -837,12 +854,13 @@
 					}
 					this.zEngineeringMaterialBo = [];
 					this.czggslList.forEach((list) => {
-							this.zEngineeringMaterialBo.push({
-								materialQuality: list.cz.id,
-								specifications: list.gg.id,
-								number: list.sl
-							})
+						this.zEngineeringMaterialBo.push({
+							materialQuality: list.cz.id,
+							specifications: list.gg.id,
+							number: list.sl.inputIntegerNumberValue + (list.sl.inputDecimalNumberValue == '' ?
+								'' : "." + list.sl.inputDecimalNumberValue)
 						})
+					})
 
 
 					let param = {

pages/municipal/municipal.vue

@@ -191,16 +191,27 @@
 									<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
 								</view>
 							</view>
-							<view class="container">
+							<!-- <view class="container">
 
 								<text>数量</text>
 								<input class="uni-input" type="number" v-model="a.sl" placeholder="请填写数量" maxlength="11"
 									style="margin-left: 10px;text-align: right;"></input>
+							</view> -->
+							<view class="container" style="border-bottom: 1px solid #f8f8f8;">
+								<text>米 数</text>
+								<!-- style="margin-left: 10px;text-align: right;" -->
+								<input class="uni-input" type="number" v-model="a.sl.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="a.sl.inputDecimalNumberValue" maxlength="1"
+									style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
 							</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: {
+							inputIntegerNumberValue: '',
+							inputDecimalNumberValue: ''
+						}})" class="tj-btn">添加</button>
 
 					</view>
 
@@ -297,7 +308,10 @@
 							id: '',
 							name: ''
 						},
-						sl: ''
+						sl: {
+							inputIntegerNumberValue: '',
+							inputDecimalNumberValue: ''
+						}
 					}, ],
 					conLists: [],
 					headers: {
@@ -753,8 +767,7 @@
 											title: '下载成功'
 										})
 									},
-									fail: error => {
-									}
+									fail: error => {}
 								})
 							}
 						}
@@ -812,13 +825,17 @@
 								throw new Error('End Loop')
 
 							}
-							if (this.isEmpty(list.sl)) {
-								this.$modal.msg('数量不能为空')
+							// if (this.isEmpty(list.sl)) {
+							// 	this.$modal.msg('数量不能为空')
 
-								throw new Error('End Loop')
+							// 	throw new Error('End Loop')
 
-							}
+							// }
 
+							if (this.isEmpty(list.sl.inputIntegerNumberValue)) {
+								this.$modal.msg("请输入米数")
+								throw new Error('End Loop')
+							}
 
 
 						})
@@ -836,12 +853,13 @@
 					}
 					this.zEngineeringMaterialBo = [];
 					this.czggslList.forEach((list) => {
-							this.zEngineeringMaterialBo.push({
-								materialQuality: list.cz.id,
-								specifications: list.gg.id,
-								number: list.sl
-							})
+						this.zEngineeringMaterialBo.push({
+							materialQuality: list.cz.id,
+							specifications: list.gg.id,
+							number: list.sl.inputIntegerNumberValue + (list.sl.inputDecimalNumberValue == '' ?
+								'' : "." + list.sl.inputDecimalNumberValue)
 						})
+					})
 
 
 					let param = {

pages/oldrenovation/courtyard/courtyard.vue

@@ -117,17 +117,28 @@
 									<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;">
 
 								<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> -->
+							<view class="container" style="border-bottom: 1px solid #f8f8f8;">
+								<text>米 数</text>
+								<!-- style="margin-left: 10px;text-align: right;" -->
+								<input class="uni-input" type="number" v-model="a.sl.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="a.sl.inputDecimalNumberValue" maxlength="1"
+									style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
 							</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: {
+							inputIntegerNumberValue: '',
+							inputDecimalNumberValue: ''
+						}})" class="tj-btn">添加</button>
 
 					</view>
 
@@ -256,7 +267,10 @@
 							id: '',
 							name: ''
 						},
-						sl: ''
+						sl: {
+							inputIntegerNumberValue: '',
+							inputDecimalNumberValue: ''
+						}
 					}, ],
 					type: '',
 					reviewStatus: '', //是否可以点击
@@ -761,28 +775,35 @@
 								throw new Error('End Loop')
 
 							}
-							if (this.isEmpty(list.sl)) {
-								this.$modal.msg('数量不能为空')
+							// if (this.isEmpty(list.sl)) {
+							// 	this.$modal.msg('数量不能为空')
 
-								throw new Error('End Loop')
+							// 	throw new Error('End Loop')
 
+							// }
+							if (this.isEmpty(list.sl.inputIntegerNumberValue)) {
+								this.$modal.msg("请输入米数")
+								throw new Error('End Loop')
 							}
 
 
 
+
 						})
 					} catch (e) {
 						if (e.message === 'End Loop') throw e
 					}
 					this.zEngineeringMaterialBo = [];
 					this.czggslList.forEach((list) => {
-							this.zEngineeringMaterialBo.push({
-								materialQuality: list.cz.id,
-								specifications: list.gg.id,
-								number: list.sl
-							})
+						this.zEngineeringMaterialBo.push({
+							materialQuality: list.cz.id,
+							specifications: list.gg.id,
+							number: list.sl.inputIntegerNumberValue + (list.sl.inputDecimalNumberValue == '' ?
+								'' : "." + list.sl.inputDecimalNumberValue)
 						})
+					})
 
+					
 					if (this.imgGuanArr.length <= 0) {
 						this.$modal.msg('请上传管上皮深度测量照片')
 						return

pages/oldrenovation/overhead/newoverhead.vue

@@ -137,16 +137,29 @@
 									<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;">
 
 								<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> -->
+							
+							<view class="container" style="border-bottom: 1px solid #f8f8f8;">
+								<text>米 数</text>
+								<!-- style="margin-left: 10px;text-align: right;" -->
+								<input class="uni-input" type="number" v-model="a.sl.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="a.sl.inputDecimalNumberValue" maxlength="1"
+									style="text-align: center; border: 1px solid #00aaff; border-radius: 20rpx;"></input>
 							</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:''})"
+						<button @click="this.czggslList.push({cz:{id: '',name: ''},gg:{id: '',name: ''},sl: {
+							inputIntegerNumberValue: '',
+							inputDecimalNumberValue: ''
+						}})"
 							class="tj-btn">添加</button>
 
 					</view>
@@ -231,7 +244,10 @@
 							id: '',
 							name: ''
 						},
-						sl: ''
+						sl: {
+							inputIntegerNumberValue: '',
+							inputDecimalNumberValue: ''
+						}
 					}, ],
 					SelectIndex: '', //选择的索引值
 					reviewStatus: '', //是否可以点击
@@ -736,11 +752,15 @@
 								throw new Error('End Loop')
 
 							}
-							if (this.isEmpty(list.sl)) {
-								this.$modal.msg('数量不能为空')
+							// if (this.isEmpty(list.sl)) {
+							// 	this.$modal.msg('数量不能为空')
 
-								throw new Error('End Loop')
+							// 	throw new Error('End Loop')
 
+							// }
+							if (this.isEmpty(list.sl.inputIntegerNumberValue)) {
+								this.$modal.msg("请输入米数")
+								throw new Error('End Loop')
 							}
 
 
@@ -762,7 +782,8 @@
 							this.zEngineeringMaterialBo.push({
 								materialQuality: list.cz.id,
 								specifications: list.gg.id,
-								number: list.sl
+								number: list.sl.inputIntegerNumberValue + (list.sl.inputDecimalNumberValue == '' ?
+									'' : "." + list.sl.inputDecimalNumberValue)
 							})
 						}),