2 Commitit df4cd7d1de ... 0ba0f3319f

Tekijä SHA1 Viesti Päivämäärä
  menchuang 0ba0f3319f Merge branch 'zdsz3.0' of http://192.168.10.18:3000/wangtong/zd_wechatApp into zdsz3.0 1 vuosi sitten
  menchuang ca7b8892f4 修改 顶管/基建 数量->米数 1 vuosi sitten
3 muutettua tiedostoa jossa 41 lisäystä ja 20 poistoa
  1. 3 3
      config.js
  2. 18 8
      pages/TopPipeWork/TopPipeWork.vue
  3. 20 9
      pages/infrastructure/infrastructure.vue

+ 3 - 3
config.js

@@ -1,10 +1,10 @@
 // 应用全局配置
 module.exports = {
 
-	 baseUrl: 'https://www.xcx.cczdsz.cn/prod-api',
+	// baseUrl: 'https://www.xcx.cczdsz.cn/prod-api',
 	// baseUrl: 'http://192.168.4.6:8080',
-	//baseUrl: 'http://192.168.4.20:8080',
-	// baseUrl: 'http://192.168.4.11:8080',
+	// baseUrl: 'http://192.168.4.20:8080',
+	baseUrl: 'http://192.168.4.11:8080',
 	// baseUrl: 'http://192.168.4.14:8089',
 	baseIconUrl: 'https://www.xcx.cczdsz.cn/app/images/',
 	// 应用信息

+ 18 - 8
pages/TopPipeWork/TopPipeWork.vue

@@ -174,13 +174,15 @@
 							</view>
 						</view>
 					</view>
-					<view class="uni-list">
-						<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 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="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>
@@ -282,6 +284,8 @@
 				specificationValue: {}, //规格
 				materialValue: {}, //材质
 				inputNumberValue: '',
+				inputIntegerNumberValue: '',
+				inputDecimalNumberValue: '',
 				gcddValue: '', //工程地点
 				gcbmValue: '', //工程编码
 				sgdwValue: '', //施工单位
@@ -689,8 +693,8 @@
 					this.$modal.msg("请选择规格")
 					return
 				}
-				if (this.isEmpty(this.inputNumberValue)) {
-					this.$modal.msg("请输入数")
+				if (this.isEmpty(this.inputIntegerNumberValue)) {
+					this.$modal.msg("请输入数")
 					return
 				}
 				if (this.imgArr.length <= 0) {
@@ -700,6 +704,12 @@
 				if (this.loading == false) {
 					this.$modal.msg('照片或视频未上传完毕,无法提交!')
 				}
+
+				if (this.isEmpty(this.inputDecimalNumberValue)) {
+					this.inputNumberValue = this.inputIntegerNumberValue;
+				} else {
+					this.inputNumberValue = this.inputIntegerNumberValue + "." + this.inputDecimalNumberValue;
+				}
 				let param = {
 					id: this.id,
 					enginId: this.enginId,

+ 20 - 9
pages/infrastructure/infrastructure.vue

@@ -180,13 +180,15 @@
 							</view>
 						</view>
 					</view>
-					<view class="uni-list">
-						<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 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="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>
@@ -283,6 +285,8 @@
 				specificationValue: {}, //规格
 				materialValue: {}, //材质
 				inputNumberValue: '',
+				inputIntegerNumberValue: '',
+				inputDecimalNumberValue: '',
 				projectName: '', //工程名称
 				gcdzValue: '', //工程地址
 				jsdwValue: '', //建设单位
@@ -718,8 +722,8 @@
 						return
 					}
 				}
-				if (this.isEmpty(this.inputNumberValue)) {
-					this.$modal.msg("请输入数")
+				if (this.isEmpty(this.inputIntegerNumberValue)) {
+					this.$modal.msg("请输入数")
 					return
 				}
 				if (this.imgArr.length <= 0) {
@@ -730,6 +734,13 @@
 					this.$modal.msg('照片或视频未上传完毕,无法提交!')
 					return
 				}
+				
+				
+				if (this.isEmpty(this.inputDecimalNumberValue)) {
+					this.inputNumberValue = this.inputIntegerNumberValue;
+				} else {
+					this.inputNumberValue = this.inputIntegerNumberValue + "." + this.inputDecimalNumberValue;
+				}
 				if (this.isNew) {
 					//新增
 					this.zEngineeringMaterialBo.push({