From 64f45c75ea93911b9841bf00bb4c436cd294be3a Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 15 九月 2023 18:30:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
company_admin/src/views/business/category.vue | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/company_admin/src/views/business/category.vue b/company_admin/src/views/business/category.vue
index 90fc46f..9833d20 100644
--- a/company_admin/src/views/business/category.vue
+++ b/company_admin/src/views/business/category.vue
@@ -35,8 +35,6 @@
</template>
</el-table-column>
<el-table-column prop="name" label="绫诲埆鍚嶇О" min-width="100px"></el-table-column>
- <el-table-column prop="attrFirst" label="灞炴��1" min-width="100px"></el-table-column>
- <el-table-column prop="attrSecond" label="灞炴��2" min-width="100px"></el-table-column>
<el-table-column prop="sortnum" label="鎺掑簭鐮�(鍗囧簭)" min-width="100px"></el-table-column>
<el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="100px"></el-table-column>
<el-table-column prop="status" label="鐘舵��" min-width="100px">
@@ -130,8 +128,18 @@
paramList: res.paramList,
imgurl: res.imgurl,
budgetList: res.budgetList,
- fileList: res.imgurl ? [ {url: res.prefixUrl + res.imgurl} ] : []
+ type: res.type,
+ platCateId: res.platCateId,
+ tableData: res.paramList.map(item => {
+ return {
+ name: item.name,
+ isselect: item.isselect,
+ isshow: item.isshow
+ }
+ }),
+ fileList: res.imgurl ? [{ url: res.prefixUrl + res.imgurl }] : []
}
+ console.log(obj)
this.$refs.operaCategoryWindow.open('缂栬緫绫诲埆', obj)
})
}
--
Gitblit v1.9.3