From 2cc66753086d6ce4c1154cd21f1cdacba09c914d Mon Sep 17 00:00:00 2001
From: 曹睿 <360930172@qq.com>
Date: 星期三, 23 四月 2025 10:13:06 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/yuanwang-mes-uniapp

---
 src/pages/production/twist/receive/monofil.vue |   31 +++++++++++++++++++++----------
 1 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/pages/production/twist/receive/monofil.vue b/src/pages/production/twist/receive/monofil.vue
index cc82aab..b7c31b8 100644
--- a/src/pages/production/twist/receive/monofil.vue
+++ b/src/pages/production/twist/receive/monofil.vue
@@ -14,7 +14,14 @@
           </template>
         </CardTitle>
       </template>
-      <MonofilCard v-for="(item, index) in cardList" :key="index" />
+      <MonofilCard v-for="(item, index) in cardList" v-model:value="item" :key="index" />
+      <template #bottom>
+        <view class="flex justify-center items-center">
+          <wd-button block>
+            <text class="text-[#fff]" @click="save">淇濆瓨</text>
+          </wd-button>
+        </view>
+      </template>
     </z-paging>
   </view>
   <Scan ref="scanRef" />
@@ -28,7 +35,7 @@
 import ManageApi from "@/api/product/manage";
 import TwistApi from "@/api/product/twist";
 import zPaging from "@/components/z-paging/z-paging.vue";
-import { useMessage } from "@/uni_modules/wot-design-uni";
+import { useMessage } from "wot-design-uni";
 // import { useZebraScan } from "@/hooks/useZebraScan";
 // const { init, start, stop, triggerScan } = useZebraScan();
 
@@ -39,17 +46,19 @@
 const message = useMessage();
 
 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],
   });
-  console.log("鍗曚笣缂栧彿", data);
-  message.alert({
-    title: "鍗曚笣缂栧彿",
-    msg: JSON.stringify(data),
-  });
+  // console.log("鍗曚笣缂栧彿", data);
+  // message.alert({
+  //   title: "鍗曚笣缂栧彿",
+  //   msg: JSON.stringify(data),
+  // });
+  pagingRef.value.complete([data]);
 };
 
 const openScan = () => {
@@ -66,6 +75,8 @@
   }
 };
 
+const save = () => {};
+
 onLoad((options: any) => {
   // 寮�鍚箍鎾洃鍚簨浠�
   uni.$on("scan", getScanCode);

--
Gitblit v1.9.3