|
|
@@ -35,9 +35,9 @@
|
|
|
<el-table-column type="selection" width="50" align="center" />
|
|
|
<el-table-column label="排序" align="center" prop="sortOrder" width="60" />
|
|
|
<el-table-column label="专区名称" align="center" prop="zoneName" min-width="120" />
|
|
|
- <el-table-column label="协会名称" align="center" prop="associationName" min-width="160">
|
|
|
+ <el-table-column label="协会名称" align="center" prop="association_name" min-width="160">
|
|
|
<template #default="scope">
|
|
|
- <span v-if="scope.row.associationName">{{ scope.row.associationName }}</span>
|
|
|
+ <span v-if="scope.row.association_name">{{ scope.row.association_name }}</span>
|
|
|
<span v-else class="text-muted">-</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
@@ -122,8 +122,8 @@
|
|
|
</el-row>
|
|
|
|
|
|
<!-- 协会名称 -->
|
|
|
- <el-form-item label="协会名称" prop="associationName">
|
|
|
- <el-input v-model="form.associationName" placeholder="请输入协会名称"/>
|
|
|
+ <el-form-item label="协会名称" prop="association_name">
|
|
|
+ <el-input v-model="form.association_name" placeholder="请输入协会名称"/>
|
|
|
</el-form-item>
|
|
|
|
|
|
<!-- 图标配置和背景配置并排 -->
|
|
|
@@ -385,7 +385,7 @@ const fuzzyMatch = (rowVal, keyword) => {
|
|
|
const applyFilter = () => {
|
|
|
const q = queryParams;
|
|
|
filteredData.value = allData.value.filter((row) => {
|
|
|
- if (!fuzzyMatch(row.zoneName, q.zoneName) && !fuzzyMatch(row.associationName, q.zoneName)) return false;
|
|
|
+ if (!fuzzyMatch(row.zoneName, q.zoneName) && !fuzzyMatch(row.association_name, q.zoneName)) return false;
|
|
|
return true;
|
|
|
});
|
|
|
};
|
|
|
@@ -428,7 +428,7 @@ function reset() {
|
|
|
form.value = {
|
|
|
id: null,
|
|
|
zoneName: null,
|
|
|
- associationName: null,
|
|
|
+ association_name: null,
|
|
|
sortOrder: getNextSortOrder(),
|
|
|
icon: null,
|
|
|
backgroundImage: null,
|
