修改单位名称

src/common/basic.js

@@ -191,7 +191,7 @@ export function getUomInfo(value) {
 }
 
 //获取包装单位
-export function getStdPackUnitInfo(value) {
+export function getPackUnitInfo(value) {
 	var resultInfo = "";
 	if (packUnitList.length == 0) {
 		packUnitList = getDirectoryInfo("pack_unit")
@@ -957,8 +957,8 @@ export function createItemInfo(res) {
 	let item = {
 		itemCode: res.itemCode,
 		itemName: res.itemName,
-		stdPackQty: Number(res.stdPackQty),
+		packQty: Number(res.packQty),
-		stdPackUnit: res.stdPackUnit,
+		packUnit: res.packUnit,
 		qty: Number(res.qty),
 		handleQty: 0,
 		uom: res.uom,

src/common/detail.js

@@ -67,8 +67,8 @@ export function createItemInfo(detail) {
 	let item = {
 		itemCode: detail.itemCode,
 		itemName: detail.itemName,
-		stdPackQty: Number(detail.stdPackQty) || undefined,
+		packQty: Number(detail.packQty) || undefined,
-		stdPackUnit: detail.stdPackUnit,
+		packUnit: detail.packUnit,
 		qty: Number(detail.qty),
 		handleQty: 0,
 		uom: detail.uom,

src/common/directory.js

@@ -263,7 +263,7 @@ export function getUomInfo(value) {
 }
 
 //获取包装单位
-export function getStdPackUnitInfo(value) {
+export function getPackUnitInfo(value) {
 	var resultInfo = "";
 	if (packUnitList.length == 0) {
 		packUnitList = getDirectoryInfo("pack_unit")

src/common/record.js

@@ -15,8 +15,8 @@ export function createItemInfo(balance, pack) {
 	let item = {
 		itemCode: pack.itemCode,
 		itemName: pack.itemName,
-		stdPackQty: pack.stdPackQty,
+		packQty: pack.packQty,
-		stdPackUnit: pack.stdPackUnit,
+		packUnit: pack.packUnit,
 		qty: new Decimal(balance.qty).toNumber(),
 		handleQty:new Decimal(0).toNumber(),
 		uom: pack.uom,
@@ -32,8 +32,8 @@ export function createDetailInfo(balance, pack) {
 	let detail = deepCopyData(balance);
 	detail.balanceQty = new Decimal(detail.qty).toNumber()
 	detail.qty = new Decimal(detail.qty).toNumber();
-	detail.stdPackQty = new Decimal(pack.stdPackQty).toNumber()
+	detail.packQty = new Decimal(pack.packQty).toNumber()
-	detail.stdPackUnit = pack.stdPackUnit
+	detail.packUnit = pack.packUnit
 	detail.handleQty =  new Decimal(detail.qty).toNumber() ;
 	detail.package = pack;
 

src/mycomponents/detail/detailBalanceInfo.vue

@@ -32,7 +32,7 @@
 <script>
 	import {
 		getInventoryStatusName,
-		getStdPackUnitInfo,
+		getPackUnitInfo,
 		getUomInfo
 	} from '@/common/directory.js';
 	export default {

src/mycomponents/detail/detailHandleInfo.vue

@@ -32,7 +32,7 @@
 <script>
 	import {
 		getInventoryStatusName,
-		getStdPackUnitInfo
+		getPackUnitInfo
 	} from '@/common/directory.js';
 	export default {
 		components: {},

src/mycomponents/detail/detailPackageInfo.vue

@@ -21,7 +21,7 @@
 		<view class="item">
 			<text class="item_title">标包 : </text>
 			<view class="text_wrap">
-				<text class="text_wrap">{{dataContent.stdPackQty}}{{dataContent.stdPackUnit}}</text>
+				<text class="text_wrap">{{dataContent.packQty}}{{dataContent.packUnit}}</text>
 			</view>
 		</view>
 	</view>
@@ -30,7 +30,7 @@
 <script>
 	import {
 		getInventoryStatusName,
-		getStdPackUnitInfo,
+		getPackUnitInfo,
 		getUomInfo
 	} from '@/common/directory.js';
 	export default {

src/mycomponents/detail/detailRecommendInfo.vue

@@ -36,7 +36,7 @@
 <script>
 	import {
 		getInventoryStatusName,
-		getStdPackUnitInfo,
+		getPackUnitInfo,
 		getUomInfo
 	} from '@/common/directory.js';
 	export default {

src/mycomponents/detail/jobDetailPopup.vue

@@ -9,7 +9,7 @@
 <script>
 	import {
 		getInventoryStatusName,
-		getStdPackUnitInfo
+		getPackUnitInfo
 	} from '@/common/directory.js';
 	 
 	import detailCommonInfo from '@/mycomponents/detail/detailCommonInfo.vue'
@@ -42,8 +42,8 @@
 			getInventoryStatusInfo(value) {
 				return getInventoryStatusName(value).label
 			},
-			getStdPackUnit(uom) {
+			getPackUnit(uom) {
-				let item = getStdPackUnitInfo(uom);
+				let item = getPackUnitInfo(uom);
 				if (item == '') {
 					return uom;
 				} else {

src/mycomponents/job/jobDetailPopup.vue

@@ -9,7 +9,7 @@
 <script>
 	import {
 		getInventoryStatusName,
-		getStdPackUnitInfo
+		getPackUnitInfo
 	} from '@/common/directory.js';
 	 
 	import detailCommonInfo from '@/mycomponents/detail/detailCommonInfo.vue'
@@ -42,8 +42,8 @@
 			getInventoryStatusInfo(value) {
 				return getInventoryStatusName(value).label
 			},
-			getStdPackUnit(uom) {
+			getPackUnit(uom) {
-				let item = getStdPackUnitInfo(uom);
+				let item = getPackUnitInfo(uom);
 				if (item == '') {
 					return uom;
 				} else {

src/mycomponents/package/packageDetailPopup.vue

@@ -112,10 +112,10 @@
 					content: this.dataContent.convertRate
 				}, {
 					item_title: '标包数量',
-					content: this.dataContent.stdPackQty
+					content: this.dataContent.packQty
 				}, {
 					item_title: '标包单位',
-					content: this.dataContent.stdPackUnit
+					content: this.dataContent.packUnit
 				}, {
 					item_title: '仓库代码',
 					content: this.dataContent.toWarehouseCode

src/mycomponents/partCode/partCode.vue

@@ -17,7 +17,7 @@
 						<count :countType="countType"
 						:recommendQty="recommendQty" 
 						:uom="uom" 
-						:stdPackQty="stdPackQty"
+						:packQty="packQty"
 						:handledQty="handledQty"></count>
 					</view>
 					
@@ -96,7 +96,7 @@
 				type: Number,
 				default: 0
 			},
-			stdPackQty: {
+			packQty: {
 				type: Number,
 				default: 0,
 			},

src/mycomponents/qty/balanceQty.vue

@@ -6,22 +6,22 @@
 					{{Number(dataContent.qty)}}
 				</text>
 			</view>
-			<uom v-if="dataContent.stdPackQty==undefined" :uom="dataContent.uom"></uom>
+			<uom v-if="dataContent.packQty==undefined" :uom="dataContent.uom"></uom>
 		</view>
 		<view class="uni-flex uni-row center">
-			<std-pack-qty :dataContent="dataContent"></std-pack-qty>
+			<packQty :dataContent="dataContent"></packQty>
 		</view>
 	</view>
 </template>
 
 <script>
-	import stdPackQty from '@/mycomponents/qty/stdPackQty.vue'
+	import packQty from '@/mycomponents/qty/packQty.vue'
 	import uom from '@/mycomponents/qty/uom.vue'
 	import status from '@/mycomponents/status/status.vue'
 
 	export default {
 		components: {
-			stdPackQty,
+			packQty,
 			uom,
 			status
 		},

src/mycomponents/qty/balanceQtyEdit.vue

@@ -18,15 +18,15 @@
 								<view class="uni-flex uni-row u-col-center">
 									<uni-number-box @change="calcQty($event,stdCount)" :value="stdCount">
 									</uni-number-box>
-									<std-uom :uom="dataContent.stdPackUnit"></std-uom>
+									<uom :uom="dataContent.uom"></uom>
-									<!-- <uom :uom="dataContent.stdPackUnit"></uom> -->
+									<!-- <uom :uom="dataContent.packUnit"></uom> -->
 								</view>
 							</view>
 							<u-line />
 							<view class="uni-flex uni-row space-between padding title u-col-center">
 								<text>标包量 : </text>
 								<view class="uni-flex u-col-center uni-row">
-									<text>{{Number(dataContent.stdPackQty)}}</text>
+									<text>{{Number(dataContent.packQty)}}</text>
 									<uom :uom="dataContent.uom"></uom>
 								</view>
 							</view>
@@ -156,7 +156,7 @@
 			},
 			calcQty(val) {
 				if (val > 0) {
-					this.allQty = val * Number(this.dataContent.stdPackQty);
+					this.allQty = val * Number(this.dataContent.packQty);
 				}
 			},
 			setValue() {

src/mycomponents/qty/compareQty.vue

@@ -41,14 +41,14 @@
 </template>
 
 <script>
-	// import stdPackQty from '@/mycomponents/qty/stdPackQty.vue'
+	// import packQty from '@/mycomponents/qty/packQty.vue'
 	import packUnit from '@/mycomponents/qty/packUnit.vue'
 	import uom from '@/mycomponents/qty/uom.vue'
 	import status from '@/mycomponents/status/status.vue'
 
 	export default {
 		components: {
-			// stdPackQty,
+			// packQty,
 			packUnit,
 			uom,
 			status

src/mycomponents/qty/countQtyEdit.vue

@@ -19,7 +19,7 @@
 									<uni-number-box @change="calcQty($event,stdCount)" :value="stdCount" :focus="false">
 									</uni-number-box>
 									<view class="std_pack">
-										{{getStdPackUnitInfo(dataContent.stdPackUnit)}}
+										{{getPackUnitInfo(dataContent.packUnit)}}
 									</view>
 								</view>
 
@@ -28,7 +28,7 @@
 							<view class="uni-flex uni-row space-between padding title u-col-center">
 								<text>标包量 : </text>
 								<view class="uni-flex u-col-center uni-row">
-									<text>{{Number(dataContent.stdPackQty)}}</text>
+									<text>{{Number(dataContent.packQty)}}</text>
 									<uom :uom="dataContent.uom"></uom>
 								</view>
 							</view>
@@ -83,7 +83,7 @@
 	import uom from '@/mycomponents/qty/uom.vue'
 	import balanceStatus from '@/mycomponents/status/balanceStatus.vue'
 	import {
-		getStdPackUnitInfo
+		getPackUnitInfo
 	} from "@/common/directory.js"
 	import {
 		getInventoryStatusName
@@ -162,7 +162,7 @@
 				// this.dataContent = item
 				// this.inventoryStatus = this.dataContent.inventoryStatus;
 				// this.allQty = Number(this.dataContent.qty)
-				// this.stdCount = Math.ceil(this.allQty / this.dataContent.stdPackQty);
+				// this.stdCount = Math.ceil(this.allQty / this.dataContent.packQty);
 				// this.detailList = detailList
 				this.showConfirmCountdown = false;
 				this.mode = 'edit';
@@ -187,7 +187,7 @@
 				this.dataContent = item;
 				this.inventoryStatus = this.dataContent.inventoryStatus;
 				this.allQty = Number(this.dataContent.handleQty);
-				this.stdCount = Math.ceil(this.allQty / this.dataContent.stdPackQty);
+				this.stdCount = Math.ceil(this.allQty / this.dataContent.packQty);
 				this.detailList = detailList;
 			},
 
@@ -226,7 +226,7 @@
 			},
 			calcQty(val) {
 				if (val > 0) {
-					this.allQty = val * Number(this.dataContent.stdPackQty);
+					this.allQty = val * Number(this.dataContent.packQty);
 				}
 			},
 
@@ -240,8 +240,8 @@
 				this.inventoryStatus = value
 			},
 
-			getStdPackUnitInfo(value) {
+			getPackUnitInfo(value) {
-				return getStdPackUnitInfo(value).name
+				return getPackUnitInfo(value).name
 			}
 		}
 	}

src/mycomponents/qty/inspectQtyEdit.vue

@@ -133,7 +133,7 @@
 				this.closeEditPopup();
 			},
 			calcQty(val) {
-				this.allQty = val * Number(this.dataContent.stdPackQty);
+				this.allQty = val * Number(this.dataContent.packQty);
 			},
 			setValue() {
 				var balanceQty = Number(this.dataContent.qty);

src/mycomponents/qty/packQty.vue

@@ -0,0 +1,37 @@
+<template>
+	<view class="std_pack" v-if="dataContent.packQty!=undefined">
+		<text>
+			{{Number(dataContent.packQty)}}•{{getPackUnit(dataContent.packUnit)}}
+		</text>
+	</view>
+</template>
+<script>
+	import {
+		// getPackUnitInfo,
+		getPackUnitInfo
+	} from "@/common/directory.js"
+	export default {
+		data() {
+			return {
+
+			};
+		},
+		// 此处定义传入的数据
+		props: {
+			dataContent: {
+				packQty: 1000,
+				uom: "EA",
+			},
+		},
+		methods: {
+			getPackUnit(packUnit) {
+				let std = getPackUnitInfo(packUnit);
+				return std == "" ? packUnit : std.label;
+			}
+		}
+	}
+</script>
+
+
+<style>
+</style>

src/mycomponents/qty/qty.vue

@@ -15,13 +15,13 @@
 </template>
 
 <script>
-	import stdPackQty from '@/mycomponents/qty/stdPackQty.vue'
+	import packQty from '@/mycomponents/qty/packQty.vue'
 	import uom from '@/mycomponents/qty/uom.vue'
 	import status from '@/mycomponents/status/status.vue'
 
 	export default {
 		components: {
-			stdPackQty,
+			packQty,
 			status,
 			uom
 		},

src/mycomponents/qty/recommendQty.vue

@@ -16,14 +16,14 @@
 </template>
 
 <script>
-	// import stdPackQty from '@/mycomponents/qty/stdPackQty.vue'			
+	// import packQty from '@/mycomponents/qty/packQty.vue'			
 	import packUnit from '@/mycomponents/qty/packUnit.vue'
 	import uom from '@/mycomponents/qty/uom.vue'
 	import status from '@/mycomponents/status/status.vue'
 
 	export default {
 		components: {
-			// stdPackQty,
+			// packQty,
 			packUnit,
 			uom,
 			status

src/mycomponents/qty/recommendQtyEdit.vue

@@ -18,7 +18,7 @@
 								<view class="uni-flex uni-row u-col-center">
 									<uni-number-box @change="calcQty($event,stdCount)" :value="stdCount">
 									</uni-number-box>
-									<std-uom :uom="dataContent.stdPackUnit"></std-uom>
+									<std-uom :uom="dataContent.packUnit"></std-uom>
 								</view>
 
 							</view>
@@ -26,7 +26,7 @@
 							<view class="uni-flex uni-row space-between padding title u-col-center">
 								<text>标包量 : </text>
 								<view class="uni-flex u-col-center uni-row">
-									<text>{{Number(dataContent.stdPackQty)}}</text>
+									<text>{{Number(dataContent.packQty)}}</text>
 									<uom :uom="dataContent.uom"></uom>
 								</view>
 							</view>
@@ -150,7 +150,7 @@
 			},
 			calcQty(val) {
 				if (val > 0) {
-					this.allQty = val * this.dataContent.stdPackQty;
+					this.allQty = val * this.dataContent.packQty;
 				}
 			},
 			setValue() {

src/mycomponents/qty/stdPackQty.vue

@@ -1,37 +0,0 @@
-<template>
-	<view class="std_pack" v-if="dataContent.stdPackQty!=undefined">
-		<text>
-			{{Number(dataContent.stdPackQty)}}•{{getStdPackUnit(dataContent.stdPackUnit)}}
-		</text>
-	</view>
-</template>
-<script>
-	import {
-		// getStdPackUnitInfo,
-		getStdPackUnitInfo
-	} from "@/common/directory.js"
-	export default {
-		data() {
-			return {
-
-			};
-		},
-		// 此处定义传入的数据
-		props: {
-			dataContent: {
-				stdPackQty: 1000,
-				uom: "EA",
-			},
-		},
-		methods: {
-			getStdPackUnit(stdPackUnit) {
-				let std = getStdPackUnitInfo(stdPackUnit);
-				return std == "" ? stdPackUnit : std.label;
-			}
-		}
-	}
-</script>
-
-
-<style>
-</style>

src/mycomponents/qty/stdUom.vue

@@ -1,13 +1,13 @@
 <template>
 	<view class="uom">
-		{{getStdPackUnit(uom)}}
+		{{getPackUnit(uom)}}
 	</view>
 </template>
 
 
 <script>
 	import {
-		getStdPackUnitInfo
+		getPackUnitInfo
 	} from '@/common/directory.js';
 	export default {
 		data() {
@@ -23,8 +23,8 @@
 			},
 		},
 		methods: {
-			getStdPackUnit(uom) {
+			getPackUnit(uom) {
-				let item = getStdPackUnitInfo(uom);
+				let item = getPackUnitInfo(uom);
 				if (item == '') {
 					return uom;
 				} else {

src/mycomponents/wincom/basicCom/winHint.vue

@@ -21,7 +21,7 @@
 						数量{{dataContent.recommendQty}}
 					</view>
 					<view class="">
-						标包数量{{dataContent.stdPackQty}}
+						标包数量{{dataContent.packQty}}
 					</view>
 					<view class="">
 						推荐单位{{dataContent.recommendUom}}

src/pages/container/record/containerBindRecord.vue

@@ -248,8 +248,8 @@
 				let item = {
 					itemCode: res.itemCode,
 					itemName: res.itemName,
-					stdPackQty: res.stdPackQty,
+					packQty: res.packQty,
-					stdPackUnit: res.stdPackUnit,
+					packUnit: res.packUnit,
 					qty: res.qty,
 					handleQty: 0,
 					uom: res.uom,

src/pages/container/record/containerUnBindRecord.vue

@@ -193,8 +193,8 @@
 				let item = {
 					itemCode: res.itemCode,
 					itemName: res.itemName,
-					stdPackQty: res.stdPackQty,
+					packQty: res.packQty,
-					stdPackUnit: res.stdPackUnit,
+					packUnit: res.packUnit,
 					qty: res.qty,
 					handleQty: 0,
 					uom: res.uom,

src/pages/count/job/countDetail.vue

@@ -224,8 +224,8 @@
 				let item = {
 					itemCode: res.itemCode,
 					itemName: res.itemName,
-					stdPackQty: res.stdPackQty,
+					packQty: res.packQty,
-					stdPackUnit: res.stdPackUnit,
+					packUnit: res.packUnit,
 					qty: Number(res.qty),
 					handleQty: 0,
 					uom: res.uom,
@@ -503,8 +503,8 @@
 				// this.balance.qty = 0
 				this.balance.handleQty = Number(this.label.qty);
 				this.balance.balanceQty = this.balance.qty;
-				this.balance.stdPackQty = this.package.stdPackQty;
+				this.balance.packQty = this.package.packQty;
-				this.balance.stdPackUnit = this.package.stdPackUnit;
+				this.balance.packUnit = this.package.packUnit;
 				this.$refs.countQtyEdit.openEditPopupShowSeconds(this.balance,
 					null);
 			},
@@ -539,8 +539,8 @@
 							itemEditInfo.handleQty = qty;
 							itemEditInfo.inventoryStatus = inventoryStatus;
 							itemEditInfo.balanceQty = that.balance.qty;
-							itemEditInfo.stdPackQty = that.package.stdPackQty;
+							itemEditInfo.packQty = that.package.packQty;
-							itemEditInfo.stdPackUnit = that.package.stdPackUnit;
+							itemEditInfo.packUnit = that.package.packUnit;
 						}
 					}
 
@@ -599,8 +599,8 @@
 				let item = {
 					itemCode: this.package.itemCode,
 					itemName: this.package.itemName,
-					stdPackQty: this.package.stdPackQty,
+					packQty: this.package.packQty,
-					stdPackUnit: this.package.stdPackUnit,
+					packUnit: this.package.packUnit,
 					// qty: Number(qty),
 					qty: 0,
 					handleQty: 0,
@@ -625,8 +625,8 @@
 					itemName: this.package.itemName,
 					itemDesc1: this.package.itemDesc1,
 					itemDesc2: this.package.itemDesc2,
-					stdPackQty: this.package.stdPackQty,
+					packQty: this.package.packQty,
-					stdPackUnit: this.package.stdPackUnit,
+					packUnit: this.package.packUnit,
 					projectCode: "",
 					qty: 0,
 					handleQty: qty,

src/pages/count/record/countRecord.vue

@@ -273,8 +273,8 @@
 									})
 							} else {
 								this.itemEditInfo.scaned = true;
-								this.itemEditInfo.stdPackQty = result.package.stdPackQty;
+								this.itemEditInfo.packQty = result.package.packQty;
-								this.itemEditInfo.stdPackUnit = result.package.stdPackUnit;
+								this.itemEditInfo.packUnit = result.package.packUnit;
 								this.itemEditInfo.record = this.createRecordInfo(this.itemEditInfo, result.balance);
 								this.$refs.CountQtyEdit.openEditPopupShowSeconds(this.itemEditInfo);
 								this.calcHandleQty();
@@ -314,8 +314,8 @@
 				let item = {
 					itemCode: balance.itemCode,
 					itemName: pack.itemName,
-					stdPackQty: pack.stdPackQty,
+					packQty: pack.packQty,
-					stdPackUnit: pack.stdPackUnit,
+					packUnit: pack.packUnit,
 					qty: balance.qty,
 					handleQty: 0,
 					uom: pack.uom,

src/pages/customerReturn/job/returnDetail.vue

@@ -268,8 +268,8 @@
 													itemDetail.inventoryStatus = result.balance.inventoryStatus;
 													itemDetail.balance = result.balance;
 													itemDetail.balance.balanceQty =  Number(result.balance.qty)
-													itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
+													itemDetail.balance.packQty = Number(result.package.packQty)
-													itemDetail.balance.stdPackUnit = result.package.stdPackUnit
+													itemDetail.balance.packUnit = result.package.packUnit
 													this.calcHandleQty();
 												} else {
 													this.scanPopupGetFocus();
@@ -288,8 +288,8 @@
 									itemDetail.toInventoryStatus = result.balance.inventoryStatus;
 									itemDetail.balance = result.balance;
 									itemDetail.balance.balanceQty =  Number(result.balance.qty)
-									itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
+									itemDetail.balance.packQty = Number(result.package.packQty)
-									itemDetail.balance.stdPackUnit = result.package.stdPackUnit
+									itemDetail.balance.packUnit = result.package.packUnit
 									this.calcHandleQty();
 								}
 							}

src/pages/deliver/coms/comDeliverRequestPopup.vue

@@ -47,7 +47,7 @@
 									
 									<uom :uom="uom"></uom>
 									<!-- <view class="" v-if="stdPackInfo!=undefined" style="display: flex;flex-direction: row;margin-left: 10rpx;">
-										(<stdPackQty :dataContent="stdPackInfo"></stdPackQty>)
+										(<packQty :dataContent="stdPackInfo"></packQty>)
 									</view> -->
 					
 								</view>

src/pages/deliver/coms/comScanDeliverPack.vue

@@ -385,8 +385,8 @@
 			},
 
 			creatRecord(label, balance, packageInfo) {
-				balance.stdPackQty = packageInfo.stdPackQty
+				balance.packQty = packageInfo.packQty
-				balance.stdPackUnit = packageInfo.stdPackUnit
+				balance.packUnit = packageInfo.packUnit
 				let record = {
 					itemCode: label.itemCode,
 					packingNumber: label.packingNumber,

src/pages/demo/demo.vue

@@ -449,8 +449,8 @@
 					itemCode: "LJH16540NAA",
 					itemName: "门板金属螺丝钉",
 					itemDesc1: "门板金属螺丝",
-					stdPackQty: 1000,
+					packQty: 1000,
-					stdPackUnit: '箱',
+					packUnit: '箱',
 					uom: 'EA',
 					qty: 3000,
 					inventoryStatus: 2,
@@ -468,8 +468,8 @@
 					itemCode: "LJH16540NAA",
 					itemName: "门板金属螺丝钉",
 					itemDesc1: "门板金属螺丝",
-					stdPackQty: 1000,
+					packQty: 1000,
-					stdPackUnit: 'EA',
+					packUnit: 'EA',
 					uom: 'EA',
 					qty: 500,
 					inventoryStatus: 2,
@@ -482,8 +482,8 @@
 					itemCode: "LJH16540NAA",
 					itemName: "门板金属螺丝钉",
 					itemDesc1: "门板金属螺丝",
-					stdPackQty: 1000,
+					packQty: 1000,
-					stdPackUnit: 'EA',
+					packUnit: 'EA',
 					uom: 'EA',
 					qty: 1000,
 					UsableQty: 500,

src/pages/inventoryMove/job/inventoryMoveDetail.vue

@@ -312,8 +312,8 @@
 													itemDetail.fromInventoryStatus = result.balance.inventoryStatus;
 													itemDetail.balance = result.balance;
 													itemDetail.balance.balanceQty = Number(result.balance.qty);
-													itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
+													itemDetail.balance.packQty = Number(result.package.packQty)
-													itemDetail.balance.stdPackUnit = result.package.stdPackUnit
+													itemDetail.balance.packUnit = result.package.packUnit
 													this.calcHandleQty();
 												} else {
 													this.scanPopupGetFocus();
@@ -332,8 +332,8 @@
 									itemDetail.fromInventoryStatus = result.balance.inventoryStatus;
 									itemDetail.balance = result.balance;
 									itemDetail.balance.balanceQty = Number(result.balance.qty);
-									itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
+									itemDetail.balance.packQty = Number(result.package.packQty)
-									itemDetail.balance.stdPackUnit = result.package.stdPackUnit
+									itemDetail.balance.packUnit = result.package.packUnit
 									this.calcHandleQty();
 								}
 							}

src/pages/issue-按批次推荐/job/issueDetail.vue

@@ -226,8 +226,8 @@
 				let item = {
 					itemCode: detail.itemCode,
 					itemName: detail.itemName,
-					stdPackQty: detail.stdPackQty,
+					packQty: detail.packQty,
-					stdPackUnit: detail.stdPackUnit,
+					packUnit: detail.packUnit,
 					qty: detail.qty,
 					uom: detail.uom,
 					handleQty: 0,

src/pages/issue/coms/comIssueRequestPopup.vue

@@ -62,7 +62,7 @@
 									<uom :uom="uom"></uom>
 									<view class="" v-if="stdPackInfo!=undefined"
 										style="display: flex;flex-direction: row;margin-left: 10rpx;">
-										(<stdPackQty :dataContent="stdPackInfo"></stdPackQty>)
+										(<packQty :dataContent="stdPackInfo"></packQty>)
 									</view>
 								</view>
 							</view>
@@ -97,7 +97,7 @@
 		checkDirectoryItemExist
 	} from '@/common/directory.js';
 	import uom from '@/mycomponents/qty/uom.vue'
-	import stdPackQty from '@/mycomponents/qty/stdPackQty.vue'
+	import packQty from '@/mycomponents/qty/packQty.vue'
 	import balanceStatus from '@/mycomponents/status/balanceStatus.vue'
 	import winScanItem from '@/mycomponents/scan/winScanItem.vue'
 
@@ -106,7 +106,7 @@
 			uom,
 			balanceStatus,
 			winScanItem,
-			stdPackQty,
+			packQty,
 		},
 		data() {
 			return {

src/pages/issue/coms/comScanIssuePack.vue

@@ -382,8 +382,8 @@
 			},
 
 			creatRecord(label, balance, packageInfo) {
-				balance.stdPackQty = packageInfo.stdPackQty
+				balance.packQty = packageInfo.packQty
-				balance.stdPackUnit = packageInfo.stdPackUnit
+				balance.packUnit = packageInfo.packUnit
 				let record = {
 					scaned: true,
 					itemCode: label.itemCode,

src/pages/issue/js/issue.js

@@ -56,7 +56,7 @@ export function createItemInfo(detail) {
 		productionLineCode: detail.productionLineCode,
 		workStationCode: detail.workStationCode,
 		stdPackQty: detail.stdPackQty,
-		stdPackUnit: detail.stdPackUnit,
+		packUnit: detail.packUnit,
 		qty: detail.qty,
 		uom: detail.uom,
 		handleQty: 0,

src/pages/productPutaway/job/productPutawayDetail.vue

@@ -283,8 +283,8 @@
 													itemDetail.toInventoryStatus = result.balance.inventoryStatus;
 													itemDetail.balance = result.balance;
 													itemDetail.balance.balanceQty = Number(result.balance.qty)
-													itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
+													itemDetail.balance.packQty = Number(result.package.packQty)
-													itemDetail.balance.stdPackUnit = result.package.stdPackUnit
+													itemDetail.balance.packUnit = result.package.packUnit
 													this.calcHandleQty();
 												} else {
 													this.scanPopupGetFocus();
@@ -301,8 +301,8 @@
 									itemDetail.balance = result.balance;
 									itemDetail.toInventoryStatus = result.balance.inventoryStatus;
 									itemDetail.balance.balanceQty = Number(result.balance.qty)
-									itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
+									itemDetail.balance.packQty = Number(result.package.packQty)
-									itemDetail.balance.stdPackUnit = result.package.stdPackUnit
+									itemDetail.balance.packUnit = result.package.packUnit
 									this.calcHandleQty();
 								}
 							}

src/pages/productReceipt/coms/detailInfoPopup.vue

@@ -19,11 +19,11 @@
 						
 						<view class="item">
 							<text class="item_title">标包数量 : </text>
-							<text class="text_wrap">{{dataContent.stdPackQty}} </text>
+							<text class="text_wrap">{{dataContent.packQty}} </text>
 						</view>
 						<view class="item">
 							<text class="item_title">标包单位 : </text>
-							<text class="text_wrap">{{dataContent.stdPackUnit}} </text>
+							<text class="text_wrap">{{dataContent.packUnit}} </text>
 						</view>
 						
 						<view class="item">

src/pages/productReceipt/coms/productDetailInfoPopup.vue

@@ -6,11 +6,11 @@
 					<view class="uni-flex uni-column">
 						<view class="item">
 							<text class="item_title">标包数量 : </text>
-							<text class="text_wrap">{{dataContent.stdPackQty}} </text>
+							<text class="text_wrap">{{dataContent.packQty}} </text>
 						</view>
 						<view class="item">
 							<text class="item_title">标包单位 : </text>
-							<text class="text_wrap">{{getStdPackUnitInfo(dataContent.stdPackUnit)}} </text>
+							<text class="text_wrap">{{getPackUnitInfo(dataContent.packUnit)}} </text>
 						</view>
 
 					</view>
@@ -50,7 +50,7 @@
 </template>
 
 <script>
-	import {getStdPackUnitInfo} from "@/common/directory.js"
+	import {getPackUnitInfo} from "@/common/directory.js"
 	import {
 		dateFormat
 	} from '@/common/basic.js';
@@ -81,8 +81,8 @@
 			closePopup() {
 				this.$refs.popup.close()
 			},
-			getStdPackUnitInfo(value){
+			getPackUnitInfo(value){
-				return getStdPackUnitInfo(value).label
+				return getPackUnitInfo(value).label
 			},
 			dateFormat(value){
 				return dateFormat(value)

src/pages/productReceipt/record/productReceiptRecord.vue

@@ -182,8 +182,8 @@
 				let item = {
 					itemCode: label.itemCode,
 					itemName: pack.itemName,
-					stdPackQty: pack.stdPackQty,
+					packQty: pack.packQty,
-					stdPackUnit: pack.stdPackUnit,
+					packUnit: pack.packUnit,
 					qty: new Decimal(label.qty).toNumber(),
 					handleQty: new Decimal(0).toNumber(),
 					uom: pack.uom,
@@ -198,8 +198,8 @@
 				detail.qty = new Decimal(label.qty).toNumber();
 				detail.handleQty = new Decimal(label.qty).toNumber();
 				detail.inventoryStatus = "OK"
-				detail.stdPackQty = pack.stdPackQty;
+				detail.packQty = pack.packQty;
-				detail.stdPackUnit = pack.stdPackUnit;
+				detail.packUnit = pack.packUnit;
 
 				detail.package = pack;
 				detail.label = label;

src/pages/productionReceipt/job/productionReceiptDetail.vue

@@ -289,8 +289,8 @@
 													itemDetail.toInventoryStatus = result.balance.inventoryStatus;
 													itemDetail.balance = result.balance;
 													itemDetail.balance.balanceQty = Number(result.balance.qty)
-													itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
+													itemDetail.balance.packQty = Number(result.package.packQty)
-													itemDetail.balance.stdPackUnit = result.package.stdPackUnit
+													itemDetail.balance.packUnit = result.package.packUnit
 													this.calcHandleQty();
 												} else {
 													this.scanPopupGetFocus();
@@ -311,8 +311,8 @@
 									itemDetail.toInventoryStatus = result.balance.inventoryStatus;
 									itemDetail.balance = result.balance;
 									itemDetail.balance.balanceQty = Number(result.balance.qty)
-									itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
+									itemDetail.balance.packQty = Number(result.package.packQty)
-									itemDetail.balance.stdPackUnit = result.package.stdPackUnit
+									itemDetail.balance.packUnit = result.package.packUnit
 									this.calcHandleQty();
 								}
 							}

src/pages/productionReturn/coms/comReturn.vue

@@ -210,8 +210,8 @@
 				let item = {
 					itemCode: label.itemCode,
 					itemName: pack.itemName,
-					stdPackQty: pack.stdPackQty,
+					packQty: pack.packQty,
-					stdPackUnit: pack.stdPackUnit,
+					packUnit: pack.packUnit,
 					qty: Number(label.qty),
 					handleQty: 0,
 					uom: pack.uom,
@@ -226,8 +226,8 @@
 				detail.scaned = true;
 				detail.qty = Number(label.qty);
 				detail.inventoryStatus = this.businessTypeCode == 'ReturnToStore' ? "OK" : "HOLD"
-				detail.stdPackQty = pack.stdPackQty;
+				detail.packQty = pack.packQty;
-				detail.stdPackUnit = pack.stdPackUnit;
+				detail.packUnit = pack.packUnit;
 				detail.handleQty = 0;
 				detail.package = pack;
 				detail.label = label;

src/pages/productionReturn/coms/comReturnRequestPopup.vue

@@ -51,7 +51,7 @@
 									
 									<uom :uom="uom"></uom>
 									<view class="" v-if="stdPackInfo!=undefined" style="display: flex;flex-direction: row;margin-left: 10rpx;">
-										(<stdPackQty :dataContent="stdPackInfo"></stdPackQty>)
+										(<packQty :dataContent="stdPackInfo"></packQty>)
 									</view>
 
 								</view>
@@ -85,7 +85,7 @@
 		checkDirectoryItemExist
 	} from '@/common/directory.js';
 	import uom from '@/mycomponents/qty/uom.vue'
-	import stdPackQty from '@/mycomponents/qty/stdPackQty.vue'
+	import packQty from '@/mycomponents/qty/packQty.vue'
 	import balanceStatus from '@/mycomponents/status/balanceStatus.vue'
 	import winScanItem from '@/mycomponents/scan/winScanItem.vue'
 
@@ -93,7 +93,7 @@
 	export default {
 		components: {
 			uom,
-			stdPackQty,
+			packQty,
 			balanceStatus,
 			winScanItem
 		},

src/pages/productionReturn/coms/comScanReturnPack.vue

@@ -367,8 +367,8 @@
 			},
 
 			creatRecord(label, balance, packageInfo) {
-				balance.stdPackQty = packageInfo.stdPackQty
+				balance.packQty = packageInfo.packQty
-				balance.stdPackUnit = packageInfo.stdPackUnit
+				balance.packUnit = packageInfo.packUnit
 				let record = {
 					itemCode: label.itemCode,
 					packingNumber: label.packingNumber,

src/pages/productionReturn/coms/returnDetailInfoPopup.vue

@@ -6,11 +6,11 @@
 					<view class="uni-flex uni-column">
 						<view class="item">
 							<text class="item_title">标包数量 : </text>
-							<text class="text_wrap">{{dataContent.stdPackQty}} </text>
+							<text class="text_wrap">{{dataContent.packQty}} </text>
 						</view>
 						<view class="item">
 							<text class="item_title">标包单位 : </text>
-							<text class="text_wrap">{{getStdPackUnitInfo(dataContent.stdPackUnit)}} </text>
+							<text class="text_wrap">{{getPackUnitInfo(dataContent.packUnit)}} </text>
 						</view>
 
 					</view>
@@ -22,7 +22,7 @@
 </template>
 
 <script>
-	import {getStdPackUnitInfo} from "@/common/directory.js"
+	import {getPackUnitInfo} from "@/common/directory.js"
 	import {
 		dateFormat
 	} from '@/common/basic.js';
@@ -53,8 +53,8 @@
 			closePopup() {
 				this.$refs.popup.close()
 			},
-			getStdPackUnitInfo(value){
+			getPackUnitInfo(value){
-				return getStdPackUnitInfo(value).label
+				return getPackUnitInfo(value).label
 			},
 			dateFormat(value){
 				return dateFormat(value)

src/pages/productionReturn/job/returnDetail.vue

@@ -283,8 +283,8 @@
 								itemDetail.scaned = true;
 								itemDetail.handleQty = Number(result.package.qty)
 								itemDetail.inventoryStatus = "OK"
-								itemDetail.stdPackQty = result.package.stdPackQty
+								itemDetail.packQty = result.package.packQty
-								itemDetail.stdPackUnit = result.package.stdPackUnit
+								itemDetail.packUnit = result.package.packUnit
 								this.calcHandleQty();
 
 
@@ -299,8 +299,8 @@
 								// 				itemDetail.handleQty = Number(result.balance.qty)
 								// 				itemDetail.balance = result.balance;
 								// 				itemDetail.balance.balanceQty = result.balance.qty;
-								// 				itemDetail.balance.stdPackQty = result.package.stdPackQty
+								// 				itemDetail.balance.packQty = result.package.packQty
-								// 				itemDetail.balance.stdPackUnit = result.package.stdPackUnit
+								// 				itemDetail.balance.packUnit = result.package.packUnit
 								// 				this.calcHandleQty();
 								// 			} else {
 								// 				this.scanPopupGetFocus();
@@ -311,8 +311,8 @@
 								// itemDetail.handleQty = Number(result.balance.qty)
 								// itemDetail.balance = result.balance;
 								// itemDetail.balance.balanceQty = result.balance.qty;
-								// itemDetail.balance.stdPackQty = result.package.stdPackQty
+								// itemDetail.balance.packQty = result.package.packQty
-								// itemDetail.balance.stdPackUnit = result.package.stdPackUnit
+								// itemDetail.balance.packUnit = result.package.packUnit
 								// this.calcHandleQty();
 								// }
 							}

src/pages/productionReturn/record/returnToHold.vue

@@ -247,8 +247,8 @@
 				let item = {
 					itemCode: label.itemCode,
 					itemName: pack.itemName,
-					stdPackQty: pack.stdPackQty,
+					packQty: pack.packQty,
-					stdPackUnit: pack.stdPackUnit,
+					packUnit: pack.packUnit,
 					qty: new Decimal(label.qty).toNumber(),
 					handleQty: new Decimal(0).toNumber(),
 					uom: pack.uom,
@@ -263,8 +263,8 @@
 				detail.qty = new Decimal(label.qty).toNumber();
 				detail.handleQty = new Decimal(label.qty).toNumber();
 				detail.inventoryStatus = "OK"
-				detail.stdPackQty = pack.stdPackQty;
+				detail.packQty = pack.packQty;
-				detail.stdPackUnit = pack.stdPackUnit;
+				detail.packUnit = pack.packUnit;
 				detail.batch = pack.batch;
 				detail.packingNumber = pack.number;
 				detail.package = pack;

src/pages/productionReturn/record/returnToStore.vue

@@ -260,8 +260,8 @@
 				let item = {
 					itemCode: label.itemCode,
 					itemName: pack.itemName,
-					stdPackQty: pack.stdPackQty,
+					packQty: pack.packQty,
-					stdPackUnit: pack.stdPackUnit,
+					packUnit: pack.packUnit,
 					qty: new Decimal(label.qty).toNumber(),
 					handleQty: new Decimal(0).toNumber(),
 					uom: pack.uom,
@@ -276,8 +276,8 @@
 				detail.qty = new Decimal(label.qty).toNumber();
 				detail.handleQty = new Decimal(label.qty).toNumber();
 				detail.inventoryStatus = "OK"
-				detail.stdPackQty = pack.stdPackQty;
+				detail.packQty = pack.packQty;
-				detail.stdPackUnit = pack.stdPackUnit;
+				detail.packUnit = pack.packUnit;
 				detail.batch = pack.batch;
 				detail.packingNumber = pack.number;
 				detail.package = pack;

src/pages/purchaseReceipt/coms/receiptDetailInfoPopup.vue

@@ -6,11 +6,11 @@
 					<view class="uni-flex uni-column">
 						<view class="item">
 							<text class="item_title">标包数量 : </text>
-							<text class="text_wrap">{{dataContent.stdPackQty}} </text>
+							<text class="text_wrap">{{dataContent.packQty}} </text>
 						</view>
 						<view class="item">
 							<text class="item_title">标包单位 : </text>
-							<text class="text_wrap">{{getStdPackUnitInfo(dataContent.stdPackUnit)}} </text>
+							<text class="text_wrap">{{getPackUnitInfo(dataContent.packUnit)}} </text>
 						</view>
 						<view class="item">
 							<text class="item_title">供应商计量数量 : </text>
@@ -18,7 +18,7 @@
 						</view>
 						<view class="item">
 							<text class="item_title">供应商计量单位 : </text>
-							<text class="text_wrap">{{getStdPackUnitInfo(dataContent.supplierUom)}} </text>
+							<text class="text_wrap">{{getPackUnitInfo(dataContent.supplierUom)}} </text>
 						</view>
 						<view class="item">
 							<text class="item_title">转换率 : </text>
@@ -62,7 +62,7 @@
 </template>
 
 <script>
-	import {getStdPackUnitInfo} from "@/common/directory.js"
+	import {getPackUnitInfo} from "@/common/directory.js"
 	import {
 		dateFormat
 	} from '@/common/basic.js';
@@ -93,8 +93,8 @@
 			closePopup() {
 				this.$refs.popup.close()
 			},
-			getStdPackUnitInfo(value){
+			getPackUnitInfo(value){
-				return getStdPackUnitInfo(value).label
+				return getPackUnitInfo(value).label
 			},
 			dateFormat(value){
 				return dateFormat(value)

src/pages/purchaseReturn/job/returnDetail.vue

@@ -276,8 +276,8 @@
 												itemDetail.inventoryStatus =result.balance.inventoryStatus;
 												itemDetail.balance = result.balance;
 												itemDetail.balance.balanceQty = result.balance.qty;
-												itemDetail.balance.stdPackQty = result.package.stdPackQty
+												itemDetail.balance.packQty = result.package.packQty
-												itemDetail.balance.stdPackUnit = result.package.stdPackUnit
+												itemDetail.balance.packUnit = result.package.packUnit
 												this.calcHandleQty();
 											} else {
 												this.scanPopupGetFocus();
@@ -305,8 +305,8 @@
 									itemDetail.inventoryStatus =result.balance.inventoryStatus;
 									itemDetail.balance = result.balance;
 									itemDetail.balance.balanceQty = Number(result.balance.qty);
-									itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
+									itemDetail.balance.packQty = Number(result.package.packQty)
-									itemDetail.balance.stdPackUnit = result.package.stdPackUnit
+									itemDetail.balance.packUnit = result.package.packUnit
 									this.calcHandleQty();
 								}
 							}

src/pages/putaway/job/putawayDetail.vue

@@ -291,8 +291,8 @@
 													itemDetail.toInventoryStatus = result.balance.inventoryStatus
 													itemDetail.balance = result.balance;
 													itemDetail.balance.balanceQty = Number(result.balance.qty);
-													itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
+													itemDetail.balance.packQty = Number(result.package.packQty)
-													itemDetail.balance.stdPackUnit = result.package.stdPackUnit
+													itemDetail.balance.packUnit = result.package.packUnit
 													this.calcHandleQty();
 												} else {
 													this.scanPopupGetFocus();
@@ -312,8 +312,8 @@
 									itemDetail.toInventoryStatus = itemDetail.inventoryStatus
 									itemDetail.balance = result.balance;
 									itemDetail.balance.balanceQty = Number(result.balance.qty);
-									itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
+									itemDetail.balance.packQty = Number(result.package.packQty)
-									itemDetail.balance.stdPackUnit = result.package.stdPackUnit
+									itemDetail.balance.packUnit = result.package.packUnit
 									this.calcHandleQty();
 								}
 							}

src/pages/repleinsh/coms/comRepleinshRequestPopup.vue

@@ -49,7 +49,7 @@
 									
 									<uom :uom="uom"></uom>
 									<view class="" v-if="stdPackInfo!=undefined" style="display: flex;flex-direction: row;margin-left: 10rpx;">
-										(<stdPackQty :dataContent="stdPackInfo"></stdPackQty>)
+										(<packQty :dataContent="stdPackInfo"></packQty>)
 									</view>
 									
 								</view>
@@ -92,12 +92,12 @@
 	import balanceStatus from '@/mycomponents/status/balanceStatus.vue'
 	import winScanItem from '@/mycomponents/scan/winScanItem.vue'
 	import winScanLocation from '@/mycomponents/scan/winScanLocation.vue'
-	import stdPackQty from '@/mycomponents/qty/stdPackQty.vue'
+	import packQty from '@/mycomponents/qty/packQty.vue'
 
 	export default {
 		components: {
 			uom,
-			stdPackQty,
+			packQty,
 			balanceStatus,
 			winScanItem,
 			winScanLocation

src/pages/repleinsh/coms/comScanReplishPack.vue

@@ -370,8 +370,8 @@
 			},
 
 			creatRecord(label, balance, packageInfo) {
-				balance.stdPackQty = packageInfo.stdPackQty
+				balance.packQty = packageInfo.packQty
-				balance.stdPackUnit = packageInfo.stdPackUnit
+				balance.packUnit = packageInfo.packUnit
 				let record = {
 					scaned: true,
 					itemCode: label.itemCode,

src/pages/scrap/coms/scrapDetailInfoPopup.vue

@@ -6,11 +6,11 @@
 					<view class="uni-flex uni-column">
 						<view class="item">
 							<text class="item_title">标包数量 : </text>
-							<text class="text_wrap">{{dataContent.stdPackQty}} </text>
+							<text class="text_wrap">{{dataContent.packQty}} </text>
 						</view>
 						<view class="item">
 							<text class="item_title">标包单位 : </text>
-							<text class="text_wrap">{{dataContent.stdPackUnit}} </text>
+							<text class="text_wrap">{{dataContent.packUnit}} </text>
 						</view>
 						<view class="item">
 							<text class="item_title">供应商计量数量 : </text>

src/pages/scrap/job/scrapJobDetail.vue

@@ -220,8 +220,8 @@
 													itemDetail.toInventoryStatus = result.balance.inventoryStatus;
 													itemDetail.balance = result.balance;
 													itemDetail.balance.balanceQty = Number(result.balance.qty);
-													itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
+													itemDetail.balance.packQty = Number(result.package.packQty)
-													itemDetail.balance.stdPackUnit = result.package.stdPackUnit
+													itemDetail.balance.packUnit = result.package.packUnit
 													this.calcHandleQty();
 												} else {
 													this.scanPopupGetFocus();
@@ -241,8 +241,8 @@
 									itemDetail.toInventoryStatus = result.balance.inventoryStatus;
 									itemDetail.balance = result.balance;
 									itemDetail.balance.balanceQty = Number(result.balance.qty);
-									itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
+									itemDetail.balance.packQty = Number(result.package.packQty)
-									itemDetail.balance.stdPackUnit = result.package.stdPackUnit
+									itemDetail.balance.packUnit = result.package.packUnit
 									this.calcHandleQty();
 								}
 							}

src/pages/supplierDeliver/coms/recordDetailInfoPopup.vue

@@ -94,11 +94,11 @@
 					},
 					{
 						title: '标包数量',
-						content: this.dataContent.stdPackQty
+						content: this.dataContent.packQty
 					},
 					{
 						title: '标包单位',
-						content: this.dataContent.stdPackUnit
+						content: this.dataContent.packUnit
 					},{
 						title: '供应商计量数量',
 						content: this.dataContent.supplierQty

src/pages/supplierDeliver/coms/recordtDetailInfoPopup.vue

@@ -6,11 +6,11 @@
 					<view class="uni-flex uni-column">
 						<view class="item">
 							<text class="item_title">标包数量 : </text>
-							<text class="text_wrap">{{dataContent.stdPackQty}} </text>
+							<text class="text_wrap">{{dataContent.packQty}} </text>
 						</view>
 						<view class="item">
 							<text class="item_title">标包单位 : </text>
-							<text class="text_wrap">{{dataContent.stdPackUnit}} </text>
+							<text class="text_wrap">{{dataContent.packUnit}} </text>
 						</view>
 						<view class="item">
 							<text class="item_title">供应商计量数量 : </text>

src/pages/transfer/job/issueDetail.vue

@@ -277,8 +277,8 @@
 													itemDetail.toInventoryStatus = result.balance.inventoryStatus
 													itemDetail.balance = result.balance;
 													itemDetail.balance.balanceQty = Number(result.balance.qty) ;
-													itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
+													itemDetail.balance.packQty = Number(result.package.packQty)
-													itemDetail.balance.stdPackUnit = result.package.stdPackUnit
+													itemDetail.balance.packUnit = result.package.packUnit
 													this.calcHandleQty();
 												} else {
 													this.scanPopupGetFocus();
@@ -297,8 +297,8 @@
 									itemDetail.toInventoryStatus = result.balance.inventoryStatus
 									itemDetail.balance = result.balance;
 									itemDetail.balance.balanceQty =  Number(result.balance.qty) ;
-									itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
+									itemDetail.balance.packQty = Number(result.package.packQty)
-									itemDetail.balance.stdPackUnit = result.package.stdPackUnit
+									itemDetail.balance.packUnit = result.package.packUnit
 									this.calcHandleQty();
 								}
 							}

src/pages/transfer/job/receiptDetail.vue

@@ -258,7 +258,7 @@
 								this.detailSource[0].subList.sort(compareAsc('scaned')); //按扫描信息排序
 								itemDetail.handleQty = Number(result.label.qty);
 								itemDetail.toLocationCode = this.toLocationCode;
-								itemDetail.stdPackQty = result.package.stdPackQty
+								itemDetail.packQty = result.package.packQty
 								itemDetail.labelQty = Number(result.label.qty);
 								calcHandleQty(this.detailSource);
 								this.continueScan()
@@ -304,8 +304,8 @@
 													itemDetail.toInventoryStatus = result.balance.inventoryStatus
 													itemDetail.balance = result.balance;
 													itemDetail.balance.balanceQty = Number(result.balance.qty);
-													itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
+													itemDetail.balance.packQty = Number(result.package.packQty)
-													itemDetail.balance.stdPackUnit = result.package.stdPackUnit
+													itemDetail.balance.packUnit = result.package.packUnit
 													this.calcHandleQty();
 												} else {
 													this.scanPopupGetFocus();
@@ -326,8 +326,8 @@
 									itemDetail.toInventoryStatus = result.balance.inventoryStatus
 									itemDetail.balance = result.balance;
 									itemDetail.balance.balanceQty = Number(result.balance.qty);
-									itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
+									itemDetail.balance.packQty = Number(result.package.packQty)
-									itemDetail.balance.stdPackUnit = result.package.stdPackUnit
+									itemDetail.balance.packUnit = result.package.packUnit
 									this.calcHandleQty();
 								}
 							}

src/pages/transfer/job/transferDetail.vue

@@ -208,8 +208,8 @@
 				let item = {
 					itemCode: res.itemCode,
 					itemName: res.itemName,
-					stdPackQty: res.stdPackQty,
+					packQty: res.packQty,
-					stdPackUnit: res.stdPackUnit,
+					packUnit: res.packUnit,
 					qty: res.qty,
 					handleQty: 0,
 					uom: res.uom,

src/pages/unPlanned/coms/comReceiptRequestPopup.vue

@@ -53,7 +53,7 @@
 									
 									<uom :uom="uom"></uom>
 									<view class="" v-if="stdPackInfo!=undefined" style="display: flex;flex-direction: row;margin-left: 10rpx;">
-										(<stdPackQty :dataContent="stdPackInfo"></stdPackQty>)
+										(<packQty :dataContent="stdPackInfo"></packQty>)
 									</view>
 
 								</view>
@@ -85,7 +85,7 @@
 		checkDirectoryItemExist
 	} from '@/common/directory.js';
 	import uom from '@/mycomponents/qty/uom.vue'
-	import stdPackQty from '@/mycomponents/qty/stdPackQty.vue'
+	import packQty from '@/mycomponents/qty/packQty.vue'
 	import balanceStatus from '@/mycomponents/status/balanceStatus.vue'
 	import winScanItem from '@/mycomponents/scan/winScanItem.vue'
 	import winScanLocation from '@/mycomponents/scan/winScanLocation.vue'
@@ -93,7 +93,7 @@
 	export default {
 		components: {
 			uom,
-			stdPackQty,
+			packQty,
 			balanceStatus,
 			winScanItem,
 			winScanLocation

src/pages/unPlanned/job/issueJobDetail.vue

@@ -241,8 +241,8 @@
 													itemDetail.toInventoryStatus = result.balance.inventoryStatus;
 													itemDetail.balance = result.balance;
 													itemDetail.balance.balanceQty = Number(result.balance.qty);
-													itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
+													itemDetail.balance.packQty = Number(result.package.packQty)
-													itemDetail.balance.stdPackUnit = result.package.stdPackUnit
+													itemDetail.balance.packUnit = result.package.packUnit
 													this.calcHandleQty();
 												} else {
 													this.scanPopupGetFocus();
@@ -262,8 +262,8 @@
 									itemDetail.toInventoryStatus = result.balance.inventoryStatus;
 									itemDetail.balance = result.balance;
 									itemDetail.balance.balanceQty = Number(result.balance.qty);
-									itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
+									itemDetail.balance.packQty = Number(result.package.packQty)
-									itemDetail.balance.stdPackUnit = result.package.stdPackUnit
+									itemDetail.balance.packUnit = result.package.packUnit
 									this.calcHandleQty();
 								}
 							}

src/pages/unPlanned/job/receiptJobDetail.vue

@@ -233,7 +233,7 @@
 								itemDetail.scaned = true;
 								itemDetail.handleQty = Number(result.label.qty);
 								itemDetail.toLocationCode = this.toLocationCode;
-								itemDetail.stdPackQty = result.package.stdPackQty
+								itemDetail.packQty = result.package.packQty
 								itemDetail.labelQty = Number(result.label.qty);
 								calcHandleQty(this.detailSource);
 								this.continueScan()

src/pages/unPlanned/record/receiptRecord.vue

@@ -173,8 +173,8 @@
 				let item = {
 					itemCode: pack.itemCode,
 					itemName: pack.itemName,
-					stdPackQty: pack.stdPackQty,
+					packQty: pack.packQty,
-					stdPackUnit: pack.stdPackUnit,
+					packUnit: pack.packUnit,
 					qty: new Decimal(label.qty).toNumber(),
 					handleQty: new Decimal(0).toNumber(),
 					uom: label.uom,
@@ -190,8 +190,8 @@
 				detail.qty = new Decimal(label.qty).toNumber();
 				detail.handleQty = new Decimal(label.qty).toNumber();
 				detail.inventoryStatus = "OK"
-				detail.stdPackQty = pack.stdPackQty;
+				detail.packQty = pack.packQty;
-				detail.stdPackUnit = pack.stdPackUnit;
+				detail.packUnit = pack.packUnit;
 				label.inventoryStatus = "OK";
 				detail.package = pack;
 				detail.label = label;