From 6378fa4ea01c8c6a92bd3bf710686f5deedf99dd Mon Sep 17 00:00:00 2001 From: yz3456 <2753272399@qq.com> Date: 星期六, 06 四月 2024 17:45:29 +0800 Subject: [PATCH] 完善家庭会议模块 --- ruoyi-ui/src/views/meeting/index.vue | 172 ++++++++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 151 insertions(+), 21 deletions(-) diff --git a/ruoyi-ui/src/views/meeting/index.vue b/ruoyi-ui/src/views/meeting/index.vue index 22a36d5..0d8eda7 100644 --- a/ruoyi-ui/src/views/meeting/index.vue +++ b/ruoyi-ui/src/views/meeting/index.vue @@ -21,7 +21,7 @@ <hr> - <el-form :model="queryParams1"> +<!-- <el-form :model="queryParams1"> <el-row> <el-form-item label="" prop="people"> <el-input v-model="queryParams1.people" placeholder="璇疯緭鍏ユ悳绱㈠唴瀹�" clearable style="width: 200px; @@ -33,6 +33,69 @@ </el-input> </el-form-item> </el-row> + </el-form> --> + + <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"> + + <el-form-item label="鏃堕棿" prop="happenTime"> + <el-date-picker + v-model="dateRange" + style="width: 240px; + height: 35px; + border-radius: 16px 16px 16px 16px; + opacity: 0.5;" + value-format="yyyy-MM-dd" + type="daterange" + range-separator="-" + start-placeholder="寮�濮嬫棩鏈�" + end-placeholder="缁撴潫鏃ユ湡" + ></el-date-picker> + </el-form-item> + <el-form-item label="鍦扮偣" prop="address" > + <el-input + v-model="queryParams.address" + placeholder="璇疯緭鍏ュ湴鐐�" + clearable + style="width: 200px; + height: 35px; + border-radius: 16px 16px 16px 16px; + opacity: 0.5;" + @keyup.enter.native="handleQuery" + /> + </el-form-item> + <el-form-item label="鐢宠閮ㄩ棬鎴栧搴�" prop="applyOrganization" > + <el-input + v-model="queryParams.applyOrganization" + placeholder="璇疯緭鍏ョ敵璇烽儴闂ㄦ垨瀹跺涵" + clearable + style="width: 200px; + height: 35px; + border-radius: 16px 16px 16px 16px; + opacity: 0.5;" + @keyup.enter.native="handleQuery" + /> + </el-form-item> + <el-form-item label="鐢宠浜�" prop="applicant" > + <el-input + v-model="queryParams.applicant" + placeholder="璇疯緭鍏ョ敵璇蜂汉" + clearable + style="width: 200px; + height: 35px; + border-radius: 16px 16px 16px 16px; + opacity: 0.5;" + @keyup.enter.native="handleQuery" + /> + + </el-form-item> + + <el-form-item> + <el-button size="mini" @click="handleQuery" style=" width: 65px; height: 32px;background: #FFDDE3; + border-radius: 6px 6px 6px 6px;opacity:1;">鎼滅储</el-button> + <el-button size="mini" @click="resetQuery" style=" width: 65px;height: 32px; background: #FFDDE3; + border-radius: 6px 6px 6px 6px; + opacity: 1;">閲嶇疆</el-button> + </el-form-item> </el-form> <el-table :data="tableData" border :header-cell-style="{ background: 'pink', fontSize: '13px', color: 'black' }" @@ -114,11 +177,18 @@ <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body> <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px"> - <el-form-item label="鏃堕棿" prop="timeSpan"> - <el-date-picker v-model="formDat.timeSpan" type="datetimerange" range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�" - end-placeholder="缁撴潫鏃ユ湡" value-format="yyyy-MM-dd HH:mm:ss"> - </el-date-picker> + + <el-form-item label="寮�濮嬫椂闂�" prop="happenTime"> + <el-date-picker v-model="formDat.happenTime" type="date" placeholder="璇烽�夋嫨鏃ユ湡" + :editable="false" :clearable="false" :style="{width: '100%'}" value-format="yyyy-MM-dd" + ></el-date-picker> </el-form-item> + <el-form-item label="缁撴潫鏃堕棿" prop="endTime"> + <el-date-picker v-model="formDat.endTime" type="date" placeholder="璇烽�夋嫨鏃ユ湡" + :editable="false" :clearable="false" :style="{width: '100%'}" value-format="yyyy-MM-dd" + ></el-date-picker> + </el-form-item> + <el-form-item label="鏍囬" prop="meetingTitle"> <el-input v-model="formDat.meetingTitle" placeholder="璇疯緭鍏ヤ細璁爣棰�" clearable :style="{width: '100%'}"> </el-input> @@ -131,7 +201,6 @@ <el-input v-model="formDat.capacity" placeholder="璇疯緭鍏ュ彲瀹圭撼浜烘暟" clearable :style="{width: '100%'}"> </el-input> </el-form-item> - <el-form-item label="鍙備笌浜烘暟" prop="attendance"> <el-input v-model="formDat.attendance" placeholder="璇疯緭鍏ュ弬涓庝汉鏁�" clearable :style="{width: '100%'}"> @@ -146,10 +215,9 @@ </el-input> </el-form-item> <el-form-item label="鏄惁鎷滆姘寸墝" prop="status"> - <el-select v-model="formDat.status" placeholder="璇烽�夋嫨 " clearable :style="{width: '100%'}" - :disabled="dsb"> - <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" - :value="item.value"></el-option> + <el-select v-model="formDat.status" placeholder="璇烽�夋嫨" clearable :style="{width: '100%'}"> + <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value" + ></el-option> </el-select> </el-form-item> <el-form-item label="鑱旂郴浜�" prop="name"> @@ -176,9 +244,12 @@ export default { data() { return { + // 鏄剧ず鎼滅储鏉′欢 + showSearch: true, open: false, title: "", tableData: [{ + title: '1', name: 'asasd', address: 'asdadsdasd', @@ -229,11 +300,9 @@ }, ], formDat:{ - timeSpan: undefined, id: undefined, happenTime: undefined, endTime: undefined, - timeSpan: undefined, meetingTitle: undefined, address: undefined, meetingID: undefined, @@ -246,18 +315,79 @@ url: "", status: undefined }, - queryParams1: { - pageNum: 1, - pageSize: 10, - happenTime: undefined, - people: undefined, - address: undefined, - title: undefined, - remark: undefined - } + queryParams: { + pageNum: 1, + pageSize: 10, + content:undefined, + buyer:undefined, + location:undefined, + createDate:undefined, + happenTime:undefined + }, + dateRange: [], + // 琛ㄥ崟鏍¢獙 + rules: { + name: [{ + required: true, + message: '璇疯緭鍏ヨ澶囧悕绉�', + trigger: 'blur' + }], + status: [{ + // required: true, + message: '鏄惁娉ㄩ攢', + trigger: 'change' + }], + buyer: [{ + required: true, + message: '璇疯緭鍏ヨ喘涔颁汉', + trigger: 'blur' + }], + location: [{ + required: true, + message: '璇疯緭鍏ュ瓨鏀惧湴鐐�', + trigger: 'blur' + }], + remark: [{ + // required: true, + message: '璇疯緭鍏ュ娉�', + trigger: 'blur' + }], + + happenTime: [{ + required: true, + message: '璇烽�夋嫨鏃ユ湡閫夋嫨', + trigger: 'blur' + }], + content: [{ + required: true, + message: '璇疯緭鍏ユ爣棰�', + trigger: 'blur' + }], + }, + typeOptions: [{ + value: '1', + label: '鏄�', + }, + { + value: '0', + label: '鍚�', + }], + } }, methods: { + /** 鎼滅储鎸夐挳鎿嶄綔 */ + handleQuery() { + this.queryParams.pageNum = 1; + this.getList(); + }, + /** 閲嶇疆鎸夐挳鎿嶄綔 */ + resetQuery() { + this.dateRange = []; + this.resetForm("queryForm"); + this.handleQuery(); + }, + newRequest(){ this.open = true; -- Gitblit v1.9.1