heyang

api/request/config.js

@@ -9,9 +9,9 @@ const config = {
 	// base_url: 'https://demo.sxitdlc.com/xzgd/',
 
 	// base_url: 'https://lab.sxitdlc.com/labNhSystem/',//43服务器高升测试
-	 base_url: 'https://lab.sxitdlc.com/labAppTest/',//43服务器线上
+	// base_url: 'https://lab.sxitdlc.com/labAppTest/',//43服务器线上
     // base_url: 'https://lab.sxitdlc.com/appTest/',//88服务器线上
-	// base_url: 'https://lab.sxitdlc.com/labSystem/', //矿大地址
+	 base_url: 'https://lab.sxitdlc.com/labSystem/', //矿大地址
 	// base_url: 'https://lab.sxitdlc.com/jdlabSystem/', //交大地址
     // base_url: 'https://lab.sxitdlc.com/jndxlabSystem/', //暨大地址
     //  base_url: 'https://lab.sxitdlc.com/kdwclabSystem/', //矿大文昌地址

pages/fingerprint.vue

@@ -97,8 +97,20 @@
 		methods: {
 			//指紋采集
 			gather(){
-				 this.dialogVisible=true;
-				 this.fingerprintGtherFun()
+				let rest=this.yesUseList.some(v=>v.isCheck==true)
+				if(rest){
+					this.dialogVisible=true;
+					this.fingerprintGtherFun()
+				}else{
+					uni.showToast({
+							mask:true,
+							icon:"none",
+							position:"center",
+							title: '请先选择门禁名称!',
+							duration: 3000
+						});
+				}
+				
 			},
 		   dialogClose(){
 			   this.dialogVisible=false;
@@ -151,6 +163,7 @@
 						  obj.num=_this.fingerNum
 					  }
 			   })
+			    
 		       const {data} = await fingerprintGther(obj)
 				if(data.code == 200){
 					_this.dialogVisible=false;
@@ -183,6 +196,7 @@
 			    const {data} = await fingerprintQeryMySubList(_this.dialogForm)
 				if(data.code == 200){
 					_this.yesUseList=data.data;
+					console.log(_this.yesUseList)
 					_this.yesUseList.forEach(function(item){
 						item.isCheck=false;
 					})

pages_manage/gasManage/gasManage.vue

@@ -139,10 +139,9 @@
 			async getInfo(){
 				let _this=this;
 				const {data} = await useRegisterDetail({electronicTag:_this.electronicTag});
-				if(data.code==200){
+				if(data.code==200 && data.data){
 					let res = data.data;
 					let userId=uni.getStorageSync('userId');
-
 					if(res.currentStatus==4 && res.currentUserId==userId){
 						uni.navigateTo({
 						    url:'/pages_manage/useRegister/giveRegister?code='+_this.electronicTag
@@ -152,6 +151,13 @@
 						    url:'/pages_manage/useRegister/useRegister?code='+_this.electronicTag
 						});
 					}
+				}else{
+					uni.showToast({
+					    title: '当前气瓶不存在!',
+					    icon:"none",
+					    mask:true,
+					    duration: 2000
+					});
 				}
 			},
 

pages_manage/leaveConfirm/amendAir.vue

@@ -53,7 +53,7 @@
 
 			this.item=JSON.parse(decodeURIComponent(option.item));
 			this.item2=JSON.parse(decodeURIComponent(option.item2));
-			this.specificationName=JSON.parse(this.item.specificationName)
+			this.specificationName=JSON.parse(decodeURIComponent(option.specificationName));
         },
         onShow() {
 

pages_manage/leaveConfirm/leaveConfirm.vue

@@ -129,7 +129,7 @@
 			//气压有误
 			barometer(){
 				uni.navigateTo({
-				    url:'/pages_manage/leaveConfirm/amendAir?item='+encodeURIComponent(JSON.stringify(this.form))+'&item2='+encodeURIComponent(JSON.stringify(this.form2))
+				    url:'/pages_manage/leaveConfirm/amendAir?item='+encodeURIComponent(JSON.stringify(this.form))+'&item2='+encodeURIComponent(JSON.stringify(this.form2))+'&specificationName='+encodeURIComponent(JSON.stringify(this.specificationName))
 				});
 			},
 			async getInfo(){

pages_supplier/gasManage/gasManageDetail.vue

@@ -10,7 +10,7 @@
 				</view>
 			</picker>
 			<view class="register_li_min" style="border: none;">
-			    <view>*</view>
+			    <view></view>
 				<view style="color: #333333;">气体组分：</view>
 				<input v-model="form.airConstituents"  disabled maxlength="20" type="text" placeholder="请输入气体组分">
 			</view>

pages_supplier/gasRecycle/gasRecycleAirDetail.vue

@@ -30,12 +30,12 @@
 			<view v-if="pageType==1" class="register_li_min">
 			    <view></view>
 				<view>配送时间：</view>
-				<input v-model="form.qpTask.disposeTime" disabled  type="text" >
+				<input v-model="form.taskDetail.disposeTime2" disabled  type="text" >
 			</view>
 			<view v-if="pageType==1" class="register_li_min" style="border: none;">
 			    <view></view>
-				<view>接收时间：</view>
-				<input v-model="form.qpTask.createTime" disabled  type="text" >
+				<view>接收时间：</view>	
+				<input v-model="form.taskDetail.createTime" disabled  type="text" >
 			</view>
 		</view>
 		<view class="register_li" >