From 9feea2f82cb21abf58643dcffd875b1ed6f1162b Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 08 七月 2025 11:06:41 +0800
Subject: [PATCH] yys 1.新增入库查询 2.新增入库 3.入库分页查询 4.编辑
---
src/views/inventoryManagement/issueManagement/index.vue | 159 ++++++++++++++++++++++------------------------------
1 files changed, 68 insertions(+), 91 deletions(-)
diff --git a/src/views/inventoryManagement/issueManagement/index.vue b/src/views/inventoryManagement/issueManagement/index.vue
index d7f5216..7ed1f68 100644
--- a/src/views/inventoryManagement/issueManagement/index.vue
+++ b/src/views/inventoryManagement/issueManagement/index.vue
@@ -3,7 +3,7 @@
<div class="search_form">
<div>
<span class="search_title">渚涘簲鍟嗗悕绉帮細</span>
- <el-input v-model="searchForm.customerName" style="width: 240px" placeholder="璇疯緭鍏�" @change="handleQuery"
+ <el-input v-model="searchForm.supplierName" style="width: 240px" placeholder="璇疯緭鍏�" @change="handleQuery"
clearable prefix-icon="Search" />
<el-button type="primary" @click="handleQuery" style="margin-left: 10px">鎼滅储</el-button>
</div>
@@ -19,18 +19,18 @@
: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="salesContractNo" width="100" show-overflow-tooltip />
- <el-table-column label="鍏ュ簱鎵规" prop="customerContractNo" width="160" show-overflow-tooltip />
- <el-table-column label="渚涘簲鍟嗗悕绉�" prop="customerName" width="160" show-overflow-tooltip />
- <el-table-column label="浜у搧澶х被" prop="salesman" width="100" show-overflow-tooltip />
- <el-table-column label="瑙勬牸鍨嬪彿" prop="projectName" width="160" show-overflow-tooltip />
- <el-table-column label="鍗曚綅" prop="contractAmount" width="70" show-overflow-tooltip />
- <el-table-column label="鍏ュ簱鏁伴噺" prop="entryPersonName" width="90" show-overflow-tooltip />
- <el-table-column label="鍚◣鍗曚环(鍏�)" prop="entryDate" width="100" show-overflow-tooltip />
- <el-table-column label="鍚◣鎬讳环(鍏�)" prop="executionDate" width="100" show-overflow-tooltip />
- <el-table-column label="绋庣巼(%)" prop="executionDate" width="80" show-overflow-tooltip />
- <el-table-column label="涓嶅惈绋庢�讳环(鍏�)" prop="executionDate" width="180" show-overflow-tooltip />
- <el-table-column label="鍏ュ簱浜�" prop="executionDate" width="80" show-overflow-tooltip />
+ <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="unit" width="70" 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 fixed="right" label="鎿嶄綔" min-width="60" align="center">
<template #default="scope">
<el-button link type="primary" size="small" @click="openForm(scope.row);">棰嗙敤</el-button>
@@ -40,17 +40,17 @@
<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="'棰嗙敤'" width="40%" @close="closeDia">
+ <el-dialog v-model="dialogFormVisible" :title="'鏂板鍑哄簱'" width="40%" @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-input v-model="form.inboundQuantity" placeholder="璇疯緭鍏�" clearable />
</el-form-item>
<el-form-item label="鍑哄簱鏃ユ湡锛�" prop="projectName">
- <el-date-picker style="width: 100%" v-model="form.entryDate" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
+ <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-form-item label="鍑哄簱浜猴細" prop="entryPerson">
- <el-select v-model="form.entryPerson" 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>
@@ -72,18 +72,16 @@
import useUserStore from '@/store/modules/user'
import { userListNoPage } from "@/api/system/user.js";
import {
- ledgerListPage,
- customerList,
- addOrUpdateSalesLedger,
- getSalesLedgerWithProducts, delLedger
-} from "@/api/salesManagement/salesLedger.js";
+ getStockManagePage,
+ delStockManage,
+ stockOut,
+} from "@/api/inventoryManagement/stockManage.js";
+
const userStore = useUserStore()
const { proxy } = getCurrentInstance()
const tableData = ref([])
-const productData = ref([])
const selectedRows = ref([])
const userList = ref([])
-const customerOption = ref([])
const tableLoading = ref(false)
const page = reactive({
current: 1,
@@ -96,28 +94,19 @@
const dialogFormVisible = ref(false)
const data = reactive({
searchForm: {
- customerName: '',
+ supplierName: '',
+ inboundQuantity:'',
+ inboundTime:'',
+ nickName: '',
+ userId: '',
},
form: {
- salesContractNo: '',
- salesman: '',
- customerContractNo: '',
- customerId: '',
- projectName: '',
- entryPerson: '',
- entryDate: '',
- maintenanceTime: '',
- productData: [],
- executionDate: ''
+ productrecordId: '',
},
rules: {
- salesman: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
- customerContractNo: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- customerId: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
- projectName: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- entryPerson: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
- entryDate: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
- executionDate: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+ inboundTime: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+ inboundQuantity: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+ nickname: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }]
}
})
const { searchForm, form, rules } = toRefs(data)
@@ -135,17 +124,15 @@
}
const getList = () => {
tableLoading.value = true
- ledgerListPage({ ...searchForm.value, ...page }).then(res => {
+ getStockManagePage({ ...searchForm.value, ...page }).then(res => {
tableLoading.value = false
- tableData.value = res.records
- tableData.value.map(item => {
- item.children = []
- })
- total.value = res.total
+ tableData.value = res.data.records
+ console.log('res', res.data.records)
}).catch(() => {
tableLoading.value = false
})
}
+
const findNodeById = (nodes, productId) => {
for (let i = 0; i < nodes.length; i++) {
if (nodes[i].value === productId) {
@@ -162,9 +149,8 @@
};
// 琛ㄦ牸閫夋嫨鏁版嵁
const handleSelectionChange = (selection) => {
-
// 杩囨护鎺夊瓙鏁版嵁
- selectedRows.value = selection.filter(item => item.children !== undefined);
+ selectedRows.value = selection.filter(item => item.id);
console.log('selection', selectedRows.value)
}
const expandedRowKeys = ref([])
@@ -173,57 +159,48 @@
const summarizeMainTable = (param) => {
return proxy.summarizeTable(param, ['contractAmount', 'taxInclusiveTotalPrice', 'taxExclusiveTotalPrice']);
};
+const currentRowId = ref(null) // 鏂板锛氬瓨鍌ㄥ綋鍓嶆搷浣滅殑琛孖D
// 鎵撳紑寮规
const openForm = async (row) => {
- // form.value = {}
- // productData.value = []
- // let userLists = await userListNoPage()
- // userList.value = userLists.data
- // customerList().then(res => {
- // customerOption.value = res
- // })
- // console.log('userStore.id', userStore.id)
- // form.value.entryPerson = userStore.id
- // if (type === 'edit') {
- // currentId.value = row.id;
- // getSalesLedgerWithProducts({ id: row.id, type: 1 }).then(res => {
- // form.value = { ...res }
- // form.value.entryPerson = Number(res.entryPerson)
- // productData.value = form.value.productData
- // 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
+ currentRowId.value = row.id
+ form.value = {}
+ // 鍒濆鍖栬〃鍗曟暟鎹�
+ form.value = {
+ productrecordId: '',
+ inboundQuantity: '', // 鍑哄簱鏁伴噺娓呯┖
+ inboundTime: getCurrentDate(), // 榛樿褰撳墠鏃ユ湡
+ nickName: '', // 榛樿褰撳墠鐢ㄦ埛
+ }
+ console.log('form',form.value)
+ // 鍔犺浇鐢ㄦ埛鍒楄〃
+ try {
+ const userLists = await userListNoPage()
+ userList.value = userLists.data
+ } catch (error) {
+ console.error('鍔犺浇鐢ㄦ埛鍒楄〃澶辫触:', error)
+ }
}
// 鎻愪氦琛ㄥ崟
const submitForm = () => {
proxy.$refs["formRef"].validate(valid => {
- if (valid) {
- if (productData.value.length > 0) {
- form.value.productData = proxy.HaveJson(productData.value)
- } else {
- proxy.$modal.msgWarning('璇锋坊鍔犱骇鍝佷俊鎭�')
- return
+ if (valid && currentRowId.value) {
+ const outData = {
+ id: currentRowId.value, // 鍘熷璁板綍ID
+ Quantity: form.value.inboundQuantity, // 鍑哄簱鏁伴噺
+ Time: form.value.inboundTime, // 鍑哄簱鏃堕棿
+ userId: form.value.userId // 鎿嶄綔浜�
}
- let tempFileIds = []
- if (fileList.value.length > 0) {
- tempFileIds = fileList.value.map(item => item.tempId)
- }
- form.value.tempFileIds = tempFileIds
- form.value.type = 1
- addOrUpdateSalesLedger(form.value).then(res => {
+ console.log(outData)
+
+ stockOut(outData).then(res => {
proxy.$modal.msgSuccess("鎻愪氦鎴愬姛")
closeDia()
getList()
+ }).catch(err => {
+ proxy.$modal.msgError("鍑哄簱澶辫触")
})
}
})
@@ -237,14 +214,14 @@
// 瀵煎嚭
const handleOut = () => {
ElMessageBox.confirm(
- '閫変腑鐨勫唴瀹瑰皢琚鍑猴紝鏄惁纭瀵煎嚭锛�',
+ '鏄惁纭瀵煎嚭锛�',
'瀵煎嚭', {
confirmButtonText: '纭',
cancelButtonText: '鍙栨秷',
type: 'warning',
}
).then(() => {
- proxy.download("/sales/ledger/export", {}, '鍏ュ簱鍙拌处.xlsx')
+ proxy.download("/stockmanagement/export", {}, '鍏ュ簱鍙拌处.xlsx')
}).catch(() => {
proxy.$modal.msg("宸插彇娑�")
})
@@ -266,7 +243,7 @@
type: 'warning',
}
).then(() => {
- delLedger(ids).then(res => {
+ delStockManage(ids).then(res => {
proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛")
getList()
})
--
Gitblit v1.9.3