From e5c3a10ffc181fadd32c19ed0dc566d8a0cb93d7 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期二, 17 三月 2026 16:10:59 +0800
Subject: [PATCH] fix: 库存报表页面未做页码分页（仓储物流的入库管理也没有分页）
---
src/views/inventoryManagement/stockManagement/Subtract.vue | 122 +++++++++++++++++++++++++++++++++++++---
1 files changed, 113 insertions(+), 9 deletions(-)
diff --git a/src/views/inventoryManagement/stockManagement/Subtract.vue b/src/views/inventoryManagement/stockManagement/Subtract.vue
index a277a00..88cfad3 100644
--- a/src/views/inventoryManagement/stockManagement/Subtract.vue
+++ b/src/views/inventoryManagement/stockManagement/Subtract.vue
@@ -38,10 +38,71 @@
</el-form-item>
<el-form-item
- label="鏁伴噺"
- prop="qualitity"
+ label="杞︾墝鍙�"
+ prop="licensePlateNo"
>
- <el-input-number v-model="formState.qualitity" :step="1" :min="1" :max="maxQuality" style="width: 100%" />
+ <el-input v-model="formState.licensePlateNo" />
+ </el-form-item>
+
+ <el-form-item
+ label="姣涢噸(鍚�)"
+ prop="grossWeight"
+ >
+ <el-input-number
+ v-model="formState.grossWeight"
+ :step="0.01"
+ :min="0"
+ style="width: 100%"
+ @change="computeNetWeight"
+ />
+ </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">
@@ -66,7 +127,7 @@
</template>
<script setup>
-import {ref, computed, getCurrentInstance} from "vue";
+import {ref, computed, getCurrentInstance, onMounted} from "vue";
import ProductSelectDialog from "@/views/basicData/product/ProductSelectDialog.vue";
import {subtractStockInventory} from "@/api/inventoryManagement/stockInventory.js";
import {subtractStockUnInventory} from "@/api/inventoryManagement/stockUninventory.js";
@@ -93,9 +154,14 @@
initFormData()
})
-const maxQuality = computed(() => {
- return props.record.unLockedQuantity ? props.record.unLockedQuantity : 0;
+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) {
@@ -112,7 +178,13 @@
productName: "",
model: "",
unit: "",
- qualitity: 0,
+ // 杩囩鐩稿叧瀛楁
+ licensePlateNo: "",
+ grossWeight: undefined,
+ tareWeight: undefined,
+ netWeight: undefined,
+ weighingDate: undefined,
+ weighingOperator: "",
remark: '',
});
@@ -135,10 +207,36 @@
productId: undefined,
productModelId: undefined,
productName: "",
- productModelName: "",
- description: '',
+ model: "",
+ unit: "",
+ licensePlateNo: "",
+ grossWeight: undefined,
+ tareWeight: undefined,
+ netWeight: undefined,
+ weighingDate: undefined,
+ weighingOperator: "",
+ 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) {
+ formState.value.netWeight = Number(maxNet.toFixed(2));
+ proxy?.$modal?.msgWarning?.(`棰嗙敤鍑�閲嶄笉鑳借秴杩囧彴璐﹀噣閲嶏紙${maxNet.toFixed(2)} 鍚級`);
+ return;
+ }
+ formState.value.netWeight = computedNet;
+ } else {
+ formState.value.netWeight = undefined;
+ }
};
// 浜у搧閫夋嫨澶勭悊
@@ -169,6 +267,12 @@
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)} 鍚級`);
+ return;
+ }
if (props.type === 'qualified') {
subtractStockInventory(formState.value).then(res => {
// 鍏抽棴妯℃�佹
--
Gitblit v1.9.3