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/login/index.vue | 4 ++--
src/pages/production/twist/receive/monofil.vue | 20 +++++++++++---------
src/pages/production/twist/components/MonofilCard.vue | 11 +++--------
3 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue
index 7e29461..a2982bc 100644
--- a/src/pages/login/index.vue
+++ b/src/pages/login/index.vue
@@ -96,8 +96,8 @@
// 鐧诲綍琛ㄥ崟鏁版嵁
const loginFormData = ref<LoginFormData>({
- // username: "31601016",
- username: "32308027",
+ username: "31601016",
+ // username: "32308027",
password: "cxjt1234",
});
diff --git a/src/pages/production/twist/components/MonofilCard.vue b/src/pages/production/twist/components/MonofilCard.vue
index 329d7f5..38921d1 100644
--- a/src/pages/production/twist/components/MonofilCard.vue
+++ b/src/pages/production/twist/components/MonofilCard.vue
@@ -3,7 +3,7 @@
<wd-form :model="model">
<wd-cell-group :border="true">
<wd-input
- v-model="model.no"
+ v-model="model.monofilamentNumber"
label="鍗曚笣缂栧彿"
label-width="100px"
prop="no"
@@ -11,7 +11,7 @@
placeholder="璇疯緭鍏ュ崟涓濈紪鍙�"
/>
<wd-input
- v-model="model.length"
+ v-model="model.oneLength"
label="闀垮害"
label-width="100px"
prop="length"
@@ -24,12 +24,7 @@
</template>
<script setup lang="ts">
-import useFormData from "@/hooks/useFormData";
-
-const { form: model } = useFormData({
- no: undefined,
- length: undefined,
-});
+const model: any = defineModel("value");
</script>
<style lang="scss" scoped></style>
diff --git a/src/pages/production/twist/receive/monofil.vue b/src/pages/production/twist/receive/monofil.vue
index 4e928a5..b7c31b8 100644
--- a/src/pages/production/twist/receive/monofil.vue
+++ b/src/pages/production/twist/receive/monofil.vue
@@ -14,7 +14,7 @@
</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>
@@ -46,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 = () => {
--
Gitblit v1.9.3