From 8429588122e9cba6db2d3807a42c46436a3cd282 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 04 十一月 2025 16:23:52 +0800
Subject: [PATCH] 1.采购台账-加一个库存预警数量字段 2.库存管理-低于库存预警值那条数据就标红
---
src/views/inventoryManagement/receiptManagement/index.vue | 557 +++++++++++++++++++++++++++++++------------------------
1 files changed, 310 insertions(+), 247 deletions(-)
diff --git a/src/views/inventoryManagement/receiptManagement/index.vue b/src/views/inventoryManagement/receiptManagement/index.vue
index ad9a9d8..2414a5c 100644
--- a/src/views/inventoryManagement/receiptManagement/index.vue
+++ b/src/views/inventoryManagement/receiptManagement/index.vue
@@ -5,6 +5,16 @@
<span class="search_title">渚涘簲鍟嗗悕绉帮細</span>
<el-input v-model="searchForm.supplierName" style="width: 240px" placeholder="璇疯緭鍏�" @change="handleQuery"
clearable prefix-icon="Search" />
+ <span class="search_title ml10">鍏ュ簱鏃ユ湡锛�</span>
+ <el-date-picker
+ v-model="searchForm.timeStr"
+ type="date"
+ placeholder="璇烽�夋嫨鏃ユ湡"
+ value-format="YYYY-MM-DD"
+ format="YYYY-MM-DD"
+ clearable
+ @change="handleQuery"
+ />
<el-button type="primary" @click="handleQuery" style="margin-left: 10px">鎼滅储</el-button>
</div>
<div>
@@ -19,37 +29,57 @@
:summary-method="summarizeMainTable" height="calc(100vh - 18.5em)">
<el-table-column align="center" type="selection" width="55" />
<el-table-column align="center" label="搴忓彿" type="index" width="60" />
- <el-table-column label="鍏ュ簱鏃堕棿" prop="inboundTime" width="100" show-overflow-tooltip />
- <el-table-column label="鍏ュ簱鎵规" prop="inboundBatch" width="160" show-overflow-tooltip />
- <el-table-column label="渚涘簲鍟嗗悕绉�" prop="supplierName" width="160" show-overflow-tooltip />
- <el-table-column label="浜у搧澶х被" prop="productName" width="100" show-overflow-tooltip />
- <el-table-column label="瑙勬牸鍨嬪彿" prop="model" width="160" show-overflow-tooltip />
+ <el-table-column label="鍏ュ簱鏃堕棿" prop="createTime" width="100" show-overflow-tooltip />
+ <el-table-column label="鍏ュ簱鎵规" prop="inboundBatches" width="160" show-overflow-tooltip />
+ <el-table-column label="渚涘簲鍟嗗悕绉�" prop="supplierName" width="240" show-overflow-tooltip />
+ <el-table-column label="浜у搧澶х被" prop="productCategory" width="100" show-overflow-tooltip />
+ <el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" width="200" show-overflow-tooltip />
<el-table-column label="鍗曚綅" prop="unit" width="70" show-overflow-tooltip />
- <el-table-column label="鍏ュ簱鏁伴噺" prop="inboundQuantity" width="90" show-overflow-tooltip />
+ <el-table-column label="鍏ュ簱鏁伴噺" prop="inboundNum" width="90" 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="80" show-overflow-tooltip />
<el-table-column label="涓嶅惈绋庢�讳环" prop="taxExclusiveTotalPrice" width="100" show-overflow-tooltip />
- <el-table-column label="鍏ュ簱浜�" prop="nickName" width="80" show-overflow-tooltip />
+ <el-table-column label="鍏ュ簱浜�" prop="createBy" width="80" show-overflow-tooltip />
<el-table-column fixed="right" label="鎿嶄綔" min-width="60" align="center">
<template #default="scope">
- <el-button link type="primary" size="small" @click="openForm('edit', scope.row);">缂栬緫</el-button>
+ <el-button link type="primary" size="small" @click="openForm('edit', scope.row);" :disabled="scope.row.createUser !== userStore.id">缂栬緫</el-button>
</template>
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" layout="total, sizes, prev, pager, next, jumper"
:page="page.current" :limit="page.size" @pagination="paginationChange" />
</div>
+
<el-dialog v-model="dialogFormVisible" :title="operationType === 'add' ? '鏂板鍏ュ簱' : '缂栬緫鍏ュ簱'" width="70%"
@close="closeDia">
<el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
- <el-form-item label="閲囪喘璁㈠崟鍙�" prop="salesContractNo">
- <el-input v-model="form.salesContractNo" placeholder="璇疯緭鍏�" clearable />
+ <el-form-item label="閲囪喘璁㈠崟鍙�" prop="purchaseContractNumber">
+ <el-select
+ v-model="form.purchaseContractNumber"
+ placeholder="璇烽�夋嫨閲囪喘璁㈠崟鍙�"
+ clearable
+ filterable
+ remote
+ :remote-method="loadPurchaseOptions"
+ :loading="loadingPurchaseOptions"
+ @change="handlePurchaseChange"
+ :disabled="operationType === 'edit'"
+ style="width: 100%"
+ >
+ <el-option
+ v-for="item in purchaseOptions"
+ :key="item.purchaseContractNumber"
+ :label="formatPurchaseOption(item)"
+ :value="item.purchaseContractNumber"
+ />
+ </el-select>
</el-form-item>
<el-table
- :data="productData"
+ :data="productList"
border
- @selection-change="productSelected"
+ v-loading="loadingProducts"
+ @selection-change="handleSelectionChange"
>
<el-table-column align="center" type="selection" width="55" />
<el-table-column
@@ -61,11 +91,12 @@
<el-table-column label="浜у搧澶х被" prop="productCategory" />
<el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" />
<el-table-column label="鍗曚綅" prop="unit" width="70" />
+ <el-table-column label="渚涘簲鍟�" prop="supplierName" width="100" />
<el-table-column label="閲囪喘鏁伴噺" prop="quantity" width="100" />
<el-table-column label="寰呭叆搴撴暟閲�" prop="quantity0" width="100" />
- <el-table-column label="鏈鍏ュ簱鏁伴噺" prop="quantityStock" width="120">
+ <el-table-column label="鏈鍏ュ簱鏁伴噺" prop="quantityStock" width="150">
<template #default="scope">
- <el-input v-model="scope.row.quantityStock" type="number" :min="0" :max="scope.row.quantity0" />
+ <el-input-number :step="0.01" :min="0" style="width: 100%" v-model="scope.row.quantityStock" />
</template>
</el-table-column>
<el-table-column label="绋庣巼(%)" prop="taxRate" width="120" />
@@ -101,32 +132,32 @@
<script setup>
import pagination from '@/components/PIMTable/Pagination.vue'
-import { ref } from 'vue'
+import { ref, reactive, toRefs, onMounted, getCurrentInstance } from 'vue'
import { ElMessageBox } from "element-plus";
import useUserStore from '@/store/modules/user'
-import { userListNoPage } from "@/api/system/user.js";
import {
getStockInPage,
updateStockIn,
addSutockIn,
delStockIn,
- exportStockIn
+ selectProductRecordListByPuechaserId
} from "@/api/inventoryManagement/stockIn.js";
-import {listSupplier} from "@/api/basicData/supplierManageFile.js";
-import {modelListPage, productTreeList} from "@/api/basicData/product.js";
+import { purchaseListPage } from "@/api/procurementManagement/procurementLedger.js";
+
const userStore = useUserStore()
const { proxy } = getCurrentInstance()
+
const tableData = ref([])
const selectedRows = ref([])
const userList = ref([])
-const supplierLists = ref([])
-const productList = ref([]);
-const productModelList = ref([]);
-const purchaseRecords = ref([]);
-const loadingProducts = ref(false);
+
+const purchaseOptions = ref([])
+const loadingPurchaseOptions = ref(false)
+
const loading = ref(false);
const tableLoading = ref(false)
+
const page = reactive({
current: 1,
size: 100,
@@ -134,69 +165,117 @@
const total = ref(0)
// 鐢ㄦ埛淇℃伅琛ㄥ崟寮规鏁版嵁
-const operationType = ref('')
-const dialogFormVisible = ref(false)
+const operationType = ref('')// 鎿嶄綔绫诲瀷: 'add' 鎴� 'edit'
+const dialogFormVisible = ref(false)// 寮规鏄剧ず鐘舵��
+const productList = ref([]);// 浜у搧鍒楄〃鏁版嵁
+const loadingProducts = ref(false);// 浜у搧鍔犺浇鐘舵��
+const productSelectedRows = ref([]) // 浜у搧琛ㄦ牸閫変腑琛�
const data = reactive({
searchForm: {
supplierName: '',
+ timeStr: '',
},
form: {
- supplierId: null,
- supplierName: '',
- productId: null,
- productName: '',
- userId: userStore.userId,
- nickName: '',
- model: '',
- productModelId: null,
- unit: '',
- productrecordId: null,
- taxInclusiveUnitPrice: '',
- taxInclusiveTotalPrice: '',
- taxRate: '',
- taxExclusiveTotalPrice: '',
- inboundTime: '',
- inboundBatch: '',
- inboundQuantity: ''
+ id: null,
+ purchaseContractNumber: '', // 閲囪喘璁㈠崟鍙�
+ supplierId: null, // 渚涘簲鍟咺D
+ supplierName: '', // 渚涘簲鍟嗗悕绉�
+ inboundTime: '', // 鍏ュ簱鏃堕棿
+ inboundBatch: '', // 鍏ュ簱鎵规
+ recorderId: userStore.userId, // 褰曞叆浜篒D
+ recorderName: userStore.name, // 褰曞叆浜哄鍚�
+ entryDate: getCurrentDate(), // 褰曞叆鏃ユ湡
+ remark: '', // 澶囨敞
},
rules: {
- productId: [
- { required: true, message: "璇烽�夋嫨浜у搧澶х被", trigger: "change" }
- ],
- productModelId: [
- { required: true, message: "璇烽�夋嫨瑙勬牸鍨嬪彿", trigger: "change" }
- ],
- supplierId: [
- { required: true, message: "璇烽�夋嫨渚涘簲鍟�", trigger: "change" }
- ],
- inboundQuantity: [
- { required: true, message: "璇疯緭鍏ュ叆搴撴暟閲�", trigger: "blur" }
- ],
- userId: [
- { required: true, message: "璇烽�夋嫨鍏ュ簱浜�", trigger: "change" }
- ],
- unit: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- inboundTime: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
- inboundBatch: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- taxInclusiveUnitPrice: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- taxRate: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+ purchaseContractNumber: [{ required: true, message: "璇疯緭鍏ラ噰璐悎鍚屽彿", trigger: "blur" }],
+ supplierId: [{ required: true, message: "璇烽�夋嫨渚涘簲鍟�", trigger: "change" }],
+ inboundTime: [{ required: true, message: "璇烽�夋嫨鍏ュ簱鏃堕棿", trigger: "change" }],
+ inboundBatch: [{ required: true, message: "璇疯緭鍏ュ叆搴撴壒娆�", trigger: "blur" }]
}
})
const { searchForm, form, rules } = toRefs(data)
+const formatPurchaseOption = (item = {}) => {
+ const contract = item.purchaseContractNumber || '--';
+ const supplier = item.supplierName ? ` 路 ${item.supplierName}` : '';
+ return `${contract}${supplier}`;
+};
+
+const loadPurchaseOptions = async (keyword = '') => {
+ try {
+ loadingPurchaseOptions.value = true;
+ const res = await purchaseListPage({
+ current: -1,
+ size: -1,
+ purchaseContractNumber: keyword,
+ });
+ const records = res.data?.records || [];
+ purchaseOptions.value = records;
+ if (
+ form.value.purchaseContractNumber &&
+ !purchaseOptions.value.find(
+ (item) => item.purchaseContractNumber === form.value.purchaseContractNumber
+ )
+ ) {
+ purchaseOptions.value.push({
+ purchaseContractNumber: form.value.purchaseContractNumber,
+ supplierName: form.value.supplierName,
+ supplierId: form.value.supplierId,
+ });
+ }
+ } finally {
+ loadingPurchaseOptions.value = false;
+ }
+};
+
+const handlePurchaseChange = (value) => {
+ form.value.purchaseContractNumber = value || '';
+ const matched = purchaseOptions.value.find(
+ (item) => item.purchaseContractNumber === value
+ );
+ if (matched) {
+ form.value.supplierName = matched.supplierName || form.value.supplierName;
+ form.value.supplierId = matched.supplierId || form.value.supplierId;
+ }
+ if (!value) {
+ productList.value = [];
+ return;
+ }
+ fetchProductsByContract();
+};
+const exceedsAddLimit = (product) => {
+ const stock = Number(product?.quantityStock ?? 0);
+ const waiting = Number(product?.quantity0 ?? 0);
+ if (!Number.isFinite(stock) || !Number.isFinite(waiting)) {
+ return false;
+ }
+ return stock > waiting;
+};
+
+const exceedsEditLimit = (product) => {
+ const stock = Number(product?.quantityStock ?? 0);
+ const waiting = Number(product?.quantity0 ?? 0);
+ const original = Number(product?.originalQuantityStock ?? 0);
+ if (!Number.isFinite(stock) || !Number.isFinite(waiting) || !Number.isFinite(original)) {
+ return false;
+ }
+ return stock > waiting + original;
+};
+const formattedNumber = (row, column, cellValue) => {
+ return parseFloat(cellValue).toFixed(2);
+};
// 鏌ヨ鍒楄〃
/** 鎼滅储鎸夐挳鎿嶄綔 */
const handleQuery = () => {
page.current = 1
getList()
}
-
const paginationChange = (obj) => {
page.current = obj.page;
page.size = obj.limit;
getList()
}
-
const getList = () => {
tableLoading.value = true
getStockInPage({ ...searchForm.value, ...page }).then(res => {
@@ -209,218 +288,186 @@
})
}
-// 姝ｇ‘鐨勪骇鍝佸垪琛ㄥ姞杞芥柟娉�
-const loadProductList = async () => {
- loadingProducts.value = true;
+
+// 璋冪敤selectProductRecordListByPuechaserId杩欎釜鏂规硶鏍规嵁鍚堝悓鏌ヨ鍒癷d锛屽啀璋冪敤getProductRecordByhetong杩欎釜鏂规硶鏍规嵁id鏌ヨ鍒颁骇鍝佽鍗曡褰�
+// 鏂板鏍规嵁鍚堝悓鍙锋煡璇骇鍝佽褰曠殑鏂规硶
+const fetchProductsByContract = async () =>
+{
+ if (!form.value.purchaseContractNumber) {
+ proxy.$modal.msgWarning('璇烽�夋嫨鍚堝悓鍙�')
+ return
+ }
try {
- const res = await productTreeList();
-
- // 鎵佸钩鍖栧鐞嗕骇鍝佹爲
- const flattenProducts = (nodes, parentId = null) => {
- let result = [];
- nodes.forEach(node => {
- // 鍙坊鍔犳湁id鍜宭abel鐨勮妭鐐�
- if (node.id && node.label) {
- result.push({
- id: node.id,
- productName: node.label,
- parentId: parentId
- });
- }
- // 閫掑綊澶勭悊瀛愯妭鐐�
- if (node.children) {
- result = result.concat(flattenProducts(node.children, node.id));
- }
- });
- return result;
- };
-
- productList.value = flattenProducts(res.data);
- console.log('鍔犺浇鐨勪骇鍝佸垪琛�:', productList.value);
+ loadingProducts.value = true
+ // 鏍规嵁鍚堝悓鏌ヨ浜у搧璁板綍
+ const productRes = await selectProductRecordListByPuechaserId({
+ purchaseContractNumber: form.value.purchaseContractNumber
+ });
+ console.log('productRes:', productRes)
+ if (!productRes.data || productRes.data.length === 0) {
+ proxy.$modal.msgWarning('璇ュ悎鍚屼笅娌℃湁浜у搧璁板綍')
+ productList.value = [];
+ return
+ }
+ // 澶勭悊浜у搧鏁版嵁锛屾坊鍔犳湰娆″叆搴撴暟閲忓瓧娈�
+ productList.value = productRes.data.map(item => ({
+ ...item,
+ quantityStock: 0,
+ originalQuantityStock: Number(item.quantityStock ?? item.inboundQuantity ?? 0),
+ }))
} catch (error) {
- console.error('鍔犺浇浜у搧鍒楄〃澶辫触:', error);
- proxy.$modal.msgError('鍔犺浇浜у搧鍒楄〃澶辫触');
+ console.error('鏌ヨ浜у搧璁板綍澶辫触:', error)
+ proxy.$modal.msgError('鏌ヨ浜у搧璁板綍澶辫触')
+ productList.value = [];
} finally {
- loadingProducts.value = false;
+ loadingProducts.value = false
}
- return null; // 娌℃湁鎵惧埌鑺傜偣锛岃繑鍥瀗ull
-};
+}
-// 琛ㄦ牸閫夋嫨鏁版嵁
-// const handleSelectionChange = (selection) => {
-
-// 鍔犺浇瑙勬牸鍨嬪彿鍒楄〃
- const loadProductModels = async (productId) => {
- if (!productId) {
- productModelList.value = [];
- return;
- }
-
- try {
- const res = await modelListPage({
- id: productId,
- current: 1,
- size: 100
- });
-
- productModelList.value = res.data.records.map(item => ({
- id: item.id,
- model: item.model,
- unit: item.unit
- }));
-
- } catch (error) {
- console.error('鍔犺浇瑙勬牸鍨嬪彿澶辫触:', error);
- proxy.$modal.msgError('鍔犺浇瑙勬牸鍨嬪彿澶辫触');
- }
- };
-
-// 浜у搧閫夋嫨鍙樺寲
- const handleProductChange = (productId) => {
- form.value.productModelId = null
- form.value.productrecordId = null
- resetPurchaseFields()
- if (productId) {
- loadProductModels(productId)
- } else {
- productModelList.value = []
- }
- }
-
-// 瑙勬牸鍨嬪彿閫夋嫨鍙樺寲
- const handleModelChange = async (modelId) => {
- if (!form.value.productId || !modelId) return
-
- try {
- // 鏍规嵁浜у搧ID鍜屽瀷鍙稩D鏌ヨ閲囪喘璁板綍
- const res = await getPurchaseRecords({
- productId: form.value.productId,
- productModelId: form.value.productModelId,
- type: 2 // 鍋囪2琛ㄧず宸叉壒鍑嗙殑閲囪喘璁板綍
- })
-
- purchaseRecords.value = res.data.records
-
- if (purchaseRecords.value.length > 0) {
- // 榛樿鍙栫涓�鏉￠噰璐褰�
- const record = purchaseRecords.value[0]
- fillFormFromPurchaseRecord(record)
- }
- } catch (error) {
- console.error('鏌ヨ閲囪喘璁板綍澶辫触:', error)
- proxy.$modal.msgError('鏌ヨ閲囪喘璁板綍澶辫触')
- }
- }
-
-// 浠庨噰璐褰曞～鍏呰〃鍗�
- const fillFormFromPurchaseRecord = (record) => {
- form.value.productrecordId = record.id
- form.value.taxInclusiveUnitPrice = record.taxInclusiveUnitPrice
- form.value.taxRate = record.taxRate
- form.value.taxInclusiveTotalPrice = record.taxInclusiveTotalPrice
- form.value.taxExclusiveTotalPrice = record.taxExclusiveTotalPrice
- }
-
-// 閲嶇疆閲囪喘鐩稿叧瀛楁
- const resetPurchaseFields = () => {
- form.value.productrecordId = null
- form.value.unit = ''
- form.value.taxInclusiveUnitPrice = null
- form.value.taxRate = null
- form.value.taxInclusiveTotalPrice = null
- form.value.taxExclusiveTotalPrice = null
- }
-
- const loadUserList = async () => {
- try {
- const res = await userListNoPage()
- userList.value = res.data
- } catch (error) {
- console.error('鍔犺浇鐢ㄦ埛鍒楄〃澶辫触:', error)
- }
- }
-
- const loadSupplierList = async () => {
- try {
- const res = await listSupplier()
- supplierLists.value = res.data.records
- } catch (error) {
- console.error('鍔犺浇渚涘簲鍟嗗垪琛ㄥけ璐�:', error)
- }
- }
// 鎵撳紑寮规
const openForm = async (type, row) => {
operationType.value = type
dialogFormVisible.value = true
- // 鍔犺浇蹇呰鏁版嵁
- await Promise.all([
- loadUserList(),
- loadSupplierList(),
- loadProductList()
- ])
+ selectedRows.value = []
+ await loadPurchaseOptions();
if (type === 'add') {
- // 鏂板鏃堕噸缃〃鍗�
+ // 鏂板鏃跺垵濮嬪寲琛ㄥ崟
form.value = {
- userId: userStore.userId // 璁剧疆榛樿鍏ュ簱浜轰负褰撳墠鐢ㄦ埛
+ id: null,
+ purchaseContractNumber: '',
+ supplierId: null,
+ supplierName: '',
+ inboundTime: '',
+ inboundBatch: '',
+ recorderId: userStore.userId,
+ recorderName: userStore.name,
+ entryDate: getCurrentDate(),
+ remark: ''
}
+ productList.value = [] // 娓呯┖浜у搧鍒楄〃
} else {
- // 缂栬緫鏃跺～鍏呰〃鍗曟暟鎹�
- form.value = {
- ...row,
- supplierId: row.supplierId,
- productId: row.productId,
- productModelId: row.productModelId,
- userId: row.userId
- }
- if (row.productId) {
- await loadProductModels(row.productId)
+ form.value = JSON.parse(JSON.stringify(row))
+ try {
+ loadingProducts.value = true
+ // 鏍规嵁鍚堝悓鍙峰姞杞藉搴旂殑浜у搧鍒楄〃锛堝亣璁� getProductByContract 鏄彲鐢ㄦ帴鍙ｏ級
+ const res = await selectProductRecordListByPuechaserId({
+ purchaseContractNumber: form.value.purchaseContractNumber,
+ id: row.id
+ });
+ productList.value = res.data.map(item => ({
+ ...item,
+ quantityStock: Number(item.quantityStock ?? item.inboundQuantity ?? row.inboundNum ?? 0),
+ originalQuantityStock: Number(item.quantityStock ?? item.inboundQuantity ?? row.inboundNum ?? 0),
+ }))
+ selectedRows.value = productList.value
+ } catch (error) {
+ console.error('鍔犺浇浜у搧澶辫触:', error)
+ proxy.$modal.msgError('鍔犺浇浜у搧澶辫触')
+ productList.value = []
+ } finally {
+ loadingProducts.value = false
}
}
}
+ const updatePro = async () => {
+ // 鍑嗗鎻愪氦鏁版嵁
+ // 鍑嗗鎻愪氦鏁版嵁 - 淇敼涓哄悗绔渶瑕佺殑鏍煎紡
+ if (selectedRows.value.length === 0) {
+ proxy.$modal.msgWarning('璇峰厛閫夋嫨浜у搧');
+ return;
+ }
+ const target = selectedRows.value[0];
+ const stock = Number(target?.quantityStock ?? 0);
+ if (!Number.isFinite(stock) || stock <= 0) {
+ proxy.$modal.msgWarning('璇峰～鍐欐湁鏁堢殑鍏ュ簱鏁伴噺');
+ return;
+ }
+ if (exceedsEditLimit(target)) {
+ proxy.$modal.msgError('鏈鍏ュ簱鏁伴噺涓嶈兘瓒呰繃鍘熷叆搴撴暟閲忎笌寰呭叆搴撴暟閲忎箣鍜�');
+ return;
+ }
+ const stockInData = {
+ id: selectedRows.value[0].recordId,
+ quantityStock: Number(selectedRows.value[0].quantityStock),// 浣跨敤鏂版牸寮忓寲鍑芥暟
+ };
+ await updateStockIn(stockInData)
+ proxy.$modal.msgSuccess('淇敼鍏ュ簱鎴愬姛')
+ closeDia()
+ getList() // 鍒锋柊鍒楄〃
+ }
+
// 鎻愪氦琛ㄥ崟
const submitForm = async () => {
+ // 楠岃瘉鑷冲皯閫夋嫨浜嗕竴涓骇鍝�
+ if (selectedRows.value.length === 0) {
+ proxy.$modal.msgWarning('璇峰厛閫夋嫨閲囪喘鍚堝悓骞堕�夋嫨浜у搧')
+ return
+ }
+ if(operationType.value !== 'add'){
+ await updatePro()
+ return
+ }
try {
await proxy.$refs.formRef.validate()
+ // 楠岃瘉鍏ュ簱鏁伴噺
+ const invalidProducts = selectedRows.value.filter((product) => {
+ const stock = Number(product?.quantityStock ?? 0);
+ if (!Number.isFinite(stock) || stock <= 0) {
+ return true;
+ }
+ return exceedsAddLimit(product);
+ })
- if (!form.value.productrecordId) {
- proxy.$modal.msgError('璇烽�夋嫨浜у搧澶х被鍜岃鏍煎瀷鍙蜂互鑾峰彇閲囪喘璁板綍')
+ if (invalidProducts.length > 0) {
+ proxy.$modal.msgError('鏈鍏ュ簱鏁伴噺闇�澶т簬0锛屼笖涓嶈兘瓒呰繃寰呭叆搴撴暟閲�')
return
}
- const submitData = {
- productrecordId: form.value.productrecordId,
- supplierId: form.value.supplierId,
- inboundQuantity: form.value.inboundQuantity,
- userId: form.value.userId,
- }
+ // 鍑嗗鎻愪氦鏁版嵁 - 淇敼涓哄悗绔渶瑕佺殑鏍煎紡
+ const stockInData = {
+ // 鍏ュ簱鍗曞熀鏈俊鎭�
+ ...form.value,
+ inboundTime: formatDateTime(form.value.inboundTime),
+ nickName: userStore.nickName,
+ details: selectedRows.value.map(product => ({
+ id: product.id,
+ // id: product.salesLedgerProductId,
+ inboundQuantity: Number(product.quantityStock)
+ })),
+ };
+ // 璋冪敤API
+ loading.value = true
+ await addSutockIn(stockInData)
- const apiMethod = operationType.value === 'add' ? addSutockIn : updateStockIn
- await apiMethod(submitData)
-
- proxy.$modal.msgSuccess(operationType.value === 'add' ? '鏂板鎴愬姛' : '淇敼鎴愬姛')
+ proxy.$modal.msgSuccess('鏂板鍏ュ簱鎴愬姛')
closeDia()
- getList()
+ getList() // 鍒锋柊鍒楄〃
+
} catch (error) {
console.error('鎻愪氦澶辫触:', error)
if (!error.errors) {
proxy.$modal.msgError('鎿嶄綔澶辫触锛岃閲嶈瘯')
}
+ } finally {
+ loading.value = false
}
}
+
// 鍏抽棴寮规
const closeDia = () => {
proxy.$refs.formRef.resetFields()
dialogFormVisible.value = false
+
}
// 琛ㄦ牸閫夋嫨鏁版嵁
const handleSelectionChange = (selection) => {
// 杩囨护鎺夊瓙鏁版嵁
selectedRows.value = selection.filter(item => item.id);
- console.log('selection', selectedRows.value)
}
+
const expandedRowKeys = ref([])
// 涓昏〃鍚堣鏂规硶
@@ -431,7 +478,7 @@
// 瀵煎嚭
const handleOut = () => {
ElMessageBox.confirm(
- '閫変腑鐨勫唴瀹瑰皢琚鍑猴紝鏄惁纭瀵煎嚭锛�',
+ '鏄惁纭瀵煎嚭锛�',
'瀵煎嚭', {
confirmButtonText: '纭',
cancelButtonText: '鍙栨秷',
@@ -447,6 +494,12 @@
const handleDelete = () => {
let ids = []
if (selectedRows.value.length > 0) {
+ // 妫�鏌ユ槸鍚︽湁浠栦汉缁存姢鐨勬暟鎹�
+ const unauthorizedData = selectedRows.value.filter(item => item.createUser !== userStore.id);
+ if (unauthorizedData.length > 0) {
+ proxy.$modal.msgWarning("涓嶅彲鍒犻櫎浠栦汉缁存姢鐨勬暟鎹�");
+ return;
+ }
ids = selectedRows.value.map(item => item.id);
} else {
proxy.$modal.msgWarning('璇烽�夋嫨鏁版嵁')
@@ -460,7 +513,7 @@
type: 'warning',
}
).then(() => {
- delStockIn(ids).then(res => {
+ delStockIn({ids:ids}).then(res => {
proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛")
getList()
})
@@ -470,26 +523,36 @@
}
// 鑾峰彇褰撳墠鏃ユ湡骞舵牸寮忓寲涓� YYYY-MM-DD
- function getCurrentDate() {
- const today = new Date();
- const year = today.getFullYear();
- const month = String(today.getMonth() + 1).padStart(2, '0'); // 鏈堜唤浠�0寮�濮�
- const day = String(today.getDate()).padStart(2, '0');
- return `${year}-${month}-${day}`;
+// 淇敼涓烘洿閫氱敤鐨勬棩鏈熸椂闂存牸寮忓寲鍑芥暟
+function formatDateTime(date = new Date(), includeTime = true) {
+ const d = new Date(date);
+ const year = d.getFullYear();
+ const month = String(d.getMonth() + 1).padStart(2, '0');
+ const day = String(d.getDate()).padStart(2, '0');
+
+ if (!includeTime) {
+ return `${year}-${month}-${day}`; // 淇濇寔鍘熸湁 getCurrentDate 鍔熻兘
}
- const productSelectedRows = ref([])
- const productSelected = (selectedRows) => {
- productSelectedRows.value = selectedRows;
- };
+ // 鏂板鏃堕棿閮ㄥ垎鏍煎紡鍖�
+ const hours = String(d.getHours()).padStart(2, '0');
+ const minutes = String(d.getMinutes()).padStart(2, '0');
+ const seconds = String(d.getSeconds()).padStart(2, '0');
- const formattedNumber = (row, column, cellValue) => {
- return parseFloat(cellValue).toFixed(2);
- };
+ return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+}
+
+// 淇濇寔鍘熸湁 getCurrentDate 鐨勫吋瀹规��
+function getCurrentDate() {
+ return formatDateTime(new Date(), false);
+}
+
+
+
+
onMounted(() => {
getList()
})
-}
</script>
<style scoped lang="scss"></style>
--
Gitblit v1.9.3