humingbo 2 ani în urmă
părinte
comite
bf67edcbb2

+ 15 - 5
src/views/enforceflow/enforceflow.vue

@@ -376,23 +376,31 @@
         <div v-else style="margin-top:5px ">
           <el-tabs type="card" >
             <el-tab-pane label="运维提醒设置">
-              <el-table :data="enforceRemindData" stripe  style="width: 100%" >
+              <el-button type="primary" size="mini" @click="addenforceRemind">添加</el-button>
+              <el-table :data="enforceRemindData" stripe  size="mini" style="width: 100%;margin-top: 15px" >
+                <el-table-column type="index" label="序号" width="60"></el-table-column>
                 <el-table-column prop="date" label="提醒信息" width="180"></el-table-column>
                 <el-table-column prop="name" label="有限期限" width="180"></el-table-column>
                 <el-table-column prop="op" label="操作">
+                  <el-button type="primary" size="mini" @click="addenforceRemind">修改</el-button>
+                  <el-button type="primary" size="mini" @click="addenforceRemind">删除</el-button>
                 </el-table-column>
               </el-table>
             </el-tab-pane>
             <el-tab-pane label="运维记录">
-              <el-table :data="enforceRemindData" stripe  style="width: 100%">
+              <el-button type="primary" size="mini" @click="addenforceRemind">添加</el-button>
+              <el-table :data="enforceRemindData" stripe  style="width: 100%;margin-top: 15px;">
+                <el-table-column type="index" label="序号" width="60"></el-table-column>
                 <el-table-column prop="date" label="运维类型" width="180"></el-table-column>
                 <el-table-column prop="name" label="运维内容" width="180"></el-table-column>
                 <el-table-column prop="address" label="运维时间"></el-table-column>
                 <el-table-column prop="address" label="运维人员"></el-table-column>
-                <el-table-column prop="op" label="操作"></el-table-column>
+                <el-table-column prop="op" label="操作">
+                  <el-button type="primary" size="mini" @click="addenforceRemind">修改</el-button>
+                  <el-button type="primary" size="mini" @click="addenforceRemind">删除</el-button>
+                </el-table-column>
               </el-table>
             </el-tab-pane>
-
           </el-tabs>
         </div>
 
@@ -736,8 +744,10 @@ export default {
         }else{
           this.active = e
         }
-
       }
+    },
+    addenforceRemind(){
+      alert('点击添加运维提醒')
     }
   }
 

+ 9 - 0
src/views/meeting/weeklyRecords.vue

@@ -199,6 +199,10 @@ export default {
     getData() {
       let meetingId = this.meetingId
       let weeks = this.weeks
+ /*      if(meetingId===undefined || weeks===undefined){
+        this.$message.error('暂无周会会议!')
+        return
+      } */
       if (meetingId != null && weeks != null) {
         getWeeksRecordsByWeeks(meetingId, weeks).then(res => {
           this.tableData = res.data.workContent
@@ -209,9 +213,14 @@ export default {
         //获取当前周会会议id与所属周数
         getMeetingByWeekss().then(res => {
           let data = res.data;
+          if(data===null || data.id===undefined){
+            this.$message.warning('暂无属于你的周会会议!')
+            return
+          }
           if (data != null) {
             this.meetingId = data.id
             this.weeks = data.weeks
+
             getWeeksRecordsByWeeks(this.meetingId, this.weeks).then(res => {
               this.tableData = res.data.workContent
               this.getSpanArr(this.tableData);