From 266e4bf654c55ce2f7e9271048e4625f1b8b49f6 Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期一, 29 十二月 2025 14:36:08 +0800
Subject: [PATCH] Merge branch 'htq20251215' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu into htq20251215

---
 项目代码/WIDESEA_WMSClient/src/views/outbound/printForm.vue |   44 ++++++++++++++++++++++----------------------
 1 files changed, 22 insertions(+), 22 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/outbound/printForm.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/outbound/printForm.vue"
index 540435a..9490e6a 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/outbound/printForm.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/outbound/printForm.vue"
@@ -32,25 +32,25 @@
               />
             </el-form-item>
 
-            <el-form-item label="瑙勬牸" prop="specification">
+            <el-form-item label="瑙勬牸" prop="materialSpec">
               <el-input
-                v-model="printForm.specification"
+                v-model="printForm.materialSpec"
                 placeholder="璇疯緭鍏ョ墿鏂欒鏍�"
                 clearable
               />
             </el-form-item>
 
-            <el-form-item label="鎵瑰彿" prop="batchNumber">
+            <el-form-item label="鎵瑰彿" prop="barcode">
               <el-input
-                v-model="printForm.batchNumber"
+                v-model="printForm.barcode"
                 placeholder="璇疯緭鍏ユ壒鍙凤紙鐢熸垚浜岀淮鐮佺敤锛�"
                 clearable
               />
             </el-form-item>
 
-            <el-form-item label="鍘傚尯" prop="factory">
+            <el-form-item label="鍘傚尯" prop="factoryArea">
               <el-input
-                v-model="printForm.factory"
+                v-model="printForm.factoryArea"
                 placeholder="璇疯緭鍏ュ巶鍖哄悕绉�"
                 clearable
               />
@@ -59,33 +59,33 @@
 
           <!-- 绗簩鍒� -->
           <el-col :span="12">
-            <el-form-item label="渚涘簲鍟嗙紪鐮�" prop="supplierCode">
+            <el-form-item label="渚涘簲鍟嗙紪鐮�" prop="suplierCode">
               <el-input
-                v-model="printForm.supplierCode"
+                v-model="printForm.suplierCode"
                 placeholder="璇疯緭鍏ヤ緵搴斿晢缂栫爜"
                 clearable
               />
             </el-form-item>
 
-            <el-form-item label="閲囪喘鍗曞彿" prop="purchaseOrderNo">
+            <el-form-item label="閲囪喘鍗曞彿" prop="pruchaseOrderNo">
               <el-input
-                v-model="printForm.purchaseOrderNo"
+                v-model="printForm.pruchaseOrderNo"
                 placeholder="璇疯緭鍏ラ噰璐崟鍙�"
                 clearable
               />
             </el-form-item>
 
-            <el-form-item label="鏁伴噺/鎬绘暟" prop="quantityTotal">
+            <el-form-item label="鏁伴噺/鎬绘暟" prop="quantity">
               <el-input
-                v-model="printForm.quantityTotal"
+                v-model="printForm.quantity"
                 placeholder="渚嬶細100/5000"
                 clearable
               />
             </el-form-item>
 
-            <el-form-item label="鎵规" prop="batch">
+            <el-form-item label="鎵规" prop="batchNo">
               <el-input
-                v-model="printForm.batch"
+                v-model="printForm.batchNo"
                 placeholder="璇疯緭鍏ユ壒娆″彿"
                 clearable
               />
@@ -141,14 +141,14 @@
       // 琛ㄥ崟鏁版嵁锛堝搴攑rintView鎵�闇�鐨勫弬鏁帮級
       printForm: {
         materialCode: "", // 鏂欏彿
-        supplierCode: "", // 渚涘簲鍟嗙紪鐮�
+        suplierCode: "", // 渚涘簲鍟嗙紪鐮�
         materialName: "", // 鍝佸悕
-        purchaseOrderNo: "", // 閲囪喘鍗曞彿
-        specification: "", // 瑙勬牸
-        quantityTotal: "", // 鏁伴噺/鎬绘暟
-        batchNumber: "", // 鎵瑰彿锛堜簩缁寸爜鍐呭锛�
-        batch: "", // 鎵规
-        factory: "", // 鍘傚尯
+        pruchaseOrderNo: "", // 閲囪喘鍗曞彿
+        materialSpec: "", // 瑙勬牸
+        quantity: "", // 鏁伴噺/鎬绘暟
+        barcode: "", // 鎵瑰彿锛堜簩缁寸爜鍐呭锛�
+        batchNo: "", // 鎵规
+        factoryArea: "", // 鍘傚尯
         date: "", // 鏃ユ湡锛堥粯璁ゅ綋鍓嶆棩鏈燂級
       },
       // 鎵撳嵃浠芥暟锛堟敮鎸佹壒閲忕敓鎴愬鏉$浉鍚屾暟鎹級
@@ -157,7 +157,7 @@
       formRules: {
         materialCode: [{ required: true, message: "璇疯緭鍏ユ枡鍙�", trigger: "blur" }],
         materialName: [{ required: true, message: "璇疯緭鍏ュ搧鍚�", trigger: "blur" }],
-        batchNumber: [{ required: true, message: "璇疯緭鍏ユ壒鍙�", trigger: "blur" }],
+        barcode: [{ required: true, message: "璇疯緭鍏ユ壒鍙�", trigger: "blur" }],
         date: [{ required: true, message: "璇烽�夋嫨鏃ユ湡", trigger: "change" }],
       },
     };

--
Gitblit v1.9.3