From c8b65690b946b28b179796fbe2f020e732043c58 Mon Sep 17 00:00:00 2001
From: 张诺 <zhang_12370@163.com>
Date: 星期四, 08 一月 2026 18:10:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津军泰伟业' into dev_天津军泰伟业
---
src/views/inventoryManagement/stockManagement/index.vue | 99 +++----------------------------------------------
1 files changed, 6 insertions(+), 93 deletions(-)
diff --git a/src/views/inventoryManagement/stockManagement/index.vue b/src/views/inventoryManagement/stockManagement/index.vue
index 00c037c..88d1292 100644
--- a/src/views/inventoryManagement/stockManagement/index.vue
+++ b/src/views/inventoryManagement/stockManagement/index.vue
@@ -102,61 +102,6 @@
<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">
- <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 @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%"
- :row-class-name="tableRowClassName"
- :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="80" show-overflow-tooltip />
- <el-table-column label="鐗╁搧绫诲瀷" prop="itemType" width="120" 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="150"></el-table-column>
- <el-table-column label="鎬讳环(鍏�)" prop="taxInclusiveTotalPrice" width="150"></el-table-column>
- <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);">缂栬緫</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>
@@ -177,15 +122,6 @@
@submit="submitForm"
@close="closeDia"
/>
-
- <!-- 鏉愭枡搴撳瓨寮规 -->
- <FormDiaManual
- v-model:dialogFormVisible="manualDialogVisible"
- :operationType="operationType"
- :formData="form"
- @submit="submitForm"
- @close="closeDia"
- />
</div>
</template>
@@ -199,17 +135,15 @@
import {
getStockManagePage,
getStockManagePageByProduction,
- getStockManagePageByCustom,
delStockManage,
} from "@/api/inventoryManagement/stockManage.js";
import {
updateManagement, updateManagementByCustom, updateStockIn
} from "@/api/inventoryManagement/stockIn.js";
-// 瀵煎叆涓変釜鐙珛鐨勫脊妗嗙粍浠�
+// 瀵煎叆涓や釜鐙珛鐨勫脊妗嗙粍浠�
import FormDiaProduction from './components/FormDiaProduction.vue'
import FormDiaPurchase from './components/FormDiaPurchase.vue'
-import FormDiaManual from './components/FormDiaManual.vue'
const userStore = useUserStore()
const { proxy } = getCurrentInstance()
@@ -232,17 +166,16 @@
const operationType = ref('')
const activeTab = ref('production')
-// 涓変釜鐙珛鐨勫脊妗嗘樉绀虹姸鎬�
+// 寮规鏄剧ず鐘舵��
const productionDialogVisible = ref(false)
const purchaseDialogVisible = ref(false)
-const manualDialogVisible = ref(false)
const data = reactive({
searchForm: {
// supplierName: '',
productCategory:'',
customerName: '',
- timeStr: getCurrentDate(),
+ timeStr: '',
},
form: {
supplierId: null,
@@ -314,14 +247,9 @@
const getList = () => {
tableLoading.value = true
const params = buildQueryParams()
- let apiCall
- if (activeTab.value === 'production') {
- apiCall = getStockManagePageByProduction(params)
- } else if (activeTab.value === 'manual') {
- apiCall = getStockManagePageByCustom(params)
- } else {
- apiCall = getStockManagePage(params)
- }
+ const apiCall = activeTab.value === 'production'
+ ? getStockManagePageByProduction(params)
+ : getStockManagePage(params)
apiCall.then(res => {
tableLoading.value = false
tableData.value = res.data.records
@@ -340,10 +268,6 @@
item.totalPrice = (unitPrice * remainingStock).toFixed(2)
} else if (activeTab.value === 'purchase') {
// 鍘熸枡搴撳瓨锛氬惈绋庢�讳环 = 鍚◣鍗曚环 脳 鍓╀綑搴撳瓨
- const taxInclusiveUnitPrice = parseFloat(item.taxInclusiveUnitPrice) || 0
- item.taxInclusiveTotalPrice = (taxInclusiveUnitPrice * remainingStock).toFixed(2)
- } else if (activeTab.value === 'manual') {
- // 鏉愭枡搴撳瓨锛氬惈绋庢�讳环 = 鍚◣鍗曚环 脳 鍓╀綑搴撳瓨
const taxInclusiveUnitPrice = parseFloat(item.taxInclusiveUnitPrice) || 0
item.taxInclusiveTotalPrice = (taxInclusiveUnitPrice * remainingStock).toFixed(2)
}
@@ -421,8 +345,6 @@
productionDialogVisible.value = true
} else if (activeTab.value === 'purchase') {
purchaseDialogVisible.value = true
- } else if (activeTab.value === 'manual') {
- manualDialogVisible.value = true
}
}
@@ -440,9 +362,6 @@
} else if (activeTab.value === 'purchase') {
// 鍘熸枡搴撳瓨锛氱Щ闄ゅ惈绋庢�讳环瀛楁
delete submitData.taxInclusiveTotalPrice
- } else if (activeTab.value === 'manual') {
- // 鏉愭枡搴撳瓨锛氱Щ闄ゅ惈绋庢�讳环瀛楁
- delete submitData.taxInclusiveTotalPrice
}
// 绉婚櫎鍏朵粬鍙兘鐨勬�讳环瀛楁
@@ -455,9 +374,6 @@
if (activeTab.value === 'production') {
// 鎴愬搧搴撳瓨浣跨敤 updateManagement 鎺ュ彛
apiCall = updateManagement(submitData)
- } else if (activeTab.value === 'manual') {
- // 鏉愭枡搴撳瓨浣跨敤 updateManagementByCustom 鎺ュ彛
- apiCall = updateManagementByCustom(submitData)
} else {
// 鍘熸枡搴撳瓨浣跨敤 updateManagementByCustom 鎺ュ彛
apiCall = updateManagementByCustom(submitData)
@@ -501,7 +417,6 @@
proxy.resetForm("formRef")
productionDialogVisible.value = false
purchaseDialogVisible.value = false
- manualDialogVisible.value = false
}
// 瀵煎嚭
@@ -519,8 +434,6 @@
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(() => {
--
Gitblit v1.9.3