diff --git a/src/pages/back/backCode.vue b/src/pages/back/backCode.vue index 6a8568b..897e3e6 100644 --- a/src/pages/back/backCode.vue +++ b/src/pages/back/backCode.vue @@ -153,7 +153,7 @@ const scanStart = async () => { uni.showToast({ title: '扫码失败', icon: 'none' }) } if(ret.resp_code==1000){ - qrCode.value = ret.resp_result.split("qrcode=")[1]; + qrCode.value = ret.resp_result; console.log(qrCode.value) let param={ "qrCode":qrCode.value, diff --git a/src/pages/back/backCodeAdd.vue b/src/pages/back/backCodeAdd.vue index f8b436c..e1b0c01 100644 --- a/src/pages/back/backCodeAdd.vue +++ b/src/pages/back/backCodeAdd.vue @@ -122,7 +122,7 @@ const codeScan = async () => { } if(ret.resp_code==1000){ // uni.showToast({ title: '扫码成功', icon: 'none' }) - qrCode.value = ret.resp_result.split("qrcode=")[1]; + qrCode.value = ret.resp_result; codeToBack() } }) @@ -141,6 +141,7 @@ const codeToBack = async () => { if(res.code==200){ if(res.data.length>0){ maInfo.value = res.data[0] + console.log('22222222',maInfo.value) }else{ uni.showToast({ title: '扫码二维码未绑定设备编码!', icon: 'none'}) } @@ -162,14 +163,17 @@ const submitCode = () => { let info = { agreementId:maInfo.value.agreementId, backPerson:backPerson.value, - phone:phone.value + phone:phone.value, + proId:maInfo.value.proId, + unitId:maInfo.value.unitId } let detail = [{ "maId":maInfo.value.maId, "maCode":maInfo.value.maCode, "typeId":maInfo.value.typeId, "apDetection":apDetection.value, - "bmFileInfos":bmFileInfos.value + "bmFileInfos":bmFileInfos.value, + "preNum":1, }] let param = { "backApplyInfo":info, diff --git a/src/pages/picking/outbound/code-outbound.vue b/src/pages/picking/outbound/code-outbound.vue index 7a4877b..12deef4 100644 --- a/src/pages/picking/outbound/code-outbound.vue +++ b/src/pages/picking/outbound/code-outbound.vue @@ -418,7 +418,8 @@ const scanStart = () => { } if(ret.resp_code==1000){ // uni.showToast({ title: '成功', icon: 'none' }) - qrCodeScan.value = ret.resp_result.split("qrcode=")[1] + console.log('444444444444444',ret) + qrCodeScan.value = ret.resp_result if (qrCodeScan.value=="") { uni.showToast({ title: '扫码识别失败', icon: 'none'}) }else{ @@ -438,17 +439,18 @@ const getMaInfoScan = async () => { if (res.code == 200) { if (res.data && res.data.recordList.length > 0) { codeData.value = res.data.recordList[0] - uni.showModal({ - title: '出库', - content: `监测到${qrCodeScan.value}绑定设备${res.data.recordList[0].maCode},是否确定出库?`, - confirmText: '确定', - cancelText: '取消', - success: async (res) => { - if (res.confirm) { - confirmCodeOutBound() - } - } - }) + confirmCodeOutBound() + // uni.showModal({ + // title: '出库', + // content: `监测到${qrCodeScan.value}绑定设备${res.data.recordList[0].maCode},是否确定出库?`, + // confirmText: '确定', + // cancelText: '取消', + // success: async (res) => { + // if (res.confirm) { + // confirmCodeOutBound() + // } + // } + // }) }else{ uni.showToast({ title: res.data.msg, icon: 'none'}) } @@ -476,6 +478,7 @@ const confirmCodeOutBound = async () => { typeModelName: codeData.value.typeModelName, }) const res = await setOutboundNumAPI({ leaseOutDetailsList: paramsList }) + console.log('333333333333',res) if (res.code === 200) { uni.showToast({ title: '出库成功!',