2023-9-19

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'}" v-if="$route.path !== '/projectChangeDetail' && $route.path !== '/customerDetail' && $route.path !== '/PublicCustomerDetail'">
+          <el-form-item label="跟进动态" prop="content" :rules="{ required: true, message: '请填写跟进动态', trigger: 'blur'}">
             <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"
@@ -134,9 +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,//下次跟进计划
+            //"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'}" v-if="$route.path !== '/projectChangeDetail' && $route.path !== '/customerDetail' && $route.path !== '/PublicCustomerDetail'">
+          <el-form-item label="跟进动态" prop="content" :rules="{ required: true, message: '请填写跟进动态', trigger: 'blur'}">
             <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 v-if="$route.path !== '/projectChangeDetail' && $route.path !== '/customerDetail' && $route.path !== '/PublicCustomerDetail'">{{i.content}}</p>
+                  <p>{{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">

src/views/mediaStatistics/modules/salesfunnel.vue

@@ -83,7 +83,7 @@
     </div>
     <div>
       <p class="title">{{projectTile}}</p>
-      <tableTemp :layout="tablecols" :data="projectList" :opwidth="200" :custom="true"  >
+      <tableTemp :layout="tablecols" :data="projectList" :opwidth="200" :custom="true" :height="tableHieght">
         <template v-slot:customcol="scope">
           <div v-if="scope.column.columnname === 'status'">
             <span style="color:#52c41a" v-if="scope.column.data[[scope.column.columnname]] == '跟进中'">{{scope.column.data[[scope.column.columnname]]}}</span>
@@ -152,7 +152,7 @@
 </template>
 
 <script>
-import tableTemp from '@/components/table/index7'
+import tableTemp from '@/components/table/index5'
 import { Funnel,G2 } from '@antv/g2plot';
 const G = G2.getEngine('canvas');
 export default {