From dc06f58d8ed537555fd529551180f43a0586ec3f Mon Sep 17 00:00:00 2001
From: helongyang <647556386@qq.com>
Date: 星期日, 22 六月 2025 11:44:43 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

---
 代码管理/WMS/WIDESEA_WMSClient/src/views/check/inspectOrder.vue |   32 +++++++++++++++++++-------------
 1 files changed, 19 insertions(+), 13 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/check/inspectOrder.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/check/inspectOrder.vue"
index b821479..c09eed9 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/check/inspectOrder.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/check/inspectOrder.vue"
@@ -81,7 +81,6 @@
           width: 150,
           hidden: true,
           readonly: true,
-          require: true,
           align: "left",
         },
         {
@@ -89,7 +88,6 @@
           title: "妫�楠屽崟鍙�",
           type: "string",
           width: 180,
-          require: true,
           align: "left",
         },
         {
@@ -105,7 +103,6 @@
           title: "閫佹鍗曞彿",
           type: "string",
           width: 180,
-          require: true,
           align: "left",
         },
         {
@@ -118,19 +115,17 @@
         },
         //    {field:'auditStatus',title:'瀹℃壒鐘舵��',type:'int',width:110,require:true,align:'left'},
         {
-          field: "receiveDetailRowNo",
-          title: "閫佹鏄庣粏琛�",
+          field: "orderPalletCode",
+          title: "閫佹鎵樼洏",
           type: "int",
-          width: 100,
-          require: true,
+          width: 140,
           align: "left",
         },
         {
           field: "materielCode",
           title: "鐗╂枡缂栧彿",
           type: "string",
-          width: 110,
-          require: true,
+          width: 100,
           align: "left",
         },
         {
@@ -146,14 +141,13 @@
           title: "鎵规鍙�",
           type: "string",
           width: 150,
-          require: true,
           align: "left",
         },
         {
           field: "checkOrderStatus",
           title: "璐ㄦ鍗曠姸鎬�",
           type: "string",
-          width: 110,
+          width: 100,
           require: true,
           align: "left",
           bind: { key: "checkOrderStatusEnum", data: [] },
@@ -173,11 +167,24 @@
           align: "left",
         },
         {
+          field: "defectedQuantity",
+          title: "鐗归噰鏁伴噺",
+          type: "float",
+          width: 110,
+          align: "left",
+        },
+        {
+          field: "scrappedQuantity",
+          title: "鎶ュ簾鏁伴噺",
+          type: "float",
+          width: 110,
+          align: "left",
+        },
+        {
           field: "receivedQuantity",
           title: "妫�楠屾�绘暟",
           type: "float",
           width: 110,
-          require: true,
           align: "left",
         },
         {
@@ -224,7 +231,6 @@
           title: "鍒涘缓鏃堕棿",
           type: "datetime",
           width: 180,
-          require: true,
           align: "left",
         },
         //    {field:'modifier',title:'淇敼浜�',type:'string',width:100,align:'left'},

--
Gitblit v1.9.3