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

src/pages/inventoryMove/coms/okToHoldRecordPack.vue

@@ -39,7 +39,7 @@
 				<view class="label">数量：</view>
 				<view class="value1">
 					<u-number-box v-model="handleQty" ></u-number-box>
-					<view class="uom">EA</view>
+					<uom :uom="uom"></uom>
 				</view>
 			</view>
 			<view class="uni-flex uni-row hide_border">
@@ -64,10 +64,14 @@
 		getLabelInfo
 	} from '../../../common/label.js';
 	
+import uom from '@/mycomponents/qty/uom.vue'
+	
+	
 
 	export default {
 		components: {
-			winScanLocation
+			winScanLocation,
+			uom
 		},
 		emits: ["showFromLocationPopup",'itemCodeClick','confirm','getInputMsgResult','clearFromLocationCode','clickBtnClearItemCode'],
 		data() {
@@ -77,7 +81,8 @@
 				itemCode:'',
 				batch:'',
 				showOne:false,
-				isFromLocationFocus:false
+				isFromLocationFocus:false,
+				uom:""
 			}
 		},
 		props: {