From 941b7b96eb85d896a47a9457e1deb3aed1937775 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 27 十月 2025 09:21:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/inventoryManagement/stockManagement/index.vue | 42 +++++++++++++++++++++++++-----------------
1 files changed, 25 insertions(+), 17 deletions(-)
diff --git a/src/views/inventoryManagement/stockManagement/index.vue b/src/views/inventoryManagement/stockManagement/index.vue
index f2687bf..84dc029 100644
--- a/src/views/inventoryManagement/stockManagement/index.vue
+++ b/src/views/inventoryManagement/stockManagement/index.vue
@@ -26,6 +26,7 @@
<el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" width="200" show-overflow-tooltip />
<el-table-column label="鍗曚綅" prop="unit" width="80" show-overflow-tooltip />
<el-table-column label="搴撳瓨鏁伴噺" prop="inboundNum0" width="100" show-overflow-tooltip />
+ <el-table-column label="鏈�浣庡簱瀛樻暟閲�" prop="minStock" width="130" show-overflow-tooltip />
<el-table-column label="鍚◣鍗曚环" prop="taxInclusiveUnitPrice" width="100" show-overflow-tooltip />
<el-table-column label="鍚◣鎬讳环" prop="taxInclusiveTotalPrice" width="100" show-overflow-tooltip />
<el-table-column label="绋庣巼(%)" prop="taxRate" width="100" show-overflow-tooltip />
@@ -122,11 +123,11 @@
</el-select>
</el-form-item>
</el-col>
- <!-- <el-col :span="12">
+ <el-col :span="12">
<el-form-item label="鏈�浣庡簱瀛橈細" prop="minStock">
<el-input v-model="form.minStock" placeholder="璇疯緭鍏ユ渶浣庡簱瀛�" clearable />
</el-form-item>
- </el-col> -->
+ </el-col>
</el-row>
</el-form>
<template #footer>
@@ -153,7 +154,7 @@
exportStockManage
} from "@/api/inventoryManagement/stockManage.js";
import {
- updateManagement,addSutockIn,selectProductRecordListByPuechaserId
+ updateManagement,addSutockIn,selectProductRecordListByPuechaserId,updateStockIn
} from "@/api/inventoryManagement/stockIn.js";
@@ -174,7 +175,7 @@
})
const total = ref(0)
const fileList = ref([])
-
+const loading = ref(false);
// 鐢ㄦ埛淇℃伅琛ㄥ崟寮规鏁版嵁
const operationType = ref('')
const dialogFormVisible = ref(false)
@@ -202,6 +203,7 @@
stockQuantity: '',
boundTime: '',
minStock: '', // 鏂板鏈�浣庡簱瀛樺瓧娈�
+ salesLedgerProductId: null,
},
rules: {
supplierName: [{ required: true, message: '璇疯緭鍏ヤ緵搴斿晢鍚嶇О', trigger: 'blur' }],
@@ -325,23 +327,30 @@
// 妫�鏌ュ簱瀛樺苟鍒涘缓璇疯喘鍗�
const checkStockAndCreatePurchase = async () => {
const stockList = tableData.value;
- handList()
+ // handList()
for (const item of stockList) {
if (item.inboundNum0 < item.minStock) {
try {
+ console.log('item', item)
+ // const stockInData = {
+ // nickName: userStore.nickName,// 浣跨敤鏂版牸寮忓寲鍑芥暟
+ // details: [{
+ // id: item.salesLedgerProductId,
+ // inboundQuantity: item.minStock - item.inboundNum0
+ // }]
+ // };
const stockInData = {
- nickName: userStore.nickName,// 浣跨敤鏂版牸寮忓寲鍑芥暟
- details: selectedRows.value.map(product => ({
- id: product.id,
- inboundQuantity: Number(product.quantityStock)
- })),
+ id: item.id,
+ quantityStock: item.minStock + item.totalInboundNum,// 浣跨敤鏂版牸寮忓寲鍑芥暟
};
- console.log('鍑嗗鎻愪氦鐨勬暟鎹�:', JSON.parse(JSON.stringify(stockInData)));
- // 璋冪敤API
- loading.value = true
- await addSutockIn(stockInData)
+
- proxy.$modal.msgSuccess('鏂板鍏ュ簱鎴愬姛')
+ console.log('鍑嗗鎻愪氦鐨勬暟鎹�:', JSON.parse(JSON.stringify(stockInData)));
+
+ loading.value = true
+ // await addSutockIn(stockInData)
+ await updateStockIn(stockInData)
+ proxy.$modal.msgSuccess(`浜у搧 ${item.productCategory} 淇敼鍏ュ簱鎴愬姛`)
loading.value = false
// // 鐢熸垚璇疯喘鍗�
// const createRes = await createPurchaseRequest({
@@ -355,8 +364,7 @@
// proxy.$modal.msgSuccess(`浜у搧 ${item.productName} 璇疯喘鍗曞凡鐢熸垚骞舵祦杞琡);
// }
} catch (error) {
- console.error(`浜у搧 ${item.productName} 鐢熸垚璇疯喘鍗曞け璐�:`, error);
- proxy.$modal.msgError(`浜у搧 ${item.productName} 鐢熸垚璇疯喘鍗曞け璐ワ紝璇锋墜鍔ㄥ鐞哷);
+ proxy.$modal.msgError(`浜у搧 ${item.productCategory} 鐢熸垚璇疯喘鍗曞け璐ワ紝璇锋墜鍔ㄥ鐞哷);
}
}
--
Gitblit v1.9.3