From dce5b612f24808baa90028b878c51f2be33f4163 Mon Sep 17 00:00:00 2001
From: CD配唱片 <CD配唱片>
Date: 星期三, 23 四月 2025 09:22:14 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-kj-web into dev
---
src/views/basicData/event/index.vue | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/views/basicData/event/index.vue b/src/views/basicData/event/index.vue
index 061e383..7a59a76 100644
--- a/src/views/basicData/event/index.vue
+++ b/src/views/basicData/event/index.vue
@@ -177,8 +177,12 @@
</el-form-item>
<el-form-item label="閫傜敤鏃ュ巻" prop="applicableCalendar">
<el-select v-model="form.applicableCalendar" placeholder="璇烽�夋嫨閫傜敤鏃ュ巻">
- <el-option label="Zone one" value="shanghai" />
- <el-option label="Zone two" value="beijing" />
+ <el-option
+ v-for="calendar in calendarList"
+ :key="calendar.id"
+ :label="calendar.description"
+ :value="calendar.id">
+ </el-option>
</el-select>
</el-form-item>
</el-form>
@@ -199,6 +203,7 @@
import { selectProcessNameList } from "@/api/basicData/processRoute.js";
import HxlhTable from '@/components/HxlhTable'
import axios from "axios";
+import {listAll_calendar} from "@/api/basicData/calendar.js";
const { proxy } = getCurrentInstance();
@@ -215,6 +220,7 @@
const shopList = ref([]);
const allShopList = ref([]);
const processList = ref([]);
+const calendarList = ref([]);
const height = ref(document.documentElement.clientHeight - 230 + "px;")
@@ -374,12 +380,14 @@
/** 鏌ヨ宸ュ巶鍒楄〃 */
listAll_plant({}),
/** 鏌ヨ杞﹂棿鍒楄〃 */
- listAll_shop({})
+ listAll_shop({}),
+ listAll_calendar({})
])
- .then(axios.spread((response1, response2, response3) => {
+ .then(axios.spread((response1, response2, response3, response4) => {
eventList.value = response1.rows;
plantList.value = response2.data;
allShopList.value = response3.data;
+ calendarList.value = response4.data;
total.value = response1.total;
loading.value = false;
}))
--
Gitblit v1.9.3