Merge branch 'redUrgent' into allTestUrgent

src/SManagement/orderclue_detail/components/followDetail.vue

@@ -3,7 +3,7 @@
     <div class="select"  style="margin-top: -12px">
       <span class="demonstration">日期范围:</span>
       <time-select class="inline-16" @clearSelect="clearSelect" @timeChange="timeChange"></time-select>
-      <el-input style="width: 200px" placeholder="搜索" :suffix-icon="search?search.length > 0?'':'':'el-icon-search'" v-model="search" @keyup.native.enter="searchChange" @clear="timeChange" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
+      <el-input style="width: 200px" placeholder="搜索" :suffix-icon="search?search.length > 0?'':'':'el-icon-search'" v-model="search" @keyup.native.enter="searchChange" @clear="searchChange" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
       </el-input>
     </div>
     <div style="height:calc(100vh - 340px);overflow: auto;margin-top: 10px" v-if="follow.length > 0">
@@ -22,7 +22,7 @@
               </div>
               <marketingExpenses class="inline-16" ownertable="sat_orderclue" :ownerid="item.sat_ordercluefollowuplogid" :dataTime="item.createdate" :userid="item.createuserid" @onSuccess="onSuccess"></marketingExpenses>
               <upload
-                  v-if="!disabled"
+                  v-if="!disabled && item.createuserid == userid"
                   class="inline-16"
                   ref="upload"
                   :folderid="folderid"
@@ -53,6 +53,9 @@
             <div style="margin-top: 10px;margin-bottom: 10px">
               <p>跟进类型：{{item.followupmode}}</p>
             </div>
+            <div style="margin-top: 10px;margin-bottom: 10px">
+              <p>跟进内容：{{item.content}}</p>
+            </div>
             <div style="float: left">营销费用：</div>
             <div style="float: left">
               <div v-if="item.salesfeesamount || item.salesfeesamount == 0">
@@ -68,7 +71,7 @@
                   :rowCount="5"
                   :isDownLoad="true"
                   :fileData="item.attinfo"
-                  :isDelete="!disabled"
+                  :isDelete="!disabled && item.createuserid == userid"
                   @deleteSuccess="deleteFile">
               </file-item>
             </div>

src/components/normal-basic-layout-new/details/modules/followUp/editLog.vue

@@ -114,7 +114,6 @@ export default {
       this.followUpType = res.data
     },
     onSuccess(res,type) {
-      console.log(res,'res1111')
       res.attinfos = type == '删除'?res.attinfos:JSON.parse(res.attinfos)
       this.attachmentids = [...this.attachmentids,...res.attinfos.data]
       this.loading = false
@@ -133,7 +132,7 @@ export default {
           "content": {
             "sys_datafollowupid":this.data.sys_datafollowupid,
             "ownertable":this.ownertable,
-            "ownerid":this.ownerid,
+            "ownerid":this.$route.query.id,
             "type":this.form.type,
             "content":this.form.content,
             "target":this.form.target,//目的

src/components/normal-basic-layout/details/modules/followUp/followUp.vue

@@ -135,7 +135,7 @@
                   </div>
                 </div>
                 <div v-if="item.subcomment.length > 0" style="margin-left: 10px;margin-top: 10px">
-                  <div v-for="k in item.subcomment" :key="k.index">
+                  <div v-for="k in item.subcomment" :key="k.index" style="margin-top: 10px">
                     <div style="display: flex;justify-content: left;align-items: center">
                       <div style="font-size: 14px;font-weight: bold;color:#333;">{{k.createby}}</div><i style="margin: 0 10px 0 10px" class="el-icon-caret-right"></i><div style="font-size: 14px;font-weight: bold;color:#333;">{{k.replyusername}}</div>
                     </div>