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/issueManagement/index.vue | 67 ++++-----------------------------
1 files changed, 9 insertions(+), 58 deletions(-)
diff --git a/src/views/inventoryManagement/issueManagement/index.vue b/src/views/inventoryManagement/issueManagement/index.vue
index 57ac9be..3df20a8 100644
--- a/src/views/inventoryManagement/issueManagement/index.vue
+++ b/src/views/inventoryManagement/issueManagement/index.vue
@@ -77,45 +77,6 @@
: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-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 @click="handleOut">瀵煎嚭</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="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="inboundNum0" width="90" 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(scope.row);">棰嗙敤</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>
<el-dialog v-model="dialogFormVisible" :title="getDialogTitle()" width="40%" @close="closeDia">
<el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
@@ -154,7 +115,6 @@
import {
getStockInPage,
getStockInPageByProduction,
- getStockInPageByCustom, getInPageByCustom
} from "@/api/inventoryManagement/stockIn.js";
import {
getStockManagePage,
@@ -187,7 +147,7 @@
nickName: '',
userId: '',
productCategory:'',
- timeStr: getCurrentDate(),
+ timeStr: '',
},
form: {
productrecordId: '',
@@ -225,8 +185,6 @@
let apiCall
if (activeTab.value === 'production') {
apiCall = getStockInPageByProduction(params)
- } else if (activeTab.value === 'manual') {
- apiCall = getInPageByCustom(params)
} else {
apiCall = getStockInPage(params)
}
@@ -312,14 +270,14 @@
}
proxy.$refs["formRef"].validate(valid => {
if (valid && currentRowId.value) {
- const typeMap = { production: 2, purchase: 1, manual: 3 }
+ const typeMap = { production: 2, purchase: 1 }
const outData = {
id: currentRowId.value, // 鍘熷璁板綍ID
- salesLedgerProductId: activeTab.value === 'manual' ? 0 : salesLedgerProductId.value,
+ salesLedgerProductId: salesLedgerProductId.value,
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
}
console.log(outData)
@@ -353,8 +311,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(() => {
@@ -399,8 +355,7 @@
const getDialogTitle = () => {
const titleMap = {
production: '鏂板鍙戣揣',
- purchase: '鏂板棰嗙敤',
- manual: '鏂板棰嗙敤'
+ purchase: '鏂板棰嗙敤'
};
return titleMap[activeTab.value] || '鏂板鍑哄簱';
};
@@ -409,8 +364,7 @@
const getAvailableQuantityText = () => {
const textMap = {
production: '鍙彂璐ф暟閲�',
- purchase: '鍙鐢ㄦ暟閲�',
- manual: '鍙鐢ㄦ暟閲�'
+ purchase: '鍙鐢ㄦ暟閲�'
};
return textMap[activeTab.value] || '鍙嚭搴撴暟閲�';
};
@@ -419,8 +373,7 @@
const getQuantityLabel = () => {
const labelMap = {
production: '鍙戣揣鏁伴噺锛�',
- purchase: '棰嗙敤鏁伴噺锛�',
- manual: '棰嗙敤鏁伴噺锛�'
+ purchase: '棰嗙敤鏁伴噺锛�'
};
return labelMap[activeTab.value] || '鍑哄簱鏁伴噺锛�';
};
@@ -429,8 +382,7 @@
const getDateLabel = () => {
const labelMap = {
production: '鍙戣揣鏃ユ湡锛�',
- purchase: '棰嗙敤鏃ユ湡锛�',
- manual: '棰嗙敤鏃ユ湡锛�'
+ purchase: '棰嗙敤鏃ユ湡锛�'
};
return labelMap[activeTab.value] || '鍑哄簱鏃ユ湡锛�';
};
@@ -439,8 +391,7 @@
const getPersonLabel = () => {
const labelMap = {
production: '鍙戣揣浜猴細',
- purchase: '棰嗙敤浜猴細',
- manual: '棰嗙敤浜猴細'
+ purchase: '棰嗙敤浜猴細'
};
return labelMap[activeTab.value] || '鍑哄簱浜猴細';
};
--
Gitblit v1.9.3