betweeen 改成between

3 weeks ago · f19349c402
41 changed files with 46 additions and 46 deletions
--- a/src/mycomponents/scan/winScanLocation.vue
+++ b/src/mycomponents/scan/winScanLocation.vue
@ -88,7 +88,6 @@
 				this.$refs.scan.clearScanValue();
 			},
 			getScanResult(result) {
-				
 				uni.showLoading({
 					title: '扫描中...',
 					mask: true
--- a/src/pages/count/job/countJob.vue
+++ b/src/pages/count/job/countJob.vue
@ -210,7 +210,7 @@
 				if (this.queryParams.creationTime) {
 					filterParams.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.queryParams.creationTime
 					})
 				}
--- a/src/pages/count/job/fuzzyCountJob.vue
+++ b/src/pages/count/job/fuzzyCountJob.vue
@ -150,7 +150,7 @@
 				if (this.checkedToday) {
 					filters.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.todayTime
 					})
 				}
--- a/src/pages/customerReturn/job/returnJob.vue
+++ b/src/pages/customerReturn/job/returnJob.vue
@ -133,7 +133,7 @@
 				if (this.checkedToday) {
 					filters.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.todayTime
 					})
 				}
--- a/src/pages/customerReturn/record/recordList.vue
+++ b/src/pages/customerReturn/record/recordList.vue
@ -147,7 +147,7 @@
 				if (this.queryParams.creationTime) {
 					filterParams.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.queryParams.creationTime
 					})
 				}
--- a/src/pages/deliver/job/deliverJob.vue
+++ b/src/pages/deliver/job/deliverJob.vue
@ -139,7 +139,7 @@
 				if (this.checkedToday) {
 					filters.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.todayTime
 					})
 				}
--- a/src/pages/inspect/job/inspectJob.vue
+++ b/src/pages/inspect/job/inspectJob.vue
@ -126,7 +126,7 @@
 				if (this.checkedToday) {
 					filters.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.todayTime
 					})
 				}
--- a/src/pages/inventoryMove/coms/comMoveJob.vue
+++ b/src/pages/inventoryMove/coms/comMoveJob.vue
@ -170,7 +170,7 @@
 				if (this.checkedToday) {
 					filters.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.todayTime
 					})
 				}
--- a/src/pages/inventoryMove/coms/comMoveRecord.vue
+++ b/src/pages/inventoryMove/coms/comMoveRecord.vue
@ -35,7 +35,7 @@
 			<win-scan-button @goScan='openScanPopup'></win-scan-button>
 		</view>
 		<!-- 合格转隔离单独的弹窗-->
-		<okToHoldRecordPack ref="okToHoldRecordPackRef" :fromLocationCodeProps='fromLocationCode' :itemCodeProps='itemCode' :batchProps='batch' :showOnePop='showOnePop' @showFromLocationPopup='showFromLocationPopup'  @itemCodeClick='openScanPopup' @confirm='okToHoldRecordPackConfirm'></okToHoldRecordPack>
+		<okToHoldRecordPack ref="okToHoldRecordPackRef" :fromLocationCodeProps='fromLocationCode' :itemCodeProps='itemCode' :batchProps='batch' :showOnePop='showOnePop' @showFromLocationPopup='showFromLocationPopup'  @itemCodeClick='openScanPopup' @confirm='okToHoldRecordPackConfirm' @fromLocationBlur='fromLocationBlur'></okToHoldRecordPack>
 		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' :title="'箱码'">
 		</win-scan-pack-and-location>
 		<win-scan-location ref="scanFromLocationCode" title="来源库位" @getLocation='getFromLocation'
@ -476,7 +476,9 @@
 				}
 				calcHandleQty(this.detailSource);
 			},
-			
+			fromLocationBlur(){
+				this.$refs.scanPopup.
+			},
 			showErrorMessage(message) {
 				if (this.$refs.scanPopup) {
 					this.$refs.scanPopup.packLoseFocus()
--- a/src/pages/inventoryMove/coms/okToHoldRecordPack.vue
+++ b/src/pages/inventoryMove/coms/okToHoldRecordPack.vue
@ -9,14 +9,14 @@
 			</view>
 			<view class="item">
 				<view class="label">来源库位：</view>
-				<view class="value">{{fromLocationCode}}</view>
+				<view class="value"><u-input v-model="fromLocationCode" @blur="fromLocationBlur"></u-input></view>
 				<view class="searchIcon">
 					<image src="/static/search.svg" mode=""  @click="fromLocationClick"/>
 				</view>
 			</view>
 			<view class="item">
 				<view class="label">零件：</view>
-				<view class="value">{{itemCode}}</view>
+				<view class="value"><u-input v-model="itemCode"></u-input></view>
 				<view class="searchIcon">
 					<image src="/static/search.svg" mode=""  @click="itemCodeClick"/>
 				</view>
--- a/src/pages/inventoryMove/job/inventoryMoveJob.vue
+++ b/src/pages/inventoryMove/job/inventoryMoveJob.vue
@ -119,7 +119,7 @@
 				if (this.checkedToday) {
 					filters.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.todayTime
 					})
 				}
--- a/src/pages/issue/job/issueJob.vue
+++ b/src/pages/issue/job/issueJob.vue
@ -289,7 +289,7 @@
 				if (queryParams.creationTime ) {
 					filterParams.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: queryParams.creationTime
 					})
 				}
--- a/src/pages/issue/job/issueJob0816.vue
+++ b/src/pages/issue/job/issueJob0816.vue
@ -234,7 +234,7 @@
 				if (this.checkedToday) {
 					filters.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.todayTime
 					})
 				}
@ -333,7 +333,7 @@
 				// if (this.checkedToday) {
 				// 	filters.push({
 				// 		column: "create_time",
-				// 		action: "betweeen",
+				// 		action: "between",
 				// 		value: this.todayTime
 				// 	})
 				// }
--- a/src/pages/itemHold/record/recordList.vue
+++ b/src/pages/itemHold/record/recordList.vue
@ -146,7 +146,7 @@
 				if (this.queryParams.creationTime) {
 					filterParams.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.queryParams.creationTime
 					})
 				}
--- a/src/pages/package/job/overPackageJob.vue
+++ b/src/pages/package/job/overPackageJob.vue
@ -190,7 +190,7 @@
 				if (queryParams.creationTime ) {
 					filterParams.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: queryParams.creationTime
 					})
 				}
--- a/src/pages/productDismantle/job/productDismantleJob.vue
+++ b/src/pages/productDismantle/job/productDismantleJob.vue
@ -132,7 +132,7 @@
 				if (this.checkedToday) {
 					filters.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.todayTime
 					})
 				}
--- a/src/pages/productPutaway/job/productPutawayJob.vue
+++ b/src/pages/productPutaway/job/productPutawayJob.vue
@ -161,7 +161,7 @@
 				if (this.checkedToday) {
 					filters.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.todayTime
 					})
 				}
--- a/src/pages/productReceipt/job/ccProductReceiptJob.vue
+++ b/src/pages/productReceipt/job/ccProductReceiptJob.vue
@ -152,7 +152,7 @@
 				if (this.checkedToday) {
 					filters.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.todayTime
 					})
 				}
--- a/src/pages/productReceipt/job/completeReceiveJob.vue
+++ b/src/pages/productReceipt/job/completeReceiveJob.vue
@ -131,7 +131,7 @@
 				if (this.checkedToday) {
 					filters.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.todayTime
 					})
 				}
--- a/src/pages/productReceipt/job/productReceiptJob.vue
+++ b/src/pages/productReceipt/job/productReceiptJob.vue
@ -166,7 +166,7 @@
 				if (this.checkedToday) {
 					filters.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.todayTime
 					})
 				}
--- a/src/pages/productReceipt/record/recordList.vue
+++ b/src/pages/productReceipt/record/recordList.vue
@ -146,7 +146,7 @@
 				if (this.queryParams.creationTime) {
 					filterParams.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.queryParams.creationTime
 					})
 				}
--- a/src/pages/productRecycle/job/productRecycleJob.vue
+++ b/src/pages/productRecycle/job/productRecycleJob.vue
@ -134,7 +134,7 @@
 				if (this.checkedToday) {
 					filters.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.todayTime
 					})
 				}
--- a/src/pages/productionReceipt/job/productionReceiptJob.vue
+++ b/src/pages/productionReceipt/job/productionReceiptJob.vue
@ -195,7 +195,7 @@
 				if (queryParams.creationTime) {
 					filterParams.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: queryParams.creationTime
 					})
 				}
--- a/src/pages/productionReturn/job/holdToReturnJob.vue
+++ b/src/pages/productionReturn/job/holdToReturnJob.vue
@ -135,7 +135,7 @@
 				if (this.checkedToday) {
 					filters.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.todayTime
 					})
 				}
--- a/src/pages/productionReturn/job/okToReturnJob.vue
+++ b/src/pages/productionReturn/job/okToReturnJob.vue
@ -135,7 +135,7 @@
 				if (this.checkedToday) {
 					filters.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.todayTime
 					})
 				}
--- a/src/pages/productionReturn/job/returnJob.vue
+++ b/src/pages/productionReturn/job/returnJob.vue
@ -135,7 +135,7 @@
 				if (this.checkedToday) {
 					filters.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.todayTime
 					})
 				}
--- a/src/pages/productionReturn/record/returnToHoldRecordList.vue
+++ b/src/pages/productionReturn/record/returnToHoldRecordList.vue
@ -145,7 +145,7 @@
 				if (this.queryParams.creationTime) {
 					filterParams.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.queryParams.creationTime
 					})
 				}
--- a/src/pages/purchaseReceipt/job/receiptDetail.vue
+++ b/src/pages/purchaseReceipt/job/receiptDetail.vue
@ -289,8 +289,7 @@
 							getManagementPrecisions(itemCodes, that.jobToLocationCode, res => {
 								if (res.success) {
 									this.managementList = res.list;
-									this.managementType = this.managementList.some(item => item.ManagementPrecision ==
-										'BY_BATCH') ? 'BY_BATCH' : ''
+									this.managementType = this.managementList&& this.managementList[0]&& this.managementList[0].ManagementPrecision ? this.managementList[0].ManagementPrecision : 'BY_PACKAGING'
 								}
 							})
 							// if (uni.getStorageSync('purchaseReceiptDetailPointParams')) {
@ -318,7 +317,7 @@
 			},
 			getScanResult(result) {
 				this.balanceInfo = result.balance
-				if(this.managementType == 'BY_BATCH'){
+				if(this.managementType == 'BY_BATCH' || this.managementType == 'BY_QUANTITY' ){
 					this.getScanResultAfterBatch(result)
 				}else{
 					this.getScanResultAfter(result)
--- a/src/pages/purchaseReceipt/job/receiptJob.vue
+++ b/src/pages/purchaseReceipt/job/receiptJob.vue
@ -184,7 +184,7 @@
 				if (this.checkedToday) {
 					filters.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.todayTime
 					})
 				}
--- a/src/pages/purchaseReturn/job/returnJob.vue
+++ b/src/pages/purchaseReturn/job/returnJob.vue
@ -136,7 +136,7 @@
 				if (this.checkedToday) {
 					filters.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.todayTime
 					})
 				}
--- a/src/pages/purchaseReturn/job/returnJob_0904.vue
+++ b/src/pages/purchaseReturn/job/returnJob_0904.vue
@ -134,7 +134,7 @@
 				if (this.checkedToday) {
 					filters.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.todayTime
 					})
 				}
--- a/src/pages/putaway/job/putawayJob.vue
+++ b/src/pages/putaway/job/putawayJob.vue
@ -150,7 +150,7 @@
 				if (this.checkedToday) {
 					filters.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.todayTime
 					})
 				}
--- a/src/pages/putaway/job/quantityPutawayJob.vue
+++ b/src/pages/putaway/job/quantityPutawayJob.vue
@ -274,7 +274,7 @@
 				if (queryParams.creationTime) {
 					filterParams.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: queryParams.creationTime
 					})
 				}
--- a/src/pages/repleinsh/job/repleinshJob.vue
+++ b/src/pages/repleinsh/job/repleinshJob.vue
@ -206,7 +206,7 @@
 				if (queryParams.creationTime ) {
 					filterParams.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: queryParams.creationTime
 					})
 				}
--- a/src/pages/scrap/job/scrapJob.vue
+++ b/src/pages/scrap/job/scrapJob.vue
@ -130,7 +130,7 @@
 				if (this.checkedToday) {
 					filters.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.todayTime
 					})
 				}
--- a/src/pages/stockUp/job/stockUpJob.vue
+++ b/src/pages/stockUp/job/stockUpJob.vue
@ -135,7 +135,7 @@ import {
 				if (this.checkedToday) {
 					filters.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.todayTime
 					})
 				}
--- a/src/pages/supplierDeliver/record/supplierDeliverRecord.vue
+++ b/src/pages/supplierDeliver/record/supplierDeliverRecord.vue
@ -125,7 +125,7 @@
 				if (this.checkedToday) {
 					filters.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.todayTime
 					})
 				}
--- a/src/pages/transfer/job/issueJob.vue
+++ b/src/pages/transfer/job/issueJob.vue
@ -136,7 +136,7 @@
 				if (this.checkedToday) {
 					filters.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.todayTime
 					})
 				}
--- a/src/pages/transfer/job/receiptJob.vue
+++ b/src/pages/transfer/job/receiptJob.vue
@ -134,7 +134,7 @@
 				if (this.checkedToday) {
 					filters.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.todayTime
 					})
 				}
--- a/src/pages/unPlanned/job/issueJob.vue
+++ b/src/pages/unPlanned/job/issueJob.vue
@ -137,7 +137,7 @@
 				if (this.checkedToday) {
 					filters.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.todayTime
 					})
 				}
--- a/src/pages/unPlanned/job/receiptJob.vue
+++ b/src/pages/unPlanned/job/receiptJob.vue
@ -126,7 +126,7 @@
 				if (this.checkedToday) {
 					filters.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.todayTime
 					})
 				}