From 783c3d2e636fc9a2742daa5d4d42f2de29bdde7c Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 12 十二月 2025 17:26:39 +0800
Subject: [PATCH] 1.海川开心-销售台账/采购台账，有可能同一个公司不同单子，但是开票登记的时候会一起，一对多或者多对一
---
src/views/inventoryManagement/receiptManagement/index.vue | 122 ++++++++++++++++++++++++----------------
1 files changed, 73 insertions(+), 49 deletions(-)
diff --git a/src/views/inventoryManagement/receiptManagement/index.vue b/src/views/inventoryManagement/receiptManagement/index.vue
index 3080da4..c9f6e46 100644
--- a/src/views/inventoryManagement/receiptManagement/index.vue
+++ b/src/views/inventoryManagement/receiptManagement/index.vue
@@ -1,7 +1,7 @@
<template>
<div class="app-container">
<el-tabs v-model="activeTab" @tab-change="handleTabChange">
- <el-tab-pane label="鐢熶骇鍏ュ簱" name="production">
+ <el-tab-pane label="鎴愬搧鍏ュ簱" name="production">
<div class="search_form">
<div>
<!-- <span class="search_title">瀹㈡埛鍚嶇О锛�</span>-->
@@ -17,6 +17,13 @@
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>
@@ -29,7 +36,7 @@
:summary-method="summarizeMainTable" height="calc(100vh - 18.5em)">
<el-table-column align="center" label="搴忓彿" type="index" width="60" />
<el-table-column label="鍏ュ簱鏃堕棿" prop="createTime" show-overflow-tooltip />
- <el-table-column label="鍏ュ簱鎵规" prop="inboundBatches" show-overflow-tooltip />
+ <!-- <el-table-column label="鍏ュ簱鎵规" prop="inboundBatches" show-overflow-tooltip /> -->
<!-- <el-table-column label="瀹㈡埛鍚嶇О" prop="customerName" width="240" show-overflow-tooltip />-->
<el-table-column label="浜у搧澶х被" prop="productCategory" show-overflow-tooltip />
<el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" show-overflow-tooltip />
@@ -39,67 +46,74 @@
<!-- <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="createBy" width="80" show-overflow-tooltip />
+ <!-- <el-table-column label="鍏ュ簱浜�" prop="createBy" width="80" 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-tab-pane label="閲囪喘鍏ュ簱" name="purchase">-->
-<!-- <div class="search_form">-->
-<!-- <div>-->
+ <el-tab-pane label="鍘熸枡鍏ュ簱" name="purchase">
+ <div class="search_form">
+ <div>
<!--<!– <span class="search_title">渚涘簲鍟嗗悕绉帮細</span>–>-->
<!--<!– <el-input v-model="searchForm.supplierName" style="width: 240px" placeholder="璇疯緭鍏�" @change="handleQuery"–>-->
<!--<!– clearable prefix-icon="Search" />–>-->
-<!-- <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"-->
-<!-- />-->
-<!-- <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="inboundBatches" width="160" show-overflow-tooltip />-->
+ <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="inboundBatches" width="160" show-overflow-tooltip /> -->
<!--<!– <el-table-column label="渚涘簲鍟嗗悕绉�" prop="supplierName" width="240" 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="70" show-overflow-tooltip />-->
-<!-- <el-table-column label="鍏ュ簱鏁伴噺" prop="inboundNum" width="90" 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="70" show-overflow-tooltip />
+ <el-table-column label="鍏ュ簱鏁伴噺" prop="inboundNum" 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="createBy" 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, 'purchase');">缂栬緫</el-button>-->
-<!-- </template>-->
-<!-- </el-table-column>-->
-<!-- </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-table-column label="鍏ュ簱浜�" prop="createBy" 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, 'purchase');">缂栬緫</el-button>
+ </template>
+ </el-table-column>
+ </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-tab-pane label="鎴愬搧鍏ュ簱" name="manual">
+ <el-tab-pane label="鏉愭枡鍏ュ簱" name="manual">
<div class="search_form">
<div>
<!-- <span class="search_title">渚涘簲鍟嗗悕绉帮細</span>-->
@@ -114,6 +128,13 @@
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>
@@ -130,7 +151,7 @@
<el-table-column align="center" type="selection" width="55" />
<el-table-column align="center" label="搴忓彿" type="index" width="60" />
<el-table-column label="鍏ュ簱鏃堕棿" prop="inboundDate" width="100" show-overflow-tooltip />
- <el-table-column label="鍏ュ簱鎵规" prop="inboundBatches" show-overflow-tooltip />
+ <!-- <el-table-column label="鍏ュ簱鎵规" prop="inboundBatches" show-overflow-tooltip /> -->
<!-- <el-table-column label="渚涘簲鍟嗗悕绉�" prop="supplierName" width="240" show-overflow-tooltip /> -->
<el-table-column label="浜у搧澶х被" prop="productCategory" show-overflow-tooltip />
<el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" show-overflow-tooltip />
@@ -200,6 +221,7 @@
searchForm: {
supplierName: '',
customerName: '',
+ productCategory:'',
timeStr: getCurrentDate(),
},
})
@@ -227,6 +249,7 @@
params.supplierName = searchForm.value.supplierName
params.timeStr = searchForm.value.timeStr
}
+ params.productCategory = searchForm.value.productCategory
// 鏍规嵁涓嶅悓鐨� tab 绫诲瀷璋冪敤涓嶅悓鐨勬帴鍙�
const apiCall = activeTab.value === 'production'
@@ -251,6 +274,7 @@
searchForm.value.supplierName = ''
searchForm.value.customerName = ''
searchForm.value.timeStr = ''
+ searchForm.value.productCategory = ''
getList()
}
--
Gitblit v1.9.3