From f468170d79dee3f8efb75705c7e23a1b53e54e91 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 29 七月 2025 22:08:02 +0800
Subject: [PATCH] 修改了内容
---
ruoyi-ui/src/views/meeting/approveInfo.vue | 356 ++++++++++++++++++++++++++++++++--------------------------
1 files changed, 197 insertions(+), 159 deletions(-)
diff --git a/ruoyi-ui/src/views/meeting/approveInfo.vue b/ruoyi-ui/src/views/meeting/approveInfo.vue
index e42de92..19e5435 100644
--- a/ruoyi-ui/src/views/meeting/approveInfo.vue
+++ b/ruoyi-ui/src/views/meeting/approveInfo.vue
@@ -2,86 +2,94 @@
<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-form-item>
- </el-cow>
-
- <!-- <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>
- </el-form-item>
- </el-cow> -->
- <el-cow>
- <el-form-item label="鍙绾充汉鏁�" prop="capacity" 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.place" 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="conPeople" 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.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="applicant" 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.applicant" 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="familyName" 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.familyName" 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="status" label-width="120px"
+ <el-form-item label="瀹跺涵鎴栭儴闂�" prop="applyApart" label-width="90px"
style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-select v-model="formDat.status" 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="isPlacebrand" label-width="120px"
+ style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <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 +97,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 +127,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 +143,98 @@
</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: '鎷掔粷',
+ },
+ {
+ value: 3 ,
+ label: '寰呭鎵�',
+ }
+ ],
}
},
created() {
@@ -243,51 +242,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.getList();
+ // this.btn = false
});
} else {
this.$modal.msgSuccess("淇敼澶辫触");
- if (this.formDat.status == '鏄�')
- this.formDat.status = 1
- else
- this.formDat.status = 0
+ 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>
--
Gitblit v1.9.1