Эх сурвалжийг харах

修改周会查询错误数据问题

humingbo 1 жил өмнө
parent
commit
f629360c47

+ 2 - 2
src/views/meeting/meeting.vue

@@ -48,7 +48,7 @@
       </el-table-column>
       <el-table-column label="会议主题" prop="meetingName">
       </el-table-column>
-      <el-table-column label="会议地点" prop="meetingPlace" width="120">
+      <el-table-column label="会议地点" prop="meetingPlace" width="150" :show-overflow-tooltip="true">
       </el-table-column>
       <el-table-column label="会议内容" prop="meetingContent" width="80">
         <scope slot-scope="scope">
@@ -124,7 +124,7 @@
           </el-button>
           <el-button v-if="scope.row.status===0" size="mini" type="success" @click="startMeeting(scope.row)">开始会议
           </el-button>
-          <el-button v-if="scope.row.status===1" v-show="false" size="mini" type="warning" @click="endMeetingClick(scope.row)">结束会议
+          <el-button v-if="scope.row.status===1" v-show="true" size="mini" type="warning" @click="endMeetingClick(scope.row)">结束会议
           </el-button>
           <el-button v-if="scope.row.status!==0 " type="success" size="mini" @click="meetingDetail(scope.row)">会议详情
           </el-button>

+ 1 - 1
src/views/meeting/weekly.vue

@@ -3,7 +3,7 @@
     <el-form size="mini" :inline="true">
       <el-form-item label="关联会议">
         <el-select size="small" style="width: 350px" placeholder="关联会议" clearable filterable v-model="meetingWeek" @change="changeWeekData()">
-          <el-option v-for="(item,index) in meetingData" :label="item.meetingName" :key="item.id" :value="item.weeks"></el-option>
+          <el-option v-for="(item,index) in meetingData" :label="item.meetingName" :key="item.id" :value="item.id"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>