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/report/index.vue |   42 +++++++++++++++++++++++++++---------------
 1 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/src/pages/production/twist/report/index.vue b/src/pages/production/twist/report/index.vue
index f63f742..f100b78 100644
--- a/src/pages/production/twist/report/index.vue
+++ b/src/pages/production/twist/report/index.vue
@@ -20,7 +20,7 @@
           <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>
+          <wd-button size="small" plain @click="handleSelfCheck(item.id)">鑷</wd-button>
         </template>
       </wd-card>
     </z-paging>
@@ -35,7 +35,7 @@
     <wd-popup v-model="drawFormRef.visible" position="bottom" custom-class="yl-popup">
       <Draw
         :single-regulation-info-array="drawData.singleRegulationInfoArray"
-        :steel-regulation-info-array="drawData.steelRegulationInfoArray"
+        :steel-regulation-info="drawData.steelRegulationInfo"
         :reel-tooling-info="drawData.reelToolingInfo"
         :wire-id="drawData.wireId"
         @close="handleDrawClose"
@@ -50,7 +50,7 @@
 import { useToast } from "wot-design-uni";
 import ProductionCard from "../../components/ProductionCard.vue";
 import { onLoad } from "@dcloudio/uni-app";
-import { ref } from "vue";
+import { ref, reactive } from "vue";
 import ManageApi from "@/api/product/manage";
 import TwistApi from "@/api/product/twist";
 import Draw from "./draw.vue";
@@ -63,7 +63,6 @@
 const handleDrawClose = () => {
   // 纭繚寮圭獥琚纭叧闂�
   drawFormRef.visible = false;
-  console.log('Draw popup closed');
 };
 const pagingRef = ref();
 const paramsId = ref();
@@ -74,8 +73,23 @@
 });
 const drawData = ref({
   singleRegulationInfoArray: [],
-  steelRegulationInfoArray: [],
-  reelToolingInfo: {},
+  steelRegulationInfo: {
+    model: "",
+    twistedDirection: "",
+    outerDiameter: "",
+    scratch: "",
+    oilStain: "",
+  },
+  reelToolingInfo: {
+    nutFixed: "",
+    sidePlateFlat: "",
+    centerPlateFlat: "",
+    paintQuality: "",
+    burrCrack: "",
+    edgeBlunt: "",
+    woodMold: "",
+    weldQuality: "",
+  },
   wireId: "",
 });
 
@@ -118,8 +132,10 @@
   });
 };
 
-const addReport = () => {
+const addReport = async () => {
   dialog.visible = true;
+  // 鎵撳紑鏂板寮圭獥鏃惰嚜鍔ㄦ墽琛�
+  // await showDrawPopup();
 };
 
 const submit = async () => {
@@ -127,7 +143,7 @@
   dialog.visible = !isSuccess; // 濡傛灉鎻愪氦鎴愬姛锛屽叧闂脊绐�
   if (isSuccess) {
     // 鎻愪氦鎴愬姛鍚庢墽琛�
-    showDrawPopup();
+    // showDrawPopup();
   }
 };
 
@@ -151,14 +167,13 @@
     const { data } = await TwistApi.querySingleDishInspection({
       id: paramsId.value,
     });
-    console.log("棰嗙敤淇℃伅鏁版嵁:", data);
     // 閫傞厤涓嶅悓鐨勬暟鎹粨鏋勮繑鍥炴牸寮�
     const responseData = data.data || data;
     if (responseData && responseData.singleWirePrePareInfoVo) {
       const info = responseData.singleWirePrePareInfoVo;
       drawData.value = {
         singleRegulationInfoArray: info.singleRegulationInfoArray || [],
-        steelRegulationInfoArray: info.steelRegulationInfoArray || [],
+        steelRegulationInfo: info.steelRegulationInfo || {},
         reelToolingInfo: info.reelToolingInfo || {},
         wireId: paramsId.value,
       };
@@ -166,16 +181,12 @@
       drawFormRef.visible = true;
       toast.success("璇峰～鍐欓鐢ㄤ俊鎭�!");
     } else {
-      toast.error("宸插瓨鍦ㄩ鐢ㄤ俊鎭�,鏃犻渶濉姤!");
+      // toast.error("宸插瓨鍦ㄩ鐢ㄤ俊鎭�,鏃犻渶濉姤!");
     }
   } catch (error) {
     console.error("鑾峰彇棰嗙敤淇℃伅澶辫触:", error);
     toast.error("鑾峰彇淇℃伅澶辫触锛岃閲嶈瘯");
   }
-};
-
-const closeDrawPopup = () => {
-  drawDialogVisible.value = false;
 };
 
 const handleSelfCheck = (id: string) => {
@@ -202,6 +213,7 @@
 
 onLoad((options: any) => {
   paramsId.value = options.id;
+  showDrawPopup();
 });
 </script>
 

--
Gitblit v1.9.3