From 42ef348f48a79f2653b02295924ffa9579a0afd6 Mon Sep 17 00:00:00 2001 From: lishenao <3065849776@qq.com> Date: 星期二, 01 七月 2025 14:31:30 +0800 Subject: [PATCH] 库存管理 --- src/api/inventoryManagement/stockManage.js | 38 +++++ src/api/inventoryManagement/stockOut.js | 47 ++++++ src/views/inventoryManagement/receiptManagement/index.vue | 39 +++-- src/views/inventoryManagement/issueManagement/index.vue | 39 +++-- src/views/inventoryManagement/stockManagement/index.vue | 120 ++++++++++------- src/api/inventoryManagement/stockIn.js | 48 ++++++ src/views/inventoryManagement/dispatchLog/index.vue | 32 ++-- 7 files changed, 267 insertions(+), 96 deletions(-) diff --git a/src/api/inventoryManagement/stockIn.js b/src/api/inventoryManagement/stockIn.js new file mode 100644 index 0000000..d9924d4 --- /dev/null +++ b/src/api/inventoryManagement/stockIn.js @@ -0,0 +1,48 @@ +import request from "@/utils/request"; + +// 鏌ヨ鍏ュ簱淇℃伅鍒楄〃 +export const getStockInPage = (params) => { + return request({ + url: "/stockin/listPage", + method: "get", + params, + }); +}; + +// 淇敼搴撳瓨淇℃伅 +export const updateStockIn = (data) => { + return request({ + url: "/stockin/update", + method: "put", + data, + }); +}; + +// 鏂板鍟嗗搧鍏ュ簱淇℃伅 +export function addSutockIn(data) { + return request({ + url: '/stockin/add', + method: 'post', + data: data + }) +} + +// 鍒犻櫎鍏ュ簱淇℃伅 +export function delStockIn(ids) { + return request({ + url: '/stockin/del', + method: 'delete', + data: ids + }) +} + +// 瀵煎嚭鍏ュ簱淇℃伅 +export function exportStockIn(query) { + return request({ + url: '/stockin/export', + method: 'get', + params: query, + responseType: 'blob' + }) +} + diff --git a/src/api/inventoryManagement/stockManage.js b/src/api/inventoryManagement/stockManage.js new file mode 100644 index 0000000..8ce46bb --- /dev/null +++ b/src/api/inventoryManagement/stockManage.js @@ -0,0 +1,38 @@ +import request from "@/utils/request"; + +// 鏌ヨ搴撳瓨淇℃伅鍒楄〃 +export const getStockManagePage = (params) => { + return request({ + url: "/stockmanagement/page", + method: "get", + params, + }); +}; + +// 淇敼搴撳瓨淇℃伅 +export const updateStockManage = (data) => { + return request({ + url: "/stockmanagement/update", + method: "put", + data, + }); +}; + +// 鍒犻櫎搴撳瓨淇℃伅 +export function delStockManage(ids) { + return request({ + url: '/stockmanagement/del', + method: 'delete', + data: ids + }) +} + +// 瀵煎嚭搴撳瓨淇℃伅 +export function exportStockManage(query) { + return request({ + url: '/stockmanagement/export', + method: 'get', + params: query, + responseType: 'blob' + }) +} \ No newline at end of file diff --git a/src/api/inventoryManagement/stockOut.js b/src/api/inventoryManagement/stockOut.js new file mode 100644 index 0000000..51ad1a8 --- /dev/null +++ b/src/api/inventoryManagement/stockOut.js @@ -0,0 +1,47 @@ +import request from "@/utils/request"; + +//鏌ヨ鍑哄簱鍒楄〃 +export const getStockOutPage = (params) => { + return request({ + url: "/stockout/page", + method: "get", + params, + }); +}; + +//鏂板鍑哄簱淇℃伅 +export const addStockOut = (data) => { + return request({ + url: '/stockout/add', + method: 'post', + data: data + }) +} + +//淇敼鍑哄簱淇℃伅 +export const updateStockOut = (data) => { + return request({ + url: "/stockout/update", + method: "put", + data, + }); +} + +//鍒犻櫎鍑哄簱淇℃伅 +export const delStockOut = (ids) => { + return request({ + url: '/stockout/del', + method: 'delete', + data: ids + }) +} + +//瀵煎嚭鍑哄簱淇℃伅 +export const exportStockOut = (query) => { + return request({ + url: '/stockout/export', + method: 'get', + params: query, + responseType: 'blob' + }) +} \ No newline at end of file diff --git a/src/views/inventoryManagement/dispatchLog/index.vue b/src/views/inventoryManagement/dispatchLog/index.vue index 7ad8196..7f8313a 100644 --- a/src/views/inventoryManagement/dispatchLog/index.vue +++ b/src/views/inventoryManagement/dispatchLog/index.vue @@ -4,7 +4,7 @@ <div> <span class="search_title">渚涘簲鍟嗗悕绉帮細</span> <el-input - v-model="searchForm.customerName" + v-model="searchForm.supplierName" style="width: 240px" placeholder="璇疯緭鍏�" @change="handleQuery" @@ -38,67 +38,67 @@ <el-table-column align="center" label="搴忓彿" type="index" width="60" /> <el-table-column label="鍑哄簱鏃ユ湡" - prop="salesContractNo" + prop="inboundTime" width="100" show-overflow-tooltip /> <el-table-column label="渚涘簲鍟嗗悕绉�" - prop="customerName" + prop="supplierName" width="160" show-overflow-tooltip /> <el-table-column label="浜у搧澶х被" - prop="salesman" + prop="productCategory" width="100" show-overflow-tooltip /> <el-table-column label="瑙勬牸鍨嬪彿" - prop="projectName" + prop="specificationModel" width="100" show-overflow-tooltip /> <el-table-column label="鍗曚綅" - prop="contractAmount" + prop="unit" width="80" show-overflow-tooltip /> <el-table-column label="鍑哄簱鏁伴噺" - prop="entryPersonName" + prop="inboundQuantity" width="100" show-overflow-tooltip /> <el-table-column label="鍚◣鍗曚环" - prop="entryDate" + prop="taxInclusiveUnitPrice" width="100" show-overflow-tooltip /> <el-table-column label="鍚◣鎬讳环" - prop="executionDate" + prop="taxInclusiveTotalPrice" width="100" show-overflow-tooltip /> <el-table-column label="绋庣巼" - prop="executionDate" + prop="taxRate" width="100" show-overflow-tooltip /> <el-table-column label="涓嶅惈绋庢�讳环" - prop="executionDate" + prop="taxExclusiveTotalPrice" width="100" show-overflow-tooltip /> <el-table-column label="鍑哄簱浜�" - prop="executionDate" + prop="nickname" width="80" show-overflow-tooltip /> @@ -290,6 +290,10 @@ getSalesLedgerWithProducts, delLedger, } from "@/api/salesManagement/salesLedger.js"; +import { + getStockOutPage +} from "@/api/inventoryManagement/stockOut.js"; + const userStore = useUserStore(); const { proxy } = getCurrentInstance(); const tableData = ref([]); @@ -351,10 +355,10 @@ }; const getList = () => { tableLoading.value = true; - ledgerListPage({ ...searchForm.value, ...page }) + getStockOutPage({ ...searchForm.value, ...page }) .then((res) => { tableLoading.value = false; - tableData.value = res.records; + tableData.value = res.data.records; tableData.value.map((item) => { item.children = []; }); diff --git a/src/views/inventoryManagement/issueManagement/index.vue b/src/views/inventoryManagement/issueManagement/index.vue index ef38d41..edb60b8 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="100" 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="productCategory" width="100" show-overflow-tooltip /> + <el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" 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="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> @@ -77,6 +77,13 @@ addOrUpdateSalesLedger, getSalesLedgerWithProducts, delLedger } from "@/api/salesManagement/salesLedger.js"; +import { + getStockOutPage, + addStockOut, + updateStockOut, + delStockOut, + exportStockOut +} from "@/api/inventoryManagement/stockOut.js"; const userStore = useUserStore() const { proxy } = getCurrentInstance() const tableData = ref([]) @@ -97,7 +104,7 @@ const dialogFormVisible = ref(false) const data = reactive({ searchForm: { - customerName: '', + supplierName: '', }, form: { salesContractNo: '', @@ -136,9 +143,9 @@ } const getList = () => { tableLoading.value = true - ledgerListPage({ ...searchForm.value, ...page }).then(res => { + getStockOutPage({ ...searchForm.value, ...page }).then(res => { tableLoading.value = false - tableData.value = res.records + tableData.value = res.data.records tableData.value.map(item => { item.children = [] }) diff --git a/src/views/inventoryManagement/receiptManagement/index.vue b/src/views/inventoryManagement/receiptManagement/index.vue index 7d5caec..07d0139 100644 --- a/src/views/inventoryManagement/receiptManagement/index.vue +++ b/src/views/inventoryManagement/receiptManagement/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="100" 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="productCategory" width="100" show-overflow-tooltip /> + <el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" 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="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('edit', scope.row);">缂栬緫</el-button> @@ -144,6 +144,13 @@ addOrUpdateSalesLedger, getSalesLedgerWithProducts, delLedger } from "@/api/salesManagement/salesLedger.js"; +import { + getStockInPage, + updateStockIn, + addSutockIn, + delStockIn, + exportStockIn +} from "@/api/inventoryManagement/stockIn.js"; const userStore = useUserStore() const { proxy } = getCurrentInstance() const tableData = ref([]) @@ -164,7 +171,7 @@ const dialogFormVisible = ref(false) const data = reactive({ searchForm: { - customerName: '', + supplierName: '', }, form: { salesContractNo: '', @@ -203,9 +210,9 @@ } const getList = () => { tableLoading.value = true - ledgerListPage({ ...searchForm.value, ...page }).then(res => { + getStockInPage({ ...searchForm.value, ...page }).then(res => { tableLoading.value = false - tableData.value = res.records + tableData.value = res.data.records tableData.value.map(item => { item.children = [] }) diff --git a/src/views/inventoryManagement/stockManagement/index.vue b/src/views/inventoryManagement/stockManagement/index.vue index cc7df7d..e23fb15 100644 --- a/src/views/inventoryManagement/stockManagement/index.vue +++ b/src/views/inventoryManagement/stockManagement/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="salesContractNo" width="100" 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="100" show-overflow-tooltip /> - <el-table-column label="鍗曚綅" prop="contractAmount" width="80" show-overflow-tooltip /> - <el-table-column label="鍑哄簱鏁伴噺" prop="entryPersonName" width="100" 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="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="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="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 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> @@ -45,75 +45,85 @@ <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="salesContractNo"> + <el-form-item label="渚涘簲鍟嗗悕绉帮細" prop="supplierName"> <el-input v-model="form.salesContractNo" placeholder="璇疯緭鍏�" clearable /> </el-form-item> </el-col> <el-col :span="12"> - <el-form-item label="浜у搧澶х被锛�" prop="salesman"> - <el-select v-model="form.salesman" placeholder="璇烽�夋嫨" clearable> - <el-option v-for="item in userList" :key="item.nickName" :label="item.nickName" - :value="item.nickName" /> + <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-select> </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.customerContractNo" placeholder="璇疯緭鍏�" clearable /> + <el-form-item label="瑙勬牸鍨嬪彿锛�" prop="specificationModel"> + <el-input v-model="form.specificationModel" placeholder="璇疯緭鍏�" clearable /> </el-form-item> </el-col> <el-col :span="12"> <el-form-item label="鍗曚綅锛�" prop="customerId"> - <el-input v-model="form.customerContractNo" placeholder="璇疯緭鍏�" clearable /> + <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"> - <el-date-picker style="width: 100%" v-model="form.entryDate" value-format="YYYY-MM-DD" format="YYYY-MM-DD" + <el-form-item label="搴撳瓨鏃堕棿锛�" prop="projectName"> + <el-date-picker style="width: 100%" v-model="form.boundTime" value-format="YYYY-MM-DD" format="YYYY-MM-DD" type="date" placeholder="璇烽�夋嫨" clearable /> </el-form-item> </el-col> + <el-col :span="12"> - <el-form-item label="鍑哄簱鏁伴噺锛�" prop="customerContractNo"> - <el-input v-model="form.customerContractNo" placeholder="璇疯緭鍏�" clearable /> + <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.customerContractNo" placeholder="璇疯緭鍏�" clearable /> + <el-input v-model="form.taxInclusiveUnitPrice" placeholder="璇疯緭鍏�" clearable /> </el-form-item> </el-col> - <el-col :span="12"> - <el-form-item label="鍚◣鎬讳环锛�" prop="customerContractNo"> - <el-input v-model="form.customerContractNo" 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-col :span="12"> <el-form-item label="绋庣巼锛�" prop="customerId"> - <el-input v-model="form.customerContractNo" placeholder="璇疯緭鍏�" clearable /> + <el-input v-model="form.taxRate" placeholder="璇疯緭鍏�" clearable /> </el-form-item> </el-col> - <el-col :span="12"> - <el-form-item label="涓嶅惈绋庢�讳环锛�" prop="entryDate"> - <el-input v-model="form.customerContractNo" 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-col :span="12"> <el-form-item label="鍑哄簱浜猴細" prop="entryPerson"> - <el-select v-model="form.entryPerson" placeholder="璇烽�夋嫨" clearable> + <el-select v-model="form.inboundPerson" placeholder="璇烽�夋嫨" clearable> <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId" /> </el-select> </el-form-item> @@ -142,6 +152,12 @@ addOrUpdateSalesLedger, getSalesLedgerWithProducts, delLedger } from "@/api/salesManagement/salesLedger.js"; +import { + getStockManagePage , + updateStockManage, + delStockManage, + exportStockManage +} from "@/api/inventoryManagement/stockManage.js"; const userStore = useUserStore() const { proxy } = getCurrentInstance() const tableData = ref([]) @@ -162,19 +178,22 @@ const dialogFormVisible = ref(false) const data = reactive({ searchForm: { - customerName: '', + supplierName: '', }, form: { - salesContractNo: '', - salesman: '', - customerContractNo: '', + productCategory: '', + specificationModel: '', + unit: '', + taxInclusiveUnitPrice: '', + taxInclusiveTotalPrice: '', + taxExclusiveTotalPrice: '', + taxRate: '', + stockQuantity: '', + supplierName:'', customerId: '', - projectName: '', - entryPerson: '', - entryDate: '', - maintenanceTime: '', - productData: [], - executionDate: '' + boundTime: '', + inboundTime: '', + userId: '', }, rules: { salesman: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }], @@ -201,9 +220,10 @@ } 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 = res.data.records + console.log('res', res) tableData.value.map(item => { item.children = [] }) -- Gitblit v1.9.3