Merge branch 'mergeBranch' into greenUrgent

src/HDrpManagement/dataanalysis/components/quickDate.vue

@@ -1,6 +1,19 @@
 <template>
   <div>
-    <el-button-group size="small" class="inline-24" >
+    <span style="font-size: 13px">{{$t(`时间`)}}：</span>
+    <el-date-picker
+        value-format="yyyy-MM-dd"
+        @change="selectDate"
+        :append-to-body="disabled"
+        style="margin-right: 10px"
+        size="small"
+        v-model="value"
+        type="daterange"
+        :range-separator="$t('至')"
+        :start-placeholder="$t('开始日期')"
+        :end-placeholder="$t('结束日期')">
+    </el-date-picker>
+    <el-button-group size="small" class="inline-16" >
       <el-button :type="select === '上月'?'primary':''" size="small" @click="selectQuick(5)" :disabled="disabled">{{$t(`上月`)}}</el-button>
       <el-button :type="select === '日'?'primary':''" size="small" @click="selectQuick(1)" :disabled="disabled">{{$t(`本日`)}}</el-button>
       <el-button :type="select === '周'?'primary':''" size="small" @click="selectQuick(2)" :disabled="disabled">{{$t(`本周`)}}</el-button>
@@ -13,18 +26,7 @@
 <!--      <el-button :type="select === '月'?'primary':''" size="small" @click="selectQuick(3)" :disabled="disabled">{{$t(`月`)}}</el-button>-->
 <!--      <el-button :type="select === '年'?'primary':''" size="small" @click="selectQuick(4)" :disabled="disabled">{{$t(`年`)}}</el-button>-->
 <!--    </el-button-group>-->
-    <span style="font-size: 13px">{{$t(`时间`)}}：</span>
-    <el-date-picker
-        value-format="yyyy-MM-dd"
-        @change="selectDate"
-        :append-to-body="disabled"
-        size="small"
-        v-model="value"
-        type="daterange"
-        :range-separator="$t('至')"
-       :start-placeholder="$t('开始日期')"
-        :end-placeholder="$t('结束日期')">
-    </el-date-picker>
+
   </div>
 </template>
 

src/HDrpManagement/dataanalysis/modules/clue.vue

@@ -8,6 +8,7 @@
               <span style="font-size: 16px;color: #333">{{$t(`新增线索`)}}</span>
             </div>
             <div>
+              <exportFile class="inline-16" :param="clueAddParam" :columns="tablecolsAdd" file-name="新增线索"></exportFile>
               <quickDate class="inline-16" ref="quickAdd" @selectQuick="selectQuickAdd" :disabled="disabled"></quickDate>
               <fullScreen ref="addFullRef" class="inline-16" domId="clueAddFull" @onFull="onAddFull" @backFull="backAddFull"></fullScreen>
             </div>
@@ -36,6 +37,7 @@
               <span style="font-size: 16px;color: #333">{{$t(`更新线索`)}}</span>
             </div>
             <div>
+              <exportFile class="inline-16" :param="clueUpdParam" :columns="tablecolsUpdate" file-name="更新线索"></exportFile>
               <quickDate class="inline-16" ref="quickUpd" @selectQuick="selectQuickUpd" ></quickDate>
               <fullScreen class="inline-16" domId="clueUpdFull" @onFull="onUpdFull" @backFull="backUpdFull"></fullScreen>
             </div>
@@ -64,6 +66,7 @@
               <span style="font-size: 16px;color: #333">{{$t(`跟进线索`)}}</span>
             </div>
             <div>
+              <exportFile class="inline-16" :param="clueFowParam" :columns="tablecolsFollow" file-name="跟进线索"></exportFile>
               <quickDate class="inline-16" ref="quickFow" @selectQuick="selectQuickFow" :disabled="disabled"></quickDate>
               <fullScreen ref="fowFullRef" class="inline-16" domId="clueFollowFull" @onFull="onFowFull" @backFull="backFowFull"></fullScreen>
             </div>
@@ -109,10 +112,11 @@
 import quickDate from "@/HDrpManagement/dataanalysis/components/quickDate";
 import tableLayout from '@/components/table/index9'
 import fullScreen from "@/views/salesData/components/fullScreen";
+import exportFile from "@/components/export_file/index5"
 export default {
   name: "clue",
   props:['param','isDep','dataid','isPerson'],
-  components:{quickDate,tableLayout,fullScreen},
+  components:{quickDate,tableLayout,fullScreen,exportFile},
   data() {
     return {
       disabled:false,

src/HDrpManagement/dataanalysis/modules/contact.vue

@@ -8,6 +8,7 @@
               <span style="font-size: 16px;color: #333">{{$t(`新增联系人`)}}</span>
             </div>
             <div>
+              <exportFile class="inline-16" :param="param" :columns="tablecolsAdd" file-name="新增联系人"></exportFile>
               <quickDate class="inline-16" ref="quickAdd" @selectQuick="selectQuickAdd" :disabled="disabled"></quickDate>
               <fullScreen ref="addFullRef" class="inline-16" domId="contactAddFull" @onFull="onFull('新增')" @backFull="backFull('新增')"></fullScreen>
             </div>
@@ -47,6 +48,7 @@
               <span style="font-size: 16px;color: #333">{{$t(`更新联系人`)}}</span>
             </div>
             <div>
+              <exportFile class="inline-16" :param="param" :columns="tablecolsUpdate" file-name="更新联系人"></exportFile>
               <quickDate class="inline-16"  ref="quickUpd" @selectQuick="selectQuickUpd"></quickDate>
               <fullScreen ref="updFullRef" class="inline-16" domId="contactUpdFull" @onFull="onFull('更新')" @backFull="backFull('更新')"></fullScreen>
             </div>
@@ -75,6 +77,7 @@
               <span style="font-size: 16px;color: #333">{{$t(`跟进联系人`)}}</span>
             </div>
             <div>
+              <exportFile class="inline-16" :param="param" :columns="tablecolsFollow" file-name="跟进联系人"></exportFile>
               <quickDate class="inline-16" ref="quickFow" @selectQuick="selectQuickFow" :disabled="disabled"></quickDate>
               <fullScreen ref="fowFullRef" class="inline-16" domId="contactFowFull" @onFull="onFull('跟进')" @backFull="backFull('跟进')"></fullScreen>
             </div>
@@ -119,10 +122,11 @@
 import quickDate from "@/HDrpManagement/dataanalysis/components/quickDate";
 import tableLayout from '@/components/table/index9'
 import fullScreen from "@/views/salesData/components/fullScreen";
+import exportFile from "@/components/export_file/index5"
 export default {
   name: "contact",
   props:['param','isDep','dataid','isPerson'],
-  components:{quickDate,tableLayout,fullScreen},
+  components:{quickDate,tableLayout,fullScreen,exportFile},
   data() {
     return {
       listAdd:[],

src/HDrpManagement/dataanalysis/modules/customer.vue

@@ -8,6 +8,7 @@
               <span style="font-size: 16px;color: #333">{{$t(`新增客户`)}}</span>
             </div>
             <div>
+              <exportFile class="inline-16" :param="param" :columns="tablecolsAdd" file-name="新增客户"></exportFile>
               <quickDate class="inline-16" ref="quickAdd" @selectQuick="selectQuickAdd" :disabled="disabled"></quickDate>
               <fullScreen ref="addFullRef" class="inline-16" domId="customerAddFull" @onFull="onFull('新增')" @backFull="backFull('新增')"></fullScreen>
             </div>
@@ -36,6 +37,7 @@
               <span style="font-size: 16px;color: #333">{{$t(`更新客户`)}}</span>
             </div>
             <div>
+              <exportFile class="inline-16" :param="param" :columns="tablecolsUpdate" file-name="更新客户"></exportFile>
               <quickDate class="inline-16"  ref="quickUpd" @selectQuick="selectQuickUpd"></quickDate>
               <fullScreen ref="updFullRef" class="inline-16" domId="customerUpdFull" @onFull="onFull('更新')" @backFull="backFull('更新')"></fullScreen>
             </div>
@@ -64,6 +66,7 @@
               <span style="font-size: 16px;color: #333">{{$t(`跟进客户`)}}</span>
             </div>
             <div>
+              <exportFile class="inline-16" :param="param" :columns="tablecolsFollow" file-name="跟进客户"></exportFile>
               <quickDate class="inline-16" ref="quickFow" @selectQuick="selectQuickFow" :disabled="disabled"></quickDate>
               <fullScreen ref="fowFullRef" class="inline-16" domId="customerFowFull" @onFull="onFull('跟进')" @backFull="backFull('跟进')"></fullScreen>
             </div>
@@ -108,10 +111,11 @@
 import quickDate from "@/HDrpManagement/dataanalysis/components/quickDate";
 import tableLayout from '@/components/table/index9'
 import fullScreen from "@/views/salesData/components/fullScreen";
+import exportFile from "@/components/export_file/index5"
 export default {
   name: "customer",
   props:['param','isDep','dataid','isPerson'],
-  components:{quickDate,tableLayout,fullScreen},
+  components:{quickDate,tableLayout,fullScreen,exportFile},
   data() {
     return {
       listAdd:[],

src/HDrpManagement/dataanalysis/modules/documents.vue

@@ -8,6 +8,7 @@
               <span style="font-size: 16px;color: #333">{{$t('报价单')}}</span>
             </div>
             <div>
+              <exportFile class="inline-16" :param="param" :columns="quotationTablecols" file-name="报价单"></exportFile>
               <quickDate class="inline-16" @selectQuick="selectQuickQuotation"></quickDate>
               <fullScreen ref="quotationFullRef" class="inline-16" domId="quotationFull" @onFull="onFull('报价')" @backFull="backFull('报价')"></fullScreen>
             </div>
@@ -42,6 +43,7 @@
              <span style="font-size: 16px;color: #333">{{$t('合同')}}</span>
            </div>
            <div>
+             <exportFile class="inline-16" :param="param" :columns="contractTablecols" file-name="合同"></exportFile>
              <quickDate class="inline-16" @selectQuick="selectQuickContract"></quickDate>
              <fullScreen ref="contractFullRef" class="inline-16" domId="contractFull" @onFull="onFull('合同')" @backFull="backFull('合同')"></fullScreen>
            </div>
@@ -79,10 +81,11 @@
 import quickDate from "@/HDrpManagement/dataanalysis/components/quickDate";
 import tableLayout from '@/components/table/index9'
 import fullScreen from "@/views/salesData/components/fullScreen";
+import exportFile from "@/components/export_file/index5"
 export default {
   name: "documents",
   props:['param','isDep','dataid','isPerson'],
-  components:{quickDate,tableLayout,fullScreen},
+  components:{quickDate,tableLayout,fullScreen,exportFile},
   data() {
     return {
       quotationList:[],

src/HDrpManagement/dataanalysis/modules/project.vue

@@ -8,6 +8,7 @@
               <span style="font-size: 16px;color: #333">{{$t(`新增项目`)}}</span>
             </div>
             <div>
+              <exportFile class="inline-16" :param="param" :columns="tablecolsAdd" file-name="新增项目"></exportFile>
               <quickDate class="inline-16" ref="quickAdd" @selectQuick="selectQuickAdd" :disabled="disabled"></quickDate>
               <fullScreen ref="addFullRef" class="inline-16" domId="projectAddFull" @onFull="onFull('新增')" @backFull="backFull('新增')"></fullScreen>
             </div>
@@ -36,6 +37,7 @@
              <span style="font-size: 16px;color: #333">{{$t(`更新项目`)}}</span>
            </div>
            <div>
+             <exportFile class="inline-16" :param="param" :columns="tablecolsUpdate" file-name="更新项目"></exportFile>
              <quickDate class="inline-16"  ref="quickUpd" @selectQuick="selectQuickUpd"></quickDate>
              <fullScreen ref="updFullRef" class="inline-16" domId="projectUpdFull" @onFull="onFull('更新')" @backFull="backFull('更新')"></fullScreen>
            </div>
@@ -64,6 +66,7 @@
              <span style="font-size: 16px;color: #333">{{$t(`跟进项目`)}}</span>
            </div>
            <div>
+             <exportFile class="inline-16" :param="param" :columns="tablecolsFollow" file-name="跟进项目"></exportFile>
              <quickDate class="inline-16" ref="quickFow" @selectQuick="selectQuickFow" :disabled="disabled"></quickDate>
              <fullScreen ref="fowFullRef" class="inline-16" domId="projectFowFull" @onFull="onFull('跟进')" @backFull="backFull('跟进')"></fullScreen>
            </div>
@@ -109,10 +112,11 @@
 import quickDate from "@/HDrpManagement/dataanalysis/components/quickDate";
 import tableLayout from '@/components/table/index9'
 import fullScreen from "@/views/salesData/components/fullScreen";
+import exportFile from "@/components/export_file/index5"
 export default {
   name: "project",
   props:['param','isDep','dataid','isPerson'],
-  components:{quickDate,tableLayout,fullScreen},
+  components:{quickDate,tableLayout,fullScreen,exportFile},
   data() {
     return {
       listAdd:[],

src/HDrpManagement/serveWorkBill/modules/detail.vue

@@ -316,7 +316,7 @@ export default {
         },
         {
           label: "结束时间",
-          value: this.mainData.enddate,
+          value: this.mainData.finishdate,
         },
         {
           label: "操作类型",

src/components/normal-basic-layout/details/modules/followTable/index.vue

@@ -29,14 +29,14 @@
           min-width="139">
       </el-table-column>
       <el-table-column
-          v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail'"
+          v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/funnelProjectDetail'"
           prop="type"
           :label="$t(`跟进类型`)"
           min-width="80">
       </el-table-column>
       <el-table-column
           prop="contacts"
-          v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail'"
+          v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/funnelProjectDetail'"
           :label="$t(`跟进对象`)"
           min-width="69">
         <template slot-scope="scope">
@@ -56,7 +56,7 @@
           min-width="500"
           >
         <template slot-scope="scope">
-          <div v-if="($route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail')">
+          <div v-if="($route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/funnelProjectDetail')">
             <div>{{$t(`目的：`)}}{{scope.row.target}}</div>
             <div>{{$t(`过程：`)}}{{scope.row.content}}</div>
             <div>{{$t(`结果：`)}}{{scope.row.results}}</div>
@@ -66,7 +66,7 @@
         </template>
       </el-table-column>
       <el-table-column
-          v-if="$route.path === '/projectChangeDetail'"
+          v-if="$route.path === '/projectChangeDetail' || $route.path === '/funnelProjectDetail'"
           prop="squarestage"
           :label="$t(`项目阶段`)"
           min-width="80"
@@ -84,7 +84,7 @@
         </template>
       </el-table-column>
       <el-table-column
-          v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail'"
+          v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/funnelProjectDetail'"
           prop="salesfeesamount"
           :label="$t(`营销费用`)"
           min-width="80">
@@ -100,7 +100,7 @@
           <el-button type="text" size="small" @click="showReview(scope.row)" class="inline-16">{{$t(`评论`)}}({{scope.row.commentqty}})</el-button>
           <editLog v-if="userid === scope.row.createuserid && !disabled"  ref="edits" :data="scope.row" :ownertable="ownertable" @onSuccess="onSuccess" :isOperation="true"></editLog>
           <el-button type="text" size="small" class="inline-16" @click="onDelFollow(scope.row)" v-if="userid === scope.row.createuserid && !disabled">{{$t(`删除`)}}</el-button>
-          <marketingExpenses  v-if="($route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail') && !disabled"
+          <marketingExpenses  v-if="($route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/funnelProjectDetail') && !disabled"
                               class="inline-16" :ownertable="scope.row.ownertable" :ownerid="scope.row.sys_datafollowupid" :dataTime="scope.row.createdate" :userid="scope.row.createuserid" :isOperation="true"
                               @onSuccess="listData"></marketingExpenses>
         </template>

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

@@ -4,7 +4,7 @@
     <el-drawer :title="$t(`新建跟进动态`)" size="600px" append-to-body :visible.sync="dialogFormVisible" @close="onClose">
       <div class="drawer__panel">
         <el-form :model="form" ref="form" label-position="top" :label-width="tool.onlyZh('80px')">
-          <el-form-item v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail'" :label="$t(`跟进类型`)" prop="type" :rules="{ required: true, message: $t('请选择跟进类型'), trigger: 'change'}">
+          <el-form-item v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/funnelProjectDetail'" :label="$t(`跟进类型`)" prop="type" :rules="{ required: true, message: $t('请选择跟进类型'), trigger: 'change'}">
             <el-select v-model="form.type" :placeholder="$t(`请选择`)" style="width: 100%">
               <el-option
                   v-for="item in followUpType"
@@ -14,7 +14,7 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item :label="$t(`跟进对象`)" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail'" prop="dataextend.contactsid" :rules="{ required: true, message: $t('请选择跟进对象'), trigger: 'change'}">
+          <el-form-item :label="$t(`跟进对象`)" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/funnelProjectDetail'" prop="dataextend.contactsid" :rules="{ required: true, message: $t('请选择跟进对象'), trigger: 'change'}">
             <el-tag
                 style="float: left;margin-right: 5px;margin-bottom: 5px"
                 v-for="tag in selectTag"
@@ -26,22 +26,22 @@
             </el-tag>
             <contactsList style="float: left" @onSelect="onSelect" :selects="form.dataextend.contactsid"></contactsList>
           </el-form-item>
-          <el-form-item :label="$t(`跟进动态`)" prop="content" :rules="{ required: true, message: $t('请填写跟进动态'), trigger: 'blur'}" v-if="$route.path !== '/projectChangeDetail' && $route.path !== '/customerDetail' && $route.path !== '/PublicCustomerDetail'">
+          <el-form-item :label="$t(`跟进动态`)" prop="content" :rules="{ required: true, message: $t('请填写跟进动态'), trigger: 'blur'}" v-if="$route.path !== '/projectChangeDetail' && $route.path !== '/customerDetail' && $route.path !== '/PublicCustomerDetail' && $route.path !== '/funnelProjectDetail'">
             <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 18 }" v-model="form.content" :placeholder="$t(`请输入跟进动态`)" autocomplete="off"></el-input>
           </el-form-item>
-          <el-form-item :label="$t(`目的`)" prop="target" :rules="{ required: false, message: $t('请填写跟进目的'), trigger: 'blur'}" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail'">
+          <el-form-item :label="$t(`目的`)" prop="target" :rules="{ required: false, message: $t('请填写跟进目的'), trigger: 'blur'}" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/funnelProjectDetail'">
             <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 18 }" v-model="form.target" :placeholder="$t(`请输入跟进目的`)" autocomplete="off"></el-input>
           </el-form-item>
-          <el-form-item :label="$t(`过程`)" prop="content" :rules="{ required: false, message: $t('请填写跟进过程'), trigger: 'blur'}" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail'">
+          <el-form-item :label="$t(`过程`)" prop="content" :rules="{ required: false, message: $t('请填写跟进过程'), trigger: 'blur'}" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/funnelProjectDetail'">
             <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 18 }" v-model="form.content" :placeholder="$t(`请输入跟进过程`)" autocomplete="off"></el-input>
           </el-form-item>
-          <el-form-item :label="$t(`结果`)" prop="results" :rules="{ required: false, message: $t('请填写跟进结果'), trigger: 'blur'}" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail'">
+          <el-form-item :label="$t(`结果`)" prop="results" :rules="{ required: false, message: $t('请填写跟进结果'), trigger: 'blur'}" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/funnelProjectDetail'">
             <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 18 }" v-model="form.results" :placeholder="$t(`请输入跟进结果`)" autocomplete="off"></el-input>
           </el-form-item>
-          <el-form-item :label="$t(`下次跟进计划`)" prop="nextplan" :rules="{ required: false, message: $t('请填写下次跟进计划'), trigger: 'blur'}" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail'">
+          <el-form-item :label="$t(`下次跟进计划`)" prop="nextplan" :rules="{ required: false, message: $t('请填写下次跟进计划'), trigger: 'blur'}" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/funnelProjectDetail'">
             <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 18 }" v-model="form.nextplan" :placeholder="$t(`请输入下次跟进计划`)" autocomplete="off"></el-input>
           </el-form-item>
-          <el-form-item :label="$t(`变更项目阶段`)" prop="squarestage" :rules="{ required: true, message: $t('请选择项目阶段'), trigger: 'change'}" v-if="$route.path === '/projectChangeDetail'">
+          <el-form-item :label="$t(`变更项目阶段`)" prop="squarestage" :rules="{ required: true, message: $t('请选择项目阶段'), trigger: 'change'}" v-if="$route.path === '/projectChangeDetail' || $route.path === '/funnelProjectDetail'">
             <el-select v-model="form.squarestage" :placeholder="$t(`请选择项目阶段`)" @focus="squarestageFocus" style="width: 100%">
               <el-option
                   v-for="item in squarestageList"
@@ -157,7 +157,7 @@ export default {
         if (!valid) return false
         let resource = this.$route.matched[1].meta.title
         let content = {}
-        if (this.$route.path === '/projectChangeDetail'){
+        if (this.$route.path === '/projectChangeDetail' || $route.path === '/funnelProjectDetail'){
           content = {
             "sys_datafollowupid":0,
             "ownertable":this.ownertable,

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

@@ -7,7 +7,7 @@
     <el-drawer :title="$t(`编辑跟进动态`)" size="600px" append-to-body :visible.sync="dialogFormVisible" @close="onClose">
       <div class="drawer__panel">
         <el-form ref="form" :model="form" label-position="top" :label-width="tool.onlyZh('80px')">
-          <el-form-item v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail'" :label="$t(`跟进类型`)" prop="type" :rules="{ required: true, message: $t('请选择跟进类型'), trigger: 'change'}">
+          <el-form-item v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/funnelProjectDetail'" :label="$t(`跟进类型`)" prop="type" :rules="{ required: true, message: $t('请选择跟进类型'), trigger: 'change'}">
             <el-select v-model="form.type" :placeholder="$t(`请选择`)" style="width: 100%">
               <el-option
                   v-for="item in followUpType"
@@ -17,7 +17,7 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail'" :label="$t(`跟进对象`)" prop="dataextendContactsid" :rules="{ required: true, message: $t('请选择跟进对象'), trigger: 'change'}">
+          <el-form-item v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/funnelProjectDetail'" :label="$t(`跟进对象`)" prop="dataextendContactsid" :rules="{ required: true, message: $t('请选择跟进对象'), trigger: 'change'}">
             <el-tag
                 style="float: left;margin-right: 5px;margin-bottom: 5px"
                 v-for="tag in selectTag"
@@ -29,22 +29,22 @@
             </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="$t(`跟进动态`)" prop="content" :rules="{ required: true, message: $t('请填写跟进动态'), trigger: 'blur'}" v-if="$route.path !== '/projectChangeDetail' && $route.path !== '/customerDetail' && $route.path !== '/PublicCustomerDetail'">
+          <el-form-item :label="$t(`跟进动态`)" prop="content" :rules="{ required: true, message: $t('请填写跟进动态'), trigger: 'blur'}" v-if="$route.path !== '/projectChangeDetail' && $route.path !== '/customerDetail' && $route.path !== '/PublicCustomerDetail' && $route.path === '/funnelProjectDetail'">
             <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 18 }" v-model="form.content" :placeholder="$t(`请输入跟进动态`)" autocomplete="off"></el-input>
           </el-form-item>
-           <el-form-item :label="$t(`目的`)" prop="target" :rules="{ required: false, message: $t('请填写跟进目的'), trigger: 'blur'}" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail'">
+           <el-form-item :label="$t(`目的`)" prop="target" :rules="{ required: false, message: $t('请填写跟进目的'), trigger: 'blur'}" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/funnelProjectDetail'">
             <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 18 }" v-model="form.target" :placeholder="$t(`请输入跟进目的`)" autocomplete="off"></el-input>
           </el-form-item>
-          <el-form-item :label="$t(`过程`)" prop="content" :rules="{ required: false, message: $t('请填写跟进过程'), trigger: 'blur'}" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail'">
+          <el-form-item :label="$t(`过程`)" prop="content" :rules="{ required: false, message: $t('请填写跟进过程'), trigger: 'blur'}" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/funnelProjectDetail'">
             <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 18 }" v-model="form.content" :placeholder="$t(`请输入跟进过程`)" autocomplete="off"></el-input>
           </el-form-item>
-          <el-form-item :label="$t(`结果`)" prop="results" :rules="{ required: false, message: $t('请填写跟进结果'), trigger: 'blur'}" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail'">
+          <el-form-item :label="$t(`结果`)" prop="results" :rules="{ required: false, message: $t('请填写跟进结果'), trigger: 'blur'}" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/funnelProjectDetail'">
             <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 18 }" v-model="form.results" :placeholder="$t(`请输入跟进结果`)" autocomplete="off"></el-input>
           </el-form-item>
-          <el-form-item :label="$t(`下次跟进计划`)" prop="nextplan" :rules="{ required: false, message: $t('请填写下次跟进计划'), trigger: 'blur'}" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail'">
+          <el-form-item :label="$t(`下次跟进计划`)" prop="nextplan" :rules="{ required: false, message: $t('请填写下次跟进计划'), trigger: 'blur'}" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/funnelProjectDetail'">
             <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 18 }" v-model="form.nextplan" :placeholder="$t(`请输入下次跟进计划`)" autocomplete="off"></el-input>
           </el-form-item>
-          <el-form-item :label="$t(`变更项目阶段`)" prop="squarestage" :rules="{ required: true, message: $t('请选择项目阶段'), trigger: 'change'}" v-if="$route.path === '/projectChangeDetail'">
+          <el-form-item :label="$t(`变更项目阶段`)" prop="squarestage" :rules="{ required: true, message: $t('请选择项目阶段'), trigger: 'change'}" v-if="$route.path === '/projectChangeDetail' || $route.path === '/funnelProjectDetail'">
             <el-select v-model="form.squarestage" :placeholder="$t(`请选择项目阶段`)" @focus="squarestageFocus" style="width: 100%" disabled>
               <el-option
                   v-for="item in squarestageList"
@@ -152,7 +152,7 @@ export default {
         if (!valid) return false
         let resource = this.$route.matched[1].meta.title
         let content = {}
-        if (this.$route.path === '/projectChangeDetail'){
+        if (this.$route.path === '/projectChangeDetail' || $route.path === '/funnelProjectDetail'){
           content = {
             "sys_datafollowupid":this.data.sys_datafollowupid,
             "ownertable":this.ownertable,

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

@@ -51,10 +51,10 @@
               </div>
             </div>
           </div>
-          <div class="padding-style" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/projectProjectDetail' || $route.path === '/customerCustomerDetail'">
+          <div class="padding-style" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/projectProjectDetail' || $route.path === '/customerCustomerDetail' || $route.path === '/funnelProjectDetail'">
             <span class="span-style">{{$t(`跟进类型`)}}：{{i.type}}</span>
           </div>
-          <div class="padding-style" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/projectProjectDetail' || $route.path === '/customerCustomerDetail'">
+          <div class="padding-style" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/projectProjectDetail' || $route.path === '/customerCustomerDetail' || $route.path === '/funnelProjectDetail'">
             <span class="span-style">{{$t(`跟进对象`)}}：</span>
             <span  v-for="item in i.contacts" :key="item.index">
                     <span v-if="item.rowindex === i.contacts.length" class="span-style">
@@ -66,22 +66,22 @@
 
                   </span>
           </div>
-          <div class="padding-style" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/projectProjectDetail' || $route.path === '/customerCustomerDetail'">
+          <div class="padding-style" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/projectProjectDetail' || $route.path === '/customerCustomerDetail' || $route.path === '/funnelProjectDetail'">
             <span class="span-style">{{$t(`目的`)}}：{{i.target}}</span>
           </div>
-          <div class="padding-style" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/projectProjectDetail' || $route.path === '/customerCustomerDetail'">
+          <div class="padding-style" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/projectProjectDetail' || $route.path === '/customerCustomerDetail' || $route.path === '/funnelProjectDetail'">
             <span class="span-style">{{$t(`过程`)}}：{{i.content}}</span>
           </div>
-          <div class="padding-style" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/projectProjectDetail' || $route.path === '/customerCustomerDetail'">
+          <div class="padding-style" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/projectProjectDetail' || $route.path === '/customerCustomerDetail' || $route.path === '/funnelProjectDetail'">
             <span class="span-style">{{$t(`结果`)}}：{{i.results}}</span>
           </div>
-          <div class="padding-style" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/projectProjectDetail' || $route.path === '/customerCustomerDetail'">
+          <div class="padding-style" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/projectProjectDetail' || $route.path === '/customerCustomerDetail' || $route.path === '/funnelProjectDetail'">
             <span class="span-style">{{$t(`下次跟进计划`)}}：{{i.nextplan}}</span>
           </div>
-          <div class="padding-style" v-if="$route.path === '/projectChangeDetail'">
+          <div class="padding-style" v-if="$route.path === '/projectChangeDetail' || $route.path === '/funnelProjectDetail'">
             <span class="span-style">{{$t(`项目阶段`)}}：{{i.squarestage}}</span>
           </div>
-          <div class="padding-style" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/projectProjectDetail' || $route.path === '/customerCustomerDetail'">
+          <div class="padding-style" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/projectProjectDetail' || $route.path === '/customerCustomerDetail' || $route.path === '/funnelProjectDetail'">
             <span class="span-style">{{$t(`营销费用`)}}：</span>
             <span v-if="i.salesfeesamount || i.salesfeesamount == 0">
                     <span style="color: red">¥ </span>
@@ -89,7 +89,7 @@
                   </span>
             <span v-else>--</span>
           </div>
-          <div class="padding-style" v-if="$route.path !== '/projectChangeDetail' && $route.path !== '/customerDetail' && $route.path !== '/PublicCustomerDetail' && $route.path !== '/projectProjectDetail' && $route.path !== '/customerCustomerDetail'">
+          <div class="padding-style" v-if="$route.path !== '/projectChangeDetail' && $route.path !== '/customerDetail' && $route.path !== '/PublicCustomerDetail' && $route.path !== '/projectProjectDetail' && $route.path !== '/customerCustomerDetail' && $route.path !== '/funnelProjectDetail'">
             <span class="span-style">{{$t(`跟进内容`)}}：{{i.content}}</span>
           </div>
           <div style="padding: 0 10px 10px 10px">
@@ -188,7 +188,7 @@
                 <span style="font-size: 14px;color: #3874F6;margin-left: 5px;vertical-align: middle">{{$t(`评论`)}}({{i.commentqty}})</span></el-button>
             </div>
             <div>
-              <marketingExpenses  v-if="($route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail') && !disabled"  class="inline-16"  :ownerid="i.sys_datafollowupid" :dataTime="i.createdate" :userid="i.createuserid" @onSuccess="onSuccess" :ownertable="i.ownertable"></marketingExpenses>
+              <marketingExpenses  v-if="($route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/funnelProjectDetail') && !disabled"  class="inline-16"  :ownerid="i.sys_datafollowupid" :dataTime="i.createdate" :userid="i.createuserid" @onSuccess="onSuccess" :ownertable="i.ownertable"></marketingExpenses>
               <editLog v-if="nowUserid === i.createuserid && !disabled" :status="status" ref="edits" :data="i" :ownertable="ownertable" @onSuccess="queryLogs" :bindDataFile="bindData" :editData="editData"></editLog>
               <el-popconfirm
                   :confirm-button-text="$t('确定')" :cancel-button-text="$t('取消')"