From 5b3cbcef771cd23ef8db1bf29dd15e2ddd98744f Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 24 四月 2026 14:58:53 +0800
Subject: [PATCH] fix: 库存管理页面修改，领用、冻结与解冻区分
---
src/views/inventoryManagement/stockManagement/Subtract.vue | 244 ++++++++++++++++++++++++++++++++----------------
1 files changed, 163 insertions(+), 81 deletions(-)
diff --git a/src/views/inventoryManagement/stockManagement/Subtract.vue b/src/views/inventoryManagement/stockManagement/Subtract.vue
index 10fd763..00e9007 100644
--- a/src/views/inventoryManagement/stockManagement/Subtract.vue
+++ b/src/views/inventoryManagement/stockManagement/Subtract.vue
@@ -1,47 +1,62 @@
<template>
<div>
<el-dialog
- v-model="isShow"
- title="棰嗙敤"
- width="800"
- @close="closeModal"
+ v-model="isShow"
+ title="棰嗙敤"
+ width="800"
+ @close="closeModal"
>
<el-form label-width="140px" :model="formState" label-position="top" ref="formRef">
<el-form-item
- label="浜у搧鍚嶇О"
- prop="productModelId"
- :rules="[
- {
- required: true,
- message: '璇烽�夋嫨浜у搧',
- trigger: 'change',
- }
- ]"
+ label="浜у搧鍚嶇О"
+ prop="productModelId"
+ :rules="[
+ {
+ required: true,
+ message: '璇烽�夋嫨浜у搧',
+ trigger: 'change',
+ }
+ ]"
>
<el-button type="primary" @click="showProductSelectDialog = true" disabled>
{{ formState.productName ? formState.productName : '閫夋嫨浜у搧' }}
</el-button>
</el-form-item>
- <el-form-item
- label="瑙勬牸"
- prop="productModelName"
- >
- <el-input v-model="formState.model" disabled />
+ <el-form-item label="瑙勬牸" prop="productModelName">
+ <el-input v-model="formState.model" disabled />
+ </el-form-item>
+
+ <el-form-item label="鍗曚綅" prop="unit">
+ <el-input v-model="formState.unit" disabled />
</el-form-item>
<el-form-item
- label="鍗曚綅"
- prop="unit"
+ label="搴撳瓨绫诲瀷"
+ prop="stockType"
+ :rules="[
+ {
+ required: true,
+ message: '璇烽�夋嫨搴撳瓨绫诲瀷',
+ trigger: 'change',
+ }
+ ]"
>
- <el-input v-model="formState.unit" disabled />
+ <el-select v-model="formState.stockType" placeholder="璇烽�夋嫨搴撳瓨绫诲瀷" style="width: 100%">
+ <el-option label="鍚堟牸搴撳瓨" value="qualified" />
+ <el-option label="涓嶅悎鏍煎簱瀛�" value="unqualified" />
+ </el-select>
</el-form-item>
- <el-form-item
- label="鏁伴噺"
- prop="qualitity"
- >
- <el-input-number v-model="formState.qualitity" :step="1" :min="1" :max="maxQuality" style="width: 100%" />
+ <el-form-item label="鏁伴噺" prop="qualitity">
+ <el-input-number
+ v-model="formState.qualitity"
+ :step="0.01"
+ :precision="2"
+ :min="inputMin"
+ :max="maxQuality"
+ style="width: 100%"
+ />
</el-form-item>
<el-form-item label="澶囨敞" prop="remark">
@@ -49,11 +64,10 @@
</el-form-item>
</el-form>
- <!-- 浜у搧閫夋嫨寮圭獥 -->
<ProductSelectDialog
- v-model="showProductSelectDialog"
- @confirm="handleProductSelect"
- single
+ v-model="showProductSelectDialog"
+ @confirm="handleProductSelect"
+ single
/>
<template #footer>
<div class="dialog-footer">
@@ -66,9 +80,10 @@
</template>
<script setup>
-import {ref, computed, getCurrentInstance} from "vue";
+import { ref, computed, getCurrentInstance, onMounted, watch } from "vue";
import ProductSelectDialog from "@/views/basicData/product/ProductSelectDialog.vue";
-import {subtractStockInventory} from "@/api/inventoryManagement/stockInventory.js";
+import { subtractStockInventory } from "@/api/inventoryManagement/stockInventory.js";
+import { subtractStockUnInventory } from "@/api/inventoryManagement/stockUninventory.js";
const props = defineProps({
visible: {
@@ -77,37 +92,72 @@
},
record: {
type: Object,
- default: () => {},
- }
+ default: () => ({}),
+ },
+ type: {
+ type: String,
+ required: true,
+ default: "qualified",
+ },
});
-const emit = defineEmits(['update:visible', 'completed']);
+const emit = defineEmits(["update:visible", "completed"]);
-onMounted(() => {
- initFormData()
-})
+const toNumber = (value) => {
+ const num = Number(value);
+ return Number.isFinite(num) ? num : 0;
+};
-const maxQuality = computed(() => {
- return props.record.qualitity ? props.record.qualitity : 0;
-})
+const getQualifiedUnLockedStock = (row) => {
+ return toNumber(
+ row?.qualifiedUnLockedQuantity ??
+ row?.unLockedQuantity ??
+ row?.qualifiedQuantity ??
+ row?.qualitity
+ );
+};
-const initFormData = () => {
- if (props.record) {
- formState.value = {
- ...props.record,
- }
- }
-}
+const getUnqualifiedUnLockedStock = (row) => {
+ return toNumber(
+ row?.unQualifiedUnLockedQuantity ??
+ row?.unqualifiedUnLockedQuantity ??
+ row?.unQualifiedQuantity ??
+ row?.unqualifiedQuantity
+ );
+};
-// 鍝嶅簲寮忔暟鎹紙鏇夸唬閫夐」寮忕殑 data锛�
const formState = ref({
productId: undefined,
productModelId: undefined,
productName: "",
model: "",
unit: "",
- qualitity: 0,
- remark: '',
+ stockType: "qualified",
+ qualitity: 0.01,
+ remark: "",
+});
+
+const maxQuality = computed(() => {
+ if (formState.value.stockType === "unqualified") {
+ return getUnqualifiedUnLockedStock(props.record);
+ }
+ return getQualifiedUnLockedStock(props.record);
+});
+
+const inputMin = computed(() => (maxQuality.value > 0 ? 0.01 : 0));
+
+const initFormData = () => {
+ if (props.record) {
+ formState.value = {
+ ...props.record,
+ stockType: props.type === "unqualified" ? "unqualified" : "qualified",
+ qualitity: 0.01,
+ };
+ }
+};
+
+onMounted(() => {
+ initFormData();
});
const isShow = computed({
@@ -115,65 +165,97 @@
return props.visible;
},
set(val) {
- emit('update:visible', val);
+ emit("update:visible", val);
},
});
-const showProductSelectDialog = ref(false);
+watch(
+ () => props.record,
+ () => {
+ initFormData();
+ },
+ { deep: true }
+);
-let { proxy } = getCurrentInstance()
+watch(
+ maxQuality,
+ (val) => {
+ if (val <= 0) {
+ formState.value.qualitity = 0;
+ return;
+ }
+ if (!formState.value.qualitity || formState.value.qualitity < 0.01) {
+ formState.value.qualitity = 0.01;
+ } else if (formState.value.qualitity > val) {
+ formState.value.qualitity = val;
+ }
+ },
+ { immediate: true }
+);
+
+const showProductSelectDialog = ref(false);
+const { proxy } = getCurrentInstance();
const closeModal = () => {
- // 閲嶇疆琛ㄥ崟鏁版嵁
formState.value = {
productId: undefined,
productModelId: undefined,
productName: "",
productModelName: "",
- description: '',
+ stockType: "qualified",
+ qualitity: 0.01,
+ description: "",
};
isShow.value = false;
};
-// 浜у搧閫夋嫨澶勭悊
const handleProductSelect = async (products) => {
if (products && products.length > 0) {
const product = products[0];
- console.log(product)
formState.value.productId = product.productId;
formState.value.productName = product.productName;
formState.value.productModelName = product.model;
formState.value.productModelId = product.id;
formState.value.unit = product.unit;
showProductSelectDialog.value = false;
- // 瑙﹀彂琛ㄥ崟楠岃瘉鏇存柊
- proxy.$refs["formRef"]?.validateField('productModelId');
+ proxy.$refs["formRef"]?.validateField("productModelId");
}
};
const handleSubmit = () => {
- proxy.$refs["formRef"].validate(valid => {
- if (valid) {
- // 楠岃瘉鏄惁閫夋嫨浜嗕骇鍝佸拰瑙勬牸
- if (!formState.value.productModelId) {
- proxy.$modal.msgError("璇烽�夋嫨浜у搧");
- return;
- }
- if (!formState.value.productModelId) {
- proxy.$modal.msgError("璇烽�夋嫨瑙勬牸");
- return;
- }
- subtractStockInventory(formState.value).then(res => {
- // 鍏抽棴妯℃�佹
- isShow.value = false;
- // 鍛婄煡鐖剁粍浠跺凡瀹屾垚
- emit('completed');
- proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
- })
- }
- })
-};
+ proxy.$refs["formRef"].validate((valid) => {
+ if (!valid) return;
+ if (!formState.value.productModelId) {
+ proxy.$modal.msgError("璇烽�夋嫨浜у搧");
+ return;
+ }
+ if (!formState.value.productModelId) {
+ proxy.$modal.msgError("璇烽�夋嫨瑙勬牸");
+ return;
+ }
+ if (!formState.value.stockType) {
+ proxy.$modal.msgError("璇烽�夋嫨搴撳瓨绫诲瀷");
+ return;
+ }
+ if (!formState.value.qualitity || formState.value.qualitity <= 0) {
+ proxy.$modal.msgError("棰嗙敤鏁伴噺蹇呴』澶т簬0");
+ return;
+ }
+ if (formState.value.qualitity > maxQuality.value) {
+ proxy.$modal.msgError("棰嗙敤鏁伴噺涓嶈兘瓒呰繃鍙敤搴撳瓨");
+ return;
+ }
+
+ const submitApi =
+ formState.value.stockType === "unqualified" ? subtractStockUnInventory : subtractStockInventory;
+ submitApi(formState.value).then(() => {
+ isShow.value = false;
+ emit("completed");
+ proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
+ });
+ });
+};
defineExpose({
closeModal,
--
Gitblit v1.9.3