From 35968630a8702fcd0092757436f20751f51d3387 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期四, 18 九月 2025 14:03:17 +0800
Subject: [PATCH] Merge branch 'ywx' into dev
---
src/views/inventoryManagement/stockManagement/index.vue | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/src/views/inventoryManagement/stockManagement/index.vue b/src/views/inventoryManagement/stockManagement/index.vue
index b4a29eb..59dd74c 100644
--- a/src/views/inventoryManagement/stockManagement/index.vue
+++ b/src/views/inventoryManagement/stockManagement/index.vue
@@ -115,7 +115,6 @@
</el-col>
</el-row>
<el-row :gutter="30">
-
<el-col :span="12">
<el-form-item label="鍑哄簱浜猴細" prop="entryPerson">
<el-select v-model="form.createUser" placeholder="璇烽�夋嫨" clearable>
@@ -123,6 +122,11 @@
</el-select>
</el-form-item>
</el-col>
+ <el-col :span="12">
+ <el-form-item label="鏈�浣庡簱瀛橈細" prop="minStock">
+ <el-input v-model="form.minStock" placeholder="璇疯緭鍏ユ渶浣庡簱瀛�" clearable />
+ </el-form-item>
+ </el-col>
</el-row>
</el-form>
<template #footer>
@@ -149,7 +153,8 @@
exportStockManage
} from "@/api/inventoryManagement/stockManage.js";
import {
- updateManagement
+ updateManagement,
+
} from "@/api/inventoryManagement/stockIn.js";
const userStore = useUserStore()
const { proxy } = getCurrentInstance()
@@ -194,6 +199,7 @@
inboundBatch: '',
stockQuantity: '',
boundTime: '',
+ minStock: '', // 鏂板鏈�浣庡簱瀛樺瓧娈�
},
rules: {
supplierName: [{ required: true, message: '璇疯緭鍏ヤ緵搴斿晢鍚嶇О', trigger: 'blur' }],
@@ -207,7 +213,8 @@
taxExclusiveTotalPrice: [{ required: true, message: '璇疯緭鍏ヤ笉鍚◣鎬讳环', trigger: 'blur' }],
boundTime: [{ required: true, message: '璇烽�夋嫨搴撳瓨鏃堕棿', trigger: 'change' }],
inboundTime: [{ required: true, message: '璇烽�夋嫨鍏ュ簱鏃堕棿', trigger: 'change' }],
- inboundPerson: [{ required: true, message: '璇烽�夋嫨鍑哄簱浜�', trigger: 'change' }]
+ inboundPerson: [{ required: true, message: '璇烽�夋嫨鍑哄簱浜�', trigger: 'change' }],
+ minStock: [{ required: true, message: '璇疯緭鍏ユ渶浣庡簱瀛�', trigger: 'blur' }],
}
})
const { searchForm, form, rules } = toRefs(data)
@@ -310,10 +317,21 @@
proxy.$modal.msgSuccess("鎻愪氦鎴愬姛")
closeDia()
getList()
+ // 鎻愪氦鍚庢鏌ュ簱瀛樺苟灏濊瘯鍒涘缓璇疯喘鍗�
+ checkStockAndAutoCreatePurchase();
})
}
})
}
+// 妫�鏌ュ簱瀛樺苟鑷姩鍒涘缓璇疯喘鍗�
+const checkStockAndAutoCreatePurchase = async () => {
+ try {
+ await checkStockAndCreatePurchase();
+ } catch (error) {
+ console.error('鑷姩琛ヨ揣澶辫触:', error);
+ proxy.$modal.msgError('鑷姩琛ヨ揣澶辫触锛岃鎵嬪姩澶勭悊');
+ }
+};
// 鍏抽棴寮规
const closeDia = () => {
proxy.resetForm("formRef")
@@ -376,6 +394,7 @@
}
onMounted(() => {
getList()
+ checkStockAndAutoCreatePurchase();
})
</script>
--
Gitblit v1.9.3