弹框逻辑有变化

src/views/education/edit-notice.vue

@@ -8,7 +8,7 @@
           type="primary"
           style="position: absolute;right: 30px;bottom: 8px;"
           size="small"
-          @click="confirmEdit(true)"
+          @click="beforeConfirm()"
         >发布</el-button>
         <el-button
           type="primary"
@@ -21,7 +21,7 @@
         <el-form :model="formData" ref="formData" :rules="rules" label-width="120px" class="form-inline">
           <el-form-item label="是否开启公告：" prop="projectIntro" style="min-width: 1000px;margin-bottom: 10px">
             <el-col :span="20">
-              <el-radio-group size="small" v-model="formData.openFlag" @change="changeOpenFlag">
+              <el-radio-group size="small" v-model="formData.openFlag">
                 <el-radio :label="1">开启</el-radio>
                 <el-radio :label="2">关闭</el-radio>
               </el-radio-group>
@@ -79,7 +79,7 @@
       :close-on-press-escape=false
       :show-close=false>
       <p v-show="isCancleBtn" class="prot-dialog-tips-1">确定取消吗？取消后将不保存本次操作内容</p>
-      <p v-show="!isCancleBtn" class="prot-dialog-tips-1">确定要开启公告吗？点击确定后公告将立即生效</p>
+      <p v-show="!isCancleBtn" class="prot-dialog-tips-1">点击发布后将立即生效，是否继续发布？</p>
       <!-- <p class="prot-dialog-tips-2">若您选择暂不发送，您只能录入量表的非敏感信息</p> -->
       <!-- <p class="prot-dialog-tips-3">为避免打扰居民，7天内只能发送1次，您已发送过短信，请尽快联系居民同意授权</p> -->
       <span v-show="isCancleBtn" slot="footer" class="dialog-footer">
@@ -174,8 +174,7 @@ export default {
       });
     },
 
-    //提交公告信息
-    confirmEdit(needJump) {
+    beforeConfirm() {
       let flag = false;
       vm.$refs['formData'].validate(valid => {
         if (valid) {
@@ -185,16 +184,23 @@ export default {
         }
       });
       if(!flag) return;
+      vm.isCancleBtn = false;
+      if(vm.formData.noticeId) {
+        vm.isShowDialog = true;
+      }
+    },
 
-    openLoading(vm);
+    //提交公告信息
+    confirmEdit(needJump) {
+      openLoading(vm);
       vm.formData.projectId = vm.projectId
       vm.POST("portal/noticeInfo/insertOrUpdate", vm.formData).then(res => {
         closeLoading(vm);
         if (res.code == "000000") {
-          if(needJump) {
+          // if(needJump) {
             vm.$router.push('/item-manager');
             vm.$message.success('发布成功');
-          }
+          // }
         }
       });
     },
@@ -221,7 +227,7 @@ export default {
     // 确认开启的取消
     openFlagCancle() {
       vm.isShowDialog = false;
-      vm.formData.openFlag = 2;
+      // vm.formData.openFlag = 2;
       // vm.$forceUpdate();
     },