showCode调整

components/equipmentRetrieval.vue

@@ -80,7 +80,7 @@
 							<view class="inventory" v-if="item.code" >
 								
 								<view class="value">
-									{{item.code}}
+									{{showCode(item)}}
 								</view>
 							</view>
 							<view class="inventory"  v-if="queryContentBl">

main.js

@@ -45,6 +45,9 @@ Vue.mixin({
 
 	},
 	methods: {
+		showCode(info){
+			return  info.customCode?info.customCode:'-'
+		},
 		isNull(k){
 			if(k){
 				return k

pages/otherFunctions/equipmentRetrieval/equipmentInfo.vue

@@ -13,7 +13,7 @@
 		<view class="main">
 			<view class="title">
 				{{info.title}}
-				<span style="float: right;">{{info.code}}</span><!-- customCode -->
+				<span style="float: right;">{{showCode(info)}}</span><!-- customCode -->
 			</view>
 			<!-- 标签 -->
 			<view class="tabs " v-if="false">

pages/otherFunctions/homePage.vue

@@ -45,7 +45,7 @@
 		 					</view>
 		 				
 		 					<view class="name">
-		 						编号：{{nowscan.code}}
+		 						编号：{{showCode(nowscan)}}
 								<span class="name"  v-show="nowscan&&nowscan.id" style="color:blue;">
 									点击查看
 								</span>

pages/otherFunctions/lendLedger/lendLedger.vue

@@ -75,7 +75,7 @@
 				  							<span v-if="item2.healthStatus!=1"
 				  								:style="'    margin-right: 1px;color:'+recordStatusColor(item2.healthStatus)">[{{item2.healthStatusN}}]</span>
 				  							
-				  							{{item2.code}}
+				  							{{showCode(item2)}}
 				  						</span>
 				  						<!-- <span class="view" @tap="ckInfo(item2)">
 				  							查看设备

pages/projectDepartment/exportReturn/deliveryDetails.vue

@@ -60,7 +60,7 @@
 						{{item.deviceInfo?item.deviceInfo.title:''}}
 					</view>
 					<view class="state" >
-						 <text style="color: rgb(82, 181, 107);" >编号：{{item.deviceInfo?item.deviceInfo.code:''}}</text>
+						 <text style="color: rgb(82, 181, 107);" >编号：{{item.deviceInfo?showCode(item.deviceInfo):''}}</text>
 						  <text @click="ckInfo(item)" style="margin-left: 10px;color: #3385FF;">查看设备</text>
 					</view>
 				</view>

pages/projectDepartment/exportReturn/deliveryFrom.vue

@@ -68,7 +68,7 @@
 							</view>
 						
 							<view class="name">
-								编号：{{nowscan.code}}
+								编号：{{showCode(nowscan)}}
 										<span class="name"  v-show="nowscan&&nowscan.id" style="color:blue;">
 											点击查看
 										</span>
@@ -124,7 +124,7 @@
 							{{item.title}} 
 						</view>
 						<view class="name">
-							 编号:{{item.code}}
+							 编号:{{ showCode(item)}}
 						</view>
 						<view class="state" @click="delOutListMethod(i)">
 							<u-icon name="trash-fill" color="#777777" ></u-icon>删除

pages/storeManagement/equipmentDelivery/deliveriedList.vue

@@ -31,7 +31,8 @@
 							</view>
 						
 							<view class="name">
-								编号：{{nowscan.code}}
+								编号：{{showCode(nowscan)}}
+								
 										<span class="name"  v-show="nowscan&&nowscan.id" style="color:blue;">
 											点击查看
 										</span>
@@ -266,7 +267,7 @@
 									:style="'    margin-right: 1px;color:'+recordStatusColor(item2.healthStatus)">[{{item2.healthStatusN}}]</span>
 								<span v-if="item2.status!=1"
 									:style="'    margin-right: 1px;color:'+recordStatusColor(item2.status)">[{{item2.statusN}}]</span>
-								{{item2.code}}
+								{{showCode(item2)}}
 							</view>
 						</view>
 						<view class="del" @click="delOutList(item2)">
@@ -319,7 +320,7 @@
 									设备编号：
 								</view>
 								<view class="number">
-									{{item.code}}
+									{{showCode(item)}}
 								</view>
 							</view>
 							<view class="item">
@@ -622,7 +623,7 @@
 				uni.showModal({
 					title: '提示',
 					//editable:true,
-					content: '确认是否删除编号为' + item.code,
+					content: '确认是否删除',
 					success: function(res) {
 						if (res.confirm) {
 							_this.delOutListMethod(item)

pages/storeManagement/equipmentEnter/deliveryDetails.vue

@@ -27,7 +27,7 @@
 							</view>
 						
 							<view class="name">
-								编号：{{nowscan.code}}
+								编号：{{showCode(nowscan)}}
 										<span class="name"  v-show="nowscan&&nowscan.id" style="color:blue;">
 											点击查看
 										</span>
@@ -170,7 +170,7 @@
 										设备编号：
 									</view>
 									<view class="item-value">
-										{{item.deviceInfo?item.deviceInfo.code:''}}
+										{{item.deviceInfo?showCode(item.deviceInfo):''}}
 									</view>
 								</view>
 		

pages/storeManagement/equipmentInspection/equipmentInspection.vue

@@ -44,7 +44,7 @@
 					</template>
 					<template v-else>
 						<view class="title">
-							{{item.title}}  <span class="titlespan" >编号：{{item.code}}</span>
+							{{item.title}}  <span class="titlespan" >编号：{{showCode(item)}}</span>
 						</view>
 										
 						<view class="group">

pages/storeManagement/equipmentInspection/inspectionRecord.vue

@@ -35,7 +35,7 @@
 										设备编号：
 									</view>
 									<view class="item-value">
-										{{item.deviceInfo?item.deviceInfo.code:''}}
+										{{item.deviceInfo?showCode(item.deviceInfo):''}}
 									</view>
 								</view>
 

pages/storeManagement/equipmentInspection/planDetail.vue

@@ -28,7 +28,7 @@
 							</view>
 						
 							<view class="name">
-								编号：{{nowscan.code}}
+								编号：{{showCode(nowscan)}}
 										<span class="name"  v-show="nowscan&&nowscan.id" style="color:blue;">
 											点击查看
 										</span>
@@ -106,7 +106,7 @@
 										设备编号：
 									</view>
 									<view class="item-value">
-										{{item.code}}
+										{{showCode(item)}}
 									</view>
 								</view>