From 4ceaadfe421507c9cd0c32094d04ca938d518311 Mon Sep 17 00:00:00 2001
From: lishenao <3065849776@qq.com>
Date: 星期四, 03 七月 2025 14:44:13 +0800
Subject: [PATCH] 库存管理数据修改
---
src/api/inventoryManagement/stockManage.js | 20 ++
src/views/inventoryManagement/receiptManagement/index.vue | 354 ++++++++++++++++++++++++++------------
src/views/inventoryManagement/issueManagement/index.vue | 30 +-
src/views/inventoryManagement/stockManagement/index.vue | 76 +++-----
src/views/inventoryManagement/dispatchLog/index.vue | 23 +-
5 files changed, 316 insertions(+), 187 deletions(-)
diff --git a/src/api/inventoryManagement/stockManage.js b/src/api/inventoryManagement/stockManage.js
index 9909ec7..b7f0052 100644
--- a/src/api/inventoryManagement/stockManage.js
+++ b/src/api/inventoryManagement/stockManage.js
@@ -9,6 +9,14 @@
});
};
+export const getStockManageOutPage = (params) => {
+ return request({
+ url: "/stockmanagement/stockoutpage",
+ method: "get",
+ params,
+ });
+};
+
// 淇敼搴撳瓨淇℃伅
export const updateStockManage = (data) => {
return request({
@@ -44,4 +52,14 @@
method: 'post',
data: data
})
-}
\ No newline at end of file
+}
+
+//鏍规嵁id鑾峰彇搴撳瓨淇℃伅
+export function getStockManageById(id) {
+ return request({
+ url: '/stockmanagement/' + id,
+ method: 'get'
+ })
+}
+
+//
\ No newline at end of file
diff --git a/src/views/inventoryManagement/dispatchLog/index.vue b/src/views/inventoryManagement/dispatchLog/index.vue
index aa30f73..38475bd 100644
--- a/src/views/inventoryManagement/dispatchLog/index.vue
+++ b/src/views/inventoryManagement/dispatchLog/index.vue
@@ -288,7 +288,8 @@
addStockOut,
updateStockOut,
delStockOut,
- exportStockOut
+ exportStockOut,
+ getStockManageById
} from "@/api/inventoryManagement/stockOut.js";
const userStore = useUserStore();
@@ -320,18 +321,20 @@
supplierId: null,
supplierName: '',
productId: null,
- productCategory: '',
- specificationModel: '',
+ productName: '',
+ userId: userStore.userId,
+ nickname: '',
+ model: '',
+ productModelId: null,
unit: '',
+ productrecordId: null,
+ taxInclusiveUnitPrice: '',
+ taxInclusiveTotalPrice: '',
+ taxRate: '',
+ taxExclusiveTotalPrice: '',
inboundTime: '',
inboundBatch: '',
- inboundQuantity: 0,
- taxInclusiveUnitPrice: 0,
- taxInclusiveTotalPrice: 0,
- taxRate: 0,
- taxExclusiveTotalPrice: 0,
- userId: null,
- nickname: ''
+ inboundQuantity: ''
},
rules: {
supplierId: [{ required: true, message: '璇烽�夋嫨渚涘簲鍟�', trigger: 'change' }],
diff --git a/src/views/inventoryManagement/issueManagement/index.vue b/src/views/inventoryManagement/issueManagement/index.vue
index 2a5bb51..e7b8d6a 100644
--- a/src/views/inventoryManagement/issueManagement/index.vue
+++ b/src/views/inventoryManagement/issueManagement/index.vue
@@ -25,12 +25,12 @@
<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="unit" width="70" show-overflow-tooltip />
- <el-table-column label="鍏ュ簱鏁伴噺" prop="inboundQuantity" width="90" show-overflow-tooltip />
+ <el-table-column label="鍏ュ簱鏁伴噺" prop="stockQuantity" 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="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(scope.row);">鍑哄簱</el-button>
@@ -72,15 +72,10 @@
import useUserStore from '@/store/modules/user'
import { userListNoPage } from "@/api/system/user.js";
import {
- ledgerListPage,
- customerList,
- addOrUpdateSalesLedger,
- getSalesLedgerWithProducts, delLedger
-} from "@/api/salesManagement/salesLedger.js";
-import {
getStockManagePage,
delStockManage,
- stockOut
+ stockOut,
+ getStockManageOutPage
} from "@/api/inventoryManagement/stockManage.js";
const userStore = useUserStore()
@@ -106,20 +101,23 @@
},
form: {
supplierId: null,
- productId: null,
- userId: null,
supplierName: '',
+ productId: null,
productName: '',
+ userId: userStore.userId,
+ nickName: '',
+ productModelId: null,
model: '',
unit: '',
- inboundTime: '',
- inboundBatch: '',
- inboundQuantity: '',
+ productrecordId: null,
taxInclusiveUnitPrice: '',
taxInclusiveTotalPrice: '',
taxRate: '',
taxExclusiveTotalPrice: '',
- nickName: '',
+ inboundTime: '',
+ inboundBatch: '',
+ stockQuantity: '',
+ boundTime: '',
},
rules: {
supplierName: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
@@ -149,7 +147,7 @@
}
const getList = () => {
tableLoading.value = true
- getStockManagePage({ ...searchForm.value, ...page }).then(res => {
+ getStockManageOutPage({ ...searchForm.value, ...page }).then(res => {
tableLoading.value = false
tableData.value = res.data.records
console.log('res', res.data.records)
diff --git a/src/views/inventoryManagement/receiptManagement/index.vue b/src/views/inventoryManagement/receiptManagement/index.vue
index 2691509..56c25bf 100644
--- a/src/views/inventoryManagement/receiptManagement/index.vue
+++ b/src/views/inventoryManagement/receiptManagement/index.vue
@@ -30,7 +30,7 @@
<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="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>
@@ -40,13 +40,14 @@
<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-row :gutter="30">
<el-col :span="12">
- <el-form-item label="浜у搧鍚嶇О锛�" prop="productId">
- <el-select v-model="form.productId" placeholder="璇烽�夋嫨" clearable>
+ <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>
@@ -55,8 +56,9 @@
<el-col :span="12">
<el-form-item label="瑙勬牸鍨嬪彿锛�" prop="productManageId">
- <el-select v-model="form.productManageId" placeholder="璇烽�夋嫨" clearable>
- <el-option v-for="item in productmodelList" :key="item.id" :label="item.model"
+ <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>
@@ -73,19 +75,12 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="浜у搧澶х被锛�" prop="salesman">
- <el-input v-model="form.productCategory" 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.unit" placeholder="璇疯緭鍏�" clearable />
</el-form-item>
</el-col>
</el-row>
+
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="鍏ュ簱鏃堕棿锛�" prop="projectName">
@@ -131,7 +126,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="鍏ュ簱浜猴細" prop="entryPerson">
- <el-select v-model="form.nickname" 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>
@@ -165,13 +160,16 @@
import {modelListPage, productTreeList} from "@/api/basicData/product.js";
const userStore = useUserStore()
const { proxy } = getCurrentInstance()
+
const tableData = ref([])
const selectedRows = ref([])
const userList = ref([])
const supplierLists = ref([])
-const productTree = ref([]); // 浜у搧鏍戞暟鎹�
-const modelList = ref([]); // 瑙勬牸鍨嬪彿鍒楄〃
-const currentProductId = ref(null); // 褰撳墠閫変腑鐨勪骇鍝両D
+const productList = ref([]);
+const productModelList = ref([]);
+const purchaseRecords = ref([]);
+const loadingProducts = ref(false);
+
const loading = ref(false);
const tableLoading = ref(false)
const page = reactive({
@@ -189,62 +187,50 @@
supplierName: '',
},
form: {
- productManageId: null,
supplierId: null,
- productId: null,
- userId: null,
supplierName: '',
+ productId: null,
productName: '',
+ userId: userStore.userId,
+ nickName: '',
model: '',
+ productModelId: null,
unit: '',
- inboundTime: '',
- inboundBatch: '',
- inboundQuantity: '',
+ productrecordId: null,
taxInclusiveUnitPrice: '',
taxInclusiveTotalPrice: '',
taxRate: '',
taxExclusiveTotalPrice: '',
- nickname: ''
+ inboundTime: '',
+ inboundBatch: '',
+ inboundQuantity: ''
},
rules: {
- supplierName: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- productName: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
- model: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+ 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" }],
- inboundQuantity: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
taxInclusiveUnitPrice: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
taxRate: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- nickname: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }]
}
})
-const { searchForm, form, rules } = toRefs(data)
-// 3. 鑾峰彇浜у搧鏍戞柟娉�
-const getProductTree = async () => {
- try {
- loading.value = true;
- const res = await productTreeList();
- productTree.value = res.data; // 鏍规嵁瀹為檯API杩斿洖缁撴瀯璋冩暣
- } finally {
- loading.value = false;
- }
-};
-// 4. 鑾峰彇瑙勬牸鍨嬪彿鏂规硶
-const getModelList = async (productId) => {
- try {
- loading.value = true;
- const res = await modelListPage({
- id: productId,
- current: 1, // 椤电爜
- size: 10 // 姣忛〉鏉℃暟
- });
- modelList.value = res.data.records; // 鏍规嵁瀹為檯API杩斿洖缁撴瀯璋冩暣
- } finally {
- loading.value = false;
- }
-};
+const { searchForm, form, rules } = toRefs(data)
+
// 鏌ヨ鍒楄〃
/** 鎼滅储鎸夐挳鎿嶄綔 */
const handleQuery = () => {
@@ -268,21 +254,208 @@
tableLoading.value = false
})
}
-const getProductTreeList = () => {
- treeLoad.value = true;
- productTreeList()
- .then((res) => {
- list.value = res; // 灏嗚繑鍥炵殑鏁版嵁璧嬬粰list
- list.value.forEach((a) => {
- expandedKeys.value.push(a.label); // 榛樿灞曞紑鎵�鏈夎妭鐐�
- });
- treeLoad.value = false;
- })
- .catch((err) => {
- treeLoad.value = false;
+
+// 姝ｇ‘鐨勪骇鍝佸垪琛ㄥ姞杞芥柟娉�
+const loadProductList = async () => {
+ loadingProducts.value = true;
+ 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);
+ } catch (error) {
+ console.error('鍔犺浇浜у搧鍒楄〃澶辫触:', error);
+ proxy.$modal.msgError('鍔犺浇浜у搧鍒楄〃澶辫触');
+ } finally {
+ loadingProducts.value = false;
+ }
};
+// 鍔犺浇瑙勬牸鍨嬪彿鍒楄〃
+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()
+ ])
+
+ if (type === 'add') {
+ // 鏂板鏃堕噸缃〃鍗�
+ form.value = {
+ userId: userStore.userId // 璁剧疆榛樿鍏ュ簱浜轰负褰撳墠鐢ㄦ埛
+ }
+ } else {
+ // 缂栬緫鏃跺～鍏呰〃鍗曟暟鎹�
+ form.value = { ...row ,
+ supplierId: row.supplierId,
+ productId: row.productId,
+ productModelId: row.productModelId,
+ userId: row.userId
+ }
+ if (row.productId) {
+ await loadProductModels(row.productId)
+ }
+ }
+}
+
+// 鎻愪氦琛ㄥ崟
+const submitForm = async () => {
+ try {
+ await proxy.$refs.formRef.validate()
+
+ if (!form.value.productrecordId) {
+ proxy.$modal.msgError('璇烽�夋嫨浜у搧澶х被鍜岃鏍煎瀷鍙蜂互鑾峰彇閲囪喘璁板綍')
+ return
+ }
+
+ const submitData = {
+ productrecordId: form.value.productrecordId,
+ supplierId: form.value.supplierId,
+ inboundQuantity: form.value.inboundQuantity,
+ userId: form.value.userId,
+ }
+
+ const apiMethod = operationType.value === 'add' ? addSutockIn : updateStockIn
+ await apiMethod(submitData)
+
+ proxy.$modal.msgSuccess(operationType.value === 'add' ? '鏂板鎴愬姛' : '淇敼鎴愬姛')
+ closeDia()
+ getList()
+ } catch (error) {
+ console.error('鎻愪氦澶辫触:', error)
+ if (!error.errors) {
+ proxy.$modal.msgError('鎿嶄綔澶辫触锛岃閲嶈瘯')
+ }
+ }
+}
+// 鍏抽棴寮规
+const closeDia = () => {
+ proxy.$refs.formRef.resetFields()
+ dialogFormVisible.value = false
+}
// 琛ㄦ牸閫夋嫨鏁版嵁
const handleSelectionChange = (selection) => {
// 杩囨护鎺夊瓙鏁版嵁
@@ -295,55 +468,6 @@
const summarizeMainTable = (param) => {
return proxy.summarizeTable(param, ['contractAmount', 'taxInclusiveTotalPrice', 'taxExclusiveTotalPrice']);
};
-
-// 鎵撳紑寮规
-const openForm = async (type, row) => {
- operationType.value = type
- dialogFormVisible.value = true
- let userLists = await userListNoPage()
- userList.value = userLists.data
- console.log('userList', userList.value)
-
- let supplierlists = await listSupplier()
- supplierLists.value = supplierlists.data.records
- console.log('supplierList', supplierLists.value)
-
- await getProductTree();
-
-
-
-
-
-
- if (type === 'add') {
- // 鏂板鏃堕噸缃〃鍗�
- form.value = {
- nickname: userStore.userId // 璁剧疆榛樿鍏ュ簱浜轰负褰撳墠鐢ㄦ埛
- }
- } else {
- // 缂栬緫鏃跺～鍏呰〃鍗曟暟鎹�
- form.value = { ...row }
- }
- }
-
-// 鎻愪氦琛ㄥ崟
-const submitForm = () => {
- proxy.$refs["formRef"].validate(valid => {
- if (valid) {
- const apiMethod = operationType.value === 'add' ? addSutockIn : updateStockIn
- apiMethod(form.value).then(res => {
- proxy.$modal.msgSuccess(operationType.value === 'add' ? "鏂板鎴愬姛" : "淇敼鎴愬姛")
- closeDia()
- getList()
- })
- }
- })
-}
-// 鍏抽棴寮规
-const closeDia = () => {
- proxy.resetForm("formRef")
- dialogFormVisible.value = false
-}
// 瀵煎嚭
const handleOut = () => {
diff --git a/src/views/inventoryManagement/stockManagement/index.vue b/src/views/inventoryManagement/stockManagement/index.vue
index 777fe02..452f945 100644
--- a/src/views/inventoryManagement/stockManagement/index.vue
+++ b/src/views/inventoryManagement/stockManagement/index.vue
@@ -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">
@@ -79,7 +83,7 @@
</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>
@@ -88,7 +92,7 @@
</el-row>
<el-row :gutter="30">
<el-col :span="12">
- <el-form-item label="鍑哄簱鏁伴噺锛�" prop="customerContractNo">
+ <el-form-item label="搴撳瓨鏁伴噺锛�" prop="customerContractNo">
<el-input v-model="form.stockQuantity" placeholder="璇疯緭鍏�" clearable />
</el-form-item>
</el-col>
@@ -123,7 +127,7 @@
<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 +179,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 +209,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 +241,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 +276,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
}
--
Gitblit v1.9.3