From ccb00a17b9119200b8c8d29a177bcc129dd4c982 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期四, 19 三月 2026 17:43:13 +0800
Subject: [PATCH] Merge branch 'dev_KTHG' of http://114.132.189.42:9002/r/product-inventory-management into dev_KTHG
---
src/views/inventoryManagement/stockManagement/New.vue | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/views/inventoryManagement/stockManagement/New.vue b/src/views/inventoryManagement/stockManagement/New.vue
index 22b8a3e..9e0b6f5 100644
--- a/src/views/inventoryManagement/stockManagement/New.vue
+++ b/src/views/inventoryManagement/stockManagement/New.vue
@@ -37,9 +37,9 @@
<el-input v-model="formState.unit" disabled />
</el-form-item>
- <!-- productType === 1锛氬崐鎴愬搧锛堝厑璁告墜鍔ㄥ～鍐欐暟閲忓叆搴擄級 -->
+ <!-- 鍗婃垚鍝侊細鍏佽鎵嬪姩濉啓鏁伴噺鍏ュ簱 -->
<el-form-item
- v-if="type === 'qualified' && formState.productType === 1"
+ v-if="type === 'qualified' && (formState.parentName === '鍗婃垚鍝�' || formState.parentName === '鎴愬搧' || formState.productType === 1)"
label="鏁伴噺"
prop="qualitity"
:rules="[
@@ -62,6 +62,7 @@
v-if="type === 'qualified' && formState.productType === 0"
label="杞︾墝鍙�"
prop="licensePlateNo"
+ :rules="[{ required: true, message: '璇疯緭鍏ヨ溅鐗屽彿', trigger: ['blur','change'] }]"
>
<el-input v-model="formState.licensePlateNo" />
</el-form-item>
@@ -70,6 +71,7 @@
v-if="type === 'qualified' && formState.productType === 0"
label="姣涢噸(鍚�)"
prop="grossWeight"
+ :rules="[{ required: true, message: '璇疯緭鍏ユ瘺閲�', trigger: ['blur','change'] }]"
>
<el-input-number
v-model="formState.grossWeight"
@@ -84,6 +86,7 @@
v-if="type === 'qualified' && formState.productType === 0"
label="鐨噸(鍚�)"
prop="tareWeight"
+ :rules="[{ required: true, message: '璇疯緭鍏ョ毊閲�', trigger: ['blur','change'] }]"
>
<el-input-number
v-model="formState.tareWeight"
@@ -98,6 +101,7 @@
v-if="type === 'qualified' && formState.productType === 0"
label="鍑�閲�(鍚�)"
prop="netWeight"
+ :rules="[{ required: true, message: '璇峰厛杈撳叆姣涢噸鍜岀毊閲嶈嚜鍔ㄨ绠楀噣閲�', trigger: ['blur','change'] }]"
>
<el-input-number
v-model="formState.netWeight"
@@ -112,6 +116,7 @@
v-if="type === 'qualified' && formState.productType === 0"
label="杩囩鏃ユ湡"
prop="weighingDate"
+ :rules="[{ required: true, message: '璇烽�夋嫨杩囩鏃ユ湡', trigger: 'change' }]"
>
<el-date-picker
style="width: 100%"
@@ -128,6 +133,7 @@
v-if="type === 'qualified' && formState.productType === 0"
label="杩囩鍛�"
prop="weighingOperator"
+ :rules="[{ required: true, message: '璇疯緭鍏ヨ繃纾呭憳', trigger: ['blur','change'] }]"
>
<el-input v-model="formState.weighingOperator" />
</el-form-item>
@@ -140,6 +146,7 @@
<!-- 浜у搧閫夋嫨寮圭獥 -->
<ProductSelectDialog
v-model="showProductSelectDialog"
+ :excludeParentNames="['鑰楁潗']"
@confirm="handleProductSelect"
single
/>
@@ -182,6 +189,7 @@
productModelName: "",
unit: "",
productType: undefined,
+ parentName: "",
// 搴撳瓨鏁伴噺锛堝崐鎴愬搧鍚堟牸鍏ュ簱鍙墜鍔ㄥ～鍐欙級
qualitity: undefined,
// 杩囩鐩稿叧瀛楁锛堜粎鍘熸潗鏂欏悎鏍煎搧浣跨敤锛�
@@ -216,6 +224,7 @@
productModelName: "",
unit: "",
productType: undefined,
+ parentName: "",
qualitity: undefined,
licensePlateNo: "",
grossWeight: undefined,
@@ -243,6 +252,7 @@
formState.value.productModelId = product.id;
formState.value.unit = product.unit;
formState.value.productType = product.productType;
+ formState.value.parentName = product.parentName || "";
showProductSelectDialog.value = false;
// 瑙﹀彂琛ㄥ崟楠岃瘉鏇存柊
proxy.$refs["formRef"]?.validateField('productModelId');
--
Gitblit v1.9.3