瀏覽代碼

修改bug

humingbo 1 年之前
父節點
當前提交
655f5f1b32
共有 3 個文件被更改,包括 17 次插入8 次删除
  1. 9 1
      src/views/dashboard/index.vue
  2. 3 2
      src/views/enforceflow/enforceflow.vue
  3. 5 5
      src/views/meeting/meeting.vue

+ 9 - 1
src/views/dashboard/index.vue

@@ -253,7 +253,15 @@ export default {
       this.$router.push({path: '/enforceflow/enforceflow', query: params});
     },
     todoMeetingClick() {
-      this.$router.push('/meeting/meeting')
+      let count=this.todoMeetingConfirmCount
+      if(count===0){
+        this.$router.push('/meeting/meeting')
+      }else {
+        let params={
+            toDoMeeting:'toDoMeeting'
+        }
+        this.$router.push({path: '/meeting/meeting',query:params})
+      }
     },
     enforceRemindClick() {
       let params = {

+ 3 - 2
src/views/enforceflow/enforceflow.vue

@@ -912,7 +912,7 @@ export default {
     this.getData(this.formInline)
     this.getDeptUserTrees()
     this.fileAction = uploadFileUrl()
-    this.formInline.status = this.$route.query.status;
+    this.formInline.toDoMeeting = this.$route.query.toDoMeeting;
   },
   methods: {
     // 分页插件事件
@@ -958,7 +958,8 @@ export default {
         name: null,
         hname: null,
         hsytem: null,
-        status: null
+        status: null,
+        toDoMeeting:null
       }
       this.getData(this.formInline);
     },

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

@@ -304,14 +304,12 @@
       </div>
     </el-dialog>
 
-    <el-dialog :visible.sync="projectMeetingDetailVisble" width="95%" @click="closeProjectMeetingDailog" fullscreen
-               :close-on-click-modal="false" >
+    <el-dialog :visible.sync="projectMeetingDetailVisble" width="95%" @click="closeProjectMeetingDailog" fullscreen :close-on-click-modal="false" >
       <div style="display: flex;justify-content: space-between;margin-bottom: 8px">
         <div style="font-size: 24px">{{ pro.meetingName }}</div>
         <div>
           <el-button @click="backBtnClick"  size="small">返回</el-button>
-          <el-button v-if="pro.status===1 && pro.recorderOpFlag==='true'" size="mini" type="primary" @click="endProMeetingClick(pro)">结束会议
-          </el-button>
+          <el-button v-if="pro.status===1 && pro.recorderOpFlag==='true'" size="mini" type="primary" @click="endProMeetingClick(pro)">结束会议</el-button>
         </div>
       </div>
       <el-descriptions title="" border :column="3">
@@ -574,7 +572,8 @@ export default {
         meetingType: null,
         status: null,
         searchAuthFlag: false,
-        chooseType:'0'
+        chooseType:'0',
+        toDoMeeting:null,
 
       },
       editFormVisible: false,
@@ -655,6 +654,7 @@ export default {
   mounted() {
     this.getData(this.formInline);
     this.getDeptUserTrees();
+    this.formInline.status = this.$route.query.status;
   },
   methods: {
     getDeptUserTrees() {