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/wire/report/wire.vue | 67 +++++++++++++++++++++++++++++++--
1 files changed, 62 insertions(+), 5 deletions(-)
diff --git a/src/pages/production/wire/report/wire.vue b/src/pages/production/wire/report/wire.vue
index b57634b..da32716 100644
--- a/src/pages/production/wire/report/wire.vue
+++ b/src/pages/production/wire/report/wire.vue
@@ -22,7 +22,7 @@
</template>
<ProductionCard :data="cardAttr" :value="item" />
<template #footer>
- <wd-button size="small" plain @click="toAttachment(item.id)" style="margin-right: 10px">
+ <wd-button size="small" plain style="margin-right: 10px" @click="toAttachment(item)">
闄勪欢
</wd-button>
<wd-button size="small" plain @click="toCheck(item.id)">鑷</wd-button>
@@ -36,6 +36,13 @@
</view>
<WireForm ref="wireFormRef" />
</wd-popup>
+ <wd-popup v-model="drawFormRef.visible" position="bottom" custom-class="yl-popup">
+ <Draw
+ :wire-id="drawData.wireId"
+ :pole-number="drawData.poleNumber"
+ @close="handleDrawClose"
+ />
+ </wd-popup>
<wd-toast />
</view>
</template>
@@ -47,6 +54,7 @@
import zPaging from "@/components/z-paging/z-paging.vue";
import { onLoad } from "@dcloudio/uni-app";
import ManageApi from "@/api/product/manage";
+import Draw from "./rawMaterial.vue";
const pagingRef = ref();
const wireFormRef = ref();
@@ -55,6 +63,45 @@
const dialog = reactive({
visible: false,
});
+
+const drawFormRef = reactive({
+ visible: false,
+});
+// 澶勭悊draw缁勪欢鍏抽棴浜嬩欢
+const handleDrawClose = () => {
+ // 纭繚寮圭獥琚纭叧闂�
+ drawFormRef.visible = false;
+};
+const drawData = ref({
+ wireId: "",
+ poleNumber: "",
+});
+
+const showDrawPopup = async () => {
+ console.log("杩涘叆璇ユ柟娉曪紒");
+ try {
+ const { data } = await ManageApi.queryWireRawMaterialInspect({
+ wireId: paramsId.value,
+ poleNumber: drawData.value.poleNumber,
+ });
+ console.log("data", data);
+ // 閫傞厤涓嶅悓鐨勬暟鎹粨鏋勮繑鍥炴牸寮�
+ if (data == null) {
+ drawData.value = {
+ wireId: paramsId.value,
+ poleNumber: drawData.value.poleNumber,
+ };
+ // 鏄剧ずDraw寮圭獥
+ drawFormRef.visible = true;
+ toast.success("璇峰~鍐欓鐢ㄤ俊鎭�!");
+ } else {
+ // toast.error("宸插瓨鍦ㄩ鐢ㄤ俊鎭�,鏃犻渶濉姤!");
+ }
+ } catch (error) {
+ console.error("鑾峰彇棰嗙敤淇℃伅澶辫触:", error);
+ toast.error("鑾峰彇淇℃伅澶辫触锛岃閲嶈瘯");
+ }
+};
const cardAttr = ref<any[]>([
{
@@ -113,8 +160,14 @@
dialog.visible = true;
};
-const submit = () => {
- dialog.visible = !wireFormRef.value.submit();
+const submit = async () => {
+ const result = await wireFormRef.value.submit();
+ dialog.visible = !result.success;
+ // 璁剧疆poleNumber鍒癲rawData涓�
+ if (result.success) {
+ drawData.value.poleNumber = result.poleNumber;
+ showDrawPopup();
+ }
pagingRef.value.reload();
};
@@ -123,9 +176,13 @@
dialog.visible = false;
};
-const toAttachment = (id: number) => {
+const toAttachment = (item: any) => {
uni.navigateTo({
- url: `/pages/production/wire/attachment/index?reportId=${id}`,
+ url: "/pages/production/wire/attachment/index",
+ success: () => {
+ // 椤甸潰璺宠浆鎴愬姛鍚庡彂閫佷簨浠朵紶閫掓暟鎹�
+ uni.$emit("detailData", item);
+ },
});
};
--
Gitblit v1.9.3