From 3ea4386e3fa8861085fa8c9ba34d0f1644cda338 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 11 十一月 2025 11:05:41 +0800
Subject: [PATCH] 仓储物流-入库分类修改，导出修改
---
src/api/inventoryManagement/stockManage.js | 2
src/views/inventoryManagement/receiptManagement/index.vue | 23 +++++++----
src/views/inventoryManagement/issueManagement/index.vue | 21 +++++++---
src/views/inventoryManagement/stockManagement/index.vue | 23 +++++++++--
src/api/inventoryManagement/stockIn.js | 16 ++++++--
src/views/inventoryManagement/receiptManagement/components/formDiaManual.vue | 6 +-
src/views/inventoryManagement/dispatchLog/index.vue | 11 ++++-
7 files changed, 72 insertions(+), 30 deletions(-)
diff --git a/src/api/inventoryManagement/stockIn.js b/src/api/inventoryManagement/stockIn.js
index 8a3dfff..d45eb1e 100644
--- a/src/api/inventoryManagement/stockIn.js
+++ b/src/api/inventoryManagement/stockIn.js
@@ -18,10 +18,18 @@
});
};
-// 鍑哄簱鍙拌处-鏌ヨ鎵嬪姩鍏ュ簱淇℃伅鍒楄〃
+// 鍑哄簱鍙拌处-鏌ヨ鑷畾涔夊叆搴撲俊鎭垪琛�
export const getStockInPageByCustom = (params) => {
return request({
url: "/stockmanagement/listPageByCustom",
+ method: "get",
+ params,
+ });
+};
+// 鍏ュ簱绠＄悊-鏌ヨ鑷畾涔夊叆搴撲俊鎭垪琛�
+export const getInPageByCustom = (params) => {
+ return request({
+ url: "/stockin/listPageByCustom",
method: "get",
params,
});
@@ -63,7 +71,7 @@
})
}
-// 鏂板鎵嬪姩鍏ュ簱淇℃伅
+// 鏂板鑷畾涔夊叆搴撲俊鎭�
export function addStockInCustom(data) {
return request({
url: '/stockin/addCustom',
@@ -72,7 +80,7 @@
})
}
-// 缂栬緫鎵嬪姩鍏ュ簱淇℃伅
+// 缂栬緫鑷畾涔夊叆搴撲俊鎭�
export function updateStockInCustom(data) {
return request({
url: '/stockin/updateCustom',
@@ -90,7 +98,7 @@
})
}
-// 鍒犻櫎鎵嬪姩鍏ュ簱淇℃伅
+// 鍒犻櫎鑷畾涔夊叆搴撲俊鎭�
export function delStockInCustom(ids) {
return request({
url: '/stockin/delteCustom',
diff --git a/src/api/inventoryManagement/stockManage.js b/src/api/inventoryManagement/stockManage.js
index 3bee93f..4f5d957 100644
--- a/src/api/inventoryManagement/stockManage.js
+++ b/src/api/inventoryManagement/stockManage.js
@@ -18,7 +18,7 @@
});
};
-// 鏌ヨ鎵嬪姩鍏ュ簱搴撳瓨淇℃伅鍒楄〃
+// 鏌ヨ鑷畾涔夊叆搴撳簱瀛樹俊鎭垪琛�
export const getStockManagePageByCustom = (params) => {
return request({
url: "/stockin/listPageCopyByCustom",
diff --git a/src/views/inventoryManagement/dispatchLog/index.vue b/src/views/inventoryManagement/dispatchLog/index.vue
index 86fe158..7f4b267 100644
--- a/src/views/inventoryManagement/dispatchLog/index.vue
+++ b/src/views/inventoryManagement/dispatchLog/index.vue
@@ -135,7 +135,7 @@
</div>
</el-tab-pane>
- <el-tab-pane label="鎵嬪姩鍑哄簱" name="manual">
+ <el-tab-pane label="鑷畾涔夊嚭搴�" name="manual">
<div class="search_form">
<div>
<span class="search_title">渚涘簲鍟嗗悕绉帮細</span>
@@ -564,7 +564,14 @@
type: "warning",
})
.then(() => {
- proxy.download("/stockmanagement/export", {}, "鍑哄簱鍙拌处.xlsx");
+ // 鏍规嵁涓嶅悓鐨� tab 绫诲瀷璋冪敤涓嶅悓鐨勫鍑烘帴鍙�
+ let exportUrl = "/stockmanagement/export"
+ if (activeTab.value === 'production') {
+ exportUrl = "/stockmanagement/exportone"
+ } else if (activeTab.value === 'manual') {
+ exportUrl = "/stockmanagement/exportTwo"
+ }
+ proxy.download(exportUrl, {}, "鍑哄簱鍙拌处.xlsx");
})
.catch(() => {
proxy.$modal.msg("宸插彇娑�");
diff --git a/src/views/inventoryManagement/issueManagement/index.vue b/src/views/inventoryManagement/issueManagement/index.vue
index 3b0788b..b407944 100644
--- a/src/views/inventoryManagement/issueManagement/index.vue
+++ b/src/views/inventoryManagement/issueManagement/index.vue
@@ -102,7 +102,7 @@
</div>
</el-tab-pane>
- <el-tab-pane label="鎵嬪姩鍑哄簱" name="manual">
+ <el-tab-pane label="鑷畾涔夊嚭搴�" name="manual">
<div class="search_form">
<div>
<span class="search_title">渚涘簲鍟嗗悕绉帮細</span>
@@ -186,9 +186,9 @@
import useUserStore from '@/store/modules/user'
import { userListNoPageByTenantId } from "@/api/system/user.js";
import {
- getStockInPage,
- getStockInPageByProduction,
- getStockInPageByCustom
+ getStockInPage,
+ getStockInPageByProduction,
+ getStockInPageByCustom, getInPageByCustom
} from "@/api/inventoryManagement/stockIn.js";
import {
getStockManagePage,
@@ -258,7 +258,7 @@
if (activeTab.value === 'production') {
apiCall = getStockInPageByProduction(params)
} else if (activeTab.value === 'manual') {
- apiCall = getStockInPageByCustom(params)
+ apiCall = getInPageByCustom(params)
} else {
apiCall = getStockInPage(params)
}
@@ -350,7 +350,7 @@
quantity: form.value.inboundQuantity, // 鍑哄簱鏁伴噺
time: form.value.inboundTime, // 鍑哄簱鏃堕棿
userId: form.value.nickName, // 鎿嶄綔浜�
- type: typeMap[activeTab.value] // 鍑哄簱绫诲瀷锛氶噰璐�1锛岀敓浜�2锛屾墜鍔�3
+ type: typeMap[activeTab.value] // 鍑哄簱绫诲瀷锛氶噰璐�1锛岀敓浜�2锛岃嚜瀹氫箟3
}
console.log(outData)
@@ -380,7 +380,14 @@
type: 'warning',
}
).then(() => {
- proxy.download("/stockin/export", {}, '鍏ュ簱鍙拌处.xlsx')
+ // 鏍规嵁涓嶅悓鐨� tab 绫诲瀷璋冪敤涓嶅悓鐨勫鍑烘帴鍙�
+ let exportUrl = "/stockin/export"
+ if (activeTab.value === 'production') {
+ exportUrl = "/stockin/exportOne"
+ } else if (activeTab.value === 'manual') {
+ exportUrl = "/stockin/exportTwo"
+ }
+ proxy.download(exportUrl, {}, '鍏ュ簱鍙拌处.xlsx')
}).catch(() => {
proxy.$modal.msg("宸插彇娑�")
})
diff --git a/src/views/inventoryManagement/receiptManagement/components/formDiaManual.vue b/src/views/inventoryManagement/receiptManagement/components/formDiaManual.vue
index adf388f..8a10912 100644
--- a/src/views/inventoryManagement/receiptManagement/components/formDiaManual.vue
+++ b/src/views/inventoryManagement/receiptManagement/components/formDiaManual.vue
@@ -1,5 +1,5 @@
<template>
- <el-dialog v-model="dialogFormVisible" :title="operationType === 'add' ? '鏂板鎵嬪姩鍏ュ簱' : '缂栬緫鎵嬪姩鍏ュ簱'" width="70%"
+ <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">
<div style="margin-bottom: 10px;" v-if="operationType === 'add'">
@@ -235,7 +235,7 @@
return
}
- // 楠岃瘉鎵嬪姩娣诲姞鐨勬暟鎹繀濉瓧娈�
+ // 楠岃瘉鑷畾涔夋坊鍔犵殑鏁版嵁蹇呭～瀛楁
for (let i = 0; i < productList.value.length; i++) {
const product = productList.value[i];
if (!product.productCategory || !product.specificationModel || !product.unit) {
@@ -279,7 +279,7 @@
await addStockInCustom(payloadList)
}
- proxy.$modal.msgSuccess(operationType.value === 'edit' ? '缂栬緫鎵嬪姩鍏ュ簱鎴愬姛' : '鏂板鎵嬪姩鍏ュ簱鎴愬姛')
+ proxy.$modal.msgSuccess(operationType.value === 'edit' ? '缂栬緫鑷畾涔夊叆搴撴垚鍔�' : '鏂板鑷畾涔夊叆搴撴垚鍔�')
closeDia()
emit('success')
diff --git a/src/views/inventoryManagement/receiptManagement/index.vue b/src/views/inventoryManagement/receiptManagement/index.vue
index 77fabdf..453a21e 100644
--- a/src/views/inventoryManagement/receiptManagement/index.vue
+++ b/src/views/inventoryManagement/receiptManagement/index.vue
@@ -99,7 +99,7 @@
</div>
</el-tab-pane>
- <el-tab-pane label="鎵嬪姩鍏ュ簱" name="manual">
+ <el-tab-pane label="鑷畾涔夊叆搴�" name="manual">
<div class="search_form">
<div>
<span class="search_title">渚涘簲鍟嗗悕绉帮細</span>
@@ -165,11 +165,11 @@
import { ElMessageBox } from "element-plus";
import useUserStore from '@/store/modules/user'
import {
- getStockInPage,
- getStockInPageByProduction,
- getStockInPageByCustom,
- delStockIn,
- delStockInCustom,
+ getStockInPage,
+ getStockInPageByProduction,
+ getStockInPageByCustom,
+ delStockIn,
+ delStockInCustom, getInPageByCustom,
} from "@/api/inventoryManagement/stockIn.js";
import FormDia from './components/formDia.vue'
import FormDiaManual from './components/formDiaManual.vue'
@@ -226,7 +226,7 @@
const apiCall = activeTab.value === 'production'
? getStockInPageByProduction(params)
: activeTab.value === 'manual'
- ? getStockInPageByCustom(params)
+ ? getInPageByCustom(params)
: getStockInPage(params)
apiCall.then(res => {
@@ -279,7 +279,14 @@
cancelButtonText: '鍙栨秷',
type: 'warning',
}).then(() => {
- proxy.download("/stockin/export", {}, '鍏ュ簱鍙拌处.xlsx')
+ // 鏍规嵁涓嶅悓鐨� tab 绫诲瀷璋冪敤涓嶅悓鐨勫鍑烘帴鍙�
+ let exportUrl = "/stockin/export"
+ if (activeTab.value === 'production') {
+ exportUrl = "/stockin/exportOne"
+ } else if (activeTab.value === 'manual') {
+ exportUrl = "/stockin/exportTwo"
+ }
+ proxy.download(exportUrl, {}, '鍏ュ簱鍙拌处.xlsx')
}).catch(() => {
proxy.$modal.msg("宸插彇娑�")
})
diff --git a/src/views/inventoryManagement/stockManagement/index.vue b/src/views/inventoryManagement/stockManagement/index.vue
index b3a8467..576173c 100644
--- a/src/views/inventoryManagement/stockManagement/index.vue
+++ b/src/views/inventoryManagement/stockManagement/index.vue
@@ -36,7 +36,9 @@
<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="80" show-overflow-tooltip />
- <el-table-column label="搴撳瓨鏁伴噺" prop="inboundNum0" width="100" show-overflow-tooltip />
+ <el-table-column label="搴撳瓨鏁伴噺" prop="inboundNum" width="100" show-overflow-tooltip />
+ <el-table-column label="宸插嚭搴撴暟閲�" prop="totalInboundNum" width="100" show-overflow-tooltip />
+ <el-table-column label="寰呭嚭搴撴暟閲�" prop="inboundNum0" 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 />
@@ -88,7 +90,9 @@
<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="80" show-overflow-tooltip />
- <el-table-column label="搴撳瓨鏁伴噺" prop="inboundNum0" width="100" show-overflow-tooltip />
+ <el-table-column label="搴撳瓨鏁伴噺" prop="inboundNum" width="100" show-overflow-tooltip />
+ <el-table-column label="宸插嚭搴撴暟閲�" prop="totalInboundNum" width="100" show-overflow-tooltip />
+ <el-table-column label="寰呭嚭搴撴暟閲�" prop="inboundNum0" width="100" show-overflow-tooltip />
<el-table-column label="搴撳瓨棰勮鏁伴噺" prop="warnNum" width="130" 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 />
@@ -106,7 +110,7 @@
</div>
</el-tab-pane>
- <el-tab-pane label="鎵嬪姩鍏ュ簱" name="manual">
+ <el-tab-pane label="鑷畾涔夊叆搴�" name="manual">
<div class="search_form">
<div>
<span class="search_title">渚涘簲鍟嗗悕绉帮細</span>
@@ -142,7 +146,9 @@
<el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" width="200" show-overflow-tooltip />
<el-table-column label="鍗曚綅" prop="unit" width="80" show-overflow-tooltip />
<el-table-column label="鐗╁搧绫诲瀷" prop="itemType" width="120" show-overflow-tooltip />
- <el-table-column label="搴撳瓨鏁伴噺" prop="inboundNum" width="100" show-overflow-tooltip />
+ <el-table-column label="搴撳瓨鏁伴噺" prop="inboundNum" width="100" show-overflow-tooltip />
+ <el-table-column label="宸插嚭搴撴暟閲�" prop="totalInboundNum" width="100" show-overflow-tooltip />
+ <el-table-column label="寰呭嚭搴撴暟閲�" prop="inboundNum0" 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 />
@@ -502,7 +508,14 @@
}
).then(() => {
const exportParams = buildQueryParams()
- proxy.download("/stockin/exportCopy", exportParams, '搴撳瓨淇℃伅.xlsx')
+ // 鏍规嵁涓嶅悓鐨� tab 绫诲瀷璋冪敤涓嶅悓鐨勫鍑烘帴鍙�
+ let exportUrl = "/stockin/exportCopy"
+ if (activeTab.value === 'production') {
+ exportUrl = "/stockin/exportCopyOne"
+ } else if (activeTab.value === 'manual') {
+ exportUrl = "/stockin/exportCopyTwo"
+ }
+ proxy.download(exportUrl, exportParams, '搴撳瓨淇℃伅.xlsx')
}).catch(() => {
proxy.$modal.msg("宸插彇娑�")
})
--
Gitblit v1.9.3