Merge remote-tracking branch 'origin/master' into master

src/views/meeting/weekly.vue

@@ -311,21 +311,33 @@ export default {
 
     },
     deleteRow(index, row) {
-      if (index == 0) {
-        this.$message({
-          message: '不能删除此条数据',
-          type: 'warning'
-        });
-        return;
-      }
-      this.workPlans.splice(index, 1)
-      let id = row.id;
-      if (id != null) {
-        deleteWorkPlanById(id).then(res => {
-          this.getMeetingsAndWorkPlansByWeeksData(this.meetingWeek)
-        });
+      let meetingId=this.meetingId
+      let userId=this.$store.getters.userId
+      let data={
+        weeks:this.weeks,
+        userId:userId,
+        meetingId:meetingId
       }
-
+      getWorkPlanConfirmFlags(data).then(res=> {
+        if (res.success !== true) {
+          this.$message.warning(res.data)
+        }else{
+          if (index == 0) {
+            this.$message({
+              message: '不能删除此条数据',
+              type: 'warning'
+            });
+            return;
+          }
+          this.workPlans.splice(index, 1)
+          let id = row.id;
+          if (id != null) {
+            deleteWorkPlanById(id).then(res => {
+              this.getMeetingsAndWorkPlansByWeeksData(this.meetingWeek)
+            });
+          }
+        }
+      })
     },
     changeWeekData() {
       this.getMeetingsAndWorkPlansByWeeksData(this.meetingWeek)