Merge branch 'intex' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into intex

src/pages/repleinsh/coms/comRepleishDetailCardTime.vue

@@ -87,4 +87,20 @@
 		font-size: 40rpx;
 		font-weight: bold;
 	}
-</style>
+	.uom_blue {
+		color: #0689da;
+		padding: 5px;
+		font-size: 35rpx;
+	}
+	.uom_yellow {
+		color: #F1A532;
+		padding: 5px;
+		font-size: 35rpx;
+	}
+	.uom_green {
+		color: #329362;
+		padding: 5px;
+		font-size: 35rpx;
+	}
+
+</style>

src/pages/repleinsh/job/repleinshTimeDetail.vue

@@ -28,7 +28,7 @@
 							<view class="uni-flex uni-row space-between" style="align-items: center">
 								<!-- uni-inline-item 暂时拿掉-->
 								<view style="word-break: break-all;">
-									<pack :isShowPackingNumberProps="true"  :packingCode="item.toPackingNumber"></pack>
+									<pack title="看板编号" :isShowPackingNumberProps="true"  :packingCode="item.toPackingNumber?item.toPackingNumber.slice(item.toPackingNumber.length-5,item.toPackingNumber.length):''"></pack>
 									<batch :batch="item.toBatch"></batch>
 									<location title="来源库位" :locationCode="item.toLocationCode"></location>
 							<!-- <recommend :isShowPackingNumberProps="true"  :isShowPack="true" :detail="item" :isShowLocation="false" :isShowFromLocation="true"  :isShowToLocation="false"></recommend> -->