Merge remote-tracking branch 'origin/master'

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

@@ -7,7 +7,7 @@
     </div>
 
     <div class="app-container">
-    <gjjl types="gjdt" :data="datas"></gjjl>
+    <gjjl types="gjdt" :data="datas" isDisabled=false></gjjl>
     </div>
   </div>
 </template>

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

@@ -100,6 +100,7 @@
               <div><strong>{{item.nickName}}</strong> <span v-if="item.visitWay">({{item.visitWay}})</span></div>
               <div><span>{{item.recordInfo}}</span></div>
               <div class="rec_text">
+                <span v-if="item.projectName && showtype == 'projectgjdt'">关联项目：{{item.projectName||'--'}}</span>
                 <span v-if="item.visitPerson">拜访对象：{{item.visitPerson||'--'}}</span>
                 <span v-if="item.position">职位：{{item.position||'--'}}</span>
                 <span v-if="item.creatTime">拜访时间：{{item.creatTime}}</span>
@@ -178,7 +179,6 @@
     computed: {
     },
     created(){
-      console.log(this.isDisabled)
       //获取拜访方式
       getDictType('visit_mode_type').then(result=>{
         this.bffslist = result.code == 200 ? result.data:[]
@@ -225,6 +225,7 @@
               this.$message.success(result.msg)
               this.handleCurrentChange(1)
               this.isEdit = false
+              this.resetForm()
             }else{
               this.$message.error(result.msg)
             }
@@ -245,12 +246,24 @@
               this.$message.success(result.msg)
               this.handleCurrentChange(1)
               this.isEdit = false
+              this.resetForm()
             }else{
               this.$message.error(result.msg)
             }
           })
         }
       },
+      resetForm(){
+
+        this.addParam={
+          customerId:'', //客户id
+            visitMode:'',//拜访方式
+            nextVisitTime:'',//下次拜访时间
+            name:'',//拜访对象姓名
+            position:'',//拜访对象职务
+            content:'',//拜访内容
+        }
+      },
       //删除跟进动态
       delRecord(id){
         this.isdel = true

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

 <template>
   <div class="app-container">
-    <gjjl types="projectgjdt"></gjjl>
+    <gjjl types="projectgjdt" isDisabled=false></gjjl>
   </div>
 </template>