*

dsk-operate-ui/src/views/project/projectList/component/gjjl.vue

 <template>
   <div>
     <el-card class="box-card noborder">
-      <div class="cardtitles" v-if="showtype != 'projectgjdt'">跟进记录</div>
-      <div style="height: 24px" v-if="showtype == 'projectgjdt'"></div>
+      <div class="cardtitles">跟进记录</div>
+      <!--<div style="height: 24px" v-if="showtype == 'projectgjdt'"></div>-->
       <div class="records">
         <div class="writeIn" v-if="isDisableds == false">
           <div class="default" v-if="isEdit == false" @click="getEdit">
@@ -87,6 +87,13 @@
         </div>
         <div class="recordlist" v-if="showtype=='gjjl' || showtype == 'projectgjdt' && recordlist.total>0">
           <div class="rec_detail" v-for="(item,index) in recordlist.rows">
+            <div class="delform" v-if="isdel && delID == item.id">
+              <div class="words">是否删除该条记录</div>
+              <div>
+                <div class="btnsmall btn_primary h28" @click="delele">确定</div>
+                <div class="btnsmall btn_cancel h28" @click="isdel=false">取消</div>
+              </div>
+            </div>
 
             <div class="rec_time">
               <i class="el-icon-time"></i>
@@ -174,6 +181,7 @@
         userId:this.$store.state.user.userId,//当前用户id
         projectList:[],//关联项目
         isDisableds:this.isDisabled,
+        keys:1,
       }
     },
     computed: {
@@ -270,6 +278,7 @@
       delRecord(id){
         this.isdel = true
         this.delID = id
+        this.keys++;
       },
       delele(){
         if(this.types == 'gjdt') {
@@ -381,6 +390,9 @@
 </script>
 
 <style lang="scss" scoped>
+  .app-main{
+    overflow: initial !important;
+  }
   .el-card{
     overflow: initial;
   }

dsk-operate-ui/src/views/project/trends/index.vue

@@ -21,5 +21,4 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-
 </style>