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 |  111 ++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 96 insertions(+), 15 deletions(-)

diff --git a/src/pages/production/wire/report/wire.vue b/src/pages/production/wire/report/wire.vue
index 3a129dc..da32716 100644
--- a/src/pages/production/wire/report/wire.vue
+++ b/src/pages/production/wire/report/wire.vue
@@ -17,11 +17,14 @@
               <text class="text-[#0D867F] ml-2 font-medium">鐢熶骇浜�</text>
               <text class="text-[#333333] ml-2">{{ item.productUser }}</text>
             </view>
-            <view class="text-[#A8A8A8]" @click="toEdit">缂栬緫</view>
+            <!-- <view class="text-[#A8A8A8]" @click="toEdit">缂栬緫</view> -->
           </view>
         </template>
         <ProductionCard :data="cardAttr" :value="item" />
         <template #footer>
+          <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>
         </template>
       </wd-card>
@@ -32,6 +35,13 @@
         <wd-button type="text" @click="submit">纭畾</wd-button>
       </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>
@@ -44,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();
@@ -53,30 +64,83 @@
   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[]>([
   {
     label: "棰嗙敤鏉嗗彿",
     prop: "poleNumber",
+    span: 24,
+  },
+  {
+    label: "鍗曚笣鐩樺彿",
+    prop: "monofilamentNumber",
+    span: 24,
+  },
+  {
+    label: "鏉嗗瀷鍙�",
+    prop: "poleModel",
+  },
+  {
+    label: "鏉嗗寘鍙�",
+    prop: "polePackageNumber",
   },
   {
     label: "鏉嗛噸(kg)",
     prop: "poleWeight",
   },
   {
-    label: "鍗曚笣鐩樺彿",
-    prop: "monofilamentNumber",
-  },
-  {
     label: "瑙勬牸鍨嬪彿",
     prop: "model",
+  },
+  {
+    label: "鐩樺瀷鍙�",
+    prop: "dishModel",
   },
   {
     label: "鐩橀暱(m)",
     prop: "oneLength",
   },
   {
-    label: "鐞嗚閲嶉噺(kg)",
-    prop: "theoryWeight",
+    label: "瀹為檯闀垮害",
+    prop: "actuallyLength",
   },
   {
     label: "瀹為檯閲嶉噺(kg)",
@@ -86,23 +150,40 @@
 
 const wireReportList = ref<any[]>([]);
 
-const toEdit = () => {
-  uni.navigateTo({
-    url: "/pages/production/wire/report/wireEdit",
-  });
-};
+// const toEdit = () => {
+//   uni.navigateTo({
+//     url: "/pages/production/wire/report/wireEdit",
+//   });
+// };
 
 const addReport = () => {
   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();
 };
 
 const cancel = () => {
   toast.show("鍙栨秷");
   dialog.visible = false;
+};
+
+const toAttachment = (item: any) => {
+  uni.navigateTo({
+    url: "/pages/production/wire/attachment/index",
+    success: () => {
+      // 椤甸潰璺宠浆鎴愬姛鍚庡彂閫佷簨浠朵紶閫掓暟鎹�
+      uni.$emit("detailData", item);
+    },
+  });
 };
 
 const toCheck = (id: number) => {
@@ -127,7 +208,7 @@
 
 <style lang="scss" scoped>
 .list {
-  height: calc(100vh - 120px);
+  height: calc(100vh - 30px);
   padding: 12px;
   background: #f3f9f8;
 

--
Gitblit v1.9.3