From bad46c697e3116e80d6427ee89a93553d2eded58 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期二, 29 七月 2025 11:15:37 +0800
Subject: [PATCH] 修改扫码问题
---
src/pages/production/twist/receive/monofil.vue | 47 +++++++++++++++++++++++++++++++----------------
1 files changed, 31 insertions(+), 16 deletions(-)
diff --git a/src/pages/production/twist/receive/monofil.vue b/src/pages/production/twist/receive/monofil.vue
index e7f7be4..8d4f6dd 100644
--- a/src/pages/production/twist/receive/monofil.vue
+++ b/src/pages/production/twist/receive/monofil.vue
@@ -5,6 +5,7 @@
v-model="cardList"
:fixed="false"
:auto-show-back-to-top="true"
+ :loading-more-enabled="false"
@query="getList"
>
<template #top>
@@ -17,13 +18,13 @@
<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" />
+ <Scan ref="scanRef" emitName="scanMono" />
<wd-toast />
</view>
</template>
@@ -32,7 +33,7 @@
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 { onLoad, onUnload } from "@dcloudio/uni-app";
import Scan from "@/components/scan/index.vue";
import ManageApi from "@/api/product/manage";
import TwistApi from "@/api/product/twist";
@@ -49,14 +50,28 @@
const getScanCode = async (code: any) => {
console.log("鑷畾涔夋壂鎻忕殑缁撴灉鍥炶皟鍑芥暟:", code);
// let parseData = code.trim();
- let codeArr = code.code.split(",");
- console.log("sb:", codeArr);
+ console.log("code:===========", JSON.parse(code.code));
+ console.log("id:=============", JSON.parse(code.code).id);
const { data } = await TwistApi.getScarn({
- outPutId: codeArr[1],
+ outPutId: JSON.parse(code.code).id,
});
- const exists = cardList.value.some((item) => item.id === data.id);
+ const exists = cardList.value.some((item) => item.monofilamentNumber === data.monofilamentNumber);
if (!exists) {
- cardList.value.push(data);
+ 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("璇ュ崟涓濆凡棰嗙敤锛岃鍕块噸澶嶆壂鐮�");
@@ -78,10 +93,14 @@
};
const save = async () => {
- const { code } = await TwistApi.addStrandedWireDish(cardList.value);
+ const value = cardList.value.filter((item: { id?: number }) => item.id === undefined || item.id === null);
+
+ const { code } = await TwistApi.addStrandedWireDish(value);
if (code == 200) {
toast.success("淇濆瓨鎴愬姛");
+ cardList.value = [];
pagingRef.value.refresh();
+ getList();
} else {
toast.error("淇濆瓨澶辫触");
}
@@ -89,17 +108,13 @@
onLoad((options: any) => {
// 寮�鍚箍鎾洃鍚簨浠�
- uni.$on("scan", getScanCode);
+ uni.$on("scanMono", getScanCode);
paramsId.value = options.id;
});
onUnload(() => {
// 寮�鍚箍鎾洃鍚簨浠�
- uni.$off("scan", getScanCode);
+ uni.$off("scanMono", getScanCode);
});
-
-onShow(() => {});
-
-onHide(() => {});
</script>
<style lang="scss" scoped>
--
Gitblit v1.9.3