From 9271ff2378b6f6d5577baa9545c57f315d880d05 Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期一, 20 四月 2026 14:59:51 +0800
Subject: [PATCH] Merge branch 'dev_河南_鹤壁天沐玻璃厂' of http://114.132.189.42:9002/r/product-inventory-management into dev_河南_鹤壁天沐玻璃厂
---
src/views/procurementManagement/procurementLedger/index.vue | 62 +++++++++++++++++++++++++++++++
src/views/salesManagement/salesLedger/index.vue | 32 ++++++++--------
2 files changed, 78 insertions(+), 16 deletions(-)
diff --git a/src/views/procurementManagement/procurementLedger/index.vue b/src/views/procurementManagement/procurementLedger/index.vue
index 163d88d..abe1804 100644
--- a/src/views/procurementManagement/procurementLedger/index.vue
+++ b/src/views/procurementManagement/procurementLedger/index.vue
@@ -33,6 +33,20 @@
prefix-icon="Search"
@change="handleQuery" />
</el-form-item>
+ <el-form-item label="鍏ュ簱鐘舵�侊細">
+ <el-select v-model="searchForm.stockStatus"
+ placeholder="璇烽�夋嫨"
+ clearable
+ style="width: 140px"
+ @change="handleQuery">
+ <el-option label="鏈叆搴�"
+ :value="0" />
+ <el-option label="閮ㄥ垎鍏ュ簱"
+ :value="1" />
+ <el-option label="宸插叆搴�"
+ :value="2" />
+ </el-select>
+ </el-form-item>
<el-form-item label="褰曞叆鏃ユ湡锛�">
<el-date-picker v-model="searchForm.entryDate"
value-format="YYYY-MM-DD"
@@ -96,6 +110,16 @@
prop="availableQuality" />
<el-table-column label="閫�璐ф暟閲�"
prop="returnQuality" />
+ <el-table-column label="鍏ュ簱鐘舵��"
+ width="100px"
+ align="center">
+ <template #default="scope">
+ <el-tag :type="getProductStockStatusType(scope.row.productStockStatus)"
+ size="small">
+ {{ stockStatusText[scope.row.productStockStatus] || '鏈叆搴�' }}
+ </el-tag>
+ </template>
+ </el-table-column>
<el-table-column label="绋庣巼(%)"
prop="taxRate" />
<el-table-column label="鍚◣鍗曚环(鍏�)"
@@ -154,6 +178,16 @@
width="200"
show-overflow-tooltip
:formatter="formattedNumber" />
+ <el-table-column label="鍏ュ簱鐘舵��"
+ width="120"
+ align="center">
+ <template #default="scope">
+ <el-tag :type="getStockStatusType(scope.row.stockStatus)"
+ size="small">
+ {{ stockStatusText[scope.row.stockStatus] || '鏈叆搴�' }}
+ </el-tag>
+ </template>
+ </el-table-column>
<el-table-column label="褰曞叆浜�"
prop="recorderName"
width="120"
@@ -808,6 +842,33 @@
return typeMap[status] || "";
};
+ // 鍏ュ簱鐘舵�佹樉绀烘枃鏈�
+ const stockStatusText = {
+ 0: "鏈叆搴�",
+ 1: "閮ㄥ垎鍏ュ簱",
+ 2: "宸插叆搴�",
+ };
+
+ // 鑾峰彇涓昏〃鍏ュ簱鐘舵�佹爣绛剧被鍨�
+ const getStockStatusType = status => {
+ const typeMap = {
+ 0: "info",
+ 1: "success",
+ 2: "success",
+ };
+ return typeMap[status] || "info";
+ };
+
+ // 鑾峰彇浜у搧鍏ュ簱鐘舵�佹爣绛剧被鍨�
+ const getProductStockStatusType = status => {
+ const typeMap = {
+ 0: "info",
+ 1: "warning",
+ 2: "success",
+ };
+ return typeMap[status] || "info";
+ };
+
const templateName = ref("");
const filterInputValue = ref("");
const templateList = ref([]);
@@ -919,6 +980,7 @@
purchaseContractNumber: "", // 閲囪喘鍚堝悓缂栧彿
salesContractNo: "", // 閿�鍞悎鍚岀紪鍙�
projectName: "", // 椤圭洰鍚嶇О
+ stockStatus: undefined, // 鍏ュ簱鐘舵��
entryDate: null, // 褰曞叆鏃ユ湡
entryDateStart: undefined,
entryDateEnd: undefined,
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index 6a71d8a..0de79fd 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -225,9 +225,9 @@
<el-tag v-else-if="scope.row.productStockStatus == 2"
type="success">宸插叆搴�</el-tag>
<el-tag v-else-if="scope.row.productStockStatus == 0"
- type="info">鏈嚭搴�</el-tag>
+ type="info">鏈叆搴�</el-tag>
<el-tag v-else
- type="danger">涓嶈冻</el-tag>
+ type="danger">鏈叆搴�</el-tag>
</template>
</el-table-column>
<!-- <el-table-column label="鍙戣揣鐘舵��" width="140" align="center">
@@ -666,12 +666,12 @@
v-model="scope.row.settlePieceArea"
:min="0"
:step="1"
- :precision="10"
+ :precision="4"
style="width: 100%"
placeholder="璇疯緭鍏�"
clearable
@change="() => handleInlineSettleAreaChange(scope.row)" />
- <span v-else>{{ scope.row.settlePieceArea ?? "" }}</span>
+ <span v-else>{{ scope.row.settlePieceArea ? Number(scope.row.settlePieceArea).toFixed(4) : "" }}</span>
</template>
</el-table-column>
<el-table-column label="鏁伴噺"
@@ -701,10 +701,10 @@
v-model="scope.row.actualTotalArea"
:min="0"
:step="1"
- :precision="10"
+ :precision="4"
style="width: 100%"
placeholder="鑷姩璁＄畻" />
- <span v-else>{{ scope.row.actualTotalArea ?? "" }}</span>
+ <span v-else>{{ scope.row.actualTotalArea ? Number(scope.row.actualTotalArea).toFixed(4) : "" }}</span>
</template>
</el-table-column>
<el-table-column label="鍚◣鍗曚环(鍏�)"
@@ -1341,8 +1341,8 @@
prop="actualPieceArea">
<el-input-number v-model="productForm.actualPieceArea"
:min="0"
- :step="0.00001"
- :precision="5"
+ :step="0.0001"
+ :precision="4"
style="width: 100%"
placeholder="璇疯緭鍏�"
clearable
@@ -1354,8 +1354,8 @@
prop="actualTotalArea">
<el-input-number v-model="productForm.actualTotalArea"
:min="0"
- :step="0.00001"
- :precision="5"
+ :step="0.0001"
+ :precision="4"
style="width: 100%"
placeholder="璇疯緭鍏�"
clearable />
@@ -1366,8 +1366,8 @@
prop="settlePieceArea">
<el-input-number v-model="productForm.settlePieceArea"
:min="0"
- :step="0.00001"
- :precision="5"
+ :step="0.0001"
+ :precision="4"
style="width: 100%"
placeholder="璇疯緭鍏�"
clearable
@@ -1379,8 +1379,8 @@
prop="settleTotalArea">
<el-input-number v-model="productForm.settleTotalArea"
:min="0"
- :step="0.00001"
- :precision="5"
+ :step="0.0001"
+ :precision="4"
style="width: 100%"
placeholder="璇疯緭鍏�"
clearable />
@@ -1391,8 +1391,8 @@
prop="settleTotalArea">
<el-input-number v-model="productForm.settleTotalArea"
:min="0"
- :step="0.00001"
- :precision="5"
+ :step="0.0001"
+ :precision="4"
style="width: 100%"
placeholder="璇疯緭鍏�"
clearable />
--
Gitblit v1.9.3