From 8288a11ac7af4d4fb40d3d3b038b772ee154f616 Mon Sep 17 00:00:00 2001
From: YM <479443481@qq.com>
Date: 星期一, 22 七月 2024 18:20:19 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/TCM_CharacterLibrary
---
src/pages/academicSchools/index.vue | 132 ++++++++++++++++++++++++++++++--------------
1 files changed, 90 insertions(+), 42 deletions(-)
diff --git a/src/pages/academicSchools/index.vue b/src/pages/academicSchools/index.vue
index 311a0a1..45652ba 100644
--- a/src/pages/academicSchools/index.vue
+++ b/src/pages/academicSchools/index.vue
@@ -6,7 +6,7 @@
<!-- 楂樼骇鎼滅储 -->
<view
style="
- margin-left: 0.6rem;
+ padding-left: 0.6rem;
margin-top: 0.1rem;
display: flex;
position: relative;
@@ -43,9 +43,76 @@
</li>
</ul>
</view>
- <view v-if="isAdvancedSearch">
- <h3>楂樼骇鎼滅储</h3>
- <MyForm @submit="onSubmit" :from="searchFrom" />
+ <view v-if="isAdvancedSearch" class="searchDialog">
+ <h3 style="margin-bottom: 0.2rem">楂樼骇鎼滅储</h3>
+ <el-form label-width="100px" :model="formData" size="mini">
+ <el-row>
+ <el-col :span="8">
+ <el-form-item label="濮撳悕/鍒悕锛�">
+ <el-input v-model="formData.name"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="娲诲姩鍦帮細">
+ <el-select
+ style="width: 100%"
+ v-model="formData.actively"
+ placeholder="璇烽�夋嫨娲诲姩鍦�"
+ >
+ <!-- <el-option label="鍖哄煙涓�" value="shanghai"></el-option> -->
+ <!-- <el-option label="鍖哄煙浜�" value="beijing"></el-option> -->
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="浣滃搧锛�">
+ <el-input v-model="formData.works"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="8">
+ <el-form-item label="浜虹墿鏍囩锛�">
+ <el-select
+ style="width: 100%"
+ v-model="formData.personTags"
+ placeholder="璇烽�夋嫨浜虹墿鏍囩"
+ >
+ <!-- <el-option label="鍖哄煙涓�" value="shanghai"></el-option> -->
+ <!-- <el-option label="鍖哄煙浜�" value="beijing"></el-option> -->
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="绀句細韬唤锛�">
+ <el-select
+ style="width: 100%"
+ v-model="formData.socialIdentity"
+ placeholder="璇烽�夋嫨绀句細韬唤"
+ >
+ <!-- <el-option label="鍖哄煙涓�" value="shanghai"></el-option> -->
+ <!-- <el-option label="鍖哄煙浜�" value="beijing"></el-option> -->
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="鏃舵湡锛�">
+ <el-select
+ style="width: 100%"
+ v-model="formData.period"
+ placeholder="璇烽�夋嫨鏃舵湡"
+ >
+ <!-- <el-option label="鍖哄煙涓�" value="shanghai"></el-option> -->
+ <!-- <el-option label="鍖哄煙浜�" value="beijing"></el-option> -->
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ <div style="text-align: right">
+ <el-button type="primary" size="mini">鎼滅储</el-button>
+ <el-button size="mini">閲嶇疆</el-button>
+ </div>
</view>
<div v-if="showPerson" class="personDialog">
<i
@@ -164,44 +231,14 @@
name: "",
},
isAdvancedSearch: false,
- searchFrom: [
- {
- type: "input",
- label: "濮撳悕/鍒悕",
- name: "name",
- value: "",
- },
- {
- type: "input",
- label: "娲诲姩鍦�",
- name: "address",
- value: "",
- },
- {
- type: "input",
- label: "浣滃搧",
- name: "address",
- value: "",
- },
- {
- type: "input",
- label: "浜虹墿鏍囩",
- name: "address",
- value: "",
- },
- {
- type: "input",
- label: "绀句細韬唤",
- name: "address",
- value: "",
- },
- {
- type: "input",
- label: "鏃舵湡",
- name: "address",
- value: "",
- },
- ],
+ formData: {
+ name: "",
+ actively: "",
+ works: "",
+ personTags: "",
+ socialIdentity: "",
+ period: ""
+ },
showPerson: false,
personList: [],
personPageInfo: {
@@ -887,6 +924,17 @@
}
}
+.searchDialog {
+ position: absolute;
+ top: 0.68rem;
+ left: 0;
+ right: 0;
+ z-index: 999;
+ padding: 0.1rem 0.4rem;
+ background: #fff;
+ min-height: 2rem;
+}
+
.personDialog {
position: absolute;
top: 0.68rem;
--
Gitblit v1.9.1