跟进列表与客户列表格式调整

src/views/ecw/customer/index.vue

@@ -6,7 +6,7 @@
           <el-input v-model.trim="queryParams.number" :placeholder="$t('请输入客户编号')" clearable @keyup.enter.native="handleQuery" @input="queryParams.number = queryParams.number.replace(/\s+/g, '')" />
         </el-form-item>
         <el-form-item :label="$t('客户名称')" prop="name">
-          <el-input v-model="queryParams.name" :placeholder="$t('请输入客户名称')" clearable @keyup.enter.native="handleQuery" @input="queryParams.name = queryParams.name"  @blur="trimCustomerName" />
+          <el-input v-model="queryParams.name" :placeholder="$t('请输入客户名称')" clearable @keyup.enter.native="handleQuery"  @blur="trimCustomerName" />
         </el-form-item>
         <el-form-item :label="$t('区号')">
           <el-select filterable v-model="queryParams.areaCode" :placeholder="$t('请选择区号')">
@@ -211,7 +211,7 @@
     </el-row>
 
     <!-- 列表 -->
-    <el-table ref="multipleTable" v-loading="loading" :data="list" @selection-change="handleSelectionChange">
+    <el-table ref="multipleTable" border v-loading="loading" :data="list" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" fixed></el-table-column>
       <el-table-column :label="$t('客户编号')" align="center" fixed>
         <template v-slot="{ row }">

src/views/ecw/customerConfirm/index.vue

@@ -7,7 +7,7 @@
           <el-input v-model.trim="queryParams.number" :placeholder="$t('请输入客户编号')" clearable @keyup.enter.native="handleQuery" @input="queryParams.number = queryParams.number.replace(/\s+/g, '')" />
         </el-form-item>
         <el-form-item :label="$t('客户名称')" prop="name">
-          <el-input v-model="queryParams.name" :placeholder="$t('请输入客户名称')" clearable @keyup.enter.native="handleQuery" @input="queryParams.name = queryParams.name" @blur="trimCustomerName" />
+          <el-input v-model="queryParams.name" :placeholder="$t('请输入客户名称')" clearable @keyup.enter.native="handleQuery"  @blur="trimCustomerName" />
         </el-form-item>
         <el-form-item :label="$t('区号')">
           <el-select filterable v-model="queryParams.areaCode" :placeholder="$t('请选择区号')">
@@ -201,7 +201,7 @@
     </el-row>
 
     <!-- 列表 -->
-    <el-table ref="multipleTable" v-loading="loading" :data="list" @selection-change="handleSelectionChange">
+    <el-table ref="multipleTable" border v-loading="loading" :data="list" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" fixed></el-table-column>
       <el-table-column :label="$t('客户编号')" align="center" fixed>
         <template v-slot="{ row }">

src/views/ecw/customerToBeAssigned/index.vue

@@ -7,7 +7,7 @@
           <el-input v-model.trim="queryParams.number" :placeholder="$t('请输入客户编号')" clearable @keyup.enter.native="handleQuery" @input="queryParams.number = queryParams.number.replace(/\s+/g, '')" />
         </el-form-item>
         <el-form-item :label="$t('客户名称')" prop="name">
-          <el-input v-model="queryParams.name" :placeholder="$t('请输入客户名称')" clearable @keyup.enter.native="handleQuery" @input="queryParams.name = queryParams.name" @blur="trimCustomerName"/>
+          <el-input v-model="queryParams.name" :placeholder="$t('请输入客户名称')" clearable @keyup.enter.native="handleQuery"  @blur="trimCustomerName"/>
         </el-form-item>
         <el-form-item :label="$t('区号')">
           <el-select filterable v-model="queryParams.areaCode" :placeholder="$t('请选择区号')">
@@ -197,14 +197,14 @@
     </el-row>
 
     <!-- 列表 -->
-    <el-table ref="multipleTable" v-loading="loading" :data="list" @selection-change="handleSelectionChange">
+    <el-table ref="multipleTable" border v-loading="loading" :data="list" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" fixed></el-table-column>
-      <el-table-column :label="$t('客户编号')" align="center" prop="number">
+      <el-table-column :label="$t('客户编号')" align="center" prop="number" fixed>
         <template v-slot="{ row }">
           {{ row.number }}
         </template>
       </el-table-column>
-      <el-table-column :label="$t('客户名称')" align="center" prop="name">
+      <el-table-column :label="$t('客户名称')" align="center" prop="name" fixed>
         <template v-slot="{ row }">
           <p style="display: inline-block; white-space: pre-wrap">{{ $l(row, "name") }}</p>
         </template>

src/views/ecw/myCustomerService/index.vue

@@ -7,7 +7,7 @@
           <el-input v-model.trim="queryParams.number" :placeholder="$t('请输入客户编号')" clearable @keyup.enter.native="handleQuery" @input="queryParams.number = queryParams.number.replace(/\s+/g, '')" />
         </el-form-item>
         <el-form-item :label="$t('客户名称')" prop="name">
-          <el-input v-model="queryParams.name" :placeholder="$t('请输入客户名称')" clearable @keyup.enter.native="handleQuery" @input="queryParams.name = queryParams.name" @blur="trimCustomerName"/>
+          <el-input v-model="queryParams.name" :placeholder="$t('请输入客户名称')" clearable @keyup.enter.native="handleQuery"  @blur="trimCustomerName"/>
         </el-form-item>
         <el-form-item :label="$t('区号')">
           <el-select filterable v-model="queryParams.areaCode" :placeholder="$t('请选择区号')">
@@ -192,7 +192,7 @@
     </el-row>
 
     <!-- 列表 -->
-    <el-table ref="multipleTable" v-loading="loading" :data="list" @selection-change="handleSelectionChange">
+    <el-table ref="multipleTable" border v-loading="loading" :data="list" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" fixed></el-table-column>
       <el-table-column :label="$t('客户编号')" align="center" fixed>
         <template v-slot="{ row }">

src/views/ecw/oceanCustomer/index.vue

@@ -8,7 +8,7 @@
           <el-input v-model.trim="queryParams.number" :placeholder="$t('请输入客户编号')" clearable @keyup.enter.native="handleQuery" @input="queryParams.number = queryParams.number.replace(/\s+/g, '')" />
         </el-form-item>
         <el-form-item :label="$t('客户名称')" prop="name">
-          <el-input v-model="queryParams.name" :placeholder="$t('请输入客户名称')" clearable @keyup.enter.native="handleQuery" @input="queryParams.name = queryParams.name" @blur="trimCustomerName"/>
+          <el-input v-model="queryParams.name" :placeholder="$t('请输入客户名称')" clearable @keyup.enter.native="handleQuery"  @blur="trimCustomerName"/>
         </el-form-item>
         <el-form-item :label="$t('区号')">
           <el-select filterable v-model="queryParams.areaCode" :placeholder="$t('请选择区号')">
@@ -215,6 +215,7 @@
     <!-- 列表 -->
     <el-table
       ref="multipleTable"
+      border
       v-loading="loading"
       :data="list"
       @selection-change="handleSelectionChange"

src/views/ecw/offer/logListCommon.vue

@@ -4,50 +4,52 @@
       <div slot="header" class="clearfix">
         <el-form size="small" :inline="true" label-width="100px">
           <div class="search-z">
-            <el-form-item :label="$t('编号')" prop="number">
-              <el-input v-model.trim="followForm.number" clearable @keyup.enter.native="handleQuery" />
-            </el-form-item>
-            <el-form-item :label="$t('报价单号')" prop="offerNumber">
-              <el-input v-model.trim="followForm.offerNumber" clearable @keyup.enter.native="handleQuery" />
-            </el-form-item>
-            <el-form-item :label="$t('联系人')" prop="contactName">
+            <el-form-item :label="$t('联系人')" prop="contactName" >
               <el-input v-model.trim="followForm.contactName" clearable @keyup.enter.native="handleQuery" />
             </el-form-item>
-            <el-form-item :label="$t('联系方式')" prop="contactPhone">
+            <el-form-item :label="$t('联系方式')" prop="contactPhone" >
               <el-input v-model.trim="followForm.contactPhone" clearable @keyup.enter.native="handleQuery" />
             </el-form-item>
-            <el-form-item :label="$t('客户经理')" prop="followUserIds">
+            <el-form-item :label="$t('跟进类型')" >
+              <dict-selector clearable :type="DICT_TYPE.CUSTOMER_FOLLOWUP_TYPE" v-model="followForm.followType" @input="handleQuery"></dict-selector>
+            </el-form-item>
+            <el-form-item :label="$t('销售阶段')" >
+              <dict-selector clearable :type="DICT_TYPE.CUSTOMER_FOLLOWUP_SALE_STAGE" v-model="followForm.saleStage" @input="handleQuery"></dict-selector>
+            </el-form-item>
+            <el-form-item :label="$t('编号')" prop="number"  v-show="showSearch">
+              <el-input v-model.trim="followForm.number" clearable @keyup.enter.native="handleQuery" />
+            </el-form-item>
+            <el-form-item :label="$t('报价单号')" prop="offerNumber"  v-show="showSearch">
+              <el-input v-model.trim="followForm.offerNumber" clearable @keyup.enter.native="handleQuery" />
+            </el-form-item>
+
+            <el-form-item :label="$t('客户经理')" prop="followUserIds"  v-show="showSearch">
               <user-selector v-model="followForm.followUserIds" multiple clearable @input="handleQuery" />
             </el-form-item>
-            <el-form-item :label="$t('关联跟进记录')" prop="parentNumber">
+            <el-form-item :label="$t('关联跟进记录')" prop="parentNumber"  v-show="showSearch">
               <el-input v-model.trim="followForm.parentNumber" clearable @keyup.enter.native="handleQuery" />
             </el-form-item>
 
-            <el-form-item :label="$t('跟进类型')">
-              <dict-selector clearable :type="DICT_TYPE.CUSTOMER_FOLLOWUP_TYPE" v-model="followForm.followType" @input="handleQuery"></dict-selector>
-            </el-form-item>
-            <el-form-item :label="$t('跟进方式')">
+            <el-form-item :label="$t('跟进方式')"  v-show="showSearch">
               <dict-selector clearable :type="DICT_TYPE.CUSTOMER_FOLLOWUP_METHOD" v-model="followForm.followMethod" @input="handleQuery"></dict-selector>
             </el-form-item>
-            <el-form-item :label="$t('销售阶段')">
-              <dict-selector clearable :type="DICT_TYPE.CUSTOMER_FOLLOWUP_SALE_STAGE" v-model="followForm.saleStage" @input="handleQuery"></dict-selector>
-            </el-form-item>
+
             <!-- <el-form-item :label="$t('跟进结果')">
               <el-select clearable v-model="followForm.resultType" :placeholder="$t('请选择')" size="small" @change="handleQuery">
                 <el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_FOLLOWUP_RESULT_TYPE)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="dict.value" />
               </el-select>
             </el-form-item> -->
-            <el-form-item :label="$t('跟进状态')">
+            <el-form-item :label="$t('跟进状态')"  v-show="showSearch">
               <el-select clearable v-model="followForm.status" :placeholder="$t('请选择')" size="small" @change="handleQuery">
                 <el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_FOLLOWUP_STATUS)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="dict.value" />
               </el-select>
             </el-form-item>
           </div>
           <div class="search-time">
-            <el-form-item :label="$t('创建时间')">
+            <el-form-item :label="$t('创建时间')"  v-show="showSearch">
               <el-date-picker v-model="followFormTmp.createTime" type="datetimerange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" value-format="yyyy-MM-dd HH:mm:ss" @change="handleQuery"> </el-date-picker>
             </el-form-item>
-            <el-form-item :label="$t('下次跟进时间')">
+            <el-form-item :label="$t('下次跟进时间')"  v-show="showSearch">
               <el-date-picker v-model="followFormTmp.nextTime" type="datetimerange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" value-format="yyyy-MM-dd HH:mm:ss" @change="handleQuery"> </el-date-picker>
             </el-form-item>
             <el-form-item style="padding-left: 20px; width: auto">
@@ -73,8 +75,12 @@
             {{ $t("导出") }}
           </el-button>
         </el-col>
+        <right-toolbar
+          :showSearch.sync="showSearch"
+          @queryTable="getDataSpaceCustomerFollowupList"
+        ></right-toolbar>
       </el-row>
-      <el-table ref="multipleTable" :data="customerFollowList" v-loading="loading" @selection-change="handleSelectionChange" style="width: 100%">
+      <el-table ref="multipleTable" border :data="customerFollowList" v-loading="loading" @selection-change="handleSelectionChange" style="width: 100%">
         <el-table-column type="selection" width="55" fixed></el-table-column>
         <el-table-column prop="number" :label="$t('编号')" align="center" fixed :width="120">
           <template slot-scope="scope">
@@ -156,6 +162,8 @@ export default {
       getDictDatas,
       getDictDatas2,
       DICT_TYPE,
+      // 显示搜索条件
+      showSearch: false,
       updateStatus: false,
       customerFollowVisible: false,
       customerFollowTotal: 0,