增加盘点相关组件

src/common/directory.js

@@ -20,7 +20,8 @@ let sampleMethodList = [];
 let transferModeList = [];
 let countStageList = [];
 let locationAreaTypeList = [];
-let businessList=[]
+let businessList = [];
+let countScopeTypeList = [];
 
 
 
@@ -62,6 +63,7 @@ export function clearCacheData() {
 	countStageList = [];
 	locationAreaTypeList = []
 	businessList = []
+	countScopeTypeList = []
 }
 
 //获取字典信息
@@ -319,6 +321,24 @@ export function getUomInfo(value) {
 	return resultInfo
 }
 
+//获取盘点范围类型
+export function getCountScopeType(value) {
+	var resultInfo = "";
+	if (countStageList.length == 0) {
+		countStageList = getDirectoryInfo("count_scope_type")
+	}
+	if (countStageList.length > 0) {
+		for (let item of countStageList) {
+			if (item.value == value) {
+				resultInfo = item
+				break;
+			}
+		}
+	}
+	return resultInfo
+}
+
+
 //获取包装单位
 export function getPackUnitInfo(value) {
 	var resultInfo = "";

src/mycomponents/detail/comDetailCard.vue

@@ -107,12 +107,14 @@
 		},
 
 		mounted() {
-			if (this.detailOptions.length == 0) {
-				this.detailOptions = getDetailOption();
-			}
-			if (this.scanOptions.length == 0) {
-				this.scanOptions = getPurchaseReceiptOption(this.settingParam.allowModifyQty, false)
-			}
+			// if (this.detailOptions.length == 0) {
+			// 	this.detailOptions = getDetailOption();
+			// }
+			// if (this.scanOptions.length == 0) {
+			// 	this.scanOptions = getPurchaseReceiptOption(this.settingParam.allowModifyQty, false)
+			// }
+			
+			this.showLocation();
 		},
 
 		methods: {

src/mycomponents/package/PackageAndItemCard.vue

@@ -0,0 +1,53 @@
+<template>
+	<view :class="dataContent.scaned?'scan_view':''" style="background-color: #fff; ">
+		<view class="uni-flex uni-row space-between" style="align-items: center">
+			<view style="word-break: break-all;">
+				<item :dataContent="dataContent" style="margin-left: 4px; padding:0px 5px 5px;"></item>
+				<pack v-if="dataContent.number!=null" :packingCode="dataContent.number"></pack>
+				<batch v-if="dataContent.batch!=null" :batch="dataContent.batch"></batch>
+			</view>
+			<view class="uni-flex uni-row" style="word-break: break-all;">
+				<recommend-qty v-if="dataContent.handleQty==null || dataContent.handleQty==undefined"
+					:dataContent="dataContent" :isShowStdPack="false" :isShowStatus="isShowStatus"
+					:isShowPackCount="false"></recommend-qty>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import item from '@/mycomponents/item/item.vue'
+	import pack from '@/mycomponents/balance/pack.vue'
+	import batch from '@/mycomponents/balance/batch.vue'
+	import recommendQty from '@/mycomponents/qty/recommendQty.vue'
+
+	export default {
+		components: {
+			pack,
+			batch,
+			recommendQty,
+			item
+		},
+
+		data() {
+			return {
+
+			}
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: null
+			},
+		},
+		watch: {
+			
+		},
+		methods: {
+		 
+		}
+	}
+</script>
+
+<style>
+</style>

src/mycomponents/qty/recommendQty.vue

@@ -9,7 +9,7 @@
 			<!-- 	/{{Number(dataContent.packQty)}} -->
 			<!-- v-show="!isShowStdPack" -->
 			<uom :uom="dataContent.uom"></uom>
-			<view v-if="dataContent.packQty!=undefined" class="uni-flex uni-row ">
+			<view v-if="isShowPackCount && dataContent.packQty!=undefined" class="uni-flex uni-row ">
 				<view class="uom">/</view>
 				<view class="text_packQty">{{ calc(dataContent.qty,dataContent.packQty)}}
 				</view>
@@ -73,6 +73,10 @@
 			objTextStyle: {
 				type: Object,
 				default: null
+			},
+			isShowPackCount: {
+				type: Boolean,
+				default: true
 			}
 		},
 		watch: {

src/pages.json

@@ -1887,6 +1887,43 @@
 
 			}
 		},
+		
+		{
+			"path": "pages/count/job/fuzzyCountJob",
+			"style": {
+				"navigationBarTitleText": "盲盘任务",
+				"enablePullDownRefresh": true,
+				"titleNView": {
+					// "autoBackButton": "true",
+					"buttons": [
+						// 右边按钮
+						{
+		
+							"float": "right",
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+		
+						},
+						{
+		
+							"float": "right",
+							"fontSize": "52rpx", //按钮上文字的大小
+							"text": "\ue6e2",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						}
+					]
+				}
+			}
+		},
+		{
+			"path": "pages/count/job/fuzzyCountDetail",
+			"style": {
+				"navigationBarTitleText": "盲盘明细",
+				"enablePullDownRefresh": false
+		
+			}
+		},
 		{
 			"path": "pages/count/record/countRecord",
 			"style": {

src/pages/count/coms/comFuzzyCountJobCard.vue

@@ -0,0 +1,49 @@
+<template>
+	<job-com-main-card :dataContent="dataContent">
+		<view v-if="dataContent.countRange!=undefined" class="">
+			<view v-for="(range, index) in dataContent.countRange" :key="index">
+				<view class="card_view">
+					<text class="card_packing_code ">{{getCountScopeName(range.type)}}</text>
+					<text class="card_content ">{{range.value}}</text>
+				</view>
+			</view>
+		</view>
+	</job-com-main-card>
+</template>
+
+<script>
+	import {
+		getCountScopeType
+	} from '@/common/directory.js';
+	import jobComMainCard from '@/mycomponents/job/jobComMainCard.vue'
+	import jobComMainDetailCard from '@/mycomponents/job/jobComMainDetailCard.vue'
+	import toLocation from '@/mycomponents/balance/toLocation.vue'
+	export default {
+		components: {
+			jobComMainCard,
+			jobComMainDetailCard,
+			toLocation
+		},
+		data() {
+			return {};
+		},
+
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+		},
+
+		methods: {
+			getCountScopeName(value) {
+				let item = getCountScopeType(value);
+				return item.label;
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>

src/pages/count/job/fuzzyCountDetail.vue

@@ -0,0 +1,436 @@
+<template>
+	<view class="page-wraper">
+		<view class="page-header">
+			<view class="header_job_top">
+				<job-top :dataContent="jobContent"></job-top>
+			</view>
+		</view>
+
+		<view class="page-main" style="height: 500px;">
+			<view class="">
+				<com-blank-view @goScan='showFromLocationPopup' v-if="detailSource.length==0"></com-blank-view>
+			</view>
+			<scroll-view scroll-y="true" class="page-main-scroll">
+				<uni-swipe-action ref="swipeAction">
+					<uni-swipe-action-item @click="removeData($event,dataContent)" :right-options="removeOptions">
+						<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+							<view class="">
+								<package-and-item-card :dataContent="item"></package-and-item-card>
+								<!-- <com-count-detail-card :ref="'countDetail_'+index" :dataContent="item" :index="index"
+								@editItem="editItem" :settingParam="jobContent" @remove="updateData"
+								@updateData="updateData">
+							</com-count-detail-card> -->
+							</view>
+							<view class='split_line'></view>
+						</view>
+
+
+						<!-- <item-qty v-if="settingParam.isOpenCount=='TRUE'" :dataContent="dataContent"
+							:handleQty="dataContent.handleQty" :isShowBalanceQty="false">
+						</item-qty>
+						<item-qty v-else :dataContent="dataContent" :handleQty="dataContent.handleQty"
+							:isShowBalanceQty="true" :showRecommendQty="false" :showStdPack="true">
+						</item-qty> -->
+					</uni-swipe-action-item>
+				</uni-swipe-action>
+
+
+
+			</scroll-view>
+		</view>
+
+		<view class="page-footer">
+			<view class="uni-flex u-col-center space-between padding_10"
+				style="background-color:ghostwhite; width: 100%; ">
+				<view class="">
+				</view>
+				<view class=" uni-flex uni-row">
+					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+				</view>
+			</view>
+		</view>
+
+		<win-scan-button v-if="fromLocationCode!=''" @goScan='openScanPopup'></win-scan-button>
+		<win-scan-pack ref="scanPopup" @getResult='getScanResult'></win-scan-pack>
+
+		<win-scan-location ref="scanLocationCode" title="盘点库位" @getLocation='getLocation'></win-scan-location>
+
+		<count-qty-edit ref="countQtyEdit" @confirm="editConfirm" @close="editClose" :isShowStatus="true"
+			:allowEditStatus="editInventoryStatus" :isShowBalance="jobContent.isOpenCount=='TRUE'">
+		</count-qty-edit>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		getCountJobDetail,
+		takeCountJob,
+		cancleTakeCountJob,
+		countJobSubmit
+	} from '@/api/request2.js';
+	import {
+		calc
+	} from '@/common/calc.js';
+
+	import {
+		Decimal
+	} from 'decimal.js'; //引入
+
+	import {
+		goHome,
+		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'
+	import comCountDetailCard from '@/pages/count/coms/comCountDetailCard.vue'
+	// import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
+	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
+	import countQtyEdit from '@/mycomponents/qty/countQtyEdit.vue'
+	import jobTop from '@/mycomponents/job/jobTop.vue'
+	import comBlankView from '@/mycomponents/common/comBlankView.vue'
+	import PackageAndItemCard from '@/mycomponents/package/PackageAndItemCard.vue'
+
+	export default {
+		name: 'receipt_detail',
+		components: {
+			winScanButton,
+			winScanPack,
+			comCountDetailCard,
+			// winScanPackAndLocation,
+			winScanLocation,
+			countQtyEdit,
+			jobTop,
+			comBlankView,
+			PackageAndItemCard
+		},
+		data() {
+			return {
+				id: '',
+				scanCount: 0,
+				jobContent: {}, //任务内容
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+				balance: {}, //库存余额
+				editInventoryStatus: false,
+				package: {}, //包装
+				label: {}, //标签
+				currentEditItem: {},
+				jobStatus: "",
+				fromLocation: {},
+				fromLocationCode: '',
+
+			};
+		},
+		onLoad(option) {
+			this.id = option.id;
+			if (this.id != undefined) {
+				//新建的任务自动接收
+				if (option.status == "1") {
+					this.receive((callback => {
+						this.getDetail();
+					}));
+				} else {
+					this.getDetail();
+				}
+			}
+			this.showFromLocationPopup();
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		//拦截返回按钮事件
+		onBackPress(e) {
+			//已经接收但是没提交任务
+			if (e.from === 'backbutton') {
+				if (this.jobStatus == "2") {
+					//取消承接任务	
+					cancleTakeCountJob(this.id).then(res => {
+						uni.navigateBack();
+					}).catch(error => {
+						uni.navigateBack();
+					})
+				} else {
+					uni.navigateBack();
+				}
+				return true;
+			}
+		},
+
+		onPullDownRefresh() {
+
+			// uni.stopPullDownRefresh();
+		},
+
+		mounted() {
+
+		},
+		methods: {
+			//接收
+			receive(callback) {
+				if (this.id != null) {
+					takeCountJob(this.id).then(res => {
+						callback();
+					}).catch(error => {
+						this.showErrorMessage(error)
+					})
+				}
+			},
+
+			getDetail() {
+				var that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				getCountJobDetail(that.id).then(res => {
+					uni.hideLoading();
+					that.jobContent = res.data;
+					that.jobStatus = res.data.status;
+
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+			},
+
+			showFromLocationPopup() {
+				this.$nextTick(() => {
+					this.$refs.scanLocationCode.openScanPopup();
+				})
+			},
+
+			getLocation(location, code) {
+				this.getFromLocationCode(location, code)
+			},
+
+			getFromLocationCode(location, code) {
+				this.fromLocation = location;
+				this.fromLocationCode = code;
+				this.openScanPopup();
+			},
+
+			openScanPopup() {
+				this.$refs.scanPopup.openScanPopup();
+			},
+
+			closeScanPopup() {
+				this.$refs.scanPopup.closeScanPopup();
+			},
+
+			scanPopupGetFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
+			},
+
+
+
+			closeScanPopup() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.closeScanPopup();
+				}
+			},
+
+			scanPopupGetFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.packGetFocus();
+				}
+			},
+
+			scanPopupLoseFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.packLoseFocus();
+				}
+			},
+
+			//明盘
+			getScanResult(result) {
+				let that = this;
+				let item = this.createDetailInfo(result.package);
+				this.detailSource.push(item)
+			},
+
+			//创建盘盈的明细
+			createDetailInfo(packInfo) {
+				var detail = {
+					scaned: true,
+					// countDetailNumber: "",
+					number: this.jobContent.number,
+					packingNumber: packInfo.number,
+					batch: packInfo.batch,
+					inventoryStatus: "OK",
+					itemCode: packInfo.itemCode,
+					itemName: packInfo.itemName,
+					itemDesc1: packInfo.itemDesc1,
+					itemDesc2: packInfo.itemDesc2,
+					projectCode: "",
+					qty: packInfo.qty,
+					uom: packInfo.uom,
+					remark: "",
+					locationCode: this.fromLocationCode,
+					creator: this.$store.state.user.id,
+					warehouseCode: this.fromLocation.warehouseCode,
+					areaCode: this.fromLocation.areaCode,
+					locationGroupCode: this.fromLocation.locationGroupCode
+				}
+				return detail;
+			},
+
+
+
+			//编辑盘点结果
+			editCountResult(item, subItem) {
+				let that = this;
+				this.$refs.comMessage.showQuestionMessage("箱码【" + that.label.packingNumber +
+					"】已经完成盘点,是否要编辑盘点结果?",
+					res => {
+						if (res) {
+							this.currentEditItem = subItem;
+							this.$refs.countQtyEdit.openEditPopup(subItem,
+								item.subList);
+							// this.$refs.countQtyEdit.openEditPopupShowSeconds(subItem,
+							// 	item.subList);
+						} else {
+							this.scanPopupGetFocus();
+						}
+					})
+			},
+
+
+			editClose() {
+				this.scanPopupGetFocus();
+			},
+
+
+
+			commit() {
+				// if(this.detailSource.length==0)
+				// {
+
+				// }
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+				var params = this.setParams()
+				console.log("提交参数", JSON.stringify(params));
+				countJobSubmit(params).then(res => {
+					uni.hideLoading()
+					if (res.data == null) {
+						this.showCommitSuccessMessage("提交成功")
+					} else {
+						this.showErrorMessage("提交失败[" + res.msg + "]")
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+
+			},
+
+			setParams() {
+				var subList = []
+				var creator = this.$store.state.user.id
+				this.jobContent.subList = this.detailSource
+				// this.jobContent.creator = creator;
+				return this.jobContent;
+			},
+
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {
+						this.afterCloseMessage()
+					}
+				});
+			},
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+						this.afterCloseMessage()
+					}
+				});
+			},
+
+			showScanMessage(message) {
+				this.$refs.comMessage.showScanMessage(message);
+			},
+
+			afterCloseMessage() {
+				this.scanPopupGetFocus();
+			},
+
+			closeScanMessage() {
+				this.scanPopupGetFocus();
+			},
+
+			editItem(item) {
+				this.currentEditItem = item;
+				var detail = this.detailSource.find(r => r.itemCode == item.itemCode);
+				this.$refs.countQtyEdit.openEditPopup(item,
+					detail.subList);
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					navigateBack(1);
+				})
+			},
+			getCountStageName(value) {
+				return getCountStageName(value)
+			},
+			isOpenCount(value) {
+				return value == "TRUE" ? "明盘" : "盲盘"
+			}
+
+		}
+
+	}
+</script>
+
+<style scoped lang="scss">
+	page {
+		width: 100%;
+		height: 100%;
+		background-color: #fff;
+	}
+
+	.page-wraper {
+		display: flex;
+		flex-direction: column;
+		width: 100%;
+		height: 100%;
+	}
+
+
+	.page-main {
+		flex: 1;
+		position: relative;
+	}
+
+	.page-main-scroll {
+		position: absolute;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+	}
+
+	.page-main-list {
+		/*  height: 80rpx;
+	    line-height: 80rpx; */
+		text-align: center;
+		background: #e0e0e0;
+
+	}
+</style>

src/pages/count/job/fuzzyCountJob.vue

@@ -0,0 +1,448 @@
+<template>
+	<view class="">
+		<com-empty-view v-if="jobList.length==0"></com-empty-view>
+		<job-filter ref="filter" otherTitle="ASN" @switchChangeToday="switchChangeToday"
+			@switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber" :checkedToday="checkedToday"
+			:checkedWaitTask="checkedWaitTask">
+		</job-filter>
+		<view v-if="jobList.length>0">
+			<uni-swipe-action ref="swipeAction">
+				<view v-for="(item, index) in jobList" :key="index">
+					<uni-swipe-action-item :right-options="item.status=='2'?detailGiveupOptions:detailOptions"
+						@click="swipeClick($event,item)">
+						<com-fuzzy-count-job-card :dataContent="item"
+							@click='openJobDetail(item)'></com-fuzzy-count-job-card>
+					</uni-swipe-action-item>
+				</view>
+			</uni-swipe-action>
+
+			<job-list-popup ref="jobListPopup" @selectedItem="selectedItem"></job-list-popup>
+			<job-info-popup ref='jobInfoPopup'></job-info-popup>
+
+			<uni-load-more :status="loadingType" />
+		</view>
+		<win-scan-button @goScan='openScanPopup' v-if="jobList.length>0"></win-scan-button>
+		<winScanPackJob title="库位" ref="scanPopup" @getResult='getScanResult'>
+		</winScanPackJob>
+		<jobList ref="jobList" @selectItem="selectItem"></jobList>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		cancleTakeCountJob,
+		getCountJobList
+	} from '@/api/request2.js';
+
+	import {
+		goHome,
+		updateTitle
+	} from '@/common/basic.js';
+
+	import {
+		getDetailOption,
+		getDetailGiveupOption
+	} from '@/common/array.js';
+
+	import {
+		getCountScopeType,
+	} from '@/common/directory.js';
+
+	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
+	import jobFilter from '@/mycomponents/job/jobFilter.vue'
+	import comFuzzyCountJobCard from '@/pages/count/coms/comFuzzyCountJobCard.vue'
+	import jobListPopup from '@/pages/count/coms/jobListPopup.vue'
+	import jobInfoPopup from '@/pages/count/coms/jobInfoPopup.vue'
+	import jobList from '@/mycomponents/jobList/jobList.vue'
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import winScanPackJob from "@/mycomponents/scan/winScanPackJob.vue"
+
+	export default {
+		name: 'receipt',
+		components: {
+			comEmptyView,
+			jobFilter,
+			comFuzzyCountJobCard,
+			jobListPopup,
+			jobInfoPopup,
+			winScanPackJob,
+			jobList,
+			winScanButton
+		},
+		data() {
+			return {
+				jobList: [],
+				pageNo: 1,
+				pageSize: 10,
+				totalCount: 0,
+				loadingType: "nomore",
+				checkedToday: false,
+				checkedWaitTask: false,
+				todayTime: "",
+				status: '1,2', //待处理 、进行中
+				detailOptions: [],
+				detailGiveupOptions: [],
+				title: '',
+				countScopeTypeDic: []
+			};
+		},
+		onLoad(option) {
+			this.title = option.title
+		},
+
+		onShow() {
+			this.getList('refresh');
+		},
+
+		onReady() {
+			this.detailOptions = getDetailOption();
+			this.detailGiveupOptions = getDetailGiveupOption();
+			this.countScopeTypeDic = getCountScopeType();
+		},
+
+		onReachBottom() {
+			//避免多次触发
+			if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
+				return;
+			}
+			this.getList("more");
+		},
+
+		onPullDownRefresh() {
+			this.getList('refresh');
+		},
+
+		//后退按钮
+		onBackPress(options) {
+			if (options.from === 'navigateBack') {
+				uni.navigateBack({
+					delta: 1
+				})
+				return false;
+			}
+		},
+
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			} else if (e.index == 1) {
+				this.$refs.filter.openFilter();
+			}
+		},
+
+		methods: {
+			getList(type) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中­....",
+					mask: true
+				});
+
+				this.loadingType = "loading";
+				if (type === "refresh") {
+					this.pageNo = 1;
+					this.jobList = [];
+				}
+
+				var filters = []
+				if (this.checkedToday) {
+					filters.push({
+						column: "create_time",
+						action: "betweeen",
+						value: this.todayTime
+					})
+				}
+
+				filters.push({
+					column: "status",
+					action: "in",
+					value: this.status
+				})
+
+				filters.push({
+					column: "isOpenCount",
+					action: "==",
+					value: "FALSE"
+
+				})
+				// filters.push({
+				// 	column: "accept_user_id",
+				// 	action: "==",
+				// 	value: this.$store.state.user.id
+				// })
+				var params = {
+					filters: filters,
+					pageNo: this.pageNo,
+					pageSize: this.pageSize,
+					sort: "number",
+					by: "DESC"
+				}
+
+				getCountJobList(params).then(res => {
+					uni.hideLoading();
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+
+					var list = res.data.list;
+					this.totalCount = res.data.total
+					updateTitle(this.title + "(" + this.totalCount + ")");
+					this.loadingType = "loadmore";
+					if (list == null || list.length == 0) {
+						this.loadingType = "nomore";
+						return;
+					}
+					this.jobList = type === "refresh" ? list : this.jobList.concat(list);
+
+					// this.jobList[0].countRange = [{
+					// 	type: "LOCATION_CODE",
+					// 	value: "902,903"
+					// }, {
+					// 	type: "ITEMS_CODE",
+					// 	value: "123"
+					// }]
+					// this.jobList[1].countRange = [{
+					// 	type: "AREABASIC_CODE",
+					// 	value: "101"
+					// }, {
+					// 	type: "ITEMS_CODE",
+					// 	value: "123"
+					// }];
+
+					this.pageNo++;
+
+				}).catch(error => {
+					if (type === "refresh") {
+						uni.stopPullDownRefresh();
+					}
+					updateTitle(this.title);
+					this.loadingType = "";
+					uni.hideLoading();
+					that.showMessage(error)
+				})
+			},
+
+			getCountRange(value) {
+				if (value == undefined || value == null)
+					return "";
+				var rangeList = [];
+
+				value.forEach(r => {
+					let item = rangeList.find(l => l.type == r.type);
+					if (item != undefined) {
+						item.value = item.value + "," + r.value
+					} else {
+						let data = {
+							typeCode: r.type,
+							typeName: getDescFromDic(r.type),
+							value: r.value
+						};
+
+						rangeList.push(r)
+					}
+				})
+				return rangeList;
+			},
+
+			openJobDetail(item) {
+				uni.navigateTo({
+					url: './fuzzyCountDetail?id=' + item.id + '&status=' + item.status + '&title=' + this.title
+
+				});
+			},
+
+			showItemList(itemList) {
+				this.$refs.jobListPopup.openPopup(itemList);
+			},
+
+			selectedItem(item) {
+				this.openJobDetail(item);
+			},
+
+			openScanPopup() {
+				this.$refs.scanPopup.openScanPopup();
+			},
+
+			selectItem(item) {
+				this.$refs.scanPopup.closeScanPopup();
+				this.openJobDetail(item)
+
+			},
+
+			swipeClick(e, dataContent) {
+				if (e.content.text == "详情") {
+					this.openjobInfoPopup(dataContent);
+				} else if (e.content.text == "放弃") {
+					this.$refs.comMessage.showQuestionMessage("确定要放弃当前任务?",
+						res => {
+							if (res) {
+								this.cancleJob(dataContent.id);
+							}
+						});
+				}
+			},
+
+			openjobInfoPopup(item) {
+				this.$refs.jobInfoPopup.openPopup(item)
+			},
+
+			cancleJob(id) {
+				cancleTakeCountJob(id).then(res => {
+					if (res.data) {
+						this.getList("refresh")
+						uni.showToast({
+							title: "放弃任务成功"
+						})
+					} else {
+						this.showMessage("放弃任务失败")
+					}
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+
+			switchChangeToday(state, creationTime) {
+				this.checkedToday = state;
+				this.todayTime = creationTime;
+				this.getList("refresh");
+			},
+
+			switchChangeWait(state, jobStatus) {
+				this.checkedWaitTask = state;
+				this.status = jobStatus;
+				this.getList("refresh");
+			},
+
+			getScanNumber(code) {
+				this.getDataListByType(code)
+			},
+			getDataListByType(code) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				var filters = []
+				filters.push({
+					column: "status",
+					action: "in",
+					value: '1,2'
+				})
+				filters.push({
+					column: "number",
+					action: "==",
+					value: code
+				})
+
+				filters.push({
+					column: "countSplitType",
+					action: "==",
+					value: "locationCode"
+				})
+				filters.push({
+					column: "accept_user_id",
+					action: "==",
+					value: this.$store.state.user.id
+				})
+
+				var params = {
+					filters: filters,
+					pageNo: 1,
+					pageSize: 100,
+					sort: "number",
+					by: "DESC"
+				}
+				getCountJobList(params).then(res => {
+					uni.hideLoading();
+					if (res.data.list.length == 0) {
+						that.showMessage('未查找到' + '【' + code + '】的收货任务');
+					} else if (res.data.list.length == 1) {
+						that.openJobDetail(res.data.list[0]);
+					}
+				}).catch(error => {
+					uni.hideLoading();
+					that.showMessage(error);
+				})
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+
+			getScanResult(result) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				var filters = []
+				filters.push({
+					column: "status",
+					action: "in",
+					value: '1,2'
+				})
+
+				filters.push({
+					column: "countSplitType",
+					action: "==",
+					value: "locationCode"
+				})
+
+				filters.push({
+					column: "countSplitCode",
+					action: "==",
+					value: result.label.code
+				})
+
+				filters.push({
+					column: "accept_user_id",
+					action: "==",
+					value: this.$store.state.user.id
+				})
+
+				var params = {
+					filters: filters,
+					pageNo: 1,
+					pageSize: 1000,
+					sort: "number",
+					by: "DESC"
+				}
+				getCountJobList(params).then(res => {
+					uni.hideLoading();
+					let resultList = res.data.list;
+					resultList.forEach(item => {
+						item.title = item.number;
+						item.selected = false
+					})
+					let list = []
+					resultList.forEach(item => {
+						if (!list.find(subItem => subItem.title == item.title)) {
+							list.push(item)
+						}
+					})
+
+					if (list.length == 0) {
+						that.showMessage('未查找到库位' + '【' + result.label.code + '】的盘点任务');
+					} else if (list.length == 1) {
+						that.selectItem(list[0]);
+					} else {
+						that.$refs.jobList.openList(list)
+					}
+				}).catch(error => {
+					uni.hideLoading();
+					that.showMessage(error);
+				})
+			}
+		},
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>

src/pages/index/index.vue

@@ -362,7 +362,7 @@
 						"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",
-						"count_stage", "inspect_result", "area_type"
+						"count_stage", "inspect_result", "area_type","count_scope_type"
 					]
 				}
 				getDictionaryItem(params).then(res => {

src/pages/putaway/record/putawayRecord.vue

@@ -1,6 +1,5 @@
 <template>
 	<view class="page-wraper">
-
 		<view class="">
 			<com-blank-view @goScan='showFromLocationPopup' v-if="detailSource.length==0"></com-blank-view>
 		</view>