From 563640b16778af6a281ed9417e2dcbed0ba5aa54 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期三, 08 五月 2024 10:51:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web/src/views/modules/basicInfo/SelectTyModel.vue | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/web/src/views/modules/basicInfo/SelectTyModel.vue b/web/src/views/modules/basicInfo/SelectTyModel.vue
index 894e6ae..19ca724 100644
--- a/web/src/views/modules/basicInfo/SelectTyModel.vue
+++ b/web/src/views/modules/basicInfo/SelectTyModel.vue
@@ -13,6 +13,9 @@
@selection-change="changeRow">
<el-table-column type="selection" width="40" align="center"/>
<el-table-column prop="name" label="鍚嶇О"/>
+ <zt-table-column-dict v-if="!pageCode" prop="nodeType" label="鑺傜偣绫诲瀷" dict="product"/>
+ <zt-table-column-dict v-else prop="productType" label="鑺傜偣绫诲瀷" dict="product"/>
+ <el-table-column prop="sort" label="鎺掑簭"/>
</el-table>
</zt-table-wraper>
</div>
--
Gitblit v1.9.1