From 5f18876241777adb7cacce4bc8316779cb16c237 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 03 四月 2026 10:04:58 +0800
Subject: [PATCH] 生产报表联调，并优化页面
---
src/views/consumablesLogistics/stockManagement/Subtract.vue | 125 ++++-------------------------------------
1 files changed, 14 insertions(+), 111 deletions(-)
diff --git a/src/views/consumablesLogistics/stockManagement/Subtract.vue b/src/views/consumablesLogistics/stockManagement/Subtract.vue
index 29fa533..e8b7153 100644
--- a/src/views/consumablesLogistics/stockManagement/Subtract.vue
+++ b/src/views/consumablesLogistics/stockManagement/Subtract.vue
@@ -38,71 +38,19 @@
</el-form-item>
<el-form-item
- label="杞︾墝鍙�"
- prop="licensePlateNo"
- >
- <el-input v-model="formState.licensePlateNo" />
- </el-form-item>
-
- <el-form-item
- label="姣涢噸(鍚�)"
- prop="grossWeight"
+ 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
- label="鐨噸(鍚�)"
- prop="tareWeight"
- >
- <el-input-number
- v-model="formState.tareWeight"
- :step="0.01"
- :min="0"
- style="width: 100%"
- @change="computeNetWeight"
- />
- </el-form-item>
-
- <el-form-item
- label="鍑�閲�(鍚�)"
- prop="netWeight"
- >
- <el-input-number
- v-model="formState.netWeight"
- :step="0.01"
- :min="0"
- style="width: 100%"
- disabled
- />
- </el-form-item>
-
- <el-form-item
- label="杩囩鏃ユ湡"
- prop="weighingDate"
- >
- <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
- label="杩囩鍛�"
- prop="weighingOperator"
- >
- <el-input v-model="formState.weighingOperator" />
</el-form-item>
<el-form-item label="澶囨敞" prop="remark">
@@ -154,15 +102,6 @@
initFormData()
})
-const isRawMaterial = computed(() => {
- return props.record.parentName === '鍘熸潗鏂�';
-})
-
-const ledgerNetWeight = computed(() => {
- const n = Number(props.record?.netWeight ?? 0);
- return Number.isFinite(n) ? n : 0;
-});
-
const initFormData = () => {
if (props.record) {
formState.value = {
@@ -178,13 +117,7 @@
productName: "",
model: "",
unit: "",
- // 杩囩鐩稿叧瀛楁
- licensePlateNo: "",
- grossWeight: undefined,
- tareWeight: undefined,
- netWeight: undefined,
- weighingDate: undefined,
- weighingOperator: "",
+ qualitity: undefined,
remark: '',
});
@@ -209,40 +142,10 @@
productName: "",
model: "",
unit: "",
- licensePlateNo: "",
- grossWeight: undefined,
- tareWeight: undefined,
- netWeight: undefined,
- weighingDate: undefined,
- weighingOperator: "",
+ qualitity: undefined,
remark: '',
};
isShow.value = false;
-};
-
-// 鍑�閲� = 姣涢噸 - 鐨噸
-const computeNetWeight = () => {
- const { grossWeight, tareWeight } = formState.value;
- if (grossWeight != null && tareWeight != null) {
- const net = Number(grossWeight) - Number(tareWeight);
- const safeNet = Number(net.toFixed(2));
- const computedNet = safeNet > 0 ? safeNet : 0;
- const maxNet = ledgerNetWeight.value;
- if (Number.isFinite(maxNet) && maxNet > 0 && computedNet > maxNet) {
- const cappedNet = Number(maxNet.toFixed(2));
- formState.value.netWeight = cappedNet;
- // 鍚屾姣涢噸锛屼繚鎸侊細鍑�閲� = 姣涢噸 - 鐨噸
- const tare = Number(tareWeight);
- if (Number.isFinite(tare)) {
- formState.value.grossWeight = Number((tare + cappedNet).toFixed(2));
- }
- proxy?.$modal?.msgWarning?.(`棰嗙敤鍑�閲嶄笉鑳借秴杩囧彴璐﹀噣閲嶏紙${maxNet.toFixed(2)} 鍚級`);
- return;
- }
- formState.value.netWeight = computedNet;
- } else {
- formState.value.netWeight = undefined;
- }
};
// 浜у搧閫夋嫨澶勭悊
@@ -273,10 +176,10 @@
proxy.$modal.msgError("璇烽�夋嫨瑙勬牸");
return;
}
- const maxNet = ledgerNetWeight.value;
- const usedNet = Number(formState.value.netWeight ?? 0);
- if (Number.isFinite(maxNet) && maxNet > 0 && Number.isFinite(usedNet) && usedNet > maxNet) {
- proxy.$modal.msgError(`棰嗙敤鍑�閲嶄笉鑳借秴杩囧彴璐﹀噣閲嶏紙${maxNet.toFixed(2)} 鍚級`);
+ const availableQty = Number(props.record?.qualitity ?? 0);
+ const useQty = Number(formState.value.qualitity ?? 0);
+ if (Number.isFinite(availableQty) && Number.isFinite(useQty) && useQty > availableQty) {
+ proxy.$modal.msgError(`棰嗙敤鏁伴噺涓嶈兘瓒呰繃搴撳瓨鏁伴噺锛�${availableQty}锛塦);
return;
}
if (props.type === 'qualified') {
--
Gitblit v1.9.3