From 1d9ac2f72d8780fceeb5b8b2bf3492e73c3afe5f Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 16 十月 2026 12:54:39 +0800
Subject: [PATCH] chore: 和鑫电器配置文件
---
src/views/procurementManagement/procurementLedger/index.vue | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/src/views/procurementManagement/procurementLedger/index.vue b/src/views/procurementManagement/procurementLedger/index.vue
index 6167e6c..a1bc225 100644
--- a/src/views/procurementManagement/procurementLedger/index.vue
+++ b/src/views/procurementManagement/procurementLedger/index.vue
@@ -27,7 +27,7 @@
<el-select v-model="searchForm.stockInStatus" placeholder="璇烽�夋嫨" clearable style="width: 240px"
@change="handleQuery">
<el-option label="寰呭叆搴�" value="寰呭叆搴�" />
- <el-option label="鍏ュ簱涓�" value="鍏ュ簱涓�" />
+ <el-option label="閮ㄥ垎鍏ュ簱" value="鍏ュ簱涓�" />
<el-option label="瀹屽叏鍏ュ簱" value="瀹屽叏鍏ュ簱" />
</el-select>
</el-form-item>
@@ -58,6 +58,7 @@
<el-table-column label="浜у搧澶х被" prop="productCategory" />
<el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" />
<el-table-column label="鍗曚綅" prop="unit" />
+ <el-table-column label="浠舵暟" prop="packagingSpec" />
<el-table-column label="鍏ュ簱瀹℃牳鐘舵��" prop="stockInApprovalStatus" width="120">
<template #default="scope">
<el-tag :type="getStockInApprovalStatusType(scope.row.stockInApprovalStatus)" size="small">
@@ -90,7 +91,7 @@
<el-table-column label="鍏ュ簱鐘舵��" prop="stockInStatus" width="100" show-overflow-tooltip>
<template #default="scope">
<el-tag :type="getStockInStatusType(scope.row.stockInStatus)" size="small">
- {{ scope.row.stockInStatus || '--' }}
+ {{ formatStockInStatus(scope.row.stockInStatus) || '--' }}
</el-tag>
</template>
</el-table-column>
@@ -137,7 +138,7 @@
<el-col :span="12">
<el-form-item label="渚涘簲鍟嗗悕绉帮細" prop="supplierId">
<el-select v-model="form.supplierId" placeholder="璇烽�夋嫨" filterable clearable>
- <el-option v-for="item in supplierList" :key="item.id" :label="item.supplierName" :value="item.id">{{ item.supplierType ? item.supplierName + '---' + item.supplierType : item.supplierName }}</el-option>
+<el-option v-for="item in supplierList" :key="item.id" :label="item.supplierName" :value="item.id">{{ item.supplierName }}</el-option>
</el-select>
</el-form-item>
</el-col>
@@ -208,6 +209,7 @@
<el-table-column label="浜у搧澶х被" prop="productCategory" />
<el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" />
<el-table-column label="鍗曚綅" prop="unit" width="70" />
+ <el-table-column label="浠舵暟" prop="packagingSpec" width="120" show-overflow-tooltip />
<el-table-column label="鏁伴噺" prop="quantity" width="70" />
<!-- <el-table-column label="搴撳瓨棰勮鏁伴噺" prop="warnNum" width="120" show-overflow-tooltip />-->
<el-table-column label="绋庣巼(%)" prop="taxRate" width="80" />
@@ -307,6 +309,13 @@
<el-select v-model="productForm.taxRate" placeholder="璇烽�夋嫨" clearable @change="mathNum">
<el-option v-for="dict in tax_rate" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="30">
+ <el-col :span="12">
+ <el-form-item label="浠舵暟锛�" prop="packagingSpec">
+ <el-input v-model="productForm.packagingSpec" clearable />
</el-form-item>
</el-col>
</el-row>
@@ -480,11 +489,17 @@
return typeMap[status] || "";
};
+// 鍏ュ簱鐘舵�佹樉绀猴細鍏ュ簱涓紙閮ㄥ垎瀹℃牳閫氳繃鍏ュ簱锛夊睍绀轰负閮ㄥ垎鍏ュ簱
+const formatStockInStatus = status => {
+ if (status === "鍏ュ簱涓�") return "閮ㄥ垎鍏ュ簱";
+ return status;
+};
+
// 鑾峰彇鍏ュ簱鐘舵�佹爣绛剧被鍨�
const getStockInStatusType = status => {
const typeMap = {
"寰呭叆搴�": "info", // 寰呭叆搴� - 鐏拌壊
- "鍏ュ簱涓�": "warning", // 鍏ュ簱涓� - 姗欒壊
+ "鍏ュ簱涓�": "warning", // 閮ㄥ垎鍏ュ簱 - 姗欒壊
"瀹屽叏鍏ュ簱": "success", // 瀹屽叏鍏ュ簱 - 缁胯壊
};
return typeMap[status] || "";
@@ -665,6 +680,7 @@
productModelId: "",
specificationModel: "",
unit: "",
+ packagingSpec: "",
quantity: "",
taxInclusiveUnitPrice: "",
taxRate: "",
--
Gitblit v1.9.3