合并

VUECODE/smart-property-manage/src/views/social/announcement/details.vue

@@ -52,7 +52,6 @@ export default {
         for (let i = 0; i < imgList.length; i++) {
           this.ruleForm.contentImg.push({ url: imgList[i].imageUrl })
         }
-        console.log('详情', resData)
         if (this.ruleForm.status === '0') {
           this.isEdi = false
         }

VUECODE/smart-property-manage/src/views/social/announcement/edit.vue

@@ -81,7 +81,6 @@ export default {
   },
   methods: {
     submitForm(formName,status) {
-      console.log(status)
       // 加载框
       const loading = this.$loading({
         lock: true,
@@ -156,7 +155,6 @@ export default {
     },
     sortHandleChange(value) { // 权重值
       this.ruleForm.sort = value
-      console.log(value)
     },
     getById(id) { // 页面初始化后调用此方法根据ID获取公告信息
       this.ruleForm.id=this.$route.params.id

VUECODE/smart-property-manage/src/views/social/announcement/index.vue

@@ -179,7 +179,20 @@ export default {
         this.$message.error('请选择一行数据进行修改!')
         return
       }
-      this.$router.push({ name: 'announcement-edit', params: { id: ids[0] }})
+       let ide= this.deleteIds[0]
+       this.listQuery.id = ide 
+      this.$store.dispatch('AnnouncementById', this.listQuery).then((res) => {
+        const resData = res.data
+        const announcement = resData.tpAnnouncement
+        const imgList = resData.studentList
+        this.listQuery = announcement
+        console.log("1",this.listQuery.status)
+        if(this.listQuery.status == 0){
+          this.$message.error('已作废不可以修改')
+          return
+        }
+          this.$router.push({ name: 'announcement-edit', params: { id: ids[0] }})
+      })
       },
     deleteAnnouncement(){
       const ids = this.deleteIds