From fae5df1d3f1ae875ac546cacfb4744b2e8230ca2 Mon Sep 17 00:00:00 2001
From: yz3456 <2753272399@qq.com>
Date: 星期一, 29 七月 2024 11:07:24 +0800
Subject: [PATCH] 修改了bug

---
 ruoyi-ui/src/views/meeting/statisticsInfo.vue |  154 +++++++++++++++++++--------------------------------
 1 files changed, 57 insertions(+), 97 deletions(-)

diff --git a/ruoyi-ui/src/views/meeting/statisticsInfo.vue b/ruoyi-ui/src/views/meeting/statisticsInfo.vue
index 02e18c9..c283340 100644
--- a/ruoyi-ui/src/views/meeting/statisticsInfo.vue
+++ b/ruoyi-ui/src/views/meeting/statisticsInfo.vue
@@ -13,35 +13,25 @@
           <el-row :span="12">
 
             <el-cow>
-              <el-form-item label="瀹跺涵鍙�" prop="num" label-width="90px"
+              <el-form-item label="瀹跺涵鍙�" prop="familyId" label-width="90px"
                 style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
-                <el-input v-model="formDat.num" placeholder="璇疯緭鍏ュ搴彿" clearable :style="{width: '100%'}">
+                <el-input v-model="formData.familyId" 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="useTime" label-width="90px"
                 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>
+                <el-input v-model="formData.useTime" placeholder="璇疯緭鍏ヤ娇鐢ㄦ椂闂�" clearable :style="{width: '100%'}" :disabled="dsb">
+                </el-input>
               </el-form-item>
             </el-cow>
 
             <el-cow>
-              <el-form-item label="缁撴潫鏃堕棿" prop="endTime" label-width="80px"
+              <el-form-item label="浼氳瀹ゅ悕绉�" prop="conferenceRoom" label-width="90px"
                 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>
-              </el-form-item>
-            </el-cow>
-
-            <el-cow>
-              <el-form-item label="浼氳瀹ゅ悕绉�" prop="address" 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-model="formData.conferenceRoom" placeholder="璇疯緭鍏ヤ細璁鍚嶇О" clearable :style="{width: '100%'}" :disabled="dsb">
                 </el-input>
               </el-form-item>
             </el-cow>
@@ -49,23 +39,23 @@
             <el-cow>
               <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.title" placeholder="璇疯緭鍏ユ爣棰�" clearable :style="{width: '100%'}">
+                <el-input 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="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-model="formData.applyPerson" placeholder="璇疯緭鍏ョ敵璇蜂汉" clearable :style="{width: '100%'}" :disabled="dsb">
                 </el-input>
               </el-form-item>
             </el-cow>
 
             <el-cow>
-              <el-form-item label="瀹℃壒浜�" prop="approve" label-width="90px"
+              <el-form-item label="瀹℃壒浜�" prop="ratifyPerson" label-width="90px"
                 style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
-                <el-input v-model="formDat.approve" placeholder="璇疯緭鍏ュ鎵逛汉" clearable :style="{width: '100%'}">
+                <el-input v-model="formData.ratifyPerson" placeholder="璇疯緭鍏ュ鎵逛汉" clearable :style="{width: '100%'}" :disabled="dsb">
                 </el-input>
               </el-form-item>
             </el-cow>
@@ -73,7 +63,7 @@
             <el-cow>
               <el-form-item label="鐘舵��" prop="status" 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.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>
@@ -96,6 +86,11 @@
 </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 {getMeetingInfo1} from "@/api/meeting/index";
   export default {
     components: {},
     props: [],
@@ -118,85 +113,20 @@
         isShow: true,
         uploading: false,
 
-        formDat: {
-          id: undefined,
-          happenTime: 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
-
-
+        formData:{
+            "title":undefined,
+            "familyId":undefined,
+            "conferenceRoom":undefined,
+            "applyPerson":undefined,
+            "ratifyPerson":undefined,
+            "status":undefined,
+            "useTime":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'
-          }],
         },
         typeOptions: [{
             value: 1,
@@ -227,7 +157,37 @@
       }
 
       let _this = this
-    },
+
+        this.loading = true;
+        getMeetingInfo1(id).then((response) => {
+          console.log(response.data,'123123123')
+          this.formData = response.data;
+          // let paths = this.formData.url.split(",");
+       //    for(let i = 0; i < paths.length; i++)
+       //    {
+       //      if(paths[i]!="") {
+       //        let pth = paths[i].substr(paths[i].length - 4, paths[i].length)
+       //        if (_this.fot.includes(pth) === true)
+      	// {
+      	// 	if(paths[i][0]=="/")
+       //          _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
+      	//   else
+      	//      _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
+      	//   }
+       //        else {
+       //          let nms = paths[i].split("\/")
+       //          let nm = nms[nms.length - 1]
+      	//   if(paths[i][0]=="/")
+       //          _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
+      	// 	else
+      	// 	_this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
+
+      	// }
+       //      }
+       //    }
+          this.loading = false;
+        });
+      },
     mounted() {},
     methods: {
       submitForm() {

--
Gitblit v1.9.1