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 |  120 ++++++++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 96 insertions(+), 24 deletions(-)

diff --git a/ruoyi-ui/src/views/meeting/index.vue b/ruoyi-ui/src/views/meeting/index.vue
index 1d9187c..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>
@@ -21,20 +21,6 @@
 
     <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">
 
       <el-form-item label="鏃堕棿" prop="happenTime">
@@ -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="寮�濮嬫棩鏈�"
@@ -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" />
 
@@ -222,7 +208,7 @@
       </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">
@@ -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