From 15d3b001720d3baa8a30f5f6a105a6809e9ec063 Mon Sep 17 00:00:00 2001 From: 曹睿 <360930172@qq.com> Date: 星期三, 21 五月 2025 09:19:25 +0800 Subject: [PATCH] feat: app扫码接口调整 --- src/pages/production/twist/receive/monofil.vue | 58 ++++++++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 42 insertions(+), 16 deletions(-) diff --git a/src/pages/production/twist/receive/monofil.vue b/src/pages/production/twist/receive/monofil.vue index 4e928a5..dc9f9a0 100644 --- a/src/pages/production/twist/receive/monofil.vue +++ b/src/pages/production/twist/receive/monofil.vue @@ -14,28 +14,29 @@ </template> </CardTitle> </template> - <MonofilCard v-for="(item, index) in cardList" :key="index" /> + <MonofilCard v-for="(item, index) in cardList" :key="index" :data="item" /> <template #bottom> <view class="flex justify-center items-center"> - <wd-button block> - <text class="text-[#fff]" @click="save">淇濆瓨</text> + <wd-button block @click="save"> + <text class="text-[#fff]">淇濆瓨</text> </wd-button> </view> </template> </z-paging> + <Scan ref="scanRef" /> + <wd-toast /> </view> - <Scan ref="scanRef" /> </template> <script setup lang="ts"> import CardTitle from "@/components/card-title/index.vue"; import MonofilCard from "../components/MonofilCard.vue"; +import { useToast } from "wot-design-uni"; import { onLoad, onUnload, onShow, onHide } from "@dcloudio/uni-app"; import Scan from "@/components/scan/index.vue"; import ManageApi from "@/api/product/manage"; import TwistApi from "@/api/product/twist"; import zPaging from "@/components/z-paging/z-paging.vue"; -import { useMessage } from "wot-design-uni"; // import { useZebraScan } from "@/hooks/useZebraScan"; // const { init, start, stop, triggerScan } = useZebraScan(); @@ -43,20 +44,37 @@ const pagingRef = ref(); const scanRef = ref(); const cardList = ref<any[]>([]); -const message = useMessage(); +const toast = useToast(); const getScanCode = async (code: any) => { - let parseData = code.trim(); - console.log("鑷畾涔夋壂鎻忕殑缁撴灉鍥炶皟鍑芥暟:", parseData); - let codeArr = parseData.split(","); + console.log("鑷畾涔夋壂鎻忕殑缁撴灉鍥炶皟鍑芥暟:", code); + // let parseData = code.trim(); + let codeArr = code.code.split(","); + console.log("sb:", codeArr); const { data } = await TwistApi.getScarn({ - outPutId: codeArr[1], + outPutId: codeArr[1].id, }); - console.log("鍗曚笣缂栧彿", data); - message.alert({ - title: "鍗曚笣缂栧彿", - msg: JSON.stringify(data), - }); + const exists = cardList.value.some((item) => item.monofilamentNumber === data.monofilamentNumber); + if (!exists) { + const { id, outPutId, wireId, oneLength, ...rest } = data; + console.log("sb", { + wireId: paramsId.value, + outputId: id, + amount: oneLength, + ongLength: oneLength, + ...rest, + }); + cardList.value.push({ + wireId: paramsId.value, + outputId: id, + amount: oneLength, + ongLength: oneLength, + ...rest, + }); + pagingRef.value.complete(cardList.value); + } else { + toast.error("璇ュ崟涓濆凡棰嗙敤锛岃鍕块噸澶嶆壂鐮�"); + } }; const openScan = () => { @@ -73,7 +91,15 @@ } }; -const save = () => {}; +const save = async () => { + const { code } = await TwistApi.addStrandedWireDish(cardList.value); + if (code == 200) { + toast.success("淇濆瓨鎴愬姛"); + pagingRef.value.refresh(); + } else { + toast.error("淇濆瓨澶辫触"); + } +}; onLoad((options: any) => { // 寮�鍚箍鎾洃鍚簨浠� -- Gitblit v1.9.3