From 901cd45f087ffd434feda0070b174966cc37c8f3 Mon Sep 17 00:00:00 2001
From: 曹睿 <360930172@qq.com>
Date: 星期一, 07 七月 2025 13:59:58 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/product-inventory-management into dev
---
src/views/inventoryManagement/stockManagement/index.vue | 95 ++++++++++++++++++-----------------------------
1 files changed, 36 insertions(+), 59 deletions(-)
diff --git a/src/views/inventoryManagement/stockManagement/index.vue b/src/views/inventoryManagement/stockManagement/index.vue
index 777fe02..b5181d2 100644
--- a/src/views/inventoryManagement/stockManagement/index.vue
+++ b/src/views/inventoryManagement/stockManagement/index.vue
@@ -8,7 +8,7 @@
<el-button type="primary" @click="handleQuery" style="margin-left: 10px">鎼滅储</el-button>
</div>
<div>
- <el-button type="primary" @click="openForm('add')">鏂板</el-button>
+ <!-- <el-button type="primary" @click="openForm('add')">鏂板</el-button> -->
<el-button @click="handleOut">瀵煎嚭</el-button>
<el-button type="danger" plain @click="handleDelete">鍒犻櫎</el-button>
</div>
@@ -22,15 +22,15 @@
<el-table-column label="搴撳瓨鏃ユ湡" prop="boundTime" width="100" show-overflow-tooltip />
<el-table-column label="鍏ュ簱鏃ユ湡" prop="inboundTime" width="100" show-overflow-tooltip />
<el-table-column label="渚涘簲鍟嗗悕绉�" prop="supplierName" width="160" show-overflow-tooltip />
- <el-table-column label="浜у搧澶х被" prop="productCategory" width="100" show-overflow-tooltip />
- <el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" width="100" show-overflow-tooltip />
+ <el-table-column label="浜у搧澶х被" prop="productName" width="100" show-overflow-tooltip />
+ <el-table-column label="瑙勬牸鍨嬪彿" prop="model" width="100" show-overflow-tooltip />
<el-table-column label="鍗曚綅" prop="unit" width="80" show-overflow-tooltip />
<el-table-column label="鍑哄簱鏁伴噺" prop="stockQuantity" width="100" 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 />
<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="nickName" 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>
@@ -46,22 +46,26 @@
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="渚涘簲鍟嗗悕绉帮細" prop="supplierName">
- <el-input v-model="form.salesContractNo" placeholder="璇疯緭鍏�" clearable />
+ <el-input v-model="form.supplierName" placeholder="璇疯緭鍏�" clearable />
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="浜у搧澶х被锛�" prop="productCategory">
- <el-select v-model="form.productCategory" placeholder="璇烽�夋嫨" clearable>
- <el-option v-for="item in userList" :key="item.productCategory" :label="item.productCategory"
- :value="item.productCategory" />
+ <el-form-item label="浜у搧澶х被锛�" prop="productId">
+ <el-select v-model="form.productId" placeholder="璇烽�夋嫨" clearable filterable @change="handleProductChange">
+ <el-option v-for="item in productList" :key="item.id" :label="item.productName"
+ :value="item.id" />
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="30">
<el-col :span="12">
- <el-form-item label="瑙勬牸鍨嬪彿锛�" prop="specificationModel">
- <el-input v-model="form.specificationModel" placeholder="璇疯緭鍏�" clearable />
+ <el-form-item label="瑙勬牸鍨嬪彿锛�" prop="productManageId">
+ <el-select v-model="form.productModelId" placeholder="璇峰厛閫夋嫨浜у搧澶х被" clearable filterable :disabled="!form.productId"
+ @change="handleModelChange">
+ <el-option v-for="item in productModelList" :key="item.id" :label="item.model"
+ :value="item.id" />
+ </el-select>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -77,53 +81,44 @@
type="date" placeholder="璇烽�夋嫨" clearable />
</el-form-item>
</el-col>
-
<el-col :span="12">
- <el-form-item label="鍑哄簱鏃堕棿锛�" prop="projectName">
+ <el-form-item label="鍏ュ簱鏃堕棿锛�" prop="projectName">
<el-date-picker style="width: 100%" v-model="form.inboundTime" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
type="date" placeholder="璇烽�夋嫨" clearable />
</el-form-item>
</el-col>
-
</el-row>
<el-row :gutter="30">
- <el-col :span="12">
- <el-form-item label="鍑哄簱鏁伴噺锛�" prop="customerContractNo">
- <el-input v-model="form.stockQuantity" placeholder="璇疯緭鍏�" clearable />
- </el-form-item>
- </el-col>
<el-col :span="12">
<el-form-item label="鍚◣鍗曚环锛�" prop="customerId">
<el-input v-model="form.taxInclusiveUnitPrice" placeholder="璇疯緭鍏�" clearable />
</el-form-item>
</el-col>
-
- </el-row>
- <el-row :gutter="30">
<el-col :span="12">
<el-form-item label="鍚◣鎬讳环锛�" prop="customerContractNo">
<el-input v-model="form.taxInclusiveTotalPrice" placeholder="璇疯緭鍏�" clearable />
</el-form-item>
</el-col>
+ </el-row>
+ <el-row :gutter="30">
<el-col :span="12">
<el-form-item label="绋庣巼锛�" prop="customerId">
<el-input v-model="form.taxRate" placeholder="璇疯緭鍏�" clearable />
</el-form-item>
</el-col>
-
- </el-row>
- <el-row :gutter="30">
<el-col :span="12">
<el-form-item label="涓嶅惈绋庢�讳环锛�" prop="entryDate">
<el-input v-model="form.taxExclusiveTotalPrice" placeholder="璇疯緭鍏�" clearable />
</el-form-item>
</el-col>
+ </el-row>
+ <el-row :gutter="30">
<el-col :span="12">
<el-form-item label="鍑哄簱浜猴細" prop="entryPerson">
- <el-select v-model="form.inboundPerson" placeholder="璇烽�夋嫨" clearable>
+ <el-select v-model="form.nickName" placeholder="璇烽�夋嫨" clearable>
<el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId" />
</el-select>
</el-form-item>
@@ -175,22 +170,24 @@
supplierName: '',
},
form: {
- productCategory: '',
- specificationModel: '',
+ supplierId: null,
+ supplierName: '',
+ productId: null,
+ productName: '',
+ userId: userStore.userId,
+ nickName: '',
+ productModelId: null,
+ model: '',
unit: '',
+ productrecordId: null,
taxInclusiveUnitPrice: '',
taxInclusiveTotalPrice: '',
- taxExclusiveTotalPrice: '',
taxRate: '',
- stockQuantity: '',
- supplierName:'',
- customerId: '',
- boundTime: '',
+ taxExclusiveTotalPrice: '',
inboundTime: '',
- inboundPerson: '',
- userId: '',
- supplierId: '',
- productId: '',
+ inboundBatch: '',
+ stockQuantity: '',
+ boundTime: '',
},
rules: {
supplierName: [{ required: true, message: '璇疯緭鍏ヤ緵搴斿晢鍚嶇О', trigger: 'blur' }],
@@ -203,7 +200,7 @@
taxRate: [{ required: true, message: '璇疯緭鍏ョ◣鐜�', trigger: 'blur' }],
taxExclusiveTotalPrice: [{ required: true, message: '璇疯緭鍏ヤ笉鍚◣鎬讳环', trigger: 'blur' }],
boundTime: [{ required: true, message: '璇烽�夋嫨搴撳瓨鏃堕棿', trigger: 'change' }],
- inboundTime: [{ required: true, message: '璇烽�夋嫨鍑哄簱鏃堕棿', trigger: 'change' }],
+ inboundTime: [{ required: true, message: '璇烽�夋嫨鍏ュ簱鏃堕棿', trigger: 'change' }],
inboundPerson: [{ required: true, message: '璇烽�夋嫨鍑哄簱浜�', trigger: 'change' }]
}
})
@@ -235,20 +232,6 @@
})
}
-// const findNodeById = (nodes, productId) => {
-// for (let i = 0; i < nodes.length; i++) {
-// if (nodes[i].value === productId) {
-// return nodes[i].label; // 鎵惧埌鑺傜偣锛岃繑鍥炶鑺傜偣
-// }
-// if (nodes[i].children && nodes[i].children.length > 0) {
-// const foundNode = findNodeById(nodes[i].children, productId);
-// if (foundNode) {
-// return foundNode.label; // 鍦ㄥ瓙鑺傜偣涓壘鍒帮紝杩斿洖璇ヨ妭鐐�
-// }
-// }
-// }
-// return null; // 娌℃湁鎵惧埌鑺傜偣锛岃繑鍥瀗ull
-// };
// 琛ㄦ牸閫夋嫨鏁版嵁
const handleSelectionChange = (selection) => {
@@ -284,12 +267,6 @@
fileList.value = form.value.salesLedgerFiles
})
}
- // let userAll = await userStore.getInfo()
- // userList.value.forEach(element => {
- // if(userAll.user.nickName === element.nickName && userAll.user.userName === element.userName) {
- // form.value.entryPerson = userAll.user.userId // 璁剧疆榛樿涓氬姟鍛樹负褰撳墠鐢ㄦ埛
- // }
- // });
form.value.entryDate = getCurrentDate() // 璁剧疆榛樿褰曞叆鏃ユ湡涓哄綋鍓嶆棩鏈�
dialogFormVisible.value = true
}
@@ -327,7 +304,7 @@
// 瀵煎嚭
const handleOut = () => {
ElMessageBox.confirm(
- '閫変腑鐨勫唴瀹瑰皢琚鍑猴紝鏄惁纭瀵煎嚭锛�',
+ '鏄惁纭瀵煎嚭锛�',
'瀵煎嚭', {
confirmButtonText: '纭',
cancelButtonText: '鍙栨秷',
--
Gitblit v1.9.3