From 78c565e37520fad100693c4e298e30e7c916d1bb Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期二, 28 十月 2025 16:21:40 +0800
Subject: [PATCH] fix: 领用二维码异常提示，原材料自检重构
---
src/pages/production/twist/receive/monofil.vue | 288 ++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 244 insertions(+), 44 deletions(-)
diff --git a/src/pages/production/twist/receive/monofil.vue b/src/pages/production/twist/receive/monofil.vue
index d5cc002..1c7a03e 100644
--- a/src/pages/production/twist/receive/monofil.vue
+++ b/src/pages/production/twist/receive/monofil.vue
@@ -11,16 +11,22 @@
<CardTitle title="鍗曚笣棰嗙敤" :hideAction="false">
<template #action>
<wd-button type="icon" icon="scan" color="#0D867F" @click="openScan"></wd-button>
+ <wd-button
+ type="icon"
+ icon="add-circle"
+ color="#0D867F"
+ @click="openManualInput"
+ ></wd-button>
</template>
</CardTitle>
</template>
<!-- <MonofilCard v-for="(item, index) in cardList" :key="index" :data="item" /> -->
- <wd-tabs v-model="tab" slidable="always">
+ <wd-tabs v-model="tab" slidable="always" class="tabs-container">
<block v-for="item in nodeList" :key="item">
<wd-tab :title="item.twistedLayer" :name="item.twistedLayer">
- <view class="content">
+ <scroll-view class="content" scroll-y>
<MonofilCard v-for="(m, i) in item.strandedWireDish" :key="i" :data="m" />
- </view>
+ </scroll-view>
</wd-tab>
</block>
</wd-tabs>
@@ -38,6 +44,32 @@
:nodeList="nodeList"
@confirm="handleConfirmSave"
/>
+
+ <!-- 鎵嬪姩杈撳叆璐ㄩ噺杩芥函鍙峰脊妗� -->
+ <wd-popup v-model="showManualInput" position="center" :close-on-click-modal="false">
+ <view class="manual-input-modal">
+ <view class="modal-header">
+ <text class="title">鎵嬪姩棰嗙敤鍗曚笣</text>
+ <wd-icon name="close" @click="closeManualInput" />
+ </view>
+ <view class="modal-content">
+ <view class="input-label">鍗曚笣缂栧彿</view>
+ <wd-input
+ v-model="manualOutPutId"
+ placeholder="璇疯緭鍏ュ崟涓濈紪鍙�"
+ clearable
+ @clear="manualOutPutId = ''"
+ />
+ </view>
+ <view class="modal-footer">
+ <wd-button @click="closeManualInput" type="default">鍙栨秷</wd-button>
+ <wd-button type="primary" @click="handleManualConfirm" custom-class="confirm-btn">
+ 纭畾
+ </wd-button>
+ </view>
+ </view>
+ </wd-popup>
+
<wd-toast />
</view>
</template>
@@ -61,6 +93,8 @@
const toast = useToast();
const tab = ref("");
const showStatisticsModal = ref(false);
+const showManualInput = ref(false);
+const manualOutPutId = ref("");
// 鐩戝惉鏍囩鍒囨崲
watch(tab, () => {
@@ -75,53 +109,127 @@
// let parseData = code.trim();
console.log("code:===========", JSON.parse(code.code));
console.log("id:=============", JSON.parse(code.code).id);
- const { data } = await TwistApi.getScarn({
- outPutId: JSON.parse(code.code).id,
- });
+ try {
+ const { data } = await TwistApi.getScarn({
+ outPutId: JSON.parse(code.code).id,
+ });
- // 妫�鏌ユ槸鍚﹀凡閫夋嫨鏍囩
- if (!tab.value) {
- toast.error("璇峰厛閫夋嫨涓�涓眰");
- return;
- }
-
- // 鎵惧埌褰撳墠閫変腑鐨勫眰
- console.log("tab.value:===========2", tab.value);
- const currentLayer = nodeList.value.find((node) => node.twistedLayer === tab.value);
- if (!currentLayer) {
- toast.error("鏈壘鍒板綋鍓嶉�変腑鐨勫眰");
- return;
- }
-
- // 妫�鏌ュ綋鍓嶅眰鏄惁宸插瓨鍦ㄨ鍗曚笣
- const exists = currentLayer.strandedWireDish?.some(
- (item: any) => item.monofilamentNumber === data.monofilamentNumber
- );
- if (!exists) {
- const { id, outPutId, wireId, oneLength, ...rest } = data;
- const newItem = {
- wireId: paramsId.value,
- outputId: id,
- amount: oneLength,
- ongLength: oneLength,
- ...rest,
- };
-
- // 娣诲姞鍒板綋鍓嶅眰鐨� strandedWireDish 涓�
- if (!currentLayer.strandedWireDish) {
- currentLayer.strandedWireDish = [];
+ // 妫�鏌ユ槸鍚﹀凡閫夋嫨鏍囩
+ if (!tab.value) {
+ toast.error("璇峰厛閫夋嫨涓�涓眰");
+ return;
}
- currentLayer.strandedWireDish.push(newItem);
- // 鍒锋柊褰撳墠灞傜殑鏁版嵁鏄剧ず
- getList();
- } else {
- toast.error("璇ュ崟涓濆凡棰嗙敤锛岃鍕块噸澶嶆壂鐮�");
+ // 鎵惧埌褰撳墠閫変腑鐨勫眰
+ console.log("tab.value:===========2", tab.value);
+ const currentLayer = nodeList.value.find((node) => node.twistedLayer === tab.value);
+ if (!currentLayer) {
+ toast.error("鏈壘鍒板綋鍓嶉�変腑鐨勫眰");
+ return;
+ }
+
+ // 妫�鏌ュ綋鍓嶅眰鏄惁宸插瓨鍦ㄨ鍗曚笣
+ const exists = currentLayer.strandedWireDish?.some(
+ (item: any) => item.monofilamentNumber === data.monofilamentNumber
+ );
+ if (!exists) {
+ const { id, outPutId, wireId, oneLength, ...rest } = data;
+ const newItem = {
+ wireId: paramsId.value,
+ outputId: id,
+ amount: oneLength,
+ ongLength: oneLength,
+ ...rest,
+ };
+
+ // 娣诲姞鍒板綋鍓嶅眰鐨� strandedWireDish 涓�
+ if (!currentLayer.strandedWireDish) {
+ currentLayer.strandedWireDish = [];
+ }
+ currentLayer.strandedWireDish.push(newItem);
+
+ // 鍒锋柊褰撳墠灞傜殑鏁版嵁鏄剧ず
+ getList();
+ } else {
+ toast.error("璇ュ崟涓濆凡棰嗙敤锛岃鍕块噸澶嶆壂鐮�");
+ }
+ } catch (error) {
+ toast.error("浜岀淮鐮佸紓甯革紝璇锋洿鎹簩缁寸爜锛�");
}
};
const openScan = () => {
scanRef.value.triggerScan();
+};
+
+// 鎵撳紑鎵嬪姩杈撳叆寮规
+const openManualInput = () => {
+ // 妫�鏌ユ槸鍚﹀凡閫夋嫨鏍囩
+ if (!tab.value) {
+ toast.error("璇峰厛閫夋嫨涓�涓眰");
+ return;
+ }
+ showManualInput.value = true;
+};
+
+// 鍏抽棴鎵嬪姩杈撳叆寮规
+const closeManualInput = () => {
+ showManualInput.value = false;
+ manualOutPutId.value = "";
+};
+
+// 鎵嬪姩杈撳叆纭
+const handleManualConfirm = async () => {
+ if (!manualOutPutId.value.trim()) {
+ toast.error("璇疯緭鍏ヨ川閲忚拷婧彿");
+ return;
+ }
+
+ try {
+ const { data } = await TwistApi.selectByMonofilamentNumber({
+ monofilamentNumber: manualOutPutId.value.trim(),
+ });
+
+ // 鎵惧埌褰撳墠閫変腑鐨勫眰
+ const currentLayer = nodeList.value.find((node) => node.twistedLayer === tab.value);
+ if (!currentLayer) {
+ toast.error("鏈壘鍒板綋鍓嶉�変腑鐨勫眰");
+ return;
+ }
+
+ // 妫�鏌ュ綋鍓嶅眰鏄惁宸插瓨鍦ㄨ鍗曚笣
+ const exists = currentLayer.strandedWireDish?.some(
+ (item: any) => item.monofilamentNumber === data.monofilamentNumber
+ );
+
+ if (!exists) {
+ const { id, outPutId, wireId, oneLength, ...rest } = data;
+ const newItem = {
+ wireId: paramsId.value,
+ outputId: id,
+ amount: oneLength,
+ ongLength: oneLength,
+ ...rest,
+ };
+
+ // 娣诲姞鍒板綋鍓嶅眰鐨� strandedWireDish 涓�
+ if (!currentLayer.strandedWireDish) {
+ currentLayer.strandedWireDish = [];
+ }
+ currentLayer.strandedWireDish.push(newItem);
+
+ // 鍒锋柊褰撳墠灞傜殑鏁版嵁鏄剧ず
+ getList();
+
+ // 鍏抽棴寮规骞舵竻绌鸿緭鍏�
+ closeManualInput();
+ toast.success("娣诲姞鎴愬姛");
+ } else {
+ toast.error("璇ュ崟涓濆凡棰嗙敤锛岃鍕块噸澶嶆坊鍔�");
+ }
+ } catch (error: any) {
+ toast.error(error.msg || "鏌ヨ澶辫触");
+ }
};
const getList = async () => {
@@ -189,7 +297,7 @@
nodeList.value.forEach((node) => {
node.strandedWireDish.forEach((item: any) => {
- item.twistId = node.twistId;
+ item.saleTwistId = node.twistId;
});
if (node.strandedWireDish && Array.isArray(node.strandedWireDish)) {
const layerNewData = node.strandedWireDish.filter(
@@ -243,22 +351,114 @@
<style lang="scss" scoped>
.list_box {
- height: calc(100vh - 100px);
+ height: calc(100vh - 50px);
background: #f3f9f8;
+ display: flex;
+ flex-direction: column;
}
+
+// 鎵嬪姩杈撳叆寮规鏍峰紡
+.manual-input-modal {
+ width: 320px;
+ background: #fff;
+ border-radius: 12px;
+ overflow: hidden;
+
+ .modal-header {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ padding: 16px 20px;
+ border-bottom: 1px solid #f0f0f0;
+
+ .title {
+ font-size: 18px;
+ font-weight: 600;
+ color: #333;
+ }
+ }
+
+ .modal-content {
+ padding: 20px;
+
+ .input-label {
+ font-size: 14px;
+ color: #333;
+ margin-bottom: 8px;
+ font-weight: 500;
+ }
+ }
+
+ .modal-footer {
+ display: flex;
+ gap: 12px;
+ padding: 16px 20px;
+ border-top: 1px solid #f0f0f0;
+ }
+}
+
+:deep(.manual-input-modal .confirm-btn) {
+ background-color: #0d867f !important;
+ border-color: #0d867f !important;
+
+ .wd-button__content {
+ color: #fff !important;
+ }
+}
+
+// tab瀹瑰櫒鏍峰紡
+.tabs-container {
+ height: calc(100vh - 200px);
+ display: flex;
+ flex-direction: column;
+}
+
+.content {
+ height: calc(100vh - 200px);
+ width: 100%;
+}
+
:deep(.wd-button__content) {
color: #0d867f;
}
:deep(.zp-paging-container) {
background: transparent !important;
+ flex: 1;
+ display: flex;
+ flex-direction: column;
}
:deep(.zp-paging-container-content) {
background: transparent !important;
+ flex: 1;
+ display: flex;
+ flex-direction: column;
}
:deep(.wd-tabs) {
background: transparent !important;
+ height: 100%;
+ display: flex;
+ flex-direction: column;
+ overflow: hidden;
}
:deep(.wd-tabs__nav) {
margin-bottom: 10px;
+ flex-shrink: 0;
+ position: sticky;
+ top: 0;
+ z-index: 10;
+ background: #f3f9f8;
+}
+:deep(.wd-tabs__content) {
+ flex: 1;
+ overflow: visible;
+}
+:deep(.wd-tab__pane) {
+ height: 100%;
+}
+:deep(.zp-paging-container-top) {
+ flex-shrink: 0;
+}
+:deep(.zp-paging-container-bottom) {
+ flex-shrink: 0;
}
</style>
--
Gitblit v1.9.3