sync

main.js

@@ -19,7 +19,7 @@ Vue.prototype.loadImgSrc = function(img) {
 	return config.baseIconUrl+img;
 }
 
-const app = new Vue({
+const app = new Vue({  
 	...App
 })
 

pages.json

@@ -99,6 +99,20 @@
 				"navigationBarTitleText": "公告详情"
 
 			}
+		},
+		{
+			"path" : "pages/bottom_leg/bottom_leg",
+			"style" : 
+			{
+				"navigationBarTitleText" : "底腿"
+			}
+		},
+		{
+			"path" : "pages/piping_record/piping_record",
+			"style" : 
+			{
+				"navigationBarTitleText" : "管道施工记录"
+			}
 		}
 
 	],

pages/oldrenovation/indoor/indoor.vue

@@ -250,10 +250,13 @@
 							</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>
+							<text>米 数</text>
+							<!-- style="margin-left: 10px;text-align: right;" -->
+							<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>
@@ -285,7 +288,7 @@
 							</view>
 						</view>
 
-						
+
 					</view>
 				</view>
 				<!--表后管-->
@@ -329,10 +332,13 @@
 							</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>
+							<text>米 数</text>
+							<!-- style="margin-left: 10px;text-align: right;" -->
+							<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>
@@ -408,10 +414,13 @@
 							</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>
+							<text>米 数</text>
+							<!-- style="margin-left: 10px;text-align: right;" -->
+							<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>
@@ -497,7 +506,9 @@
 					imgArr: [],
 					XQValue: {},
 					XZQValue: {},
-					projectValue: {'dictValue':'1'},
+					projectValue: {
+						'dictValue': '0'
+					},
 					LevelValue: {},
 					LDValue: {},
 					DYValue: {},
@@ -517,6 +528,8 @@
 					loading: false,
 					isCheck: true, //是否按照施工图纸施工
 					inputNumberValue: '',
+					inputIntegerNumberValue: '',
+					inputDecimalNumberValue: '',
 					title: '',
 					historyList: {} //历史数据
 
@@ -1006,14 +1019,20 @@
 							this.onsubmit();
 						}
 					} else if (this.objValue.enginClassValue == '立杠') {
-						//立杠  判断  材质  规格  数量
+						//立杠  判断  材质  规格  米数
 						if (this.isEmpty(this.materialValue.id)) {
 							this.$modal.msg("请选择材质")
 						} else if (this.isEmpty(this.specificationValue.id)) {
 							this.$modal.msg("请选择规格")
-						} else if (this.isEmpty(this.inputNumberValue)) {
-							this.$modal.msg("请输入数量")
+						} else if (this.isEmpty(this.inputIntegerNumberValue)) {
+							this.$modal.msg("请输入米数")
 						} else {
+
+							if (this.isEmpty(this.inputDecimalNumberValue)) {
+								this.inputNumberValue = this.inputIntegerNumberValue;
+							} else {
+								this.inputNumberValue = this.inputIntegerNumberValue + "." + this.inputDecimalNumberValue;
+							}
 							this.onsubmit();
 						}
 					} else if (this.objValue.enginClassValue == '挂表') {
@@ -1025,13 +1044,13 @@
 						}
 
 					} else if (this.objValue.enginClassValue == '表后管') {
-						//表后管  判断  材质  规格  数量 （为必须有一张照片和一个视频）
+						//表后管  判断  材质  规格  米数 （为必须有一张照片和一个视频）
 						if (this.isEmpty(this.materialValue.id)) {
 							this.$modal.msg("请选择材质")
 						} else if (this.isEmpty(this.specificationValue.id)) {
 							this.$modal.msg("请选择规格")
-						} else if (this.isEmpty(this.inputNumberValue)) {
-							this.$modal.msg("请输入数量")
+						} else if (this.isEmpty(this.inputIntegerNumberValue)) {
+							this.$modal.msg("请输入米数")
 						} else if (this.imgArr.length <= 0) {
 							this.$modal.msg('请上传照片或视频')
 						} else if (this.loading == false) {
@@ -1045,6 +1064,11 @@
 
 							if (hasImage && hasVideo) {
 								//表后管  特殊  提交
+								if (this.isEmpty(this.inputDecimalNumberValue)) {
+									this.inputNumberValue = this.inputIntegerNumberValue;
+								} else {
+									this.inputNumberValue = this.inputIntegerNumberValue + "." + this.inputDecimalNumberValue;
+								}
 								let param = {
 									district: this.XZQValue.dictValue,
 									areaId: this.XQValue.id,
@@ -1064,7 +1088,7 @@
 											zEngineeringMaterialBo: [{
 												materialQuality: this.materialValue.id, //材质
 												specifications: this.specificationValue.id, //规格
-												number: this.inputNumberValue //数量
+												number: this.inputNumberValue //米数
 											}]
 										}
 									}
@@ -1087,7 +1111,7 @@
 							}
 						}
 					} else if (this.objValue.enginClassValue == '阀管') {
-						//阀管  判断  材质  规格  数量
+						//阀管  判断  材质  规格  米数
 						if (this.isEmpty(this.doorValue.dictValue)) {
 							this.$modal.msg("请选择上门类型")
 						} else if (this.isEmpty(this.SelfClosValve.dictValue)) {
@@ -1096,9 +1120,15 @@
 							this.$modal.msg("请选择材质")
 						} else if (this.isEmpty(this.specificationValue.id)) {
 							this.$modal.msg("请选择规格")
-						} else if (this.isEmpty(this.inputNumberValue)) {
-							this.$modal.msg("请输入数量")
+						} else if (this.isEmpty(this.inputIntegerNumberValue)) {
+							this.$modal.msg("请输入米数")
 						} else {
+
+							if (this.isEmpty(this.inputDecimalNumberValue)) {
+								this.inputNumberValue = this.inputIntegerNumberValue;
+							} else {
+								this.inputNumberValue = this.inputIntegerNumberValue + "." + this.inputDecimalNumberValue;
+							}
 							this.onsubmit();
 						}
 					}
@@ -1159,7 +1189,7 @@
 
 										zEngineeringMaterialBo: [{
 											brand: this.brandValue.dictValue, //品牌
-											// number: this.inputNumberValue //数量
+											// number: this.inputNumberValue //米数
 										}]
 									}
 								}
@@ -1186,7 +1216,7 @@
 										zEngineeringMaterialBo: [{
 											materialQuality: this.materialValue.id, //材质
 											specifications: this.specificationValue.id, //规格
-											number: this.inputNumberValue //数量
+											number: this.inputNumberValue //米数
 										}]
 									}
 								}
@@ -1213,7 +1243,7 @@
 
 										zEngineeringMaterialBo: [{
 											brand: this.brandValue.dictValue, //品牌
-											//number: this.inputNumberValue //数量
+											//number: this.inputNumberValue //米数
 										}]
 									}
 								}
@@ -1241,7 +1271,7 @@
 											selfClosingValveType: this.SelfClosValve.dictValue, //自闭阀类型
 											materialQuality: this.materialValue.id, //材质
 											specifications: this.specificationValue.id, //规格
-											number: this.inputNumberValue //数量
+											number: this.inputNumberValue //米数
 										}]
 									}
 								}

pages/work/index.vue

@@ -39,6 +39,10 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 							</image>
 							<image :src="loadImgSrc('jk.png')" class="line2-btn-big" v-if="item.dictLabel == '架空'">
 							</image>
+							<image :src="loadImgSrc('jk.png')" class="line2-btn-big" v-if="item.dictLabel == '底腿'">
+							</image>
+							<image :src="loadImgSrc('jk.png')" class="line2-btn-big" v-if="item.dictLabel == '管道施工记录'">
+							</image>
 							{{item.dictLabel}}
 						</view>
 					</view>
@@ -62,6 +66,10 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 							</image>
 							<image :src="loadImgSrc('jk2.png')" class="line2-btn-big" v-if="item.dictLabel == '架空'">
 							</image>
+							<image :src="loadImgSrc('jk2.png')" class="line2-btn-big" v-if="item.dictLabel == '底腿'">
+							</image>
+							<image :src="loadImgSrc('jk2.png')" class="line2-btn-big" v-if="item.dictLabel == '管道施工记录'">
+							</image>
 							{{item.dictLabel}}
 						</view>
 					</view>
@@ -222,6 +230,8 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 						this.typeList = response.data;
 					});
 
+
+					this.handleShowSheet();
 				} else if (e == 'courtyard') {
 					//新建庭院
 					getDicts("new_built_courtyard").then(response => {
@@ -237,9 +247,35 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 
 
 					});
-				}
 
-				this.handleShowSheet();
+					this.handleShowSheet();
+				} else if (e == 'bottom_leg') {
+					//新建底腿
+					const obj = {
+						enginType: this.enginType, //旧改 还是新建  写死
+						enginClassification: this.enginClassification //室内  庭院  架空
+
+					};
+					uni.navigateTo({
+						url: '/pages/bottom_leg/bottom_leg?params=' + encodeURIComponent(JSON
+							.stringify(
+								obj))
+					})
+
+				} else if (e == 'construction_records') {
+					//新建管道施工记录
+					const obj = {
+						enginType: this.enginType, //旧改 还是新建  写死
+						enginClassification: this.enginClassification //室内  庭院  架空
+
+					};
+					uni.navigateTo({
+						url: '/pages/piping_record/piping_record?params=' + encodeURIComponent(JSON
+							.stringify(
+								obj))
+					})
+
+				}
 
 			},
 			OldProject(e) {
@@ -254,6 +290,7 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 						this.typeList = response.data;
 					});
 
+					this.handleShowSheet();
 				} else if (e == 'courtyard') {
 					//旧改庭院
 					getDicts("old_renovation_courtyard").then(response => {
@@ -261,15 +298,41 @@ border-radius: 50%; margin-right: 20rpx;">旧</view>
 						this.typeList = response.data;
 
 					});
+					this.handleShowSheet();
 				} else if (e == 'overhead') {
 					//旧改架空
 					getDicts("old_renovation_overhead").then(response => {
 						console.log("架空", response.data)
 						this.typeList = response.data;
 					});
+					this.handleShowSheet();
+				} else if (e == 'bottom_leg') {
+					//旧改底腿
+					const obj = {
+						enginType: this.enginType, //旧改 还是新建  写死
+						enginClassification: this.enginClassification //室内  庭院  架空
+
+					};
+					uni.navigateTo({
+						url: '/pages/bottom_leg/bottom_leg?params=' + encodeURIComponent(JSON
+							.stringify(
+								obj))
+					})
+
+				} else if (e == 'construction_records') {
+					//旧改管道施工记录
+					const obj = {
+						enginType: this.enginType, //旧改 还是新建  写死
+						enginClassification: this.enginClassification //室内  庭院  架空
+
+					};
+					uni.navigateTo({
+						url: '/pages/piping_record/piping_record?params=' + encodeURIComponent(JSON
+							.stringify(
+								obj))
+					})
 				}
 
-				this.handleShowSheet();
 			},
 
 			//二次弹窗 选择类型