From b9b69ab04e9f10550c57d31e5017e482c7c96c39 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期一, 23 三月 2026 10:21:21 +0800
Subject: [PATCH] fix: 修改3.22客户提出的修改需求
---
src/views/consumablesLogistics/stockManagement/New.vue | 118 +++++++++++-----------------------------------------------
1 files changed, 23 insertions(+), 95 deletions(-)
diff --git a/src/views/consumablesLogistics/stockManagement/New.vue b/src/views/consumablesLogistics/stockManagement/New.vue
index 1b3b975..2d3d7a6 100644
--- a/src/views/consumablesLogistics/stockManagement/New.vue
+++ b/src/views/consumablesLogistics/stockManagement/New.vue
@@ -37,85 +37,30 @@
<el-input v-model="formState.unit" disabled />
</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' && formState.productType === 0"
- label="姣涢噸(鍚�)"
- prop="grossWeight"
- :rules="[{ required: true, message: '璇疯緭鍏ユ瘺閲�', trigger: ['blur','change'] }]"
+ v-if="type === 'qualified'"
+ label="鏁伴噺"
+ prop="qualitity"
+ :rules="[{ required: true, message: '璇疯緭鍏ユ暟閲�', trigger: ['blur', 'change'] }]"
>
<el-input-number
- v-model="formState.grossWeight"
- :step="0.01"
+ v-model="formState.qualitity"
:min="0"
+ :step="1"
+ :precision="0"
style="width: 100%"
- @change="computeNetWeight"
+ controls-position="right"
+ placeholder="璇疯緭鍏ユ暟閲�"
/>
</el-form-item>
<el-form-item
- v-if="type === 'qualified' && formState.productType === 0"
- label="鐨噸(鍚�)"
- prop="tareWeight"
- :rules="[{ required: true, message: '璇疯緭鍏ョ毊閲�', trigger: ['blur','change'] }]"
+ v-if="type === 'qualified'"
+ label="閲囪喘鍛�"
+ prop="purchaser"
+ :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-input v-model="formState.purchaser" placeholder="璇疯緭鍏ラ噰璐憳" />
</el-form-item>
<el-form-item label="澶囨敞" prop="remark">
@@ -169,13 +114,8 @@
productModelName: "",
unit: "",
productType: undefined,
- // 杩囩鐩稿叧瀛楁锛堜粎鍘熸潗鏂欏悎鏍煎搧浣跨敤锛�
- licensePlateNo: "",
- grossWeight: undefined,
- tareWeight: undefined,
- netWeight: undefined,
- weighingDate: undefined,
- weighingOperator: "",
+ qualitity: undefined,
+ purchaser: "",
remark: '',
});
@@ -193,23 +133,24 @@
let { proxy } = getCurrentInstance()
const closeModal = () => {
- // 閲嶇疆琛ㄥ崟鏁版嵁
formState.value = {
productId: undefined,
productModelId: undefined,
productName: "",
productModelName: "",
- description: '',
+ unit: "",
+ productType: undefined,
+ qualitity: undefined,
+ purchaser: "",
+ 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;
+ formState.value.purchaser = "";
if (products && products.length > 0) {
const product = products[0];
formState.value.productId = product.productId;
@@ -221,19 +162,6 @@
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;
}
};
--
Gitblit v1.9.3