From 325e771ebdbe407f4c098531aae0c7e20cefc1a0 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期四, 15 一月 2026 14:44:41 +0800
Subject: [PATCH] Merge branch 'dev_天津军泰伟业' of http://114.132.189.42:9002/r/product-inventory-management into dev_天津军泰伟业
---
src/views/inventoryManagement/receiptManagement/index.vue | 513 ++++++++++++++++++++++++++++++++++----------------------
1 files changed, 308 insertions(+), 205 deletions(-)
diff --git a/src/views/inventoryManagement/receiptManagement/index.vue b/src/views/inventoryManagement/receiptManagement/index.vue
index 663d00c..577e0f3 100644
--- a/src/views/inventoryManagement/receiptManagement/index.vue
+++ b/src/views/inventoryManagement/receiptManagement/index.vue
@@ -13,21 +13,23 @@
value-format="YYYY-MM-DD"
format="YYYY-MM-DD"
clearable
- @change="handleQuery" />
+ @change="handleQuery"/>
<span class="search_title ml10">浜у搧澶х被锛�</span>
<el-input v-model="searchForm.productCategory"
style="width: 240px"
placeholder="璇疯緭鍏�"
- clearable />
+ clearable/>
<el-button type="primary"
@click="handleQuery"
- style="margin-left: 10px">鎼滅储</el-button>
+ style="margin-left: 10px">鎼滅储
+ </el-button>
</div>
<div>
<el-button @click="handleOut">瀵煎嚭</el-button>
<el-button type="danger"
plain
- @click="handleDelete">鍒犻櫎</el-button>
+ @click="handleDelete">鍒犻櫎
+ </el-button>
</div>
</div>
<div class="table_list">
@@ -43,32 +45,32 @@
height="calc(100vh - 18.5em)">
<el-table-column align="center"
type="selection"
- width="55" />
+ width="55"/>
<el-table-column align="center"
label="搴忓彿"
type="index"
- width="60" />
+ width="60"/>
<el-table-column label="鍏ュ簱鏃堕棿"
prop="createTime"
- show-overflow-tooltip />
+ show-overflow-tooltip/>
<el-table-column label="閿�鍞悎鍚屽彿"
prop="salesContractNo"
width="180"
- show-overflow-tooltip />
+ show-overflow-tooltip/>
<el-table-column label="浜у搧澶х被"
prop="productCategory"
- show-overflow-tooltip />
+ show-overflow-tooltip/>
<el-table-column label="瑙勬牸鍨嬪彿"
prop="specificationModel"
- show-overflow-tooltip />
+ show-overflow-tooltip/>
<el-table-column label="鍗曚綅"
prop="unit"
width="70"
- show-overflow-tooltip />
+ show-overflow-tooltip/>
<el-table-column label="鍏ュ簱鏁伴噺"
prop="inboundNum"
width="100"
- show-overflow-tooltip />
+ show-overflow-tooltip/>
<el-table-column label="鍗曚环(鍏�)"
prop="unitPrice"
width="150"></el-table-column>
@@ -92,7 +94,7 @@
layout="total, sizes, prev, pager, next, jumper"
:page="page.current"
:limit="page.size"
- @pagination="paginationChange" />
+ @pagination="paginationChange"/>
</div>
</el-tab-pane>
<el-tab-pane label="鍘熸枡鍏ュ簱"
@@ -106,23 +108,26 @@
value-format="YYYY-MM-DD"
format="YYYY-MM-DD"
clearable
- @change="handleQuery" />
+ @change="handleQuery"/>
<span class="search_title ml10">浜у搧澶х被锛�</span>
<el-input v-model="searchForm.productCategory"
style="width: 240px"
placeholder="璇疯緭鍏�"
- clearable />
+ clearable/>
<el-button type="primary"
@click="handleQuery"
- style="margin-left: 10px">鎼滅储</el-button>
+ style="margin-left: 10px">鎼滅储
+ </el-button>
</div>
<div>
<el-button type="primary"
- @click="openForm('add', 'purchase')">鏂板鍏ュ簱</el-button>
+ @click="openForm('add', 'purchase')">鏂板鍏ュ簱
+ </el-button>
<el-button @click="handleOut">瀵煎嚭</el-button>
<el-button type="danger"
plain
- @click="handleDelete">鍒犻櫎</el-button>
+ @click="handleDelete">鍒犻櫎
+ </el-button>
</div>
</div>
<div class="table_list">
@@ -138,37 +143,37 @@
height="calc(100vh - 18.5em)">
<el-table-column align="center"
type="selection"
- width="55" />
+ width="55"/>
<el-table-column align="center"
label="搴忓彿"
type="index"
- width="60" />
+ width="60"/>
<el-table-column label="鍏ュ簱鏃堕棿"
prop="createTime"
width="100"
- show-overflow-tooltip />
+ show-overflow-tooltip/>
<el-table-column label="閲囪喘鍚堝悓鍙�"
prop="purchaseContractNumber"
width="180"
- show-overflow-tooltip />
+ show-overflow-tooltip/>
<el-table-column label="渚涘簲鍟嗗悕绉�"
prop="supplierName"
width="240"
- show-overflow-tooltip />
+ show-overflow-tooltip/>
<el-table-column label="浜у搧澶х被"
prop="productCategory"
- show-overflow-tooltip />
+ show-overflow-tooltip/>
<el-table-column label="瑙勬牸鍨嬪彿"
prop="specificationModel"
- show-overflow-tooltip />
+ show-overflow-tooltip/>
<el-table-column label="鍗曚綅"
prop="unit"
width="70"
- show-overflow-tooltip />
+ show-overflow-tooltip/>
<el-table-column label="鍏ュ簱鏁伴噺"
prop="inboundNum"
width="100"
- show-overflow-tooltip />
+ show-overflow-tooltip/>
<el-table-column label="鍚◣鍗曚环(鍏�)"
prop="taxInclusiveUnitPrice"
width="150"></el-table-column>
@@ -178,7 +183,7 @@
<el-table-column label="鍏ュ簱浜�"
prop="createBy"
width="80"
- show-overflow-tooltip />
+ show-overflow-tooltip/>
<el-table-column fixed="right"
label="鎿嶄綔"
min-width="60"
@@ -188,7 +193,8 @@
:disabled="scope.row.type == 1"
type="primary"
size="small"
- @click="openForm('edit', scope.row, 'purchase');">缂栬緫</el-button>
+ @click="openForm('edit', scope.row, 'purchase');">缂栬緫
+ </el-button>
</template>
</el-table-column>
</el-table>
@@ -197,7 +203,89 @@
layout="total, sizes, prev, pager, next, jumper"
:page="page.current"
:limit="page.size"
- @pagination="paginationChange" />
+ @pagination="paginationChange"/>
+ </div>
+ </el-tab-pane>
+ <el-tab-pane label="鐢熶骇鍏ュ簱"
+ name="product">
+ <div class="search_form">
+ <div>
+ <span class="search_title ml10">鍏ュ簱鏃ユ湡锛�</span>
+ <el-date-picker v-model="searchForm.timeStr"
+ type="date"
+ placeholder="璇烽�夋嫨鏃ユ湡"
+ value-format="YYYY-MM-DD"
+ format="YYYY-MM-DD"
+ clearable
+ @change="handleQuery"/>
+ <span class="search_title ml10">浜у搧澶х被锛�</span>
+ <el-input v-model="searchForm.productCategory"
+ style="width: 240px"
+ placeholder="璇疯緭鍏�"
+ clearable/>
+ <el-button type="primary"
+ @click="handleQuery"
+ style="margin-left: 10px">鎼滅储
+ </el-button>
+ </div>
+ <div>
+ <el-button type="primary"
+ @click="openForm('add', 'purchase')">鏂板鍏ュ簱
+ </el-button>
+ <el-button @click="handleOut">瀵煎嚭</el-button>
+ <el-button type="danger"
+ plain
+ @click="handleDelete">鍒犻櫎
+ </el-button>
+ </div>
+ </div>
+ <div class="table_list">
+ <el-table :data="tableData"
+ border
+ v-loading="tableLoading"
+ @selection-change="handleSelectionChange"
+ :expand-row-keys="expandedRowKeys"
+ :row-key="row => row.id"
+ show-summary
+ style="width: 100%"
+ :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="createTime"
+ width="100"
+ show-overflow-tooltip/>
+ <el-table-column label="浜у搧澶х被"
+ prop="productCategory"
+ show-overflow-tooltip/>
+ <el-table-column label="瑙勬牸鍨嬪彿"
+ prop="specificationModel"
+ show-overflow-tooltip/>
+ <el-table-column label="鍗曚綅"
+ prop="unit"
+ width="220"
+ show-overflow-tooltip/>
+ <el-table-column label="鍏ュ簱鏁伴噺"
+ prop="inboundNum"
+ width="220"
+ show-overflow-tooltip/>
+ <el-table-column label="鍏ュ簱浜�"
+ prop="createBy"
+ width="220"
+ show-overflow-tooltip/>
+ </el-table>
+ <pagination v-show="total > 0"
+ :total="total"
+ layout="total, sizes, prev, pager, next, jumper"
+ :page="page.current"
+ :limit="page.size"
+ @pagination="paginationChange"/>
</div>
</el-tab-pane>
</el-tabs>
@@ -211,165 +299,180 @@
</template>
<script setup>
- import pagination from "@/components/PIMTable/Pagination.vue";
- import {
- ref,
- reactive,
- toRefs,
- onMounted,
- getCurrentInstance,
- nextTick,
- } from "vue";
- import { ElMessageBox } from "element-plus";
- import useUserStore from "@/store/modules/user";
- import dayjs from "dayjs";
- import {
- getStockInPage,
- getStockInPageByProduction,
- delStockIn,
- } from "@/api/inventoryManagement/stockIn.js";
- import FormDia from "./components/formDia.vue";
- import FormDiaProduct from "./components/formDiaProduct.vue";
+import pagination from "@/components/PIMTable/Pagination.vue";
+import {
+ ref,
+ reactive,
+ toRefs,
+ onMounted,
+ getCurrentInstance,
+ nextTick,
+} from "vue";
+import {ElMessageBox} from "element-plus";
+import useUserStore from "@/store/modules/user";
+import dayjs from "dayjs";
+import {
+ getStockInPage,
+ getStockInPageByProduction,
+ getStockInPageByProductProduction,
+ delStockIn,
+} from "@/api/inventoryManagement/stockIn.js";
+import FormDia from "./components/formDia.vue";
+import FormDiaProduct from "./components/formDiaProduct.vue";
- // 鑾峰彇褰撳墠鏃ユ湡
- function getCurrentDate() {
- return dayjs().format("YYYY-MM-DD");
+// 鑾峰彇褰撳墠鏃ユ湡
+function getCurrentDate() {
+ return dayjs().format("YYYY-MM-DD");
+}
+
+const {proxy} = getCurrentInstance();
+
+const tableData = ref([]);
+const selectedRows = ref([]);
+const tableLoading = ref(false);
+const formDia = ref();
+const formDiaProduct = ref();
+const activeTab = ref("production"); // 褰撳墠婵�娲荤殑 tab
+
+const page = reactive({
+ current: 1,
+ size: 100,
+});
+const total = ref(0);
+
+const data = reactive({
+ searchForm: {
+ supplierName: "",
+ customerName: "",
+ productCategory: "",
+ timeStr: "",
+ },
+});
+const {searchForm} = toRefs(data);
+// 鏌ヨ鍒楄〃
+/** 鎼滅储鎸夐挳鎿嶄綔 */
+const handleQuery = () => {
+ page.current = 1;
+ getList();
+};
+const paginationChange = obj => {
+ page.current = obj.page;
+ page.size = obj.limit;
+ getList();
+};
+const pageProductChange = obj => {
+ page.current = obj.page;
+ page.size = obj.limit;
+ getList();
+};
+const getList = () => {
+ tableLoading.value = true;
+ const params = {...page};
+
+ // 鏍规嵁涓嶅悓鐨� tab 绫诲瀷浼犻�掍笉鍚岀殑鏌ヨ鍙傛暟
+ if (activeTab.value === "production") {
+ params.customerName = searchForm.value.customerName;
+ params.timeStr = searchForm.value.timeStr;
+ } else {
+ params.supplierName = searchForm.value.supplierName;
+ params.timeStr = searchForm.value.timeStr;
}
-
- const { proxy } = getCurrentInstance();
-
- const tableData = ref([]);
- const selectedRows = ref([]);
- const tableLoading = ref(false);
- const formDia = ref();
- const formDiaProduct = ref();
- const activeTab = ref("production"); // 褰撳墠婵�娲荤殑 tab
-
- const page = reactive({
- current: 1,
- size: 100,
- });
- const total = ref(0);
-
- const data = reactive({
- searchForm: {
- supplierName: "",
- customerName: "",
- productCategory: "",
- timeStr: "",
- },
- });
- const { searchForm } = toRefs(data);
- // 鏌ヨ鍒楄〃
- /** 鎼滅储鎸夐挳鎿嶄綔 */
- const handleQuery = () => {
- page.current = 1;
- getList();
- };
- const paginationChange = obj => {
- page.current = obj.page;
- page.size = obj.limit;
- getList();
- };
- const getList = () => {
- tableLoading.value = true;
- const params = { ...page };
-
- // 鏍规嵁涓嶅悓鐨� tab 绫诲瀷浼犻�掍笉鍚岀殑鏌ヨ鍙傛暟
- if (activeTab.value === "production") {
- params.customerName = searchForm.value.customerName;
- params.timeStr = searchForm.value.timeStr;
- } else {
- params.supplierName = searchForm.value.supplierName;
- params.timeStr = searchForm.value.timeStr;
- }
- params.productCategory = searchForm.value.productCategory;
-
- // 鏍规嵁涓嶅悓鐨� tab 绫诲瀷璋冪敤涓嶅悓鐨勬帴鍙�
- const apiCall =
- activeTab.value === "production"
- ? getStockInPageByProduction(params)
- : getStockInPage(params);
-
- apiCall
- .then(res => {
- tableLoading.value = false;
- tableData.value = res.data.records;
-
- // 鍓嶇璁＄畻鎬讳环锛氭�讳环 = unitPrice * inboundNum
- tableData.value = tableData.value.map(item => {
- // 浣跨敤鍏ュ簱鏁伴噺璁＄畻鎬讳环
- const inboundNum = Number(item.inboundNum) || 0;
- const unitPrice = Number(item.unitPrice) || 0;
- const taxInclusiveUnitPrice = Number(item.taxInclusiveUnitPrice) || 0;
-
- // 鏍规嵁鏍囩椤电被鍨嬭绠椾笉鍚岀殑鎬讳环
- if (activeTab.value === "production") {
- // 鎴愬搧搴撳瓨锛氭�讳环 = unitPrice * 鍏ュ簱鏁伴噺
- item.totalPrice = (unitPrice * inboundNum).toFixed(2);
- } else {
- // 鍘熸枡鍜屾潗鏂欏簱瀛橈細鍚◣鎬讳环 = taxInclusiveUnitPrice * 鍏ュ簱鏁伴噺
- item.taxInclusiveTotalPrice = (
- taxInclusiveUnitPrice * inboundNum
- ).toFixed(2);
- }
-
- return item;
+ params.productCategory = searchForm.value.productCategory;
+ if (activeTab.value === "production") {
+ getStockInPageByProductProduction(params)
+ .then(res => {
+ tableLoading.value = false;
+ tableData.value = res.data.records;
});
- total.value = res.data.total;
- })
- .catch(() => {
- tableLoading.value = false;
- });
- };
+ }else {
+ // 鏍规嵁涓嶅悓鐨� tab 绫诲瀷璋冪敤涓嶅悓鐨勬帴鍙�
+ const apiCall =
+ activeTab.value === "production"
+ ? getStockInPageByProduction(params)
+ : getStockInPage(params);
- // 鍒囨崲 tab
- const handleTabChange = tabName => {
- page.current = 1;
- // 鍒囨崲 tab 鏃舵竻绌烘悳绱㈡潯浠�
- searchForm.value.supplierName = "";
- searchForm.value.customerName = "";
- searchForm.value.timeStr = "";
- searchForm.value.productCategory = "";
- getList();
- };
+ apiCall
+ .then(res => {
+ tableLoading.value = false;
+ tableData.value = res.data.records;
- // 鎵撳紑寮规
- const openForm = async (type, row, tabType) => {
- const currentTab = tabType || activeTab.value;
- await nextTick(() => {
- if (currentTab === "production") {
- formDiaProduct.value?.openDialog(type, row);
- } else {
- formDia.value?.openDialog(type, row);
- }
- });
- };
+ // 鍓嶇璁＄畻鎬讳环锛氭�讳环 = unitPrice * inboundNum
+ tableData.value = tableData.value.map(item => {
+ // 浣跨敤鍏ュ簱鏁伴噺璁＄畻鎬讳环
+ const inboundNum = Number(item.inboundNum) || 0;
+ const unitPrice = Number(item.unitPrice) || 0;
+ const taxInclusiveUnitPrice = Number(item.taxInclusiveUnitPrice) || 0;
- // 琛ㄦ牸閫夋嫨鏁版嵁
- const handleSelectionChange = selection => {
- selectedRows.value = selection.filter(item => item.id);
- };
+ // 鏍规嵁鏍囩椤电被鍨嬭绠椾笉鍚岀殑鎬讳环
+ if (activeTab.value === "production") {
+ // 鎴愬搧搴撳瓨锛氭�讳环 = unitPrice * 鍏ュ簱鏁伴噺
+ item.totalPrice = (unitPrice * inboundNum).toFixed(2);
+ } else {
+ // 鍘熸枡鍜屾潗鏂欏簱瀛橈細鍚◣鎬讳环 = taxInclusiveUnitPrice * 鍏ュ簱鏁伴噺
+ item.taxInclusiveTotalPrice = (
+ taxInclusiveUnitPrice * inboundNum
+ ).toFixed(2);
+ }
- const expandedRowKeys = ref([]);
+ return item;
+ });
- // 涓昏〃鍚堣鏂规硶
- const summarizeMainTable = param => {
- return proxy.summarizeTable(param, [
- "contractAmount",
- "taxInclusiveTotalPrice",
- "taxExclusiveTotalPrice",
- ]);
- };
+ total.value = res.data.total;
+ })
+ .catch(() => {
+ tableLoading.value = false;
+ });
+ }
- // 瀵煎嚭
- const handleOut = () => {
- ElMessageBox.confirm("鏄惁纭瀵煎嚭锛�", "瀵煎嚭", {
- confirmButtonText: "纭",
- cancelButtonText: "鍙栨秷",
- type: "warning",
- })
+};
+
+// 鍒囨崲 tab
+const handleTabChange = tabName => {
+ page.current = 1;
+ // 鍒囨崲 tab 鏃舵竻绌烘悳绱㈡潯浠�
+ searchForm.value.supplierName = "";
+ searchForm.value.customerName = "";
+ searchForm.value.timeStr = "";
+ searchForm.value.productCategory = "";
+ getList();
+};
+
+// 鎵撳紑寮规
+const openForm = async (type, row, tabType) => {
+ const currentTab = tabType || activeTab.value;
+ await nextTick(() => {
+ if (currentTab === "production") {
+ formDiaProduct.value?.openDialog(type, row);
+ } else {
+ formDia.value?.openDialog(type, row);
+ }
+ });
+};
+
+// 琛ㄦ牸閫夋嫨鏁版嵁
+const handleSelectionChange = selection => {
+ selectedRows.value = selection.filter(item => item.id);
+};
+
+const expandedRowKeys = ref([]);
+
+// 涓昏〃鍚堣鏂规硶
+const summarizeMainTable = param => {
+ return proxy.summarizeTable(param, [
+ "contractAmount",
+ "taxInclusiveTotalPrice",
+ "taxExclusiveTotalPrice",
+ ]);
+};
+
+// 瀵煎嚭
+const handleOut = () => {
+ ElMessageBox.confirm("鏄惁纭瀵煎嚭锛�", "瀵煎嚭", {
+ confirmButtonText: "纭",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ })
.then(() => {
// 鏍规嵁涓嶅悓鐨� tab 绫诲瀷璋冪敤涓嶅悓鐨勫鍑烘帴鍙�
let exportUrl = "/stockin/export";
@@ -381,21 +484,21 @@
.catch(() => {
proxy.$modal.msg("宸插彇娑�");
});
- };
+};
- // 鍒犻櫎
- const handleDelete = () => {
- if (selectedRows.value.length === 0) {
- proxy.$modal.msgWarning("璇烽�夋嫨鏁版嵁");
- return;
- }
- const ids = selectedRows.value.map(item => item.id);
+// 鍒犻櫎
+const handleDelete = () => {
+ if (selectedRows.value.length === 0) {
+ proxy.$modal.msgWarning("璇烽�夋嫨鏁版嵁");
+ return;
+ }
+ const ids = selectedRows.value.map(item => item.id);
- ElMessageBox.confirm("閫変腑鐨勫唴瀹瑰皢琚垹闄わ紝鏄惁纭鍒犻櫎锛�", "鍒犻櫎", {
- confirmButtonText: "纭",
- cancelButtonText: "鍙栨秷",
- type: "warning",
- })
+ ElMessageBox.confirm("閫変腑鐨勫唴瀹瑰皢琚垹闄わ紝鏄惁纭鍒犻櫎锛�", "鍒犻櫎", {
+ confirmButtonText: "纭",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ })
.then(() => {
// 鏍规嵁褰撳墠 tab 绫诲瀷閫夋嫨涓嶅悓鐨勫垹闄ゆ帴鍙ｅ拰type鍙傛暟
let deleteApi, deleteParams;
@@ -403,30 +506,30 @@
if (activeTab.value === "production") {
// 鎴愬搧鍒犻櫎锛宼ype浼�2
deleteApi = delStockIn;
- deleteParams = { ids, type: 2 };
+ deleteParams = {ids, type: 2};
} else {
// 鍘熸枡鍒犻櫎锛宼ype浼�1
deleteApi = delStockIn;
- deleteParams = { ids, type: 1 };
+ deleteParams = {ids, type: 1};
}
deleteApi(deleteParams)
- .then(() => {
- proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- getList();
- })
- .catch(() => {
- proxy.$modal.msgError("鍒犻櫎澶辫触");
- });
+ .then(() => {
+ proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ getList();
+ })
+ .catch(() => {
+ proxy.$modal.msgError("鍒犻櫎澶辫触");
+ });
})
.catch(() => {
proxy.$modal.msg("宸插彇娑�");
});
- };
+};
- onMounted(() => {
- getList();
- });
+onMounted(() => {
+ getList();
+});
</script>
<style scoped lang="scss"></style>
--
Gitblit v1.9.3