bonus
/
bonus-material-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://14.103.246.124:16000/bonus/bonus-material-app

This commit is contained in:
hongchao 2025-09-09 20:12:15 +08:00
parent f379b132c3 23b06e40a9
commit ed7350ae84
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/pages/materialsStation/toolsLease/codeOut.vue
View File

@ -93,9 +93,11 @@
<uni-col :span="6"> <uni-col :span="6">
<button class="item-btn" type="primary" @click="handleRfid">RFID识别</button> <button class="item-btn" type="primary" @click="handleRfid">RFID识别</button>
</uni-col> </uni-col>
<uni-col :span="6"> <!--
<button class="item-btn" type="primary" @click="ocrClick">OCR识别</button> <uni-col :span="6">
</uni-col> <button class="item-btn" type="primary" @click="ocrClick">OCR识别</button>
</uni-col>
-->
</uni-row> </uni-row>
</view> </view>
<ScanQrCode <ScanQrCode

3
src/pages/picking/outbound/details.vue
View File

@ -156,10 +156,11 @@ const getOutboundDetailsData = async () => {
mask: true mask: true
}) })
let res; let res;
if (leaseApplyInfo.value.publishTask === null || leaseApplyInfo.value.publishTask == "") { if (leaseApplyInfo.value.publishTask === null || leaseApplyInfo.value.publishTask == "" || leaseApplyInfo.value.publishTask == 'null') {
console.log("Condition: publishTask is null or empty string"); console.log("Condition: publishTask is null or empty string");
// 如果 publishTask 为空，则只传递两个参数 // 如果 publishTask 为空，则只传递两个参数
console.log("yyyyyyyyyyyyyyyyyyyy"); console.log("yyyyyyyyyyyyyyyyyyyy");
leaseApplyInfo.value.publishTask = ''
const { data } = await getOutboundDetailsAPI( const { data } = await getOutboundDetailsAPI(
leaseApplyInfo.value.parentId, leaseApplyInfo.value.parentId,
keyWord.value, keyWord.value,