From ba79a3ec46100b75675d0a7b5b9bb1b8a0b6e349 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期四, 08 一月 2026 14:07:13 +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 | 76 +------------------------------------
1 files changed, 3 insertions(+), 73 deletions(-)
diff --git a/src/views/inventoryManagement/receiptManagement/index.vue b/src/views/inventoryManagement/receiptManagement/index.vue
index 68b1b77..a0f6e2b 100644
--- a/src/views/inventoryManagement/receiptManagement/index.vue
+++ b/src/views/inventoryManagement/receiptManagement/index.vue
@@ -107,66 +107,9 @@
:page="page.current" :limit="page.size" @pagination="paginationChange" />
</div>
</el-tab-pane>
-
- <el-tab-pane label="鏉愭枡鍏ュ簱" name="manual">
- <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', 'manual')">鏂板鍏ュ簱</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="inboundDate" width="100" show-overflow-tooltip />
- <el-table-column label="鎵规鍙�" prop="code" width="130" 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="itemType" show-overflow-tooltip />
- <el-table-column label="鍏ュ簱鏁伴噺" prop="inboundNum" width="100" show-overflow-tooltip />
- <el-table-column label="鍓╀綑搴撳瓨" prop="inboundNum0" show-overflow-tooltip />
- <el-table-column label="鍗曚环(鍏�)" prop="taxInclusiveUnitPrice" width="150"></el-table-column>
- <el-table-column label="鎬讳环(鍏�)" prop="taxInclusiveTotalPrice" width="150"></el-table-column>
- <el-table-column label="鍏ュ簱浜�" prop="createBy" width="80" show-overflow-tooltip />
- <el-table-column fixed="right" label="鎿嶄綔" width="100" align="center">
- <template #default="scope">
- <el-button link type="primary" size="small" @click="openForm('edit', scope.row, 'manual');">缂栬緫</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-tabs>
<form-dia ref="formDia" @close="handleQuery" @success="handleQuery"></form-dia>
- <form-dia-manual ref="formDiaManual" @close="handleQuery" @success="handleQuery"></form-dia-manual>
<form-dia-product ref="formDiaProduct" @close="handleQuery" @success="handleQuery"></form-dia-product>
</div>
</template>
@@ -181,10 +124,8 @@
getStockInPage,
getStockInPageByProduction,
delStockIn,
- delStockInCustom, getInPageByCustom,
} from "@/api/inventoryManagement/stockIn.js";
import FormDia from './components/formDia.vue'
-import FormDiaManual from './components/formDiaManual.vue'
import FormDiaProduct from './components/formDiaProduct.vue'
// 鑾峰彇褰撳墠鏃ユ湡
@@ -198,7 +139,6 @@
const selectedRows = ref([])
const tableLoading = ref(false)
const formDia = ref()
-const formDiaManual = ref()
const formDiaProduct = ref()
const activeTab = ref('production') // 褰撳墠婵�娲荤殑 tab
@@ -213,7 +153,7 @@
supplierName: '',
customerName: '',
productCategory:'',
- timeStr: getCurrentDate(),
+ timeStr: '',
},
})
const { searchForm } = toRefs(data)
@@ -245,8 +185,6 @@
// 鏍规嵁涓嶅悓鐨� tab 绫诲瀷璋冪敤涓嶅悓鐨勬帴鍙�
const apiCall = activeTab.value === 'production'
? getStockInPageByProduction(params)
- : activeTab.value === 'manual'
- ? getInPageByCustom(params)
: getStockInPage(params)
apiCall.then(res => {
@@ -293,9 +231,7 @@
const openForm = async (type, row, tabType) => {
const currentTab = tabType || activeTab.value
await nextTick(() => {
- if (currentTab === 'manual') {
- formDiaManual.value?.openDialog(type, row)
- } else if (currentTab === 'production') {
+ if (currentTab === 'production') {
formDiaProduct.value?.openDialog(type, row)
}else {
formDia.value?.openDialog(type, row)
@@ -326,8 +262,6 @@
let exportUrl = "/stockin/export"
if (activeTab.value === 'production') {
exportUrl = "/stockin/exportOne"
- } else if (activeTab.value === 'manual') {
- exportUrl = "/stockin/exportTwo"
}
proxy.download(exportUrl, {}, '鍏ュ簱鍙拌处.xlsx')
}).catch(() => {
@@ -355,14 +289,10 @@
// 鎴愬搧鍒犻櫎锛宼ype浼�2
deleteApi = delStockIn
deleteParams = { ids, type: 2 }
- } else if (activeTab.value === 'purchase') {
+ } else {
// 鍘熸枡鍒犻櫎锛宼ype浼�1
deleteApi = delStockIn
deleteParams = { ids, type: 1 }
- } else {
- // 鏉愭枡鍏ュ簱
- deleteApi = delStockInCustom
- deleteParams = { ids }
}
deleteApi(deleteParams).then(() => {
--
Gitblit v1.9.3