跟进动态功能放出来

src/SManagement/orderclue/components/follow.vue

@@ -9,7 +9,7 @@
             <el-date-picker v-model="timer" type="datetime" format="yyyy-MM-dd HH:mm:ss"  size="small">
             </el-date-picker>
           </el-form-item>
-          <el-form-item label="跟进类型" prop="followupmode">
+          <el-form-item label="本次跟进方式" prop="followupmode">
             <el-select v-model="param.followupmode" placeholder="请选择方式" size="small">
               <el-option v-for="(item,index) in followTypeList" :key="index" :label="item.value" :value="item.value">
               </el-option>

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

@@ -26,10 +26,10 @@
             </el-tag>
             <contactsList style="float: left" @onSelect="onSelect" :selects="form.dataextend.contactsid"></contactsList>
           </el-form-item>
-          <el-form-item label="跟进动态" prop="content" :rules="{ required: true, message: '请填写跟进动态', trigger: 'blur'}">
+          <el-form-item label="跟进动态" prop="content" :rules="{ required: true, message: '请填写跟进动态', trigger: 'blur'}" v-if="$route.path !== '/projectChangeDetail' || $route.path !== '/customerDetail' || $route.path !== '/PublicCustomerDetail'">
             <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 18 }" v-model="form.content" placeholder="请输入跟进动态" autocomplete="off"></el-input>
           </el-form-item>
-          <!--<el-form-item label="目的" prop="target" :rules="{ required: false, message: '请填写跟进目的', trigger: 'blur'}" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail'">
+          <el-form-item label="目的" prop="target" :rules="{ required: false, message: '请填写跟进目的', trigger: 'blur'}" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail'">
             <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 18 }" v-model="form.target" placeholder="请输入跟进目的" autocomplete="off"></el-input>
           </el-form-item>
           <el-form-item label="过程" prop="content" :rules="{ required: false, message: '请填写跟进过程', trigger: 'blur'}" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail'">
@@ -40,7 +40,7 @@
           </el-form-item>
           <el-form-item label="下次跟进计划" prop="nextplan" :rules="{ required: false, message: '请填写下次跟进计划', trigger: 'blur'}" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail'">
             <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 18 }" v-model="form.nextplan" placeholder="请输入下次跟进计划" autocomplete="off"></el-input>
-          </el-form-item>-->
+          </el-form-item>
           <el-form-item>
             <upload
               ref="upload"
@@ -124,9 +124,6 @@ export default {
       this.followUpType = res.data
     },
     submitLog () {
-      //"target":this.form.target,//目的
-      //"results":this.form.results,//结果
-      //"nextplan":this.form.nextplan,//下次跟进计划
       this.$refs.form.validate(async (valid)=>{
         if (!valid) return false
         const res = await this.$api.requested({
@@ -137,6 +134,9 @@ export default {
             "ownerid":this.$route.query.id,
             "type":this.form.type,
             "content":this.form.content,
+            "target":this.form.target,//目的
+            "results":this.form.results,//结果
+            "nextplan":this.form.nextplan,//下次跟进计划
             "dataextend": {
               "contactsid": this.form.dataextend.contactsid // 跟进对象
             }

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

@@ -26,10 +26,10 @@
             </el-tag>
             <contactsList style="float: left" @onSelect="onSelect" ref="listData" :selects="form.dataextend.contactsid" :sys_enterpriseid="sys_enterpriseid"></contactsList>
           </el-form-item>
-          <el-form-item label="跟进动态" prop="content" :rules="{ required: true, message: '请填写跟进动态', trigger: 'blur'}">
+          <el-form-item label="跟进动态" prop="content" :rules="{ required: true, message: '请填写跟进动态', trigger: 'blur'}" v-if="$route.path !== '/projectChangeDetail' || $route.path !== '/customerDetail' || $route.path !== '/PublicCustomerDetail'">
             <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 18 }" v-model="form.content" placeholder="请输入跟进动态" autocomplete="off"></el-input>
           </el-form-item>
-          <!-- <el-form-item label="目的" prop="target" :rules="{ required: false, message: '请填写跟进目的', trigger: 'blur'}" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail'">
+           <el-form-item label="目的" prop="target" :rules="{ required: false, message: '请填写跟进目的', trigger: 'blur'}" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail'">
             <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 18 }" v-model="form.target" placeholder="请输入跟进目的" autocomplete="off"></el-input>
           </el-form-item>
           <el-form-item label="过程" prop="content" :rules="{ required: false, message: '请填写跟进过程', trigger: 'blur'}" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail'">
@@ -40,7 +40,7 @@
           </el-form-item>
           <el-form-item label="下次跟进计划" prop="nextplan" :rules="{ required: false, message: '请填写下次跟进计划', trigger: 'blur'}" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail'">
             <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 18 }" v-model="form.nextplan" placeholder="请输入下次跟进计划" autocomplete="off"></el-input>
-          </el-form-item> -->
+          </el-form-item>
           <div class="flex-align-center flex-between pionter" v-for="file in data.attinfos" :key="file.index">
             <div class="flex-align-center">
               <img width="30" :src="checkFileType(file.postfix) === 'file'?require('@/assets/file_icons/file.svg'):file.url" class="inline-16" alt="">
@@ -127,9 +127,9 @@ export default {
             "ownerid":this.$route.query.id,
             "type":this.form.type,
             "content":this.form.content,
-            // "target":this.form.target,//目的
-            // "results":this.form.results,//结果
-            // "nextplan":this.form.nextplan,//下次跟进计划
+            "target":this.form.target,//目的
+            "results":this.form.results,//结果
+            "nextplan":this.form.nextplan,//下次跟进计划
             "dataextend": {
               "contactsid": this.form.dataextend.contactsid // 跟进对象
             }

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

@@ -72,7 +72,7 @@
 
                   </span>
                 </div>
-                <!-- <div v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail'">
+                 <div v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail'">
                   <span>目的：{{i.target}}</span>
                 </div>
                 <div v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail'">
@@ -83,9 +83,9 @@
                 </div>
                 <div v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail'">
                   <span>下次跟进计划：{{i.nextplan}}</span>
-                </div> -->
+                </div>
                 <div class="follow-progress">
-                  <p>{{i.content}}</p>
+                  <p v-if="$route.path !== '/projectChangeDetail' || $route.path !== '/customerDetail' || $route.path !== '/PublicCustomerDetail'">{{i.content}}</p>
                   <div>
                     <!-- <previewImage v-show="checkFileType(img.postfix) === 'img'" style="width:60px;height:60px;margin-left:5px" v-for="img in i.attinfos" :key="img.index" :image="img" :deletebtn="true" @onSuccess="queryLogs"></previewImage> -->
                     <div class="flex-align-center flex-between pionter" v-for="img in i.attinfos" :key="img.index" style="padding:10px;margin-bottom:5px">