heyang

api/request/config.js

@@ -9,7 +9,7 @@ const config = {
     // base_url: 'http://192.168.1.43:9800',//43服务器
 	// base_url: 'https://demo.zjznai.com/xzgd/',
 	// base_url: 'https://lab.zjznai.com/labNhSystem/',//43服务器高升测试
-	 //base_url: 'https://lab.zjznai.com/labAppTest/',//43服务器线上
+	// base_url: 'https://lab.zjznai.com/labAppTest/',//43服务器线上
      // base_url: 'https://lab.zjznai.com/appTest/',//88服务器线上
 	 //base_url: 'https://lab.zjznai.com//labSystem/', //矿大地址
       // base_url: 'https://lab.zjznai.com/labSaasSystem/', //矿大化工

pages/gasBottle/gasUse/gasUse.vue

@@ -240,7 +240,12 @@
 				if(num<=0){
 					num=0;
 				}
-				this.$set(this.form,'usageAmount',num.toFixed(2))
+				if(Object.is(num, NaN)){
+					this.$set(this.form,'usageAmount','')
+				}else{
+					this.$set(this.form,'usageAmount',num.toFixed(2)?num.toFixed(2):'')
+				}
+				
 			},
 			// //开始时间选中事件
 			// startChange(form,e){
@@ -364,6 +369,15 @@
 					});
 					return
 				}
+				if(!_this.form.usageAmount){
+					uni.showToast({
+						title: '请输入本次使用量!',
+						icon:"none",
+						mask:true,
+						duration: 2000
+					});
+					return
+				}
 				this.$set(this.form,'stcokId',this.form.id);
 				this.$set(this.form,'id','');
 				this.$set(this.form,'usageImg',this.imgList.join(','));

pages/gasBottle/stockList/stockList.vue

@@ -31,7 +31,9 @@
 			<view class="search_t">
 				<view class="search_n">
 					<input v-model="getData.searchValue"    type="text" placeholder="实验室名称/房间号">
-					<img  @click="searchBtn()" class="icon_img" src="@/pages_manage/images/icon_aqjc_ss.png"/>
+					<view class="search_n_img" @click="searchBtn()">
+						<img   class="icon_img" src="@/pages_manage/images/icon_aqjc_ss.png"/>
+					</view>
 				</view>
 			</view>
 		</view>
@@ -298,7 +300,7 @@
 					display: flex;
 					justify-content: space-between;
 					align-items: center;
-					padding:0 40rpx;
+					padding:0 0rpx 0 40rpx;
 					box-sizing: border-box;
 					>input{
 						width: 640rpx;
@@ -308,9 +310,14 @@
 						color: #CCCCCC;
 						line-height: 30rpx;
 					}
-					>img{
-						width: 30rpx;
-						height: 30rpx;
+					.search_n_img{
+						width: 70rpx;
+						height: 80rpx;
+						>img{
+							width: 30rpx;
+							height: 30rpx;
+							margin: 26rpx 0 0 15rpx;
+						}
 					}
 				}
 

pages/gasBottle/stockList/storageAdd.vue

@@ -26,13 +26,13 @@
 				</view>
 			</view>
 			<view class="register_li_min">
-				<view>*</view>
+				<view> </view>
 				<view>气表压力：</view>
 				<input v-model="form.gasPressure" maxlength="6"  @input="onKeyVinInput($event)" placeholder-style="color:#999;" placeholder="请输入气表压力">
 			</view>
 			<!-- 检验有效期 -->
 			<view class="register_li_min2">
-				<view><text  style="color: #f00;margin-right: 10rpx;">*</text>检验有效期:</view>
+				<view><text  style="color: #f00;margin-right: 10rpx;"> </text>检验有效期:</view>
 				<picker mode="date" @change="startChange($event)">
 					<input class="picker-text" v-model="form.validPeriod" disabled  type="text" placeholder-style="color:#999;"  placeholder="时间">
 				</picker>
@@ -276,24 +276,24 @@
 					});
 					return
 				}
-				if(!this.form.gasPressure){
-					uni.showToast({
-						title: '请输入气表压力',
-						icon:"none",
-						mask:true,
-						duration: 2000
-					});
-					return
-				}
-				if(!this.form.validPeriod){
-					uni.showToast({
-						title: '请选择检验有效期',
-						icon:"none",
-						mask:true,
-						duration: 2000
-					});
-					return
-				}
+				// if(!this.form.gasPressure){
+				// 	uni.showToast({
+				// 		title: '请输入气表压力',
+				// 		icon:"none",
+				// 		mask:true,
+				// 		duration: 2000
+				// 	});
+				// 	return
+				// }
+				// if(!this.form.validPeriod){
+				// 	uni.showToast({
+				// 		title: '请选择检验有效期',
+				// 		icon:"none",
+				// 		mask:true,
+				// 		duration: 2000
+				// 	});
+				// 	return
+				// }
 				if(!this.form.beaconTag){
 					uni.showToast({
 						title: '请输入信标标签',