diff --git a/src/mycomponents/scan/winScanLocation.vue b/src/mycomponents/scan/winScanLocation.vue index 0f4c0144..68c18dfa 100644 --- 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 diff --git a/src/pages/count/job/countJob.vue b/src/pages/count/job/countJob.vue index 7ca78774..fa45bfd1 100644 --- 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 }) } diff --git a/src/pages/count/job/fuzzyCountJob.vue b/src/pages/count/job/fuzzyCountJob.vue index e57b4aba..d5199cb3 100644 --- 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 }) } diff --git a/src/pages/customerReturn/job/returnJob.vue b/src/pages/customerReturn/job/returnJob.vue index c562ee51..ce074f2f 100644 --- 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 }) } diff --git a/src/pages/customerReturn/record/recordList.vue b/src/pages/customerReturn/record/recordList.vue index c59f4018..af97d0bd 100644 --- 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 }) } diff --git a/src/pages/deliver/job/deliverJob.vue b/src/pages/deliver/job/deliverJob.vue index 58d58a70..6aeda18c 100644 --- 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 }) } diff --git a/src/pages/inspect/job/inspectJob.vue b/src/pages/inspect/job/inspectJob.vue index 4ac64d4c..0d21bc92 100644 --- 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 }) } diff --git a/src/pages/inventoryMove/coms/comMoveJob.vue b/src/pages/inventoryMove/coms/comMoveJob.vue index 4e77583f..ef029a01 100644 --- 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 }) } diff --git a/src/pages/inventoryMove/coms/comMoveRecord.vue b/src/pages/inventoryMove/coms/comMoveRecord.vue index 4f130f8a..5ea7357b 100644 --- a/src/pages/inventoryMove/coms/comMoveRecord.vue +++ b/src/pages/inventoryMove/coms/comMoveRecord.vue @@ -35,7 +35,7 @@ - + 来源库位： - {{fromLocationCode}} + 零件： - {{itemCode}} + diff --git a/src/pages/inventoryMove/job/inventoryMoveJob.vue b/src/pages/inventoryMove/job/inventoryMoveJob.vue index 97ef5176..69619c2a 100644 --- 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 }) } diff --git a/src/pages/issue/job/issueJob.vue b/src/pages/issue/job/issueJob.vue index 5f2e24a1..9f98eadc 100644 --- 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 }) } diff --git a/src/pages/issue/job/issueJob0816.vue b/src/pages/issue/job/issueJob0816.vue index a3017f95..c714bfc1 100644 --- 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 // }) // } diff --git a/src/pages/itemHold/record/recordList.vue b/src/pages/itemHold/record/recordList.vue index c4558f64..9feae876 100644 --- 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 }) } diff --git a/src/pages/package/job/overPackageJob.vue b/src/pages/package/job/overPackageJob.vue index 7a4cd225..1715c018 100644 --- 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 }) } diff --git a/src/pages/productDismantle/job/productDismantleJob.vue b/src/pages/productDismantle/job/productDismantleJob.vue index 4712fc84..ea90a1d0 100644 --- 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 }) } diff --git a/src/pages/productPutaway/job/productPutawayJob.vue b/src/pages/productPutaway/job/productPutawayJob.vue index 25541856..0228ac61 100644 --- 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 }) } diff --git a/src/pages/productReceipt/job/ccProductReceiptJob.vue b/src/pages/productReceipt/job/ccProductReceiptJob.vue index a9e11e68..3fbc9781 100644 --- 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 }) } diff --git a/src/pages/productReceipt/job/completeReceiveJob.vue b/src/pages/productReceipt/job/completeReceiveJob.vue index e8520ab7..5cd87b95 100644 --- 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 }) } diff --git a/src/pages/productReceipt/job/productReceiptJob.vue b/src/pages/productReceipt/job/productReceiptJob.vue index 3a722ba8..989029a2 100644 --- 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 }) } diff --git a/src/pages/productReceipt/record/recordList.vue b/src/pages/productReceipt/record/recordList.vue index 831613b1..ca564a58 100644 --- 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 }) } diff --git a/src/pages/productRecycle/job/productRecycleJob.vue b/src/pages/productRecycle/job/productRecycleJob.vue index 59d6d9f4..72a6f3bb 100644 --- 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 }) } diff --git a/src/pages/productionReceipt/job/productionReceiptJob.vue b/src/pages/productionReceipt/job/productionReceiptJob.vue index 4d1f72a0..5d33464d 100644 --- 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 }) } diff --git a/src/pages/productionReturn/job/holdToReturnJob.vue b/src/pages/productionReturn/job/holdToReturnJob.vue index 1c10671f..c571028f 100644 --- 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 }) } diff --git a/src/pages/productionReturn/job/okToReturnJob.vue b/src/pages/productionReturn/job/okToReturnJob.vue index f6aaada1..bbe43ac5 100644 --- 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 }) } diff --git a/src/pages/productionReturn/job/returnJob.vue b/src/pages/productionReturn/job/returnJob.vue index 5dd8a87b..f4df3056 100644 --- 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 }) } diff --git a/src/pages/productionReturn/record/returnToHoldRecordList.vue b/src/pages/productionReturn/record/returnToHoldRecordList.vue index 4e3f2d6a..a6f20096 100644 --- 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 }) } diff --git a/src/pages/purchaseReceipt/job/receiptDetail.vue b/src/pages/purchaseReceipt/job/receiptDetail.vue index 4dace67f..df6e75cc 100644 --- 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) diff --git a/src/pages/purchaseReceipt/job/receiptJob.vue b/src/pages/purchaseReceipt/job/receiptJob.vue index b1a8c9b6..cd90837b 100644 --- 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 }) } diff --git a/src/pages/purchaseReturn/job/returnJob.vue b/src/pages/purchaseReturn/job/returnJob.vue index c9761207..86572ea5 100644 --- 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 }) } diff --git a/src/pages/purchaseReturn/job/returnJob_0904.vue b/src/pages/purchaseReturn/job/returnJob_0904.vue index 97f80e7c..2ab89e75 100644 --- 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 }) } diff --git a/src/pages/putaway/job/putawayJob.vue b/src/pages/putaway/job/putawayJob.vue index cd09fa03..221be3dd 100644 --- 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 }) } diff --git a/src/pages/putaway/job/quantityPutawayJob.vue b/src/pages/putaway/job/quantityPutawayJob.vue index 88b999eb..6ea7c10c 100644 --- 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 }) } diff --git a/src/pages/repleinsh/job/repleinshJob.vue b/src/pages/repleinsh/job/repleinshJob.vue index a1063cda..3af57d9d 100644 --- 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 }) } diff --git a/src/pages/scrap/job/scrapJob.vue b/src/pages/scrap/job/scrapJob.vue index e6951b4d..93e93adb 100644 --- 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 }) } diff --git a/src/pages/stockUp/job/stockUpJob.vue b/src/pages/stockUp/job/stockUpJob.vue index 58276213..c8114d86 100644 --- 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 }) } diff --git a/src/pages/supplierDeliver/record/supplierDeliverRecord.vue b/src/pages/supplierDeliver/record/supplierDeliverRecord.vue index f1cd6202..0b473e82 100644 --- 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 }) } diff --git a/src/pages/transfer/job/issueJob.vue b/src/pages/transfer/job/issueJob.vue index f4997341..2a194fd0 100644 --- 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 }) } diff --git a/src/pages/transfer/job/receiptJob.vue b/src/pages/transfer/job/receiptJob.vue index eab54301..8f903d7c 100644 --- 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 }) } diff --git a/src/pages/unPlanned/job/issueJob.vue b/src/pages/unPlanned/job/issueJob.vue index 324f5a48..8750cbee 100644 --- 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 }) } diff --git a/src/pages/unPlanned/job/receiptJob.vue b/src/pages/unPlanned/job/receiptJob.vue index 0fbfeed8..7f6326a6 100644 --- 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 }) }