From 3119fa3f7f7a1791d918d77d3e8315d762719ab7 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期日, 13 十月 2024 22:23:10 +0800
Subject: [PATCH] 修改bug
---
ruoyi-ui/src/views/meeting/index.vue | 158 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 115 insertions(+), 43 deletions(-)
diff --git a/ruoyi-ui/src/views/meeting/index.vue b/ruoyi-ui/src/views/meeting/index.vue
index c3cb233..3c9b044 100644
--- a/ruoyi-ui/src/views/meeting/index.vue
+++ b/ruoyi-ui/src/views/meeting/index.vue
@@ -1,5 +1,5 @@
<template>
- <div class="app-container">
+ <div class="app-container" style="opacity: 1;">
<el-backtop :bottom="150" :right="30">
<el-button type="primary" circle class="el-icon-top"></el-button>
@@ -10,30 +10,16 @@
<span>浼氳鐢宠</span>
<div class="button-container"></div>
<div style="display: flex; align-items: center;">
- <el-button @click="newRequest" size="mini" type="text" v-hasPermi="['person:information:memo']" style="margin-left: 200px">
+ <!-- <el-button @click="newRequest" size="mini" type="text" v-hasPermi="['person:information:memo']" style="margin-left: 200px">
<div class="form"><el-icon style="padding-right:100px;"></el-icon>
<span class="text" style="width: 69px;height: 26px;font-size: 16px;
font-family: Microsoft YaHei-Regular, Microsoft YaHei; color: #EBA4AA;">鏂扮敵璇�</span>
</div>
- </el-button>
+ </el-button> -->
</div>
</h1>
<hr>
-
-<!-- <el-form :model="queryParams1">
- <el-row>
- <el-form-item label="" prop="people">
- <el-input v-model="queryParams1.people" placeholder="璇疯緭鍏ユ悳绱㈠唴瀹�" clearable style="width: 200px;
- height: 35px;
- text-align: left;
- border-radius: 16px 16px 16px 16px;
- opacity: 0.5;" @keyup.enter.native="handleQuery">
- <i slot="prefix" class="el-input__icon el-icon-search"></i>
- </el-input>
- </el-form-item>
- </el-row>
- </el-form> -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
@@ -44,7 +30,7 @@
height: 35px;
border-radius: 16px 16px 16px 16px;
opacity: 0.5;"
- value-format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd HH:mm:ss"
type="daterange"
range-separator="-"
start-placeholder="寮�濮嬫棩鏈�"
@@ -99,16 +85,16 @@
</el-form>
<el-row :gutter="10" class="mb8">
- <!-- <el-col :span="1.5">
+ <el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
- @click="handleAdd"
- v-hasPermi="['system:role:add']"
+ @click="newRequest"
+ v-hasPermi="['person:information:memo']"
>鏂板</el-button>
- </el-col> -->
+ </el-col>
<el-col :span="1.5">
<el-button
@@ -162,7 +148,7 @@
</el-row>
- <el-table v-loading="loading" :data="meetingList" :row-key="getRowId" ref="multipleTable"
+ <el-table v-loading="loading" border :data="meetingList" :row-key="getRowId" ref="multipleTable"
@selection-change="handleSelectionChange" :row-class-name="tableRowClassName">
<el-table-column type="selection" :reserve-selection="true" width="55" align="center" />
@@ -177,52 +163,52 @@
scope.row.place ? scope.row.place : '鈥斺�斺�斺��' }}</template>
</el-table-column>
- <el-table-column label="鍙绾充汉鏁�" prop="conPeople" sortable align="center">
+ <el-table-column label="鍙绾充汉鏁�" prop="conPeople" sortable align="center" min-width="150">
<template slot-scope="scope">{{
scope.row.conPeople ? scope.row.conPeople : '鈥斺�斺�斺��' }}</template>
</el-table-column>
- <el-table-column label="鍙備笌浜烘暟" prop="partPeople" sortable align="center">
+ <el-table-column label="鍙備笌浜烘暟" prop="partPeople" sortable align="center" min-width="120">
<template slot-scope="scope">{{
scope.row.partPeople ? scope.row.partPeople : '鈥斺�斺�斺��' }}</template>
</el-table-column>
- <el-table-column label="鐢宠浜�" prop="applyPerson" sortable align="center">
+ <el-table-column label="鐢宠浜�" prop="applyPerson" sortable align="center" min-width="120">
<template slot-scope="scope">{{
scope.row.applyPerson ? scope.row.applyPerson : '鈥斺�斺�斺��' }}</template>
</el-table-column>
- <el-table-column label="鐢宠閮ㄩ棬鎴栧搴�" prop="applyApart" sortable align="center">
+ <el-table-column label="鐢宠閮ㄩ棬鎴栧搴�" prop="applyApart" sortable align="center" min-width="150">
<template slot-scope="scope">{{
scope.row.applyApart ? scope.row.applyApart : '鈥斺�斺�斺��' }}</template>
</el-table-column>
- <el-table-column label="寮�濮嬫椂闂�" prop="startTime" sortable align="center">
+ <el-table-column label="寮�濮嬫椂闂�" prop="startTime" sortable align="center"min-width="120">
<template slot-scope="scope">{{ scope.row.startTime
? scope.row.startTime : '鈥斺�斺�斺��' }}</template>
</el-table-column>
- <el-table-column label="缁撴潫鏃堕棿" prop="endTime" sortable align="center">
+ <el-table-column label="缁撴潫鏃堕棿" prop="endTime" sortable align="center" min-width="120">
<template slot-scope="scope">{{ scope.row.endTime ?
scope.row.endTime : '鈥斺�斺�斺��' }}</template>
</el-table-column>
- <el-table-column label="鏄惁鎽嗘斁姘寸墝" prop="isPlacebrand" sortable align="center">
+ <el-table-column label="鏄惁鎽嗘斁姘寸墝" prop="isPlacebrand" sortable align="center" min-width="150">
<template slot-scope="scope">{{scope.row.isPlacebrand===1? '鏄�': '鍚�'}}</template>
</el-table-column>
- <el-table-column label="鑱旂郴浜�" prop="connPerson" sortable align="center">
+ <el-table-column label="鑱旂郴浜�" prop="connPerson" sortable align="center" min-width="100">
<template slot-scope="scope">{{ scope.row.connPerson ?
scope.row.connPerson : '鈥斺�斺�斺��' }}</template>
</el-table-column>
- <el-table-column label="鑱旂郴鐢佃瘽" prop="connPhone" sortable align="center">
+ <el-table-column label="鑱旂郴鐢佃瘽" prop="connPhone" sortable align="center" min-width="100">
<template slot-scope="scope">{{ scope.row.connPhone
? scope.row.connPhone : '鈥斺�斺�斺��' }}</template>
</el-table-column>
<el-table-column label="鐘舵��" prop="statu" sortable align="center">
- <template slot-scope="scope">{{scope.row.statu===1? '鍚屾剰': '鎷掔粷'}}</template>
+ <template slot-scope="scope">{{scope.row.statu===1? '鍚屾剰': (scope.row.statu ===0 ? '鎷掔粷' : '寰呭鎵�')}}</template>
</el-table-column>
<el-table-column label="鎿嶄綔" align="center" width="200" class-name="small-padding fixed-width">
@@ -252,13 +238,13 @@
<el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">
<el-form-item label="寮�濮嬫椂闂�" prop="startTime">
- <el-date-picker v-model="formDat.startTime" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
- :editable="false" :clearable="false" :style="{width: '100%'}" value-format="yyyy-MM-dd"
+ <el-date-picker v-model="formDat.startTime" type="datetime" placeholder="璇烽�夋嫨鏃ユ湡"
+ :editable="false" :clearable="false" :style="{width: '100%'}" value-format="yyyy-MM-dd HH:mm:ss"
></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 v-model="formDat.endTime" type="datetime" placeholder="璇烽�夋嫨鏃ユ湡"
+ :editable="false" :clearable="false" :style="{width: '100%'}" value-format="yyyy-MM-dd HH:mm:ss"
></el-date-picker>
</el-form-item>
@@ -271,12 +257,12 @@
</el-input>
</el-form-item>
<el-form-item label="鍙绾充汉鏁�" prop="conPeople">
- <el-input v-model="formDat.conPeople" placeholder="璇疯緭鍏ュ彲瀹圭撼浜烘暟" clearable :style="{width: '100%'}">
+ <el-input v-model="formDat.conPeople" type="number" placeholder="璇疯緭鍏ュ彲瀹圭撼浜烘暟" clearable :style="{width: '100%'}">
</el-input>
</el-form-item>
<el-form-item label="鍙備笌浜烘暟" prop="partPeople">
- <el-input v-model="formDat.partPeople" placeholder="璇疯緭鍏ュ弬涓庝汉鏁�" clearable :style="{width: '100%'}">
+ <el-input v-model="formDat.partPeople" type="number" placeholder="璇疯緭鍏ュ弬涓庝汉鏁�" clearable :style="{width: '100%'}">
</el-input>
</el-form-item>
<el-form-item label="鐢宠浜�" prop="applyPerson">
@@ -287,7 +273,7 @@
<el-input v-model="formDat.applyApart" placeholder="璇疯緭鍏ョ敵璇峰搴垨閮ㄩ棬" clearable :style="{width: '100%'}">
</el-input>
</el-form-item>
- <el-form-item label="鏄惁鎷滆姘寸墝" prop="isPlacebrand">
+ <el-form-item label="鏄惁鎽嗘斁姘寸墝" prop="isPlacebrand">
<el-select v-model="formDat.isPlacebrand" placeholder="璇烽�夋嫨" clearable :style="{width: '100%'}">
<el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
></el-option>
@@ -301,10 +287,11 @@
<el-input v-model="formDat.connPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" clearable :style="{width: '100%'}"></el-input>
</el-form-item>
<el-form-item label="鐘舵��" prop="statu">
- <el-select v-model="formDat.statu" placeholder="璇烽�夋嫨" clearable :style="{width: '100%'}">
+ <!-- <el-select v-model="formDat.statu" placeholder="璇烽�夋嫨" clearable :style="{width: '100%'}">
<el-option v-for="(item, index) in typeOptions2" :key="index" :label="item.label" :value="item.value"
></el-option>
- </el-select>
+ </el-select> -->
+ <el-input placeholder="寰呭鎵�" :disabled='true'></el-input>
</el-form-item>
</el-form>
@@ -373,6 +360,66 @@
dateRange: [],
// 琛ㄥ崟鏍￠獙
rules: {
+ startTime: [{
+ required: true,
+ message: '璇疯緭鍏ュ紑濮嬫椂闂�',
+ trigger: 'blur'
+ }],
+ endTime: [{
+ required: true,
+ message: '璇疯緭鍏ョ粨鏉熸椂闂�',
+ trigger: 'blur'
+ }],
+ title: [{
+ required: true,
+ message: '璇疯緭鍏ユ爣棰�',
+ trigger: 'blur'
+ }],
+ place: [{
+ required: true,
+ message: '璇疯緭鍏ュ湴鐐�',
+ trigger: 'blur'
+ }],
+ conPeople: [{
+ required: true,
+ message: '璇疯緭鍏ュ彲瀹圭撼浜烘暟',
+ trigger: 'blur'
+ }],
+ partPeople: [{
+ required: true,
+ message: '璇疯緭鍏ュ弬涓庝汉鏁�',
+ trigger: 'blur'
+ }],
+ applyPerson: [{
+ required: true,
+ message: '璇疯緭鍏ョ敵璇蜂汉',
+ trigger: 'blur'
+ }],
+ applyApart: [{
+ required: true,
+ message: '璇疯緭鍏ョ敵璇峰搴垨閮ㄩ棬',
+ trigger: 'blur'
+ }],
+ isPlacebrand: [{
+ required: true,
+ message: '璇烽�夋嫨鏄惁鎽嗘斁姘寸墝',
+ trigger: 'change'
+ }],
+ connPerson: [{
+ required: true,
+ message: '璇疯緭鍏ヨ仈绯讳汉',
+ trigger: 'blur'
+ }],
+ connPhone: [{
+ required: true,
+ message: '璇疯緭鍏ヨ仈绯荤數璇�',
+ trigger: 'blur'
+ }],
+ // statu: [{
+ // // required: true,
+ // message: '璇烽�夋嫨鐘舵��',
+ // trigger: 'blur'
+ // }],
},
typeOptions: [
@@ -427,6 +474,28 @@
this.queryParams.pageNum = 1;
this.getList();
},
+ reset() {
+ if (this.$refs.menu != undefined) {
+ this.$refs.menu.setCheckedKeys([]);
+ }
+ this.menuExpand = false,
+ this.menuNodeAll = false,
+ this.deptExpand = true,
+ this.deptNodeAll = false,
+ this.form = {
+ roleId: undefined,
+ roleName: undefined,
+ roleKey: undefined,
+ roleSort: 0,
+ status: "0",
+ menuIds: [],
+ deptIds: [],
+ menuCheckStrictly: true,
+ deptCheckStrictly: true,
+ remark: undefined
+ };
+ this.resetForm("elForm");
+ },
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
this.dateRange = [];
@@ -436,17 +505,20 @@
newRequest(){
+ this.reset();
this.open = true;
this.title = "鏂扮敵璇�"
},
cancel() {
this.open = false;
- // this.reset();
+ this.reset();
},
submitDataScope: function() {
this.$refs["elForm"].validate(valid => {
// alert(valid)
if (valid) {
+ // console.log(this.formDat,'formDat')
+ this.formDat.statu = 3
addMeeting(this.formDat).then(response => {
this.$modal.msgSuccess("鏂板鎴愬姛");
this.open = false;
--
Gitblit v1.9.1