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 | 144 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 135 insertions(+), 9 deletions(-)
diff --git a/src/views/inventoryManagement/stockManagement/New.vue b/src/views/inventoryManagement/stockManagement/New.vue
index 1f86fd6..9e0b6f5 100644
--- a/src/views/inventoryManagement/stockManagement/New.vue
+++ b/src/views/inventoryManagement/stockManagement/New.vue
@@ -37,19 +37,105 @@
<el-input v-model="formState.unit" disabled />
</el-form-item>
+ <!-- 鍗婃垚鍝侊細鍏佽鎵嬪姩濉啓鏁伴噺鍏ュ簱 -->
<el-form-item
- label="搴撳瓨鏁伴噺"
+ v-if="type === 'qualified' && (formState.parentName === '鍗婃垚鍝�' || formState.parentName === '鎴愬搧' || formState.productType === 1)"
+ label="鏁伴噺"
prop="qualitity"
+ :rules="[
+ { required: true, message: '璇疯緭鍏ユ暟閲�', trigger: ['blur', 'change'] }
+ ]"
>
- <el-input-number v-model="formState.qualitity" :step="1" :min="1" style="width: 100%" />
+ <el-input-number
+ v-model="formState.qualitity"
+ :min="0"
+ :step="1"
+ :precision="0"
+ style="width: 100%"
+ controls-position="right"
+ placeholder="璇疯緭鍏ユ暟閲�"
+ />
+ </el-form-item>
+
+ <!-- productType === 0锛氬師鏉愭枡 -->
+ <el-form-item
+ 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>
<el-form-item
- v-if="type === 'qualified'"
- label="搴撳瓨棰勮鏁伴噺"
- prop="warnNum"
+ v-if="type === 'qualified' && formState.productType === 0"
+ label="姣涢噸(鍚�)"
+ prop="grossWeight"
+ :rules="[{ required: true, message: '璇疯緭鍏ユ瘺閲�', trigger: ['blur','change'] }]"
>
- <el-input-number v-model="formState.warnNum" :step="1" :min="0" :max="formState.qualitity" style="width: 100%" />
+ <el-input-number
+ v-model="formState.grossWeight"
+ :step="0.01"
+ :min="0"
+ style="width: 100%"
+ @change="computeNetWeight"
+ />
+ </el-form-item>
+
+ <el-form-item
+ v-if="type === 'qualified' && formState.productType === 0"
+ label="鐨噸(鍚�)"
+ prop="tareWeight"
+ :rules="[{ required: true, message: '璇疯緭鍏ョ毊閲�', trigger: ['blur','change'] }]"
+ >
+ <el-input-number
+ v-model="formState.tareWeight"
+ :step="0.01"
+ :min="0"
+ style="width: 100%"
+ @change="computeNetWeight"
+ />
+ </el-form-item>
+
+ <el-form-item
+ v-if="type === 'qualified' && formState.productType === 0"
+ label="鍑�閲�(鍚�)"
+ prop="netWeight"
+ :rules="[{ required: true, message: '璇峰厛杈撳叆姣涢噸鍜岀毊閲嶈嚜鍔ㄨ绠楀噣閲�', trigger: ['blur','change'] }]"
+ >
+ <el-input-number
+ v-model="formState.netWeight"
+ :step="0.01"
+ :min="0"
+ style="width: 100%"
+ disabled
+ />
+ </el-form-item>
+
+ <el-form-item
+ v-if="type === 'qualified' && formState.productType === 0"
+ label="杩囩鏃ユ湡"
+ prop="weighingDate"
+ :rules="[{ required: true, message: '璇烽�夋嫨杩囩鏃ユ湡', trigger: 'change' }]"
+ >
+ <el-date-picker
+ style="width: 100%"
+ v-model="formState.weighingDate"
+ value-format="YYYY-MM-DD HH:mm:ss"
+ format="YYYY-MM-DD HH:mm:ss"
+ type="datetime"
+ placeholder="璇烽�夋嫨杩囩鏃ユ湡"
+ clearable
+ />
+ </el-form-item>
+
+ <el-form-item
+ 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>
<el-form-item label="澶囨敞" prop="remark">
@@ -60,6 +146,7 @@
<!-- 浜у搧閫夋嫨寮圭獥 -->
<ProductSelectDialog
v-model="showProductSelectDialog"
+ :excludeParentNames="['鑰楁潗']"
@confirm="handleProductSelect"
single
/>
@@ -101,8 +188,17 @@
productName: "",
productModelName: "",
unit: "",
- qualitity: 0,
- warnNum: 0,
+ productType: undefined,
+ parentName: "",
+ // 搴撳瓨鏁伴噺锛堝崐鎴愬搧鍚堟牸鍏ュ簱鍙墜鍔ㄥ～鍐欙級
+ qualitity: undefined,
+ // 杩囩鐩稿叧瀛楁锛堜粎鍘熸潗鏂欏悎鏍煎搧浣跨敤锛�
+ licensePlateNo: "",
+ grossWeight: undefined,
+ tareWeight: undefined,
+ netWeight: undefined,
+ weighingDate: undefined,
+ weighingOperator: "",
remark: '',
});
@@ -126,13 +222,28 @@
productModelId: undefined,
productName: "",
productModelName: "",
- description: '',
+ unit: "",
+ productType: undefined,
+ parentName: "",
+ qualitity: undefined,
+ licensePlateNo: "",
+ grossWeight: undefined,
+ tareWeight: undefined,
+ netWeight: undefined,
+ weighingDate: undefined,
+ weighingOperator: "",
+ remark: '',
};
isShow.value = false;
};
// 浜у搧閫夋嫨澶勭悊
const handleProductSelect = async (products) => {
+ formState.value.weighingDate = undefined;
+ formState.value.grossWeight = undefined;
+ formState.value.tareWeight = undefined;
+ formState.value.netWeight = undefined;
+ formState.value.qualitity = undefined;
if (products && products.length > 0) {
const product = products[0];
formState.value.productId = product.productId;
@@ -140,12 +251,27 @@
formState.value.productModelName = product.model;
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');
}
};
+// 鍑�閲� = 姣涢噸 - 鐨噸
+const computeNetWeight = () => {
+ const { grossWeight, tareWeight } = formState.value;
+ if (grossWeight != null && tareWeight != null) {
+ const net = Number(grossWeight) - Number(tareWeight);
+ // 淇濈暀涓や綅灏忔暟锛屼笖涓嶄负璐�
+ const safeNet = Number(net.toFixed(2));
+ formState.value.netWeight = safeNet > 0 ? safeNet : 0;
+ } else {
+ formState.value.netWeight = undefined;
+ }
+};
+
const handleSubmit = () => {
proxy.$refs["formRef"].validate(valid => {
if (valid) {
--
Gitblit v1.9.3