客户相关列表补充最新跟进记录和最新跟进时间

src/views/ecw/customer/index.vue

@@ -228,14 +228,25 @@
       -->
 
       <el-table-column :label="$t('主联系人')" prop="defaultContactName"></el-table-column>
-      <el-table-column :label="$t('主联系方式')" prop="defaultContactPhone">
-        <template v-slot="{ row }">
-          +{{ row.defaultContactPhone }} <br />
-          <contacts :id="row.id">
-            <el-button type="text">更多</el-button>
-          </contacts>
+<!--      <el-table-column :label="$t('主联系方式')" prop="defaultContactPhone">-->
+<!--        <template v-slot="{ row }">-->
+<!--          +{{ row.defaultContactPhone }} <br />-->
+<!--          <contacts :id="row.id">-->
+<!--            <el-button type="text">更多</el-button>-->
+<!--          </contacts>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+      <el-table-column :label="$t('最新跟进时间')" width="120">
+        <template slot-scope="scope" v-if= "scope.row.followupBackVO">
+          {{ parseTime(scope.row.followupBackVO.followTime) }}
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('最新跟进记录')" width="120">
+        <template slot-scope="scope" v-if= "scope.row.followupBackVO">
+          <a href="javascript:void(0)" @click="handleCustomerFollowLink(scope.row.followupBackVO)" class="link-type">{{ scope.row.followupBackVO.number }}</a>
         </template>
       </el-table-column>
+
       <el-table-column :label="$t('客户类别')" align="center" prop="status">
         <template slot-scope="{ row }">
           {{
@@ -656,6 +667,7 @@
       </div>
     </el-dialog>
     <customer-follow-list :customer-id="customerId" :id="customerId" :customer-service="customerService" :customer-number="customerNumber" ref="CustomerFollowList" v-if="customerFollowVisible"></customer-follow-list>
+    <customer-follow ref="customerFollow"  @refresh="handleQuery" v-if="customerFollowVisible"/>
     <customer-complaints :customer-id="customerId" ref="customerComplaints"></customer-complaints>
     <transfer-customer :show.sync="transferShow" :customer-ids.sync="selectCustomerList"></transfer-customer>
     <add-potential-custom ref="potentialCustom" @change="getList"></add-potential-custom>
@@ -707,6 +719,8 @@ import { getCustomerSelect } from "@/api/ecw/customer"
 import { getProductTypeList } from "@/api/ecw/productType"
 import { getProductList } from "@/api/ecw/product"
 import { listMySimpleDepts } from "@/api/system/dept"
+import UserSelector from "@/components/UserSelector/index.vue";
+import CustomerFollow from "@/views/ecw/customer/components/customerFollow.vue";
 export default {
   name: "EcwCustomerIndex",
   components: {
@@ -719,10 +733,12 @@ export default {
     transferCustomer,
     AreaCodeSelector,
     CustomerSetting,
-    CustomerMerge
+    CustomerMerge,
+    CustomerFollow
   },
   data() {
     return {
+      customerFollowVisible: false,
       env: process.env.NODE_ENV,
       getDictDatas,
       getDictDatas2,
@@ -1000,6 +1016,12 @@ export default {
         this.$refs["customerMerge"].dialogVisible = true
       })
     },
+    handleCustomerFollowLink(row) {
+      this.customerFollowVisible = true
+      this.$nextTick((_) => {
+        this.$refs["customerFollow"].handleView(row)
+      })
+    },
     recovery(row) {
       this.$confirm(this.$t("是否要回收当前{name}", row), "提示", {
         confirmButtonText: "确定",

src/views/ecw/customerConfirm/index.vue

@@ -445,14 +445,25 @@
         </template>
       </el-table-column>
       <el-table-column :label="$t('主联系人')" prop="defaultContactName"></el-table-column>
-      <el-table-column :label="$t('主联系方式')" prop="defaultContactPhone">
-        <template v-slot="{row}">
-          +{{row.defaultContactPhone}} <br/>
-          <contacts :id="row.id" >
-            <el-button  type="text">更多</el-button>
-          </contacts>
+<!--      <el-table-column :label="$t('主联系方式')" prop="defaultContactPhone">-->
+<!--        <template v-slot="{row}">-->
+<!--          +{{row.defaultContactPhone}} <br/>-->
+<!--          <contacts :id="row.id" >-->
+<!--            <el-button  type="text">更多</el-button>-->
+<!--          </contacts>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+      <el-table-column :label="$t('最新跟进时间')" width="120">
+        <template slot-scope="scope" v-if= "scope.row.followupBackVO">
+          {{ parseTime(scope.row.followupBackVO.followTime) }}
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('最新跟进记录')" width="120">
+        <template slot-scope="scope" v-if= "scope.row.followupBackVO">
+          <a href="javascript:void(0)" @click="handleCustomerFollowLink(scope.row.followupBackVO)" class="link-type">{{ scope.row.followupBackVO.number }}</a>
         </template>
       </el-table-column>
+
       <el-table-column :label="$t('客户类别')" align="center" prop="status">
         <template slot-scope="{ row }">
           {{ getDictDatas2(DICT_TYPE.CUSTOMER_TYPE, (row.type||'').split(',')).map(e => isChinese ? e.label : e.labelEn).join(', ')}}
@@ -814,6 +825,7 @@
       </div>
     </el-dialog>
     <transfer-customer :show.sync="openHandOver" :customer-ids.sync="handOverForm.customerIdList"></transfer-customer>
+    <customer-follow ref="customerFollow"  @refresh="handleQuery" v-if="customerFollowVisible"/>
     <customer-setting
       ref="customerSetting"
       @refresh="getList"
@@ -847,6 +859,7 @@ import { getProductTypeList } from "@/api/ecw/productType";
 import { getProductList } from "@/api/ecw/product";
 import { listMySimpleDepts } from "@/api/system/dept";
 import Template from "@/views/cms/template/index.vue";
+import CustomerFollow from "@/views/ecw/customer/components/customerFollow.vue";
 export default {
   name: "EcwCustomerconfirmIndex",
   activated() {
@@ -927,10 +940,12 @@ export default {
     Contacts,
     transferCustomer,
     AreaCodeSelector,
-    CustomerSetting
+    CustomerSetting,
+    customerFollow
   },
   data() {
     return {
+      customerFollowVisible: false,
       // 遮罩层
       loading: true,
       // 导出遮罩层
@@ -1049,6 +1064,12 @@ export default {
     //     this.$message.info(this.$t('已取消'))
     //   });
     // },
+    handleCustomerFollowLink(row) {
+      this.customerFollowVisible = true
+      this.$nextTick((_) => {
+        this.$refs["customerFollow"].handleView(row)
+      })
+    },
     getDictDatas,
     countryFormatter(row, column, cellValue) {
       const country = this.countryList.find((e) => e.id === cellValue)

src/views/ecw/customerToBeAssigned/index.vue

@@ -442,14 +442,25 @@
         </template>
       </el-table-column>
       <el-table-column :label="$t('主联系人')" prop="defaultContactName"></el-table-column>
-      <el-table-column :label="$t('主联系方式')" prop="defaultContactPhone">
-        <template v-slot="{row}">
-          +{{row.defaultContactPhone}} <br/>
-          <contacts :id="row.id" >
-            <el-button  type="text">更多</el-button>
-          </contacts>
+<!--      <el-table-column :label="$t('主联系方式')" prop="defaultContactPhone">-->
+<!--        <template v-slot="{row}">-->
+<!--          +{{row.defaultContactPhone}} <br/>-->
+<!--          <contacts :id="row.id" >-->
+<!--            <el-button  type="text">更多</el-button>-->
+<!--          </contacts>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+      <el-table-column :label="$t('最新跟进时间')" width="120">
+        <template slot-scope="scope" v-if= "scope.row.followupBackVO">
+          {{ parseTime(scope.row.followupBackVO.followTime) }}
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('最新跟进记录')" width="120">
+        <template slot-scope="scope" v-if= "scope.row.followupBackVO">
+          <a href="javascript:void(0)" @click="handleCustomerFollowLink(scope.row.followupBackVO)" class="link-type">{{ scope.row.followupBackVO.number }}</a>
         </template>
       </el-table-column>
+
       <el-table-column :label="$t('客户类别')" align="center" prop="status">
         <template slot-scope="{ row }">
           {{ getDictDatas2(DICT_TYPE.CUSTOMER_TYPE, (row.type||'').split(',')).map(e => isChinese ? e.label : e.labelEn).join(', ')}}
@@ -611,6 +622,7 @@
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
                 @pagination="getList"/>
     <transfer-customer :show.sync="batchTransferShow" :customer-ids.sync="selectCustomerList"></transfer-customer>
+    <customer-follow ref="customerFollow"  @refresh="handleQuery" v-if="customerFollowVisible"/>
     <customer-setting
       ref="customerSetting"
       @refresh="getList"
@@ -634,6 +646,7 @@ import Template from "@/views/cms/template/index.vue";
 import Contacts from "@/views/ecw/customer/components/contacts.vue";
 import CustomerSetting from "../customer/components/customerSetting.vue";
 import AreaCodeSelector from "@/components/AreaCodeSelector/index.vue";
+import CustomerFollow from "@/views/ecw/customer/components/customerFollow.vue";
 import { getNodeList } from "@/api/ecw/node";
 import { getCustomerSelect, changeCustomerDefaultPay, changeCustomerNoConsignee,changeCustomerDefaultBilling } from "@/api/ecw/customer";
 import { getProductTypeList } from "@/api/ecw/productType";
@@ -651,10 +664,12 @@ export default {
     upload,
     transferCustomer,
     AreaCodeSelector,
+    CustomerFollow,
     CustomerSetting
   },
   data() {
     return {
+      customerFollowVisible: false,
       batchTransferShow:false,
       getDictDatas,
       getDictDatas2,
@@ -784,6 +799,12 @@ export default {
     handleSelectionChange(val){
       this.selectCustomerList = val.map(i => i.id);
     },
+    handleCustomerFollowLink(row) {
+      this.customerFollowVisible = true
+      this.$nextTick((_) => {
+        this.$refs["customerFollow"].handleView(row)
+      })
+    },
     /** 查询列表 */
     getList() {
       this.loading = true;

src/views/ecw/myCustomerService/index.vue

@@ -220,12 +220,22 @@
         </template>
       </el-table-column>
       <el-table-column :label="$t('主联系人')" prop="defaultContactName"></el-table-column>
-      <el-table-column :label="$t('主联系方式')" prop="defaultContactPhone">
-        <template v-slot="{ row }">
-          +{{ row.defaultContactPhone }} <br />
-          <contacts :id="row.id">
-            <el-button type="text">更多</el-button>
-          </contacts>
+<!--      <el-table-column :label="$t('主联系方式')" prop="defaultContactPhone">-->
+<!--        <template v-slot="{ row }">-->
+<!--          +{{ row.defaultContactPhone }} <br />-->
+<!--          <contacts :id="row.id">-->
+<!--            <el-button type="text">更多</el-button>-->
+<!--          </contacts>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+      <el-table-column :label="$t('最新跟进时间')" width="120">
+        <template slot-scope="scope" v-if= "scope.row.followupBackVO">
+          {{ parseTime(scope.row.followupBackVO.followTime) }}
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('最新跟进记录')" width="120">
+        <template slot-scope="scope" v-if= "scope.row.followupBackVO">
+          <a href="javascript:void(0)" @click="handleCustomerFollowLink(scope.row.followupBackVO)" class="link-type">{{ scope.row.followupBackVO.number }}</a>
         </template>
       </el-table-column>
       <el-table-column :label="$t('客户类别')" align="center" prop="status">
@@ -361,6 +371,7 @@
     <!-- 分页组件 -->
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize" @pagination="getList" />
     <customer-follow-list :customer-id="customerId" :id="customerId" :customer-service="customerService" :customer-number="customerNumber" ref="CustomerFollowList" v-if="customerFollowVisible"></customer-follow-list>
+    <customer-follow ref="customerFollow"  @refresh="handleQuery" v-if="customerFollowVisible"/>
     <customer-complaints ref="customerComplaint" :customer-id.sync="customerId"></customer-complaints>
     <transfer-customer :show.sync="show" :customer-ids.sync="selectCustomerList"></transfer-customer>
     <customer-setting ref="customerSetting" @refresh="getList"></customer-setting>
@@ -372,6 +383,7 @@ import { createCustomer, updateCustomer, deleteCustomer, getMyCustomerService, m
 import { getDictDatas, DICT_TYPE, getDictDatas2 } from "@/utils/dict"
 import upload from "@/components/ImageUpload"
 import customerFollowList from "../customer/components/customerFollow"
+import customerFollow from "../customer/components/customerFollow"
 import customerComplaints from "@/components/customerComplaints"
 import { listServiceUser, getUserProfile, listAllSimpl } from "@/api/system/user"
 import { getCountryListAll } from "@/api/ecw/country"
@@ -392,6 +404,7 @@ export default {
     Template,
     upload,
     customerFollowList,
+    customerFollow,
     customerComplaints,
     transferCustomer,
     AreaCodeSelector,
@@ -464,6 +477,7 @@ export default {
   },
   data() {
     return {
+      customerFollowVisible: false,
       show: false,
       creditList: [],
       countryList: [],
@@ -563,7 +577,6 @@ export default {
       userId: undefined,
       customerService: undefined,
       customerNumber: undefined,
-      customerFollowVisible: false,
       enterOpenSeaTime: [],
       customerServiceConfirmedTime: [],
       firstDealTime: [],
@@ -669,6 +682,12 @@ export default {
         this.productList = []
       }
     },
+    handleCustomerFollowLink(row) {
+      this.customerFollowVisible = true
+      this.$nextTick((_) => {
+        this.$refs["customerFollow"].handleView(row)
+      })
+    },
     /** 取消按钮 */
     cancel() {
       this.open = false