diff --git a/common/scanUtil.js b/common/scanUtil.js index 5bbd935..e74b54e 100644 --- a/common/scanUtil.js +++ b/common/scanUtil.js @@ -19,12 +19,13 @@ export const scanTypeEnum = { } export const getScanParams = (type, model = {})=> { + let scanDate = dayjs().format("YYYY-MM-DD HH:mm:ss") return { scanType: type, // 扫描类型 - opType: 2, // 确认 动作 + opType: model._opType || 2, // 动作, 1 检查; 2 确认 scanData: [{ + scanDate, ...model, - scanDate: dayjs().format("YYYY-MM-DD HH:mm:ss") }] } } @@ -36,8 +37,10 @@ export const ansScanResponse = ({ res, title })=> { let bl = false if(result == "success") { bl = true - playAudio(audioTypeEnum.correct) - title && showToast(`${title}成功`) + if(title) { + playAudio(audioTypeEnum.correct) + showToast(`${title}成功`) + } } else { switch (resItem?.message){ case '重复扫描': @@ -47,7 +50,7 @@ export const ansScanResponse = ({ res, title })=> { playAudio(audioTypeEnum.dotexist) break; default: - playAudio(audioTypeEnum.networkError) + // playAudio(audioTypeEnum.networkError) break; } showToast(resItem?.message || `${title}失败`) diff --git a/pages/deliveryDeal/arriveDeliveryScanning.vue b/pages/deliveryDeal/arriveDeliveryScanning.vue index c96a697..a9a4924 100644 --- a/pages/deliveryDeal/arriveDeliveryScanning.vue +++ b/pages/deliveryDeal/arriveDeliveryScanning.vue @@ -110,7 +110,11 @@ let daoRes = await apiService.scanRecord({...daoParam, _loading: true}) let { bl: daoBl, resItem: daoResItem } = ansScanResponse({ res: daoRes }) if(daoBl) { - let paiParam = getScanParams(scanTypeEnum.paiJian, { ...this.submitParam, ...extParam }) + let paiParam = getScanParams(scanTypeEnum.paiJian, { + scanDate: dayjs().add(10, 'minute').format("YYYY-MM-DD HH:mm:ss"), // 自定义扫描时间 +10min + ...this.submitParam, + ...extParam + }) let paiRes = await apiService.scanRecord({...paiParam, _loading: true}) let { bl, resItem } = ansScanResponse({ res: paiRes, title: "到派件" }) if(bl) { diff --git a/pages/deliveryDeal/signedScanning.vue b/pages/deliveryDeal/signedScanning.vue index f0c2f92..2621cd9 100644 --- a/pages/deliveryDeal/signedScanning.vue +++ b/pages/deliveryDeal/signedScanning.vue @@ -105,8 +105,10 @@ initData() { this.submitParam.billCode = this.queryOption.billCode || this.queryOption.orderSn }, - handleScanValChange: debounce(function(val){ - + handleScanValChange: debounce(async function(val){ + let scnParam = getScanParams(scanTypeEnum.qianShou, { ...this.submitParam, _opType: 1 }) + let res = await apiService.scanRecord({...scnParam, _loading: true}) + let { bl, resItem } = ansScanResponse({ res }) }), async handleSubmit() { await checkParams(this.submitParam, this.submitValidConfig) diff --git a/pages/tms/coPackingScanning.vue b/pages/tms/coPackingScanning.vue index c17bf79..5bd7a0f 100644 --- a/pages/tms/coPackingScanning.vue +++ b/pages/tms/coPackingScanning.vue @@ -5,7 +5,7 @@ - @@ -16,9 +16,16 @@ - + + + + 系统生成 + + 合包完成 @@ -100,6 +107,9 @@ getPackCodeList: apiService.getPackCodeList, initData() { this.submitParam.billCode = this.queryOption.billCode + }, + async handleCreatePaNo() { + }, async handleSubmit(val) { let extParam = {} @@ -115,7 +125,7 @@ } }, handleScanValChange: debounce(function(val){ - val && (this.handleSubmit(val)) + }), resetForm() { this.submitParam.billCode = ''