|
|
@@ -22,7 +22,7 @@
|
|
|
</el-form-item>
|
|
|
<el-form-item label="活动分类" prop="categoryIdsArr">
|
|
|
<el-select v-model="basicForm.categoryIdsArr" placeholder="请选择活动分类(可多选)" class="select-box" style="width: 440px;" multiple collapse-tags>
|
|
|
- <el-option v-for="item in categoryOptions" :key="item.id" :label="item.categoryName" :value="item.id"></el-option>
|
|
|
+ <el-option v-for="item in categoryOptions" :key="item.id" :label="item.categoryName" :value="String(item.id)"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="活动名称" prop="activityName">
|
|
|
@@ -431,10 +431,14 @@ export default {
|
|
|
// this.basicForm = { ...this.basicForm, ...res.data }
|
|
|
this.updateObjectFromSource(this.basicForm, res.data)
|
|
|
// 解析后端存的 CSV(category_ids)到数组供 el-select multiple 使用
|
|
|
- if (res.data.categoryIds) {
|
|
|
- this.basicForm.categoryIdsArr = res.data.categoryIds.split(',').map(Number).filter(n => !isNaN(n))
|
|
|
- } else if (res.data.categoryId) {
|
|
|
- this.basicForm.categoryIdsArr = [res.data.categoryId]
|
|
|
+ const rawCategoryIds = Array.isArray(res.data.categoryIds)
|
|
|
+ ? res.data.categoryIds
|
|
|
+ : String(res.data.categoryIds || '').split(',')
|
|
|
+ const categoryIds = rawCategoryIds.map(id => String(id).trim()).filter(Boolean)
|
|
|
+ if (categoryIds.length > 0) {
|
|
|
+ this.basicForm.categoryIdsArr = categoryIds
|
|
|
+ } else if (res.data.categoryId !== null && res.data.categoryId !== undefined && res.data.categoryId !== '') {
|
|
|
+ this.basicForm.categoryIdsArr = [String(res.data.categoryId)]
|
|
|
} else {
|
|
|
this.basicForm.categoryIdsArr = []
|
|
|
}
|