修改盘点任务

api/request2.js

@@ -1163,26 +1163,26 @@ export function getCountJobDetail(id) {
 }
 
 /**
- * 盘点 任务承接
+ * 盘点任务 任务承接
  * @param {*} id
  * 
  */
 export function takeCountJob(id) {
 	return request({
-		url: baseApi + "/wms/purchasereceipt-job-main/accept?id=" + id,
+		url: baseApi + "/wms/count-job-main/accept?id=" + id,
 		method: "put",
 		data: {},
 	});
 }
 
 /**
- * 盘点 放弃承接
+ * 盘点任务 放弃承接
  * @param {*} id
  * 
  */
 export function cancleTakeCountJob(id) {
 	return request({
-		url: baseApi + "/wms/purchasereceipt-job-main/abandon?id=" + id,
+		url: baseApi + "/wms/count-job-main/abandon?id=" + id,
 		method: "put",
 		data: {},
 	});
@@ -1195,7 +1195,7 @@ export function cancleTakeCountJob(id) {
  */
 export function countJobSubmit(params) {
 	return request({
-		url: baseApi + "/magic-api/pda/job/purchasereceipt/jobSubmit?id=" + id,
+		url: baseApi + "/wms/count-job-main/execute",
 		method: "put",
 		data: params,
 	});

common/directory.js

@@ -17,6 +17,8 @@ let nextActionList = [];
 let inspectTypeList = [];
 let sampleMethodList = [];
 let transferModeList = [];
+let countStageList = [];
+
 
 
 // 获取业务类型字典项
@@ -51,6 +53,7 @@ export function clearCacheData() {
 	   inspectTypeList = [];
 	   sampleMethodList =[];
 	   transferModeList = [];
+	   countStageList =[];
 }
 
 //获取字典信息
@@ -436,6 +439,26 @@ export function getTransferModeName(value) {
 	return resultInfo
 }
 
+//获取盘点阶段名称
+export function getCountStageName(value) {
+	var resultInfo = "";
+	if (countStageList.length == 0) {
+		countStageList = getDirectoryInfo("count_stage")
+	}
+	if (countStageList.length > 0) {
+		for (let item of countStageList) {
+			if (item.value == value) {
+				resultInfo = item.label
+				break;
+			}
+		}
+	}
+	return resultInfo
+}
+
+
+
+
 
 
 

mycomponents/location/requiredLocation.vue

@@ -59,7 +59,10 @@
 		},
 		methods: {
 			showLocation() {
+				if(this.isShowEdit){
 					this.$refs.scanLocationCode.openScanPopup();
+				}
+				
 			},
 			//扫描源库位
 			getLocation(location, code) {

mycomponents/qty/CountQtyEdit.vue

@@ -43,7 +43,7 @@
 								</view>
 							</view>
 							<u-line />
-							<view class="uni-flex uni-row space-between padding title u-col-center">
+							<view v-if="isShowBalance" class="uni-flex uni-row space-between padding title u-col-center">
 								<text>库存数量 : </text>
 								<view class="uni-flex uni-row uni-center" style="align-items: center;">
 									<text class="text_recommend">{{Number(dataContent.balanceQty)}}</text>
@@ -52,7 +52,7 @@
 							</view>
 							<u-line />
 							<view v-if="isShowStatus" class="uni-flex uni-row space-between title"
-								style="align-items: center; padding-left: 20rpx;">
+								style="align-items: center; padding-left: 30rpx;">
 								<text>库存状态 : </text>
 								<view class="uni-flex uni-row uni-center" style="align-items: center;">
 									<balanceStatus ref="balanceStatus" :status="inventoryStatus" :allowEdit='false'
@@ -102,7 +102,6 @@
 				stateData: 0,
 				balanceQty: 0,
 				inventoryStatus: "",
-				originalInventoryStatus: "",
 				dataContent: {},
 				handleQty: 0,
 				seconds: 0,
@@ -131,6 +130,10 @@
 				type: Boolean,
 				default: true
 			},
+			isShowBalance: {
+				type: Boolean,
+				default: true
+			},
 			allowEditStatus: {
 				type: Boolean,
 				default: false
@@ -139,8 +142,6 @@
 		methods: {
 			openEditPopup(item, detaiList) {
 				this.dataContent = item
-				// this.originalInventoryStatus = this.dataContent.inventoryStatus
-				// this.inventoryStatus = this.dataContent.toInventoryStatus
 				this.inventoryStatus = this.dataContent.inventoryStatus;
 				this.allQty = Number(this.dataContent.qty)
 				this.showConfirmCountdown = false;
@@ -151,8 +152,6 @@
 
 			openEditPopupShowSeconds(item, detaiList) {
 				this.dataContent = item;
-				// this.originalInventoryStatus = this.dataContent.inventoryStatus
-				// this.inventoryStatus = this.dataContent.toInventoryStatus
 				this.inventoryStatus = this.dataContent.inventoryStatus;
 				this.allQty = Number(this.dataContent.qty);
 				this.showConfirmCountdown = true;
@@ -179,7 +178,6 @@
 				this.setValue();
 			},
 			cancel() {
-				this.dataContent.inventoryStatus = this.originalInventoryStatus;
 				this.closeEditPopup();
 			},
 			startTimer() {
@@ -197,42 +195,11 @@
 				this.allQty = val * this.dataContent.stdPackQty;
 			},
 			setValue() {
-				this.dataContent.qty = Number(this.allQty)
+				this.dataContent.handleQty = Number(this.allQty)
 				this.$emit("confirm");
 				this.closeEditPopup();
-				// this.callback();
 			},
-			callback() {
-				//查询列表中是否存在
-				var item = this.detaiList.find(
-					detail => {
-						if (detail.record == undefined) {
-							if (detail.packingNumber == this.dataContent.packingNumber &&
-								detail.batch == this.dataContent.batch &&
-								detail.inventoryStatus == this.inventoryStatus) {
-								return detail;
-							}
-						} else {
-							if (detail.record.packingNumber == this.dataContent.packingNumber &&
-								detail.record.batch == this.dataContent.batch &&
-								detail.record.inventoryStatus == this.inventoryStatus) {
-								return detail;
-							}
-						}
-
-					})
-				if (item == undefined) {
-					this.dataContent.inventoryStatus = this.inventoryStatus
-					this.dataContent.qty = Number(this.allQty)
-					this.$emit("confirm");
-					this.closeEditPopup();
-				} else {
-					this.$refs.comMessage.showErrorMessage("箱码[" + item.packingNumber + "]批次[" + item.batch + "]" + "状态[" +
-						getInventoryStatusName(item.inventoryStatus) + "]已经在列表中", res => {
 
-						})
-				}
-			},
 			updateStatus(value) {
 				this.inventoryStatus = value
 				console.log(this.inventoryStatus)

mycomponents/qty/compareQty.vue

@@ -13,13 +13,15 @@
 					<view v-else-if="Number(recommendQty) ==Number( handleQty)" class="text_equal">
 							{{Number(handleQty)}}
 					</view>
+					
 				</view>
-				<view  class="std_split">/</view>
+					<view v-if="Number(handleQty)>0 " class="std_split">/</view>
-				<view class="text_recommend center">
+					<view v-if="isShowRecommendQty" class="text_recommend center">
 							{{Number(recommendQty)}}
 					</view>
+				
 			</view>
-			<uom v-show="!isShowStdPack" :uom="dataContent.uom"></uom>
+			<uom v-show="Number(handleQty)>0||(isShowRecommendQty&&Number(recommendQty)>0)" :uom="dataContent.uom"></uom>
 		</view>
 		<view>
 			<std-pack-qty v-show="isShowStdPack" :dataContent="dataContent"></std-pack-qty>
@@ -71,6 +73,10 @@
 			isShowStdPack: {
 				type: Boolean,
 				default: true
+			},
+			isShowRecommendQty: {
+				type: Boolean,
+				default: true
 			}
 		},
 		watch: {

mycomponents/recommend/recommendCount.vue

@@ -0,0 +1,117 @@
+<template>
+	<view :class="detail.scaned?'scan_view':''" style="background-color: #ffffff;">
+		<view class="uni-flex uni-row space-between ">
+			<!-- uni-inline-item 暂时拿掉-->
+			<view>
+				<pack v-if="isShowPack" :packingCode="detail.packingNumber"></pack>
+				<batch v-if="isShowBatch" :batch="detail.batch"></batch>
+				<location v-if="isShowFromLocation" title="来源库位" :locationCode="detail.fromLocationCode">
+				</location>
+				<location v-if="isShowToLocation" title="目标库位" :locationCode="detail.toLocationCode">
+				</location>
+			</view>
+			<view>
+				<!-- <recommend-qty v-if="detail.handleQty==null || detail.handleQty==undefined" :dataContent="detail"
+					:isShowStdPack="false"></recommend-qty> -->
+				<compare-qty :dataContent="detail" :recommendQty="Number(detail.qty)" :isShowRecommendQty="isShowRecommendQty"
+					:handleQty="Number(detail.handleQty)" :isShowStdPack="false">
+				</compare-qty>
+				<view class="uni-flex uni-row" style="vertical-align:center">
+					<text style="font-size: 30rpx;color: #2979ff; " 
+						@click="copy">复制采购</text>
+					<text style="font-size: 30rpx;color: #2979ff;" @click="copyPro">|制品</text>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import pack from '@/mycomponents/balance/pack.vue'
+	import location from '@/mycomponents/balance/location.vue'
+	import batch from '@/mycomponents/balance/batch.vue'
+	import recommendQty from '@/mycomponents/qty/recommendQty.vue'
+	import compareQty from '@/mycomponents/qty/compareQty.vue'
+
+	export default {
+		components: {
+			pack,
+			location,
+			batch,
+			recommendQty,
+			compareQty
+		},
+
+		data() {
+			return {
+
+			}
+		},
+		props: {
+			detail: {
+				type: Object,
+				default: {}
+			},
+			isShowPack: {
+				type: Boolean,
+				default: true
+			},
+			isShowBatch: {
+				type: Boolean,
+				default: true
+			},
+			isShowFromLocation: {
+				type: Boolean,
+				default: true
+			},
+			isShowToLocation: {
+				type: Boolean,
+				default: false
+			},
+
+			locationTitle: {
+				type: String,
+				default: '库位'
+			},
+			isShowRecommendQty:{
+				type: Boolean,
+				default: true
+			}
+
+		},
+		watch: {
+
+		},
+		methods: {
+			copy() {
+				// HPQ;V1.0;ICE115F11161AG;PP20230427000026;B20230427002;Q100
+				var content = "HPQ;V1.0;I" + this.detail.itemCode + ";P" + this.detail.packingNumber + ";B" + this.detail
+					.batch + ";Q" + this.detail.qty
+				this.$copyText(content).then(
+					res => {
+						uni.showToast({
+							title: '复制采购标签成功',
+							icon: 'none'
+						})
+					}
+				)
+			},
+			copyPro() {
+				// HPQ;V1.0;ICE115F11161AG;PP20230427000026;B20230427002;Q100
+				var content = "HMQ;V1.0;I" + this.detail.itemCode + ";P" + this.detail.packingNumber + ";B" + this.detail
+					.batch + ";Q" + this.detail.qty
+				this.$copyText(content).then(
+					res => {
+						uni.showToast({
+							title: '复制制品标签成功',
+							icon: 'none'
+						})
+					}
+				)
+			}
+		}
+	}
+</script>
+
+<style>
+</style>

pages/count/coms/comCountDetailCard.vue

@@ -14,7 +14,7 @@
 					<uni-swipe-action ref="swipeAction">
 						<uni-swipe-action-item @click="swipeClick($event,item)"
 							:right-options="item.scaned?scanOptions:detailOptions">
-							<recommend :detail="item"  :isShowFromLocation="false"></recommend>
+							<recommendCount :detail="item"  :isShowFromLocation="false" :isShowRecommendQty="settingParam.isOpenCount=='TRUE'"></recommendCount>
 						</uni-swipe-action-item>
 					</uni-swipe-action>
 					<u-line color="#D8D8D8"></u-line>
@@ -28,7 +28,7 @@
 
 <script>
 	import itemQty from '@/mycomponents/item/itemQty.vue'
-	import recommend from '@/mycomponents/recommend/recommend.vue'
+	import recommendCount from '@/mycomponents/recommend/recommendCount.vue'
 	import detailInfoPopup from '@/pages/count/coms/detailInfoPopup.vue'
 	import comMessage from '@/mycomponents/common/comMessage.vue'
 
@@ -41,7 +41,7 @@
 	export default {
 		components: {
 			itemQty,
-			recommend,
+			recommendCount,
 			detailInfoPopup,
 			comMessage
 		},

pages/count/coms/comCountJobCard.vue

@@ -9,7 +9,7 @@
 
  			<view class="task_text">
  				<view class="">
- 					盘点阶段 : {{dataContent.stage}}
+ 					盘点阶段 : {{getCountStageName(dataContent.stage)}}
  				</view>
  			</view>
 
@@ -18,11 +18,19 @@
  					盘点库位 : {{dataContent.locationCode}}
  				</view>
  			</view>
+			<view class="task_text">
+				<view class="">
+					盘点策略 : {{isOpenCount(dataContent.isOpenCount)}}
+				</view>
+			</view>
  		</view>
  	</job-com-main-card>
  </template>
 
  <script>
+	 import {
+	 	getCountStageName
+	 } from '@/common/directory.js';
  	import jobComMainCard from '@/mycomponents/job/jobComMainCard.vue'
  	export default {
  		components: {
@@ -40,7 +48,12 @@
  		},
 
  		methods: {
-
+			getCountStageName(value){
+				return getCountStageName(value)
+			},
+			isOpenCount(value){
+				return value=="TRUE"?"明盘":"盲盘"
+			}
  		}
  	}
  </script>

pages/count/coms/jobInfoPopup.vue

@@ -6,12 +6,22 @@
 					<view class="uni-flex uni-column">
 						<view class="item">
 							<text class="item_title">计划单号 : </text>
-							<text class="text_wrap">{{dataContent.PlanNumber}} </text>
+							<text class="text_wrap">{{dataContent.planNumber}} </text>
 						</view>
 						<view class="item">
 							<text class="item_title">阶段 : </text>
-							<text class="text_wrap">{{dataContent.Stage}} </text>
+							<text class="text_wrap">{{getCountStageName(dataContent.stage)}} </text>
 						</view>
+
+						<view class="item">
+							<text class="item_title">库位 : </text>
+							<text class="text_wrap">{{dataContent.locationCode}} </text>
+						</view>
+						<view class="item">
+							<text class="item_title">盘点策略 : </text>
+							<text class="text_wrap">{{isOpenCount(dataContent.isOpenCount)}}</text>
+						</view>
+
 					</view>
 				</view>
 			</job-common-info>
@@ -20,6 +30,9 @@
 </template>
 
 <script>
+	import {
+		getCountStageName
+	} from '@/common/directory.js';
 	import jobCommonInfo from '@/mycomponents/job/jobCommonInfo.vue'
 	export default {
 		components: {
@@ -45,6 +58,12 @@
 			closePopup() {
 				this.$refs.popup.close()
 			},
+			getCountStageName(value) {
+				return getCountStageName(value)
+			},
+			isOpenCount(value) {
+				return value == "TRUE" ? "明盘" : "盲盘"
+			}
 		}
 	}
 </script>

pages/count/job/countDetail.vue

@@ -1,6 +1,27 @@
 <template>
 	<view class="page-wraper">
-		
+		<view class="page-header">
+			<view class="header_job_top">
+				<job-top :dataContent="jobContent"></job-top>
+			</view>
+			<view class="cen_card" style="padding-top: 10rpx;padding-bottom: 10rpx;">
+				<view class="cell_box uni-flex uni-row">
+					<view class="cell_info">
+						<view class="text_lightblue">阶段</view>
+						<view>{{getCountStageName(jobContent.stage)}}</view>
+					</view>
+					<view class="cell_info">
+						<view class="text_lightblue">策略</view>
+						<view>{{ isOpenCount(jobContent.isOpenCount) }}</view>
+					</view>
+					<view class="cell_info">
+						<view class="text_lightblue">库位</view>
+						<view>{{fromLocationCode}}</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<u-line color="#D8D8D8" style="margin-bottom: 15rpx;"></u-line>
 		<view class="page-main">
 			<scroll-view scroll-y="true" class="page-main-scroll">
 				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
@@ -19,9 +40,6 @@
 			<view class="uni-flex u-col-center space-between padding_10"
 				style="background-color:ghostwhite; width: 100%; ">
 				<view class="">
-					<requiredLocation title="盘点库位" :locationCode="fromLocationCode" :isShowEdit="jobContent.allowModifyLocation==1"
-						@getLocation='scanLocationCode' :locationTypeList="locationTypeList"></requiredLocation>
-					<u-line></u-line>
 				</view>
 				<view class=" uni-flex uni-row">
 					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@@ -31,7 +49,8 @@
 
 		<win-scan-button @goScan='openScanPopup'></win-scan-button>
 		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
-		<count-qty-edit ref="CountQtyEdit" @confirm="editConfirm" :isShowStatus="false" :allowEditStatus="true">
+		<count-qty-edit ref="countQtyEdit" @confirm="editConfirm" :isShowStatus="true" :allowEditStatus="false"
+			:isShowBalance="jobContent.isOpenCount=='TRUE'">
 		</count-qty-edit>
 		<com-message ref="comMessage"></com-message>
 	</view>
@@ -50,6 +69,9 @@
 		navigateBack,
 		getPackingNumberAndBatch
 	} from '@/common/basic.js';
+	import {
+		getCountStageName
+	} from '@/common/directory.js';
 
 	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
 	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
@@ -57,7 +79,8 @@
 	import comCountDetailCard from '@/pages/count/coms/comCountDetailCard.vue'
 	import comMessage from '@/mycomponents/common/comMessage.vue'
 	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
-	import CountQtyEdit from '@/mycomponents/qty/CountQtyEdit.vue'
+	import countQtyEdit from '@/mycomponents/qty/countQtyEdit.vue'
+	import jobTop from '@/mycomponents/job/jobTop.vue'
 
 	export default {
 		name: 'receipt_detail',
@@ -68,7 +91,8 @@
 			requiredLocation,
 			comMessage,
 			winScanPackAndLocation,
-			CountQtyEdit,
+			countQtyEdit,
+			jobTop
 		},
 		data() {
 			return {
@@ -81,9 +105,6 @@
 				jobContent: {}, //任务内容
 				subList: [], //接口返回的任务subList
 				detailSource: [], //绑定在页面上的数据源
-				locationTypeList: [],
-				toLocationInfo: {},
-				businessTypeInfo: {},
 				itemEditInfo: {}
 			};
 		},
@@ -91,15 +112,14 @@
 			this.id = option.id;
 			if (this.id != undefined) {
 				//新建的任务自动接收
-				// if (option.status == "JOB_PENDING") {
+				if (option.status == "1") {
-				// 	this.receive((callback => {
+					this.receive((callback => {
-				// 		this.received = true;
+						this.received = true;
-				// 		this.getDetail();
-				// 	}));
-				// } else {
-				// 	this.getDetail();
-				// }
 						this.getDetail();
+					}));
+				} else {
+					this.getDetail();
+				}
 			}
 		},
 		//返回首页
@@ -158,14 +178,11 @@
 					if (res.data == null) {
 						that.showMessage('未获取到详情');
 					} else {
-						if (res.data.subList.length > 0) {
 						that.jobContent = res.data;
 						that.fromLocationCode = that.jobContent.locationCode;
 						that.subList = res.data.subList;
 						that.detailSource = that.getDataSource(that.subList)
-						} else {
+						this.calcHandleQty();
-							that.showErrorMessage('列表数据为0');
-						}
 					}
 
 				}).catch(error => {
@@ -209,9 +226,8 @@
 
 			createDetailInfo(data) {
 				data.scaned = false;
-				// data.record = {};
 				let detail = data;
-				detail.balanceQty = detail.qty
+				detail.balanceQty = 0
 				detail.inventoryStatus = detail.inventoryStatus
 				detail.fromLocationCode = this.fromLocationCode
 				return detail;
@@ -233,15 +249,11 @@
 				for (let item of this.detailSource) {
 					item.handleQty = 0;
 					for (let detail of item.subList) {
-						if (detail.scaned) {
+						if (detail != undefined && detail.scaned) {
-							if (detail.record != undefined) {
-								item.handleQty += Number(detail.record.qty)
-							} else {
 							item.handleQty += Number(detail.qty)
 						}
 					}
 				}
-				}
 				this.$forceUpdate();
 			},
 
@@ -287,30 +299,19 @@
 				try {
 					var packingNumber = result.balance.packingNumber;
 					var batch = result.balance.batch;
-					var qty = result.balance.qty;
+					var balanceQty = result.balance.qty;
 					var itemCode = result.balance.itemCode;
 					var inventoryStatus = result.balance.inventoryStatus;
 					var detail = this.detailSource.find(r => r.itemCode == itemCode);
+					var itemEditInfo;
 					//检查零件号是否存在
 					if (detail == undefined) {
 						//零件号不存在，创建零件号数据添加到列表。设置为已经扫描
 						this.addNewItemCodeToList(result)
 					} else {
 						//零件号存在，查询是否在任务列表中
-						// var itemDetail;
+
-						// var index;
+						itemEditInfo = detail.subList.find(item => {
-
-						// for (var i = 0; i < detail.subList.length; i++) {
-						// 	if (detail.subList[i].packingNumber == packingNumber &&
-						// 		detail.subList[i].batch == batch &&
-						// 		detail.subList[i].inventoryStatus == inventoryStatus) {
-						// 		index = i;
-						// 		itemDetail = detail.subList[i]
-						// 		break
-						// 	}
-						// }
-
-						this.itemEditInfo = detail.subList.find(item => {
 							if (item.packingNumber == packingNumber &&
 								item.batch == batch &&
 								item.inventoryStatus == inventoryStatus) {
@@ -318,19 +319,18 @@
 							}
 						})
 
-						if (this.itemEditInfo == undefined) {
+						if (itemEditInfo == undefined) {
 							//不在任务列表中，提示是否添加到列表
 							this.addExistItemCodeToList(detail, result);
 
 						} else {
 							//在列表中，更新已扫描状态，
-							if (this.itemEditInfo.scaned) {
+							if (itemEditInfo.scaned) {
 								this.$refs.comMessage.showSelectMessageModal("箱码【" + packingNumber +
 									"】已经完成盘点,是否要编辑数量",
 									res => {
-										// this.$.refs["countDetail_" + index][0].edit(itemDetail)
 										if (res) {
-											this.$refs.CountQtyEdit.openEditPopup(this.itemEditInfo.record,
+											this.$refs.countQtyEdit.openEditPopup(itemEditInfo,
 												detail.subList);
 										} else {
 											this.scanPopupGetFocus();
@@ -338,12 +338,12 @@
 									})
 
 							} else {
-								// this.$.refs["countDetail_" + index][0].editSeconds(itemDetail)
+								itemEditInfo.scaned = true;
-								this.itemEditInfo.scaned = true;
+								itemEditInfo.handleQty = balanceQty;
-								this.itemEditInfo.record = this.createRecordInfo(this.itemEditInfo);
+								itemEditInfo.balanceQty = balanceQty;
-								this.itemEditInfo.record.stdPackQty = result.package.stdPackQty;
+								itemEditInfo.stdPackQty = result.package.stdPackQty;
-								this.itemEditInfo.record.stdPackUnit = result.package.stdPackUnit;
+								itemEditInfo.stdPackUnit = result.package.stdPackUnit;
-								this.$refs.CountQtyEdit.openEditPopupShowSeconds(this.itemEditInfo.record, detail
+								this.$refs.countQtyEdit.openEditPopupShowSeconds(itemEditInfo, detail
 									.subList);
 								this.updateData()
 							}
@@ -361,7 +361,6 @@
 						if (res) {
 							var item = this.createAddItemInfo(result.balance, result.package);
 							let newDetail = this.createAddDetailInfo(result.balance, result.package); //
-							newDetail.record = this.createRecordInfo(newDetail);
 							item.subList.push(newDetail);
 							this.detailSource.push(item)
 							this.updateData()
@@ -377,9 +376,7 @@
 						if (res) {
 							detail.qty += Number(detail.qty)
 							let newDetail = this.createAddDetailInfo(result.balance, result.package); //
-							newDetail.record = this.createRecordInfo(newDetail);
 							detail.subList.push(newDetail);
-							var test = this.detailSource;
 							this.updateData()
 
 						}
@@ -395,55 +392,42 @@
 					qty: Number(balance.qty),
 					handleQty: 0,
 					uom: pack.uom,
-					subList: []
+					subList: [],
+
 				}
 				return item;
 			},
 
 			createAddDetailInfo(balance, pack) {
 				var detail = {
-					scaned: true,
-					balanceQty: balance.qty,
-					toInventoryStatus: balance.inventoryStatus,
-					fromLocationCode: balance.locationCode,
 					id: "",
+					scaned: true,
 					countDetailNumber: "",
-					ownerCode: balance.OwnerCode,
+					ownerCode: balance.ownerCode,
 					packingNumber: balance.packingNumber,
-					containerNumber: pack.ContainerNumber,
+					containerNumber: pack.containerNumber,
 					batch: balance.batch,
 					inventoryStatus: balance.inventoryStatus,
-					itemCode: balance.itemCode,
+					itemCode: pack.itemCode,
 					itemName: pack.itemName,
 					itemDesc1: pack.itemDesc1,
 					itemDesc2: pack.itemDesc2,
-					stdPackQty: pack.stdPackQty,
-					stdPackUnit: pack.stdPackUnit,
 					projectCode: "",
 					qty: balance.qty,
+					handleQty: balance.qty,
 					uom: balance.uom,
-					masterID: "",
 					number: "",
 					remark: "",
-					creationTime: "",
+					countQty: balance.qty,
-					creatorId: "",
+					balanceQty: balance.qty,
-					creatorName: "",
+					fromLocationCode: balance.locationCode,
-					siteId: ""
+					stdPackQty: pack.stdPackQty,
+					stdPackUnit: pack.stdPackUnit,
 				}
 
 				return detail;
 			},
 
-			createRecordInfo(detail) {
-				var record = {}
-				detail.scaned = true;
-				// let record = JSON.parse(JSON.stringify(detail));
-				//克隆对象，深度克隆，防止双向绑定同一个变量
-				Object.assign(record, detail)
-				record.fromLocationCode = this.fromLocationCode;
-				return record;
-			},
-
 			scanLocationCode(location, code) {
 				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
 					this.toLocationCode = code
@@ -456,19 +440,59 @@
 
 			},
 
+			getScanCount() {
+				var scanCount = 0;
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							scanCount = scanCount + 1;
+						}
+					})
+				})
+				return scanCount;
+			},
+
+			getTotalCount() {
+				var totalCount = 0;
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						totalCount = totalCount + 1;
+					})
+				})
+				return totalCount;
+			},
+
+
 			commit() {
-				if (this.scanCount == this.subList.length) {
+				this.scanCount = this.getScanCount();
+
+				if (this.scanCount == this.getTotalCount()) {
 					this.submitJob();
-				} else if (this.scanCount < this.subList.length) {
+				} else if (this.scanCount < this.getTotalCount()) {
 					//扫描数量小于任务数量，判断是否允许部分提交
 					if (this.jobContent.allowPartialComplete == "TRUE") {
 						//提交
+						this.$refs.comMessage.showQuestionMessage("已经扫描[" + this.scanCount +
+							"]总共[" + this
+							.getTotalCount() + "],是否把未扫描的盘点数量设置为0?",
+							res => {
+								if (res) {
+									this.detailSource.forEach(item => {
+										item.subList.forEach(detail => {
+											if (!detail.scaned) {
+												detail.countQty = 0;
+											}
+										})
+									})
 									this.submitJob();
+								}
+							});
+
 					} else {
 						//不允许部分提交，提示
 						this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount +
-							"]箱总共[" + this
+							"]总共[" + this
-							.subList.length + "]箱", res => {
+							.getTotalCount() + "]", res => {
 								if (res) {
 									this.openScanPopup();
 								}
@@ -483,36 +507,20 @@
 					title: "提交中....",
 					mask: true
 				});
-				var itemCodes = []
+				var params = this.setParams()
-				this.detailSource.forEach(item => {
+				console.log("提交参数", JSON.stringify(params));
-					itemCodes.push(item.itemCode)
+				countJobSubmit(this.id, params).then(res => {
+					uni.hideLoading()
+					if (res.data) {
+						this.showCommitSuccessMessage("提交成功<br>生成盘点记录" + res.data)
+					} else {
+						this.showErrorMessage("提交失败[" + res.msg + "]")
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
 				})
 
-				//获取管理模式，封装参数
-			// 	getManagementPrecisions(itemCodes, this.toLocationCode, res => {
-			// 		if (res.success) {
-			// 			this.managementList = res.list;
-			// 			var params = this.setParams()
-			// 			console.log("提交参数", JSON.stringify(params));
-			// 			// var params = this.getParams();
-			
-			// 			// countJobSubmit(this.id, params).then(res => {
-			// 			// 	if (res.data) {
-			// 			// 		this.showCommitSuccessMessage("提交成功<br>生成采购收货记录" + res.data.Number, )
-			// 			// 	} else {
-			// 			// 		this.showErrorMessage("提交失败[" + res.msg + "]")
-			// 			// 	}
-			// 			// 	uni.hideLoading()
-			// 			// }).catch(error => {
-			// 			// 	uni.hideLoading()
-			// 			// 	this.showErrorMessage(error)
-			// 			// })
-			// 		} else {
-			// 			uni.hideLoading();
-			// 			this.showErrorMessage(res.message);
-			// 		}
-			// 	});
-			
 			},
 
 			setParams() {
@@ -522,14 +530,12 @@
 				this.detailSource.forEach(item => {
 					item.subList.forEach(detail => {
 						if (detail.scaned) {
-							var info = getPackingNumberAndBatch(this.managementList, detail.itemCode,
+							detail.countQty = detail.handleQty;
-								detail.packingNumber, detail.batch);
-							detail.toPackingNumber = info.packingNumber;
-							detail.toBatch = info.batch;
-							subList.push(detail)
 						}
+						subList.push(detail)
 					})
 				})
+				
 				this.jobContent.subList = subList
 				this.jobContent.creator = creator;
 				return this.jobContent;
@@ -564,8 +570,8 @@
 			},
 
 			editItem(item) {
-				var detail = this.detailSource.find(r => r.itemCode == item.record.itemCode);
+				var detail = this.detailSource.find(r => r.itemCode == item.itemCode);
-				this.$refs.CountQtyEdit.openEditPopup(item.record,
+				this.$refs.countQtyEdit.openEditPopup(item,
 					detail.subList);
 			},
 
@@ -573,7 +579,14 @@
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
 					navigateBack(1);
 				})
+			},
+			getCountStageName(value) {
+				return getCountStageName(value)
+			},
+			isOpenCount(value) {
+				return value == "TRUE" ? "明盘" : "盲盘"
 			}
+
 		}
 
 	}

pages/index/index.vue

@@ -272,7 +272,7 @@
 					types:["job_status","location_type","item_status","uom",
 					"inventory_status","container_type","pack_unit","unplanned_receipt_reason",
 					"unplanned_issue_reason","scrap_reason","inspect_failed_reason",
-					"request_status","inspect_type","next_action","sample_method","transfer_mode"]
+					"request_status","inspect_type","next_action","sample_method","transfer_mode","count_stage"]
 				} 
 				getDictionaryItem(params).then(res => {
 					if (res.data.length > 0) {

static/config.json

@@ -18,7 +18,7 @@
 
 		"request_url": {
 			"name": "request_url",
-			"value": "http://192.168.0.230:12080/admin-api",
+			"value": "http://192.168.0.157:12080/admin-api",
 			"dev2": "http://192.168.0.157:12080/admin-api",
 			"chefang": "http://192.168.0.178:12080/admin-api",
 			"chenxinming": "http://192.168.0.230:12080/admin-api",