From e5a70efeaa9fd96ce1242e5d582c8237319fade4 Mon Sep 17 00:00:00 2001
From: 张诺 <zhang_12370@163.com>
Date: 星期五, 10 四月 2026 11:13:15 +0800
Subject: [PATCH] Merge branch 'dev_天津_阳光印刷' of http://114.132.189.42:9002/r/product-inventory-management into dev_天津_阳光印刷
---
src/views/inventoryManagement/stockManagement/Unqualified.vue | 101 +++++++++++++++++++++++++++++++-------------------
1 files changed, 63 insertions(+), 38 deletions(-)
diff --git a/src/views/inventoryManagement/stockManagement/Unqualified.vue b/src/views/inventoryManagement/stockManagement/Unqualified.vue
index 9b5652d..f1b7a2a 100644
--- a/src/views/inventoryManagement/stockManagement/Unqualified.vue
+++ b/src/views/inventoryManagement/stockManagement/Unqualified.vue
@@ -10,50 +10,60 @@
<el-button type="primary" @click="handleQuery" style="margin-left: 10px">鎼滅储</el-button>
</div>
<div>
- <el-button type="primary" @click="isShowNewModal = true">鏂板搴撳瓨</el-button>
+ <el-button type="primary" @click="isShowNewModal = true">鏂板搴撳瓨</el-button>
+ <el-button type="info" plain icon="Upload" @click="isShowImportModal = true">
+ 瀵煎叆搴撳瓨
+ </el-button>
<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" style="width: 100%"
- :row-class-name="tableRowClassName" height="calc(100vh - 18.5em)">
+ :expand-row-keys="expandedRowKeys" :row-key="row => row.id" style="width: 100%"
+ :row-class-name="tableRowClassName" 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="productName" show-overflow-tooltip />
+ <el-table-column label="浠撳簱缂栫爜" prop="warehouseCode" show-overflow-tooltip />
+ <el-table-column label="浠撳簱" prop="warehouseName" show-overflow-tooltip />
+ <el-table-column label="瀛樿揣缂栫爜" prop="productCode" show-overflow-tooltip />
+ <el-table-column label="瀛樿揣" prop="productName" show-overflow-tooltip />
<el-table-column label="瑙勬牸鍨嬪彿" prop="model" show-overflow-tooltip />
- <el-table-column label="鍗曚綅" prop="unit" show-overflow-tooltip />
- <el-table-column label="搴撳瓨鏁伴噺" prop="qualitity" show-overflow-tooltip />
- <el-table-column label="鍐荤粨鏁伴噺" prop="lockedQuantity" show-overflow-tooltip />
+ <el-table-column label="鍗曚綅(涓诲崟浣�)" prop="unit" min-width="100" show-overflow-tooltip />
+ <el-table-column label="鍗曚綅(杈呭崟浣�)" prop="subUnit" min-width="100" show-overflow-tooltip />
+ <el-table-column label="鏁伴噺(涓诲崟浣�)" prop="qualitity" min-width="100" show-overflow-tooltip />
+ <el-table-column label="鏁伴噺(杈呭崟浣�)" prop="subQualitity" min-width="100" show-overflow-tooltip />
<el-table-column label="澶囨敞" prop="remark" show-overflow-tooltip />
<el-table-column label="鏈�杩戞洿鏂版椂闂�" prop="updateTime" 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="showSubtractModal(scope.row)" :disabled="scope.row.unLockedQuantity === 0">棰嗙敤</el-button>
- <el-button link type="primary" size="small" v-if="scope.row.unLockedQuantity > 0" @click="showFrozenModal(scope.row)">鍐荤粨</el-button>
- <el-button link type="primary" size="small" v-if="scope.row.lockedQuantity > 0" @click="showThawModal(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" />
+ :page="page.current" :limit="page.size" @pagination="paginationChange" />
</div>
<new-stock-inventory v-if="isShowNewModal"
- v-model:visible="isShowNewModal"
- type="unqualified"
- @completed="handleQuery" />
+ v-model:visible="isShowNewModal"
+ type="qualified"
+ @completed="handleQuery" />
<subtract-stock-inventory v-if="isShowSubtractModal"
- v-model:visible="isShowSubtractModal"
- :record="record"
- type="unqualified"
- @completed="handleQuery" />
+ v-model:visible="isShowSubtractModal"
+ :record="record"
+ type="qualified"
+ @completed="handleQuery" />
+ <!-- 瀵煎叆搴撳瓨-->
+ <import-stock-inventory v-if="isShowImportModal"
+ v-model:visible="isShowImportModal"
+ type="qualified"
+ @uploadSuccess="handleQuery" />
<!-- 鍐荤粨/瑙ｅ喕搴撳瓨-->
<frozen-and-thaw-stock-inventory v-if="isShowFrozenAndThawModal"
v-model:visible="isShowFrozenAndThawModal"
:record="record"
:operation-type="operationType"
- type="unqualified"
+ type="qualified"
@completed="handleQuery" />
</div>
</template>
@@ -61,12 +71,12 @@
<script setup>
import pagination from '@/components/PIMTable/Pagination.vue'
import { ref, reactive, toRefs, onMounted, getCurrentInstance } from 'vue'
-import { ElMessageBox } from "element-plus";
-import { getStockUninventoryListPage } from "@/api/inventoryManagement/stockUninventory.js";
+import {ElMessage, ElMessageBox} from "element-plus";
+import { getStockInventoryListPage } from "@/api/inventoryManagement/stockInventory.js";
const NewStockInventory = defineAsyncComponent(() => import("@/views/inventoryManagement/stockManagement/New.vue"));
const SubtractStockInventory = defineAsyncComponent(() => import("@/views/inventoryManagement/stockManagement/Subtract.vue"));
+const ImportStockInventory = defineAsyncComponent(() => import("@/views/inventoryManagement/stockManagement/Import.vue"));
const FrozenAndThawStockInventory = defineAsyncComponent(() => import("@/views/inventoryManagement/stockManagement/FrozenAndThaw.vue"));
-
const { proxy } = getCurrentInstance()
const tableData = ref([])
const selectedRows = ref([])
@@ -81,13 +91,17 @@
const isShowNewModal = ref(false)
// 鏄惁鏄剧ず棰嗙敤寮规
const isShowSubtractModal = ref(false)
+
// 鏄惁鏄剧ず鍐荤粨/瑙ｅ喕寮规
const isShowFrozenAndThawModal = ref(false)
// 鎿嶄綔绫诲瀷
const operationType = ref('frozen')
+// 鏄惁鏄剧ず瀵煎叆寮规
+const isShowImportModal = ref(false)
const data = reactive({
searchForm: {
productName: '',
+ rootName:'杈呮潗'
}
})
const { searchForm } = toRefs(data)
@@ -105,7 +119,7 @@
}
const getList = () => {
tableLoading.value = true
- getStockUninventoryListPage({ ...searchForm.value, ...page }).then(res => {
+ getStockInventoryListPage({ ...searchForm.value, ...page }).then(res => {
tableLoading.value = false
tableData.value = res.data.records
total.value = res.data.total
@@ -115,6 +129,17 @@
tableLoading.value = false
})
}
+
+const handleFileSuccess = (response) => {
+ const { code, msg } = response;
+ if (code == 200) {
+ ElMessage({ message: "瀵煎叆鎴愬姛", type: "success" });
+ upload.open = false;
+ emits("uploadSuccess");
+ } else {
+ ElMessage({ message: msg, type: "error" });
+ }
+};
// 鐐瑰嚮棰嗙敤
const showSubtractModal = (row) => {
@@ -146,25 +171,25 @@
// 琛ㄦ牸琛岀被鍚�
const tableRowClassName = ({ row }) => {
- // const stock = Number(row?.unLockedQuantity ?? 0);
- // const warn = Number(row?.warnNum ?? 0);
- // if (!Number.isFinite(stock) || !Number.isFinite(warn)) {
- // return '';
- // }
- // return stock < warn ? 'row-low-stock' : '';
+ const stock = Number(row?.unLockedQuantity ?? 0);
+ const warn = Number(row?.warnNum ?? 0);
+ if (!Number.isFinite(stock) || !Number.isFinite(warn)) {
+ return '';
+ }
+ return stock < warn ? 'row-low-stock' : '';
};
// 瀵煎嚭
const handleOut = () => {
ElMessageBox.confirm(
- '鏄惁纭瀵煎嚭锛�',
- '瀵煎嚭', {
- confirmButtonText: '纭',
- cancelButtonText: '鍙栨秷',
- type: 'warning',
- }
+ '鏄惁纭瀵煎嚭锛�',
+ '瀵煎嚭', {
+ confirmButtonText: '纭',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning',
+ }
).then(() => {
- proxy.download("/stockUninventory/exportStockUninventory", {}, '涓嶅悎鏍煎簱瀛樹俊鎭�.xlsx')
+ proxy.download("/stockInventory/exportStockInventory", {}, '杈呮潗搴撳瓨淇℃伅.xlsx')
}).catch(() => {
proxy.$modal.msg("宸插彇娑�")
})
@@ -177,11 +202,11 @@
<style scoped lang="scss">
:deep(.row-low-stock td) {
- background-color: #fde2e2;
- color: #c45656;
+ // background-color: #fde2e2;
+ // color: #c45656;
}
:deep(.row-low-stock:hover > td) {
- background-color: #fcd4d4;
+ // background-color: #fcd4d4;
}
</style>
--
Gitblit v1.9.3