讲师管理bug

src/components/common/CommonAlert.vue

@@ -22,7 +22,7 @@
         <div class="body">
           <div><span>{{ content }}</span></div>
         </div>
-        <div class="del_btnbox">
+        <div class="del_btnbox" v-if="isCloseBtn">
           <div class="del_btn btn2" @click="close" v-if="cancel">
             <div class="btnText">取消</div>
           </div>
@@ -30,6 +30,11 @@
             <div class="btnText">确定</div>
           </div>
         </div>
+        <div class="del_btnbox" v-else>
+          <div class="del_btn btn2" @click="close">
+            <div class="btnText">关闭</div>
+          </div>
+        </div>
       </div>
     </div>
   </a-modal>
@@ -64,6 +69,10 @@ const props = defineProps({
   type: {
     type: Number,
     default: 1
+  },
+  isCloseBtn: {
+    type: Boolean,
+    default: true
   }
 });
 const types = {

src/views/lecturer/Organization.vue

@@ -483,11 +483,15 @@ const getTableDate = (obj) => {
     }
       //删除弹窗
       const deleteModal = (record) => {
+        let contents = '';
+        (record.status == 1 || record.status == 4)&& record.parentName && (contents = '是否确认进行删除?');
+        (record.status == 1 || record.status == 4)&& !record.parentName && (contents = '是否确认进行删除?删除后关联的子节点将一并删除');
+        record.status == 2 && (contents = '该培训发生组织正在审核中，无法删除');
         dialog({
-          content: '是否确认进行删除 ?',
+          content: contents||'是否确认进行删除?',
+          isCloseBtn: record.status == 2 ? false : true,
           ok: () => {
             lecturer.affiliationDelById(record.id).then(res=>{
-              console.log(res,'res')
               if(typeof (res.data.data) != 'object'){
                 message.error(res.data.data)
                 return
@@ -495,7 +499,6 @@ const getTableDate = (obj) => {
               message.success("删除成功")
               searchSubmit();
             }).catch(err=>{
-              console.log(err,'errr')
               message.error(err.msg)
             })
           }