From c7bd6db3190ff5c4b55d004db0b9fa944604925f Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期五, 18 十月 2024 11:09:15 +0800
Subject: [PATCH] Merge branch 'lsf-topTask'
---
src/components/SearchBar.vue | 51 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 32 insertions(+), 19 deletions(-)
diff --git a/src/components/SearchBar.vue b/src/components/SearchBar.vue
index fedb1e6..b137a36 100644
--- a/src/components/SearchBar.vue
+++ b/src/components/SearchBar.vue
@@ -1,10 +1,14 @@
<template>
<el-row class="layout">
- <el-col :span="16">
+ <el-col :span="12">
<el-form :inline="true" :model="formSearch">
<el-form-item label="鎬讳换鍔�">
<!-- <el-input v-model="formSearch.topTaskId" placeholder="鎬讳换鍔�" /> -->
- <el-select v-model="formSearch.topTaskId" placeholder="鎬讳换鍔�">
+ <el-select
+ v-model="formSearch.topTaskId"
+ placeholder="鎬讳换鍔�"
+ style="width: 260px"
+ >
<el-option
v-for="s in topTasks"
:key="s.value"
@@ -14,7 +18,11 @@
</el-select>
</el-form-item>
<el-form-item label="鍦烘櫙绫诲瀷">
- <el-select v-model="formSearch.sceneTypeId" placeholder="鍦烘櫙绫诲瀷">
+ <el-select
+ v-model="formSearch.sceneTypeId"
+ placeholder="鍦烘櫙绫诲瀷"
+ style="width: 150px"
+ >
<el-option
v-for="s in sceneTypes"
:key="s.value"
@@ -28,7 +36,7 @@
</el-form-item>
</el-form>
</el-col>
- <el-col :span="8">
+ <el-col :span="12">
<el-row justify="end">
<slot name="summary"></slot>
</el-row>
@@ -38,7 +46,7 @@
<script>
import taskApi from '@/api/fysp/taskApi';
-import { enumScene } from "@/enum/scene";
+import { enumScene } from '@/enum/scene';
export default {
emits: ['onSubmit'],
@@ -48,39 +56,44 @@
sceneTypes: enumScene(2, false),
formSearch: {
topTaskId: '',
- sceneTypeId: '',
- },
+ sceneTypeId: ''
+ }
};
},
methods: {
//鑾峰彇鏌ヨ鏉′欢
getOptions() {
taskApi.getTopTask().then((res) => {
- const list = [];
- res.forEach((r) => {
- list.push({
+ const list = res.map((r) => {
+ return {
value: r.tguid,
label: r.name,
- towncode: r.towncode,
- districtCode: r.districtcode,
- month: r.starttime.slice(0, 7),
- });
+ data: r
+ };
});
this.topTasks = list;
this.formSearch.topTaskId = list[0].value;
- this.$emit('onSubmit', this.formSearch);
+ this.onSubmit();
});
},
//鏌ヨ瀛愪换鍔＄粺璁′俊鎭�
onSubmit() {
- // console.log(this.formSearch.sceneTypeId)
- this.$emit('onSubmit', this.formSearch);
- },
+ const task = this.topTasks.find(
+ (t) => t.data.tguid == this.formSearch.topTaskId
+ );
+ const param = {
+ topTask: task ? task.data : {},
+ sceneTypeId: this.formSearch.sceneTypeId
+ };
+ console.log(param);
+
+ this.$emit('onSubmit', param);
+ }
},
mounted() {
this.formSearch.sceneTypeId = this.sceneTypes[0].value;
this.getOptions();
- },
+ }
};
</script>
--
Gitblit v1.9.3