From 444ba76f4cca8a9df3faf61ab33ec631aec7fbba Mon Sep 17 00:00:00 2001 From: chengxiangling <291105840@qq.com> Date: 星期五, 16 五月 2025 16:59:12 +0800 Subject: [PATCH] 提交right-toolbar组件事件调用计划运行模块 --- src/views/basicData/event/index.vue | 26 ++++++++++++++++++-------- 1 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/views/basicData/event/index.vue b/src/views/basicData/event/index.vue index 061e383..e7047b6 100644 --- a/src/views/basicData/event/index.vue +++ b/src/views/basicData/event/index.vue @@ -49,10 +49,10 @@ <!-- placeholder="璇烽�夋嫨浜嬩欢缁撴潫鏃堕棿">--> <!-- </el-date-picker>--> <!-- </el-form-item>--> - <el-form-item> + <!-- <el-form-item> <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button> <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button> - </el-form-item> + </el-form-item> --> </el-form> <el-row :gutter="10" class="mb8"> @@ -94,7 +94,9 @@ v-hasPermi="['core:event:export']" >瀵煎嚭</el-button> </el-col> - <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar> + <right-toolbar v-model:showSearch="showSearch" + @queryTable="handleQuery" + @resetTable="resetQuery"></right-toolbar> </el-row> <HxlhTable @@ -177,8 +179,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 +205,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,8 +222,9 @@ const shopList = ref([]); const allShopList = ref([]); const processList = ref([]); +const calendarList = ref([]); -const height = ref(document.documentElement.clientHeight - 230 + "px;") +const height = ref(document.documentElement.clientHeight - 210 + "px;") // 澶氶�夋閫変腑鏁版嵁 const handleCheckboxChange = (data) => { @@ -374,12 +382,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