From 6a9d1d79399c445f818120703783e4bdf28ca121 Mon Sep 17 00:00:00 2001
From: zhang_12370 <z2864490065@outlook.com>
Date: 星期四, 26 六月 2025 11:36:08 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/zd-before into dev
---
src/views/warehouseManagement/index.vue | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/views/warehouseManagement/index.vue b/src/views/warehouseManagement/index.vue
index a9016ea..8b73507 100644
--- a/src/views/warehouseManagement/index.vue
+++ b/src/views/warehouseManagement/index.vue
@@ -54,11 +54,11 @@
<el-table-column prop="totalPriceIncludingTax" label="鎬讳环(鍚◣)" width="130" />
<el-table-column prop="priceExcludingTax" label="鍗曚环(涓嶅惈绋�)" width="130" />
<el-table-column prop="totalPriceExcludingTax" label="鎬讳环(涓嶅惈绋�)" width="130" />
- <el-table-column prop="pendingReplenishment" label="寰呰ˉ搴�" width="130" />
+ <el-table-column prop="pendingReplenishment" label="寰呰ˉ搴�" width="130" v-if="activeTab=== 'officialInventory'"/>
<el-table-column label="鐓よ川" align="center" v-if="activeTab=== 'officialInventory'" width="600">
<el-table-column v-for="col in columnTitle" :key="col.prop" :prop="col.prop" :label="col.label" align="center" sortable min-width="200"/>
</el-table-column>
- <el-table-column prop="registrantId" label="鐧昏浜�" width="180"/>
+ <el-table-column prop="registrant" label="鐧昏浜�" width="180"/>
<el-table-column prop="registrationDate" label="鐧昏鏃ユ湡" width="180"/>
<el-table-column fixed="right" label="鎿嶄綔" min-width="60" align="center">
<template #default="scope">
@@ -163,7 +163,7 @@
</template>
</el-dialog>
<!-- 鍚堝苟鏁版嵁寮规 -->
- <el-dialog title="鍚堝苟搴撳瓨" v-model="mergeVisible" width="800px">
+ <el-dialog :title="operationType.value === 'edit' ? '缂栬緫搴撳瓨' : '鍚堝苟搴撳瓨'" v-model="mergeVisible" width="800px">
<el-form :model="mergeForm" :rules="mergeRules" ref="mergeRef" label-width="100px">
<el-row>
<el-col :span="12">
@@ -455,7 +455,8 @@
}
// 鍚堝苟搴撳瓨鏁版嵁鏂规硶
const mergeRows = (type,row) => {
- coalFieldListOption();
+ getDropdownData()
+ coalPlanListOptions()
mergeVisible.value = true;
operationType.value = type;
if (type === 'edit') {
--
Gitblit v1.9.3