修改盘点

src/mycomponents/status/statusEdit.vue

@@ -12,8 +12,7 @@
 						<!-- u-button自带点击变换颜色 -->
 						<u-button class="button" @tap="tagClick(item)" :key="index"
 							:class="[mIndex==index ? 'active' : '']">
-							<text :class="statusStyle(item.value)">{{item.text}}</text>
+							<text :class="statusStyle(item.value)">{{item.label}}</text>
-
 						</u-button>
 					</view>
 				</view>
@@ -25,7 +24,8 @@
 
 <script>
 	import {
-		getInventoryStatusStyle
+		getInventoryStatusStyle,
+		getInventoryStatusList
 	} from '@/common/directory.js';
 
 	import {
@@ -49,7 +49,7 @@
 		watch: {
 			status: {
 				handler(newName, oldName) {
-					this.list = getInventoryStatusArray();
+					this.list = getInventoryStatusList();
 					for (var i = 0; i < this.list.length; i++) {
 						if (this.list[i].value == this.status) {
 							this.mIndex = i;

src/pages/count/job/countLightDetail.vue

@@ -19,8 +19,7 @@
 					<uni-swipe-action ref="swipeAction">
 						<uni-swipe-action-item>
 							<view class="uni-flex uni-row "
-								style="align-items: center; margin: 10rpx; border-radius: 10rpx   ;"
+								style="align-items: center; margin: 10rpx; border-radius: 10rpx   ;">
-								>
 								<comCountDetailcards :ref="'countDetail_'+index" :dataContent="item" :index="index"
 									@editItem="editItem" :settingParam="jobContent" @remove="updateData"
 									@summCount="summCount" @currentCount="currentCount" @updateData="updateData">
@@ -46,8 +45,7 @@
 
 		<win-scan-button @goScan='openScanPopup'></win-scan-button>
 		<win-scan-pack-and-location :allowModifyLocation="false" ref="scanPopup" :noShowBalanceMessage="true"
-			:isShowHistory="false"
+			:isShowHistory="false" @getCountScanResult='getCountScanResult'>
-			@getCountScanResult='getCountScanResult'>
 		</win-scan-pack-and-location>
 		<detail-info-popup ref="detailInfoPopup"></detail-info-popup>
 		<count-qty-edit ref="countQtyEdit" @confirm="editConfirm" @close="editClose" :isShowStatus="true"
@@ -201,25 +199,19 @@
 			refreshData(recordList) {
 				//记录的数据刷新列表
 				var addList = []
+
+				this.dataList.forEach(mainItem => {
+					mainItem.recordList = [];
 					recordList.forEach(subItem => {
-					let mainItem = this.dataList.find(r =>
+						//在主表中，添加到recordList
-						r.itemCode == subItem.itemCode &&
+						if (mainItem.itemCode == subItem.itemCode &&
-						r.batch == subItem.batch &&
+							mainItem.batch == subItem.batch &&
-						r.inventoryStatus == subItem.inventoryStatus)
+							mainItem.inventoryStatus == subItem.inventoryStatus)
-					//主列表存在数据
+						 {
-					if (mainItem) {
-						mainItem.scaned = true;
-						if (!mainItem.recordList) {
-							mainItem.recordList = []
-						}
 							mainItem.recordList.push(subItem)
 						}else {
-						//主列表不存在数据，添加到主列表
+							//不在主表中，添加主表明细
 							var detail = this.createBackAddDetailInfo(subItem)
-
-						if (!detail.recordList) {
-							detail.recordList = []
-						}
 							var recordItem = {
 								scaned: true,
 								isNewJobDetail: "true",
@@ -240,17 +232,19 @@
 								balanceQty: subItem.balanceQty,
 								locationCode: subItem.locationCode
 							}
+							detail.recordList=[];
 							detail.recordList.push(recordItem)
 							addList.push(detail)
 						}
-
 					})
+				})
+				
 				if (addList.length > 0) {
 					this.dataList = this.dataList.concat(addList)
 				}
-
 				this.updateList(false);
 
+
 			},
 
 
@@ -313,7 +307,9 @@
 				var pack = result.package
 				var batch = result.label.batch
 				var inventoryStatus = result.balance ? result.balance.inventoryStatus : "OK"
-				var qty = result.balance ? result.balance.qty : result.label.qty;
+				var qty = result.balance ? result.balance.qty : 0;
+				var handleQty =qty!=0?qty:result.label.qty
+				
 				var uom = pack.uom
 				var locationCode = this.locationCode
 				this.managementType = managementPrecision;
@@ -331,7 +327,7 @@
 					toBatch: batch,
 					inventoryStatus: inventoryStatus,
 					qty: qty,
-					handleQty: qty,
+					handleQty: handleQty,
 					uom: uom,
 					packUnit: pack.packUnit,
 					packQty: pack.packQty,