zc

pages_equipmentUtilization/views/equipmentInformation/infoPage.vue

@@ -13,17 +13,17 @@
 		<view class="text-max-box">
 			<img src="">
 			<view>类型</view>
-			<view>{{newData.deviceType}}</view>
+			<view>{{newData.deviceType?newData.deviceType:'-'}}</view>
 		</view>
 		<view class="text-max-box">
 			<img src="">
 			<view>品牌</view>
-			<view>{{newData.brand}}</view>
+			<view>{{newData.brand?newData.brand:'-'}}</view>
 		</view>
 		<view class="text-max-box">
 			<img src="">
 			<view>设备原值(元)</view>
-			<view>{{newData.price}}</view>
+			<view>{{newData.price?newData.price:'-'}}</view>
 		</view>
 		<view class="text-title-box">参数用途</view>
 		<view class="text-max-box">
@@ -45,33 +45,33 @@
 		<view class="text-max-box">
 			<img src="">
 			<view>设备管理员</view>
-			<view>{{newData.adminDisplay}}</view>
+			<view>{{newData.adminDisplay?newData.adminDisplay:'-'}}</view>
 		</view>
 		<view class="text-max-box">
 			<img src="">
 			<view>管理部门</view>
-			<view>{{newData.manageDeptName}}</view>
+			<view>{{newData.manageDeptName?newData.manageDeptName:'-'}}</view>
 		</view>
 		<view class="text-max-box">
 			<img src="">
 			<view>存放位置</view>
-			<view>{{newData.location}}</view>
+			<view>{{newData.location?newData.location:'-'}}</view>
 		</view>
 		<view class="text-title-box">厂家产地</view>
 		<view class="text-max-box">
 			<img src="">
 			<view>单位</view>
-			<view>{{newData.unit}}</view>
+			<view>{{newData.unit?newData.unit:'-'}}</view>
 		</view>
 		<view class="text-max-box">
 			<img src="">
 			<view>生产厂家</view>
-			<view>{{newData.manufacturer}}</view>
+			<view>{{newData.manufacturer?newData.manufacturer:'-'}}</view>
 		</view>
 		<view class="text-max-box">
 			<img src="">
 			<view>产地</view>
-			<view>{{newData.originPlace}}</view>
+			<view>{{newData.originPlace?newData.originPlace:'-'}}</view>
 		</view>
 		<view class="bottom-button" @click="onShade()">登记使用信息</view>
 		<view class="shade-max-big-box" v-if="shadeType == 1||shadeType == 2||shadeType == 3||shadeType == 4">
@@ -143,7 +143,7 @@
 					<!-- <view class="shade-text-title">如有疑问请联系：{{shadeDataC.data3}}</view> -->
 				</view>
 				<view class="shade-box" v-if="shadeType == 4">
-					<view class="text-box">
+					<view class="text-box" style="max-height: 500rpx;overflow-y: scroll;">
 						{{shadeDataD.data2}}
 					</view>
 				</view>
@@ -167,6 +167,7 @@
 				baseUrl:config.base_url,
 				userId: uni.getStorageSync('userId'),
 				newData:{
+					imageUrls:[],
 					categoryName:'',
 					deviceCode:'',
 					deviceName:'',
@@ -186,20 +187,20 @@
 				},
 				shadeDataA:{},
 				shadeDataB:{
-					data1:'张工',
-					data2:'自用',
-					data3:'2026-01-25 15:30',
-					data4:'2026-01-25 15:30',
-					data5:'3天2小时15分',
+					data1:'',
+					data2:'',
+					data3:'',
+					data4:'',
+					data5:'',
 				},
 				shadeDataC:{
-					data1:'张工',
-					data2:'2026-01-25 15:30',
-					data3:'010-88888888',
+					data1:'',
+					data2:'',
+					data3:'',
 				},
 				shadeDataD:{
-					data1:'张工',
-					data2:'2026-01-25 15:30',
+					data1:'',
+					data2:'',
 				},
 				pickerList:['自用','对外服务'],
 				pickerIndex:0,
@@ -221,6 +222,9 @@
 					data
 				} = await mpDeviceDetail({id:this.equipmentId});
 				if (data.code == 200) {
+					if(!data.data.imageUrls){
+						data.data.imageUrls = [];
+					}
 					this.$set(this,'newData',data.data);
 				}
 			},
@@ -228,17 +232,17 @@
 				if(type == 1){
 					this.$set(this,'shadeDataD',{
 						data1:'设备用途',
-						data2:this.newData.purpose,
+						data2:this.newData.purpose?this.newData.purpose:'未配置设备用途',
 					});
 				}else if(type == 2){
 					this.$set(this,'shadeDataD',{
 						data1:'技术参数',
-						data2:this.newData.techParams,
+						data2:this.newData.techParams?this.newData.techParams:'未配置技术参数',
 					});
 				}else if(type == 3){
 					this.$set(this,'shadeDataD',{
 						data1:'备注',
-						data2:this.newData.remark,
+						data2:this.newData.remark?this.newData.remark:'未配置备注',
 					});
 				}
 				this.$set(this,'shadeType',4);