From 7678c30ff853730d22a0fa374367404af8aea946 Mon Sep 17 00:00:00 2001
From: yz3456 <2753272399@qq.com>
Date: 星期五, 03 五月 2024 10:22:16 +0800
Subject: [PATCH] 完成会议审批模块
---
ruoyi-ui/src/views/meeting/approve.vue | 300 ++++++++++++++++++------
ruoyi-ui/src/api/meeting/index.js | 18 +
ruoyi-ui/src/views/meeting/statistics.vue | 8
ruoyi-ui/src/views/meeting/webcast.vue | 20
ruoyi-ui/src/views/meeting/approveInfo.vue | 338 +++++++++++++++------------
5 files changed, 449 insertions(+), 235 deletions(-)
diff --git a/ruoyi-ui/src/api/meeting/index.js b/ruoyi-ui/src/api/meeting/index.js
index 16b9896..fde3be7 100644
--- a/ruoyi-ui/src/api/meeting/index.js
+++ b/ruoyi-ui/src/api/meeting/index.js
@@ -70,6 +70,24 @@
data: data
})
}
+// ------------------------------------------------
+// 浼氳瀹℃壒
+// 鏌ヨ鎵�鏈変細璁�
+export function listMeeting2(query) {
+ return request({
+ url: '/zMeetingRatify/all',
+ method: 'get',
+ params: query
+ })
+}
+
+export function updateStatu(data) {
+ return request({
+ url: '/zMeetingRatify',
+ method: 'put',
+ data: data
+ })
+}
diff --git a/ruoyi-ui/src/views/meeting/approve.vue b/ruoyi-ui/src/views/meeting/approve.vue
index 076a163..0563977 100644
--- a/ruoyi-ui/src/views/meeting/approve.vue
+++ b/ruoyi-ui/src/views/meeting/approve.vue
@@ -1,10 +1,8 @@
<template>
<div class="app-container">
-
<el-backtop :bottom="150" :right="30">
<el-button type="primary" circle class="el-icon-top"></el-button>
</el-backtop>
-
<h1 style="font-size:21px;padding-top:30px;display: flex;">
<span>浼氳瀹℃壒</span>
@@ -12,128 +10,286 @@
<div style="display: flex; align-items: center;">
</div>
</h1>
-
<hr>
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
- <el-form :model="queryParams1">
- <el-row>
- <el-form-item label="" prop="people">
- <el-input v-model="queryParams1.people" placeholder="璇疯緭鍏ユ悳绱㈠唴瀹�" clearable style="width: 200px;
+ <el-form-item label="鏃堕棿" prop="happenTime">
+ <el-date-picker
+ v-model="dateRange"
+ style="width: 240px;
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>
+ 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="place" >
+ <el-input
+ v-model="queryParams.place"
+ 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="applyApart" >
+ <el-input
+ v-model="queryParams.applyApart"
+ 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' }"
- :row-class-name="tableRowClassName" :row-key="getRowId">
+
+ <el-table v-loading="loading" :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" /> -->
+
+ <el-table-column fixed label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="80px"/>
<el-table-column label="鏍囬" prop="title" sortable align="center">
<template slot-scope="scope">{{ scope.row.title
? scope.row.title : '鈥斺�斺�斺��' }}</template>
</el-table-column>
- <el-table-column label="鍦扮偣" prop="address" sortable align="center">
+ <el-table-column label="鍦扮偣" prop="place" sortable align="center">
<template slot-scope="scope">{{
- scope.row.address ? scope.row.address : '鈥斺�斺�斺��' }}</template>
+ scope.row.place ? scope.row.place : '鈥斺�斺�斺��' }}</template>
</el-table-column>
- <el-table-column label="鍙绾充汉鏁�" prop="capacity" sortable align="center">
+ <el-table-column label="鍙绾充汉鏁�" prop="conPeople" sortable align="center" min-width="150">
<template slot-scope="scope">{{
- scope.row.capacity ? scope.row.capacity : '鈥斺�斺�斺��' }}</template>
+ scope.row.conPeople ? scope.row.conPeople : '鈥斺�斺�斺��' }}</template>
</el-table-column>
- <el-table-column label="鍙備笌浜烘暟" prop="persons" sortable align="center">
+ <el-table-column label="鍙備笌浜烘暟" prop="partPeople" sortable align="center" min-width="120">
<template slot-scope="scope">{{
- scope.row.persons ? scope.row.persons : '鈥斺�斺�斺��' }}</template>
+ scope.row.partPeople ? scope.row.partPeople : '鈥斺�斺�斺��' }}</template>
</el-table-column>
- <el-table-column label="鐢宠浜�" prop="applicant" sortable align="center">
+ <el-table-column label="鐢宠浜�" prop="applyPerson" sortable align="center" min-width="120">
<template slot-scope="scope">{{
- scope.row.applicant ? scope.row.applicant : '鈥斺�斺�斺��' }}</template>
+ scope.row.applyPerson ? scope.row.applyPerson : '鈥斺�斺�斺��' }}</template>
</el-table-column>
- <el-table-column label="鐢宠閮ㄩ棬鎴栧搴�" prop="applyOrganization" sortable align="center">
+ <el-table-column label="鐢宠閮ㄩ棬鎴栧搴�" prop="applyApart" sortable align="center" min-width="150">
<template slot-scope="scope">{{
- scope.row.applyOrganization ? scope.row.applyOrganization : '鈥斺�斺�斺��' }}</template>
+ scope.row.applyApart ? scope.row.applyApart : '鈥斺�斺�斺��' }}</template>
</el-table-column>
- <el-table-column label="寮�濮嬫椂闂�" prop="begin" sortable align="center">
- <template slot-scope="scope">{{ scope.row.begin
- ? scope.row.begin : '鈥斺�斺�斺��' }}</template>
+ <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="end" sortable align="center">
- <template slot-scope="scope">{{ scope.row.end ?
- scope.row.end : '鈥斺�斺�斺��' }}</template>
+ <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="card" sortable align="center">
- <template slot-scope="scope">{{ scope.row.card
- ? scope.row.card : '鈥斺�斺�斺��' }}</template>
+ <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="name" sortable align="center">
- <template slot-scope="scope">{{ scope.row.name ?
- scope.row.name : '鈥斺�斺�斺��' }}</template>
+ <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="phone" sortable align="center">
- <template slot-scope="scope">{{ scope.row.phone
- ? scope.row.phone : '鈥斺�斺�斺��' }}</template>
+ <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="status" sortable align="center">
- <template slot-scope="scope">{{ scope.row.status
- ? scope.row.status : '鈥斺�斺�斺��' }}</template>
+ <el-table-column label="鐘舵��" prop="statu" sortable align="center">
+ <template slot-scope="scope">{{scope.row.statu===1? '鍚屾剰': '鎷掔粷'}}</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" align="center" width="250" class-name="small-padding fixed-width">
+ <el-table-column label="鎿嶄綔" align="center" width="200" class-name="small-padding fixed-width">
<template slot-scope="scope" v-if="scope.row.roleId !== 1">
<div class="button-container">
- <el-button v-show="agree" size="mini" type="text" @click="agree(scope.row)">鍚屾剰</el-button>
- <el-button v-show="agree" size="mini" type="text" icon="el-icon-delete">鎷掔粷</el-button>
- <el-button v-show="agree1" size="mini" type="text" icon="el-icon-delete">閲嶆柊瀹℃壒</el-button>
+ <el-button size="mini" type="text" icon="el-icon-edit" @click="agree(scope.row)">鍚屾剰</el-button>
+ <el-button size="mini" type="text" icon="el-icon-delete" @click="refuse(scope.row)">鎷掔粷</el-button>
<el-button size="mini" type="text" icon="el-icon-d-arrow-right" @click="handleCheck(scope.row)">鏌ョ湅璇︽儏</el-button>
</div>
</template>
</el-table-column>
</el-table>
+ <pagination
+ v-show="total>0"
+ :total="total"
+ :page.sync="queryParams.pageNum"
+ :limit.sync="queryParams.pageSize"
+ @pagination="getList"
+ style="background: #FEF7FC;"
+ />
</div>
</template>
<script>
+ import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
+ import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
+
+
+ import { Notification, MessageBox, Message, Loading } from 'element-ui'
+ //鍦╯ystem/note/index.js涓鍏ユ帴鍙ｅ嚱鏁� --鎺ュソ浜�
+ import {listMeeting2,updateStatu} from "@/api/meeting/index";
export default {
+ created() {
+ this.getList();
+ },
data() {
return {
- tableData: [
- { title: '1', name: 'asasd', address: 'asdadsdasd', id: 9, age: '30' },
- { title: '2', name: 'qweqwqwe', address: 'qweqweqwe', id: 2, age: '30' },
- { title: '3', name: 'zxczxczxc', address: 'zxczxczcx', id: 3, age: '30' },
- { title: '4', name: 'fghfghfh', address: 'fghfghfgh', id: 4, age: '30' },
- { title: '5', name: 'rtyrtyrty', address: 'rtyrtyrty', id: 5, age: '30' },
- { title: '6', name: 'yuiyuiyui', address: 'yuiyuiyui', id: 6, age: '30' },
- { title: '7', name: 'hjkljkljk', address: 'jkljklhlkjl', id: 7, age: '30' },
- ],
- queryParams1: {
+ formDat1:{
+ id:undefined,
+ statu:undefined
+ },
+ // 鏄剧ず鎼滅储鏉′欢
+ loading: true,
+ showSearch: true,
+ open: false,
+ title: "",
+ // 鎬绘潯鏁�
+ total: 0,
+ meetingList: [],
+ formDat:{
+ id: undefined,
+ title: undefined,
+ place: undefined,
+ conPeople: undefined,
+ partPeople: undefined,
+ applyPerson: undefined,
+ applyApart: undefined,
+ startTime: undefined,
+ endTime: undefined,
+ happenStartTime: undefined,
+ happenEndTime: undefined,
+ isPlacebrand: undefined,
+ connPerson: undefined,
+ connPhone: undefined,
+ statu: undefined,
+ createTime: undefined
+ },
+ queryParams: {
pageNum: 1,
pageSize: 10,
- happenTime: undefined,
- people: undefined,
- address: undefined,
- title: undefined,
- remark: undefined,
- status: undefined,
- agree1: false,
- agree: true,
+ place:undefined,
+ apply_Apart:undefined,
+ start_Time:undefined,
+ applyPerson:undefined
+ },
+ dateRange: [],
+ // 琛ㄥ崟鏍￠獙
+ rules: {},
+ typeOptions: [
+ {
+ value: '1',
+ label: '鏄�',
+ },
+ {
+ value: '0',
+ label: '鍚�',
+ }
+ ],
+ typeOptions2: [
+ {
+ value: '1',
+ label: '鍚屾剰',
+ },
+ {
+ value: '0',
+ label: '鎷掔粷',
+ }
+ ],
}
- }
},
methods: {
+ agree(row){
+ this.formDat1.id = row.id
+ this.formDat1.statu = 1
+ // this.$refs['elForm'].validate(valid => {
+ // if (valid) {
+ if (row.id != undefined) {
+ updateStatu(this.formDat1).then(response => {
+ this.$modal.msgSuccess("淇敼鎴愬姛");
+ // this.btn = false
+ });
+ } else {
+ this.$modal.msgSuccess("淇敼澶辫触");
+ }
+ this.getList();
+ this.getList();
+ // }
+ // })
+ },
+ refuse(row){
+ this.formDat1.id = row.id
+ this.formDat1.statu = 0
+ if (row.id != undefined) {
+ updateStatu(this.formDat1).then(response => {
+ this.$modal.msgSuccess("淇敼鎴愬姛");
+ // this.btn = false
+ });
+ } else {
+ this.$modal.msgSuccess("淇敼澶辫触");
+ }
+ this.getList();
+ this.getList();
+ },
+ // 澶氶�夋閫変腑鏁版嵁
+ handleSelectionChange(selection) {
+ this.ids = selection.map(item => item.id)
+ // alert(this.ids)
+ this.single = selection.length!=1
+ this.multiple = !selection.length
+ },
+ getList() {
+ this.loading = true;
+ this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
+ this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
+ listMeeting2(this.queryParams).then(response => {
+ this.meetingList = response.data.data;
+
+ this.total = response.data.total;
+ this.loading = false;
+ }
+
+ );
+ },
+ /** 鎼滅储鎸夐挳鎿嶄綔 */
+ handleQuery() {
+ this.queryParams.pageNum = 1;
+ this.getList();
+ },
+ /** 閲嶇疆鎸夐挳鎿嶄綔 */
+ resetQuery() {
+ this.dateRange = [];
+ this.resetForm("queryForm");
+ this.handleQuery();
+ },
+
+
tableRowClassName({ row, rowIndex }) {
@@ -147,14 +303,7 @@
return row.id
},
- agree(row){
- this.agree1 = true
- this.agree = false
- row.status = '鍚屾剰'
-
- alert(row.status)
- },
// 鏌ョ湅璇︾粏淇℃伅
handleCheck(row){
const id = row.id;
@@ -168,6 +317,11 @@
});
},
+
+
+
+
+
}
}
</script>
diff --git a/ruoyi-ui/src/views/meeting/approveInfo.vue b/ruoyi-ui/src/views/meeting/approveInfo.vue
index e42de92..26bdd78 100644
--- a/ruoyi-ui/src/views/meeting/approveInfo.vue
+++ b/ruoyi-ui/src/views/meeting/approveInfo.vue
@@ -2,43 +2,51 @@
<div class="app-container" id="printable-content">
<div class="form-header mt">
<h1 style="font-size:21px;padding-top:30px;display: flex;justify-content: space-between;align-items: center;">
- <span>瀹℃壒璇︽儏</span>
+ <span>浼氳璇︽儏</span>
</h1>
</div>
<div style="padding-left:15px">
- <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-position="left" label-width="160px">
+ <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-position="left" label-width="160px">
<el-container>
<el-row :span="12">
<el-cow>
- <el-form-item label="浼氳鏍囬" prop="meetingTitle" label-width="90px"
+ <el-form-item label="浼氳鏍囬" prop="title" label-width="90px"
style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-input v-model="formDat.meetingTitle" placeholder="璇疯緭鍏ヤ細璁爣棰�" clearable :style="{width: '100%'}">
- </el-input>
+ <el-input v-if="!dsb" v-model="formData.title" placeholder="璇疯緭鍏ヤ細璁爣棰�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
+ <el-input v-if="dsb" v-model="formData.title" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
</el-form-item>
</el-cow>
<el-cow>
- <el-form-item label="寮�濮嬫椂闂�" prop="happenTime" label-width="80px"
+ <el-form-item label="寮�濮嬫椂闂�" prop="startTime" label-width="80px"
style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-date-picker v-model="formDat.happenTime" type="datetime" placeholder="閫夋嫨鏃ユ湡鏃堕棿" align="right"
- :picker-options="pickerOptions" :style="{width: '100%'}">
+ <el-date-picker v-if="!dsb" v-model="formData.startTime" type="datetime" placeholder="閫夋嫨鏃ユ湡鏃堕棿" align="right"
+ :picker-options="pickerOptions" :style="{width: '100%'}" :disabled="dsb" value-format="yyyy-MM-dd HH:mm:ss">
+ </el-date-picker>
+ <el-date-picker v-if="dsb" v-model="formData.startTime" type="datetime" placeholder="" align="right"
+ :picker-options="pickerOptions" :style="{width: '100%'}" :disabled="dsb" value-format="yyyy-MM-dd HH:mm:ss">
</el-date-picker>
</el-form-item>
</el-cow>
<el-cow>
<el-form-item label="缁撴潫鏃堕棿" prop="endTime" label-width="80px"
style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-date-picker v-model="formDat.endTime" type="datetime" placeholder="閫夋嫨鏃ユ湡鏃堕棿" align="right"
- :picker-options="pickerOptions" :style="{width: '100%'}">
+ <el-date-picker v-if="!dsb" v-model="formData.endTime" type="datetime" placeholder="閫夋嫨鏃ユ湡鏃堕棿" align="right"
+ :picker-options="pickerOptions" :style="{width: '100%'}" :disabled="dsb" value-format="yyyy-MM-dd HH:mm:ss">
+ </el-date-picker>
+ <el-date-picker v-if="dsb" v-model="formData.endTime" type="datetime" placeholder="" align="right"
+ :picker-options="pickerOptions" :style="{width: '100%'}" :disabled="dsb" value-format="yyyy-MM-dd HH:mm:ss">
</el-date-picker>
</el-form-item>
</el-cow>
<el-cow>
- <el-form-item label="浼氳鍦扮偣" prop="address" label-width="90px"
+ <el-form-item label="浼氳鍦扮偣" prop="place" label-width="90px"
style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-input v-model="formDat.address" placeholder="璇疯緭鍏ヤ細璁湴鐐�" clearable :style="{width: '100%'}">
+ <el-input v-if="!dsb" v-model="formData.place" placeholder="璇疯緭鍏ヤ細璁湴鐐�" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ <el-input v-if="dsb" v-model="formData.place" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
</el-cow>
@@ -46,42 +54,50 @@
<!-- <el-cow>
<el-form-item label="浼氳瀹や唬鐮�" prop="meetingID" label-width="90px"
style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-input v-model="formDat.meetingID" placeholder="璇疯緭鍏ヤ細璁浠ｇ爜" clearable :style="{width: '100%'}">
+ <el-input v-model="formData.meetingID" placeholder="璇疯緭鍏ヤ細璁浠ｇ爜" clearable :style="{width: '100%'}">
</el-input>
</el-form-item>
</el-cow> -->
<el-cow>
- <el-form-item label="鍙绾充汉鏁�" prop="capacity" label-width="90px"
+ <el-form-item label="鍙绾充汉鏁�" prop="conPeople" label-width="90px"
style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-input v-model="formDat.capacity" placeholder="璇疯緭鍏ュ彲瀹圭撼浜烘暟" clearable :style="{width: '100%'}">
+ <el-input v-if="!dsb" v-model="formData.conPeople" placeholder="璇疯緭鍏ュ彲瀹圭撼浜烘暟" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ <el-input v-if="dsb" v-model="formData.conPeople" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
</el-cow>
<el-cow>
- <el-form-item label="鍙備笌浜烘暟" prop="attendance" label-width="90px"
+ <el-form-item label="鍙備笌浜烘暟" prop="partPeople" label-width="90px"
style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-input v-model="formDat.attendance" placeholder="璇疯緭鍏ュ弬涓庝汉鏁�" clearable :style="{width: '100%'}">
+ <el-input v-if="!dsb" v-model="formData.partPeople" placeholder="璇疯緭鍏ュ弬涓庝汉鏁�" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ <el-input v-if="dsb" v-model="formData.partPeople" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
</el-cow>
<el-cow>
- <el-form-item label="鐢宠浜�" prop="applicant" label-width="90px"
+ <el-form-item label="鐢宠浜�" prop="applyPerson" label-width="90px"
style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-input v-model="formDat.applicant" placeholder="璇疯緭鍏ョ敵璇蜂汉" clearable :style="{width: '100%'}">
+ <el-input v-if="!dsb" v-model="formData.applyPerson" placeholder="璇疯緭鍏ョ敵璇蜂汉" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ <el-input v-if="dsb" v-model="formData.applyPerson" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
</el-cow>
<el-cow>
- <el-form-item label="瀹跺涵鎴栭儴闂�" prop="familyName" label-width="90px"
+ <el-form-item label="瀹跺涵鎴栭儴闂�" prop="applyApart" label-width="90px"
style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-input v-model="formDat.familyName" placeholder="璇疯緭鍏ョ敵璇峰搴垨閮ㄩ棬" clearable :style="{width: '100%'}">
+ <el-input v-if="!dsb" v-model="formData.applyApart" placeholder="璇疯緭鍏ョ敵璇峰搴垨閮ㄩ棬" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ <el-input v-if="dsb" v-model="formData.applyApart" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
</el-cow>
<el-cow>
- <el-form-item label="鏄惁鎷滆姘寸墝" prop="status" label-width="120px"
+ <el-form-item label="鏄惁鎷滆姘寸墝" prop="isPlacebrand" label-width="120px"
style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-select v-model="formDat.status" placeholder="璇烽�夋嫨 " clearable :style="{width: '100%'}"
+ <el-select v-model="formData.isPlacebrand" 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>
@@ -89,16 +105,29 @@
</el-form-item>
</el-cow>
<el-cow>
- <el-form-item label="鑱旂郴浜�" prop="name" label-width="90px"
+ <el-form-item label="鑱旂郴浜�" prop="connPerson" label-width="90px"
style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-input v-model="formDat.name" placeholder="璇疯緭鍏ヨ仈绯讳汉" clearable :style="{width: '100%'}">
+ <el-input v-if="!dsb" v-model="formData.connPerson" placeholder="璇疯緭鍏ヨ仈绯讳汉" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ <el-input v-if="dsb" v-model="formData.connPerson" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
</el-cow>
<el-cow>
- <el-form-item label="鑱旂郴鐢佃瘽" prop="phone" label-width="90px"
+ <el-form-item label="鑱旂郴鐢佃瘽" prop="connPhone" label-width="90px"
style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-input v-model="formDat.phone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" clearable :style="{width: '100%'}"></el-input>
+ <el-input v-if="!dsb" v-model="formData.connPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
+ <el-input v-if="dsb" v-model="formData.connPhone" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
+ </el-form-item>
+ </el-cow>
+ <el-cow>
+ <el-form-item label="鐘舵��" prop="statu" label-width="120px"
+ style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-select v-model="formData.statu" placeholder="璇烽�夋嫨 " clearable :style="{width: '100%'}"
+ :disabled="dsb">
+ <el-option v-for="(item, index) in typeOptions2" :key="index" :label="item.label"
+ :value="item.value"></el-option>
+ </el-select>
</el-form-item>
</el-cow>
</el-row>
@@ -106,10 +135,15 @@
<h4 class="form-header"> </h4>
<el-form-item size="large">
- <el-button type="primary" @click="submitForm" :disabled="dsb">鍚屾剰</el-button>
- <el-button type="primary" @click="submitForm" :disabled="dsb">鎷掔粷</el-button>
+ <el-button v-if="isShow" type="primary" @click="agree()" :disabled="!dsb">鍚屾剰</el-button>
+ <el-button v-if="isShow" type="primary" @click="refuse()" :disabled="!dsb">鎷掔粷</el-button>
</el-form-item>
</el-form>
+
+
+ <el-dialog :visible.sync="dialogVisible">
+ <img w-full :src="dialogImageUrl" style="width: 100%; height: 100%" alt="Preview Image" />
+ </el-dialog>
</div>
@@ -117,125 +151,94 @@
</template>
<script>
+import {addRole, updateRole} from "@/api/system/role";
+import {blobValidate} from "@/utils/ruoyi";
+import errorCode from "@/utils/errorCode";
+import {Message} from "element-ui";
+ import {listMeeting,getMeetingInfo,addMeeting,enload,uploadPic,download,delMeeting,updateMeeting,updateStatu} from "@/api/meeting/index";
export default {
components: {},
props: [],
data() {
return {
- cdi: "涓汉璐骇璇︾粏淇℃伅",
- udi: "涓汉璐骇淇℃伅璇︽儏",
+ cdi: "浼氳瀹℃壒璇︾粏淇℃伅",
+ udi: "浼氳瀹℃壒淇℃伅璇︽儏",
// 鏁版嵁鑼冨洿閫夐」
fot: ['.bmp', '.jpg', '.jpeg', '.png', '.tif', '.gif', '.pcx', '.tga', '.exif', '.fpx',
'.svg', '.psd', '.cdr', '.pcd', '.dxf', '.ufo', '.eps', '.ai', '.aw', '.WMF', '.webp', '.apng'
],
+ formDat:{
+ id:undefined,
+ statu:undefined
+ },
fileList: [],
fileList1: [],
uploadFileList: [],
uploadFileList1: [],
fileListOther: [],
- dsb: false,
+ dsb: true,
btn: false,
+ isShow: true,
uploading: false,
-
- formDat: {
+ formData:{
id: undefined,
- happenTime: undefined,
+ title: undefined,
+ place: undefined,
+ conPeople: undefined,
+ partPeople: undefined,
+ applyPerson: undefined,
+ applyApart: undefined,
+ startTime: undefined,
endTime: undefined,
- timeSpan: undefined,
- meetingTitle: undefined,
- address: undefined,
- meetingID: undefined,
- capacity: undefined,
- attendance: undefined,
- applicant: undefined,
- familyName: undefined,
- name: undefined,
- phone: undefined,
- url: "",
- status: undefined
-
-
+ happenStartTime: undefined,
+ happenEndTime: undefined,
+ isPlacebrand: undefined,
+ connPerson: undefined,
+ connPhone: undefined,
+ statu: undefined,
+ createTime: undefined
},
dialogImageUrl: '',
dialogVisible: false,
disabled: false,
rules: {
- meetingTitle: [{
- required: true,
- message: '璇疯緭鍏ヤ細璁爣棰�',
- trigger: 'blur'
- }],
- happenTime: [{
- required: true,
- message: '璇烽�夋嫨寮�濮嬫椂闂�',
- trigger: 'blur'
- }],
- endTime: [{
- required: true,
- message: '璇烽�夋嫨缁撴潫鏃堕棿',
- trigger: 'blur'
- }],
- status: [{
- required: true,
- message: '璇疯緭鍏ユ槸鍚︽敞閿�',
- trigger: 'blur'
- }],
- isChange: [{
- required: true,
- message: '璇疯緭鍏ュ彉鏇�/娉ㄩ攢',
- trigger: 'blur'
- }],
- price: [{
- required: true,
- message: '璇疯緭鍏ラ噾棰�',
- trigger: 'blur'
- }],
- incomeName: [{
- required: true,
- message: '璇疯緭鍏ユ敹鏀被鍒�',
- trigger: 'blur'
- }],
- timeLimit: [{
- required: true,
- message: '璇疯緭鍏ユ湡闄�',
- trigger: 'blur'
- }],
- location: [{
- required: true,
- message: '璇疯緭鍏ュ瓨鏀句綅缃�',
- trigger: 'blur'
- }],
- propertyRight: [{
- required: true,
- message: '璇疯緭鍏ュ疄鐜伴毦搴�',
- trigger: 'blur'
- }],
-
- remark: [{
- // required: true,
- message: '璇疯緭鍏ュ娉�',
- trigger: 'blur'
- }],
+ // title: [{
+ // required: true,
+ // message: '璇疯緭鍏ヤ細璁爣棰�',
+ // trigger: 'blur'
+ // }],
+ // startTime: [{
+ // required: true,
+ // message: '璇烽�夋嫨寮�濮嬫椂闂�',
+ // trigger: 'blur'
+ // }],
+ // endTime: [{
+ // required: true,
+ // message: '璇烽�夋嫨缁撴潫鏃堕棿',
+ // trigger: 'blur'
+ // }]
},
- typeOptions: [{
- value: 1,
- label: '鏄�',
+ typeOptions: [
+ {
+ value: 1,
+ label: '鏄�',
},
{
value: 0,
label: '鍚�',
}
- ],
- typeOptions1: [{
- value: '鍙樻洿',
- label: '鍙樻洿',
- },
- {
- value: '娉ㄩ攢',
- label: '娉ㄩ攢',
- }
- ],
+ ],
+ typeOptions2: [
+ {
+ value: 1,
+ label: '鍚屾剰',
+ },
+ {
+ value: 0,
+ label: '鎷掔粷',
+ }
+ ],
}
},
created() {
@@ -243,51 +246,90 @@
let jd;
if (this.$route.query.detail == 'true') {
jd = this.$route.query.detail
- this.btn = jd
- // document.title = "淇敼涓汉璐骇璇︾粏淇℃伅";
- this.$route.meta.title = "瀹℃壒璇︽儏"; //鍒楄〃鐨勫悕绉�
+ // this.btn = jd
+ this.dsb = jd
+ this.$route.meta.title = "浼氳瀹℃壒璇︾粏淇℃伅"; //鍒楄〃鐨勫悕绉�
} else {
- // document.title = "涓汉璐骇璇︾粏淇℃伅";
- this.$route.meta.title = "瀹℃壒璇︽儏"; //鍒楄〃鐨勫悕绉�
+ this.$route.meta.title = "浼氳瀹℃壒璇︾粏淇℃伅"; //鍒楄〃鐨勫悕绉�
this.btn = false;
+ this.isShow = false
}
let _this = this
+ if (id) {
+ this.loading = true;
+ getMeetingInfo(id).then((response) => {
+ console.log(response.data,'123123123')
+ this.formData = response.data;
+ this.loading = false;
+ });
+ }
},
mounted() {},
methods: {
- submitForm() {
- let ul = this.fileList.map(function(elem) {
- return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API, "")
- }).join(",")
- let uls = this.fileListOther.map(function(elem) {
- return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API, "")
- }).join(",")
- this.formDat.url = ul + "," + uls
+ getList() {
+ const id = this.$route.params && this.$route.params.id;
+ let _this = this
+ if (id) {
+ this.loading = true;
+ getMeetingInfo(id).then((response) => {
+ console.log(response.data,'123123123')
+ this.formData = response.data;
+ this.loading = false;
+ });
+ }
- this.$refs['elForm'].validate(valid => {
- alert(this.formDat.status)
- if (valid) {
- if (this.formDat.id != undefined) {
- updateSelfEconomy(this.formDat).then(response => {
+ },
+ agree(){
+ this.formDat.id = this.formData.id
+ this.formDat.statu = 1
+ if (this.formData.id != undefined) {
+ updateStatu(this.formDat).then(response => {
this.$modal.msgSuccess("淇敼鎴愬姛");
- // this.open = false;
- if (this.formDat.status == 1)
- this.formDat.status = '鏄�'
- else
- this.formDat.status = '鍚�'
- this.btn = false
+ // this.btn = false
});
} else {
this.$modal.msgSuccess("淇敼澶辫触");
- if (this.formDat.status == '鏄�')
- this.formDat.status = 1
- else
- this.formDat.status = 0
}
- }
- })
+ this.getList();
+ this.getList();
},
+ refuse(row){
+ this.formDat.id = this.formData.id
+ this.formDat.statu = 0
+ if (this.formData.id != undefined) {
+ updateStatu(this.formDat).then(response => {
+ this.$modal.msgSuccess("淇敼鎴愬姛");
+ // this.btn = false
+ });
+ } else {
+ this.$modal.msgSuccess("淇敼澶辫触");
+ }
+ this.getList();
+ this.getList();
+ },
+ // submitForm() {
+ // this.$refs['elForm'].validate(valid => {
+ // if (valid) {
+ // if (this.formData.id != undefined) {
+ // updateMeeting(this.formData).then(response => {
+ // this.$modal.msgSuccess("淇敼鎴愬姛");
+ // // if (this.formData.status == 1)
+ // // this.formData.status = '鏄�'
+ // // else
+ // // this.formData.status = '鍚�'
+ // this.btn = false
+ // });
+ // } else {
+ // this.$modal.msgSuccess("淇敼澶辫触");
+ // // if (this.formData.status == '鏄�')
+ // // this.formData.status = 1
+ // // else
+ // // this.formData.status = 0
+ // }
+ // }
+ // })
+ // },
}
}
</script>
diff --git a/ruoyi-ui/src/views/meeting/statistics.vue b/ruoyi-ui/src/views/meeting/statistics.vue
index bf8d969..3e8d8a6 100644
--- a/ruoyi-ui/src/views/meeting/statistics.vue
+++ b/ruoyi-ui/src/views/meeting/statistics.vue
@@ -16,14 +16,14 @@
</div>
</el-button>
</div>
- <div style="display: flex; align-items: center;">
+ <!-- <div style="display: flex; align-items: center;">
<el-button @click="newRequest" size="mini" type="text" v-hasPermi="['person:information:memo']" style="margin-left: 10px">
<div class="form2" style="width: 100px;"><el-icon style="padding-right:30px;"></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>
- </div>
+ </div> -->
</h1>
@@ -88,7 +88,7 @@
</div>
</el-dialog>
<!-- 鏂板鏁版嵁妗� -->
- <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
+ <!-- <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">
@@ -143,7 +143,7 @@
<el-button type="primary" @click="submitDataScope">淇� 瀛�</el-button>
<el-button @click="cancel">鍙� 娑�</el-button>
</div>
- </el-dialog>
+ </el-dialog> -->
</div>
</template>
diff --git a/ruoyi-ui/src/views/meeting/webcast.vue b/ruoyi-ui/src/views/meeting/webcast.vue
index 1bbf291..4809e3d 100644
--- a/ruoyi-ui/src/views/meeting/webcast.vue
+++ b/ruoyi-ui/src/views/meeting/webcast.vue
@@ -147,30 +147,30 @@
<el-input v-model="formDat.meetingTitle" placeholder="璇疯緭鍏ヤ細璁爣棰�" clearable :style="{width: '100%'}">
</el-input>
</el-form-item>
- <el-form-item label="浼氳鍦扮偣" prop="address">
+<!-- <el-form-item label="浼氳鍦扮偣" prop="address">
<el-input v-model="formDat.address" placeholder="璇疯緭鍏ヤ細璁湴鐐�" clearable :style="{width: '100%'}">
</el-input>
- </el-form-item>
- <el-form-item label="浼氳瀹や唬鐮�" prop="meetingID">
+ </el-form-item> -->
+<!-- <el-form-item label="浼氳瀹や唬鐮�" prop="meetingID">
<el-input v-model="formDat.meetingID" placeholder="璇疯緭鍏ヤ細璁浠ｇ爜" clearable :style="{width: '100%'}">
</el-input>
- </el-form-item>
- <el-form-item label="鍙绾充汉鏁�" prop="capacity">
+ </el-form-item> -->
+ <!-- <el-form-item label="鍙绾充汉鏁�" prop="capacity">
<el-input v-model="formDat.capacity" placeholder="璇疯緭鍏ュ彲瀹圭撼浜烘暟" clearable :style="{width: '100%'}">
</el-input>
- </el-form-item>
- <el-form-item label="鍙備笌浜烘暟" prop="attendance">
+ </el-form-item> -->
+ <!-- <el-form-item label="鍙備笌浜烘暟" prop="attendance">
<el-input v-model="formDat.attendance" placeholder="璇疯緭鍏ュ弬涓庝汉鏁�" clearable :style="{width: '100%'}">
</el-input>
- </el-form-item>
+ </el-form-item> -->
<el-form-item label="鐢宠浜�" prop="applicant">
<el-input v-model="formDat.applicant" placeholder="璇疯緭鍏ョ敵璇蜂汉" clearable :style="{width: '100%'}">
</el-input>
</el-form-item>
- <el-form-item label="鐢宠瀹跺涵鎴栭儴闂�" prop="familyName">
+ <!-- <el-form-item label="鐢宠瀹跺涵鎴栭儴闂�" prop="familyName">
<el-input v-model="formDat.familyName" placeholder="璇疯緭鍏ョ敵璇峰搴垨閮ㄩ棬" clearable :style="{width: '100%'}">
</el-input>
- </el-form-item>
+ </el-form-item> -->
<el-form-item label="鑱旂郴浜�" prop="name">
<el-input v-model="formDat.name" placeholder="璇疯緭鍏ヨ仈绯讳汉" clearable :style="{width: '100%'}">
</el-input>
--
Gitblit v1.9.1