From b68e9764fe7f93e92088eb8b0873c831fdd7f555 Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Tue, 17 Dec 2024 17:21:13 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3app=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E4=BC=A0=E5=8F=82=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .hbuilderx/launch.json | 2 +- src/pages/new-purchase/bind/coding-bind.vue | 64 ++- src/pages/new-purchase/bind/coding-scan.vue | 134 ++--- src/pages/new-purchase/bind/details.vue | 25 +- src/pages/new-purchase/bind/index.vue | 11 +- src/pages/new-purchase/entry/code-inbound.vue | 39 +- src/pages/picking/outbound/code-outScan.vue | 204 +++---- src/pages/picking/outbound/code-outbound.vue | 85 +-- src/pages/picking/outbound/details.vue | 57 +- src/pages/picking/outbound/num-outbound.vue | 168 +++--- .../repair/repairManage/code-operate.vue | 253 +++++---- src/pages/repair/repairManage/code-view.vue | 53 +- src/pages/repair/repairManage/details.vue | 29 +- src/pages/repair/repairManage/num-operate.vue | 505 ++++++++++-------- src/pages/repair/testExamine/details.vue | 78 ++- src/pages/repair/testedInBound/details.vue | 28 +- src/utils/http.js | 2 +- 17 files changed, 1002 insertions(+), 735 deletions(-) diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json index 9c80382..0c2e437 100644 --- a/.hbuilderx/launch.json +++ b/.hbuilderx/launch.json @@ -2,7 +2,7 @@ "version" : "1.0", "configurations" : [ { - "playground" : "custom", + "playground" : "standard", "type" : "uni-app:app-android" }, { diff --git a/src/pages/new-purchase/bind/coding-bind.vue b/src/pages/new-purchase/bind/coding-bind.vue index 060a494..25dce89 100644 --- a/src/pages/new-purchase/bind/coding-bind.vue +++ b/src/pages/new-purchase/bind/coding-bind.vue @@ -1,13 +1,13 @@ - + {{ queryParams.maTypeName }} - + {{ queryParams.typeName }} @@ -17,9 +17,9 @@ {{ waitBindNum }} - + - + @@ -112,7 +112,7 @@ - + - + {{ queryParams.maTypeName }} - + {{ queryParams.typeName }} @@ -18,12 +18,12 @@ {{ waitBindNum }} - - - 开始扫码 - - + + 开始扫码 + + + @@ -31,13 +31,12 @@ - - - - 取消 - 确认 - + + + 取消 + 确认 + @@ -45,53 +44,60 @@ import { ref, computed } from 'vue' import { setBindCodingAPI } from '@/services/new-purchase/bind.js' import { debounce } from 'lodash-es' -import { onShow } from '@dcloudio/uni-app' -const query = defineProps() // 获取上级页面传递的路由参数 -const queryParams = JSON.parse(query.queryParams) -console.log(queryParams) +import { onShow, onLoad } from '@dcloudio/uni-app' +// const query = defineProps() // 获取上级页面传递的路由参数 +// const queryParams = JSON.parse(query.queryParams) +const queryParams = ref({}) +// console.log(queryParams) const formData = ref({ - maCode: '', - outFacCode: '', + maCode: '', + outFacCode: '', }) const codeNun = ref(0) // 计算待绑定数量 const waitBindNum = computed(() => { - return queryParams.checkNum - queryParams.bindNum - codeNun.value + return queryParams.value.checkNum - queryParams.value.bindNum - codeNun.value }) - + +onLoad((options) => { + queryParams.value = JSON.parse(options.queryParams) +}) + // 编码识别按钮 const scanStart = () => { console.log('编码识别--') // 只允许通过相机扫码 uni.scanCode({ - onlyFromCamera: true, - scanType: ['qrCode', 'pdf417'], - success: (res) => { - console.log('扫码结果:' + res.result); - formData.value.maCode = res.result - }, - fail: (err) => { - // uni.showToast({ - // title: '取消', - // icon: 'none' - // }); - } - }); + onlyFromCamera: true, + scanType: ['qrCode', 'pdf417'], + success: (res) => { + console.log('扫码结果:' + res.result) + formData.value.maCode = res.result + }, + fail: (err) => { + // uni.showToast({ + // title: '取消', + // icon: 'none' + // }); + }, + }) } // 绑定按钮 const onHandleBinding = debounce(async () => { - let codeList = [{ - "typeName": queryParams.typeName, - "maTypeName": queryParams.maTypeName, - "outFacCode": formData.value.outFacCode, - "maCode": formData.value.maCode - }] - + let codeList = [ + { + typeName: queryParams.value.typeName, + maTypeName: queryParams.value.maTypeName, + outFacCode: formData.value.outFacCode, + maCode: formData.value.maCode, + }, + ] + // 组装参数 const bindParams = { - typeId: queryParams.typeId, - taskId: queryParams.taskId, + typeId: queryParams.value.typeId, + taskId: queryParams.value.taskId, dtoList: codeList, } @@ -104,23 +110,23 @@ const onHandleBinding = debounce(async () => { title: '编码绑定成功!', icon: 'none', }) - formData.value.outFacCode = "" - formData.value.maCode = "" - codeNun.value = codeNun.value+1; - uni.$emit('onUpdate',codeNun.value) + formData.value.outFacCode = '' + formData.value.maCode = '' + codeNun.value = codeNun.value + 1 + uni.$emit('onUpdate', codeNun.value) } }, 500) - // 返回 +// 返回 const backPage = () => { - uni.navigateBack({ - delta: 1 - }) + uni.navigateBack({ + delta: 1, + }) } // 页面加载完毕 onShow(() => { - setTimeout(()=>{ - scanStart() - },500) + setTimeout(() => { + scanStart() + }, 500) }) @@ -137,11 +143,11 @@ onShow(() => { border-radius: 6px; box-shadow: 0 2upx 4upx 0 rgba(0, 0, 0, 0.1); } - .scan-btn{ - width: 94%; - margin: 5px auto; - } -} + .scan-btn { + width: 94%; + margin: 5px auto; + } +} .btn { display: flex; justify-content: space-around; @@ -161,10 +167,10 @@ onShow(() => { } } } -.form-view{ - width: 100%; - height: 100%; - display: flex; - align-items: center; +.form-view { + width: 100%; + height: 100%; + display: flex; + align-items: center; } diff --git a/src/pages/new-purchase/bind/details.vue b/src/pages/new-purchase/bind/details.vue index 5de98b4..0ab9740 100644 --- a/src/pages/new-purchase/bind/details.vue +++ b/src/pages/new-purchase/bind/details.vue @@ -103,10 +103,14 @@