客户列表相关页面搜索框排版调整

src/views/ecw/customer/index.vue

 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="130px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px">
       <div class="search-z">
         <el-form-item :label="$t('客户编号')" prop="number">
           <el-input v-model.trim="queryParams.number" :placeholder="$t('请输入客户编号')" clearable @keyup.enter.native="handleQuery" @input="queryParams.number = queryParams.number.replace(/\s+/g, '')" />
@@ -125,17 +125,17 @@
             <el-option :label="$t('否')" :value="0" />
           </el-select>
         </el-form-item>
-        <el-form-item :label="$t('控货无收货人')" v-show="showSearch">
+        <el-form-item :label="$t('控货无收货人')" v-show="showSearch" label-width="100px">
           <div style="width: 194px">
             <el-switch v-model="queryParams.noConsignee" />
           </div>
         </el-form-item>
-        <el-form-item :label="$t('默认付款')" v-show="showSearch">
+        <el-form-item :label="$t('默认付款')" v-show="showSearch" label-width="70px">
           <div style="width: 194px">
             <el-switch v-model="queryParams.defaultPay" />
           </div>
         </el-form-item>
-        <el-form-item :label="$t('是否显示提单价格')" v-show="showSearch">
+        <el-form-item :label="$t('是否显示提单价格')" v-show="showSearch" label-width="130px">
           <div style="width: 194px">
             <el-switch v-model="queryParams.isShowTidanPrice" />
           </div>

src/views/ecw/customer/indirectCustomer.vue

@@ -21,10 +21,7 @@
                        :key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="dict.value"/>
         </el-select>
       </el-form-item>
-      <el-form-item :label="$t('创建时间')">
-        <el-date-picker clearable  v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
-                        type="datetimerange"  range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
-      </el-form-item>
+
       <el-form-item  :label="$t('市场获客')" prop="department">
         <dict-selector clearable  :type="DICT_TYPE.ECW_CUSTOMER_RESOURCE_TYPE" v-model="queryParams.marketType" formatter="number"  @change="handleQuery"></dict-selector>
       </el-form-item>
@@ -58,6 +55,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item :label="$t('创建时间')">
+        <el-date-picker clearable  v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
+                        type="datetimerange"  range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
         <el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button>

src/views/ecw/customerConfirm/index.vue

 <template>
   <div class="app-container">
     <!-- 搜索工作栏 -->
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="130px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px">
+      <div class="search-z">
         <el-form-item :label="$t('客户编号')" prop="number">
-        <el-input
-          v-model.trim="queryParams.number"
-          :placeholder="$t('请输入客户编号')"
-          clearable
-          @keyup.enter.native="handleQuery"
-          @input="queryParams.number=queryParams.number.replace(/\s+/g, '')"
-        />
+          <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.trim="queryParams.name"
-          :placeholder="$t('请输入客户名称')"
-          clearable
-          @keyup.enter.native="handleQuery"
-          @input="queryParams.name=queryParams.name.replace(/\s+/g, '')"
-        />
+          <el-input v-model.trim="queryParams.name" :placeholder="$t('请输入客户名称')" clearable @keyup.enter.native="handleQuery" @input="queryParams.name = queryParams.name.replace(/\s+/g, '')" />
         </el-form-item>
         <el-form-item :label="$t('区号')">
-        <el-select
-          v-model="queryParams.areaCode"
-          :placeholder="$t('请选择区号')"
-        >
-          <el-option
-            v-for="(item, index) in countryList"
-            :key="index"
-            :label="
-              item.nameShort +
-              (isChinese ? item.nameZh : item.nameEn) +
-              ' +' +
-              item.tel
-            "
-            :value="item.tel"
-          />
+          <el-select v-model="queryParams.areaCode" :placeholder="$t('请选择区号')">
+            <el-option v-for="(item, index) in countryList" :key="index" :label="item.nameShort + (isChinese ? item.nameZh : item.nameEn) + ' +' + item.tel" :value="item.tel" />
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('联系方式')">
-        <el-input
-          :placeholder="$t('请输入联系方式')"
-          v-model.trim="queryParams.defaultContactPhone"
-          @input="queryParams.defaultContactPhone=queryParams.defaultContactPhone.replace(/\s+/g, '')"
-        ></el-input>
+          <el-input :placeholder="$t('请输入联系方式')" clearable v-model.trim="queryParams.defaultContactPhone" @input="queryParams.defaultContactPhone = queryParams.defaultContactPhone.replace(/\s+/g, '')"></el-input>
         </el-form-item>
-      <el-form-item :label="$t('部门')">
+        <el-form-item :label="$t('部门')" v-if="path != '/customer/department-customers'">
           <el-select v-model="queryParams.deptIds" :placeholder="$t('请选择部门')">
-          <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id"/>
+            <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('客户经理')" prop="customerService">
-        <el-select
-          multiple
-          clearable
-          v-model="queryParams.customerService"
-          :placeholder="$t('请选择客户经理')"
-          size="small"
-          @change="handleQuery"
-        >
-          <el-option
-            v-for="dict in customerServiceList"
-            :key="dict.id"
-            :label="dict.nickname"
-            :value="dict.id"
-          />
+          <el-select multiple clearable v-model="queryParams.customerService" :placeholder="$t('请选择客户经理')" size="small" @change="handleQuery">
+            <el-option v-for="dict in customerServiceList" :key="dict.id" :label="dict.nickname" :value="dict.id" />
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('客户来源')" prop="source">
-        <el-select
-          multiple
-          clearable
-          v-model="queryParams.source"
-          :placeholder="$t('请选择客户来源')"
-          size="small"
-          @change="handleQuery"
-        >
-          <el-option
-            v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_SOURCE)"
-            :key="dict.value"
-            :label="isChinese ? dict.label : dict.labelEn"
-            :value="dict.value"
-          />
+          <el-select multiple clearable v-model="queryParams.source" :placeholder="$t('请选择客户来源')" size="small" @change="handleQuery">
+            <el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_SOURCE)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="dict.value" />
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('客户类别')" prop="level">
-        <dict-selector
-          multiple
-          clearable
-          :type="DICT_TYPE.CUSTOMER_TYPE"
-          v-model="queryParams.type"
-          @change="handleQuery"
-        ></dict-selector>
+          <dict-selector multiple clearable :type="DICT_TYPE.CUSTOMER_TYPE" v-model="queryParams.type" @change="handleQuery"></dict-selector>
         </el-form-item>
         <el-form-item :label="$t('角色')">
-        <dict-selector
-          multiple
-          clearable
-          :type="DICT_TYPE.CUSTOMER_ROLE"
-          v-model="queryParams.role"
-          formatter="number"
-          @change="handleQuery"
-          :placeholder="$t('请选择')"
-        ></dict-selector>
+          <dict-selector multiple clearable :type="DICT_TYPE.CUSTOMER_ROLE" v-model="queryParams.role" formatter="number" @change="handleQuery" :placeholder="$t('请选择')"></dict-selector>
         </el-form-item>
         <el-form-item :label="$t('客户状态')" prop="status">
-        <el-select
-        multiple
-          clearable
-          v-model="queryParams.status"
-          :placeholder="$t('请选择客户状态')"
-          size="small"
-          @change="handleQuery"
-        >
-          <el-option
-            v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_STATUS)"
-            :key="dict.value"
-            :label="isChinese ? dict.label : dict.labelEn"
-            :value="dict.value"
-          />
+          <el-select multiple clearable v-model="queryParams.status" :placeholder="$t('请选择客户状态')" size="small" @change="handleQuery">
+            <el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_STATUS)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="dict.value" />
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('国籍')" prop="country">
-        <el-select
-          multiple
-          clearable
-          v-model="queryParams.country"
-          :placeholder="$t('请选择')"
-          @change="handleQuery"
-        >
-          <el-option
-            v-for="dict in countryList"
-            :key="dict.id"
-            :label="isChinese ? dict.nameZh : dict.nameEn"
-            :value="parseInt(dict.id)"
-          />
+          <el-select multiple clearable v-model="queryParams.country" :placeholder="$t('请选择')" @change="handleQuery">
+            <el-option v-for="dict in countryList" :key="dict.id" :label="isChinese ? dict.nameZh : dict.nameEn" :value="parseInt(dict.id)" />
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('出货渠道')">
-        <dict-selector
-          multiple
-          clearable
-          :type="DICT_TYPE.ECW_CUSTOMER_TRANSPORT_TYPE"
-          v-model="queryParams.transportType"
-          formatter="number"
-          @change="handleQuery"
-        ></dict-selector>
+          <dict-selector multiple clearable :type="DICT_TYPE.ECW_CUSTOMER_TRANSPORT_TYPE" v-model="queryParams.transportType" formatter="number" @change="handleQuery"></dict-selector>
         </el-form-item>
 
         <el-form-item :label="$t('业务国家')" v-show="showSearch">
-        <el-select
-          multiple
-          clearable
-          v-model="queryParams.busiCountryIds"
-          :placeholder="$t('请选择')"
-          @change="handleQuery"
-        >
-          <el-option
-            v-for="dict in countryList"
-            :key="dict.id"
-            :label="isChinese ? dict.nameZh : dict.nameEn"
-            :value="parseInt(dict.id)"
-          />
+          <el-select multiple clearable v-model="queryParams.busiCountryIds" :placeholder="$t('请选择')" @change="handleQuery">
+            <el-option v-for="dict in countryList" :key="dict.id" :label="isChinese ? dict.nameZh : dict.nameEn" :value="parseInt(dict.id)" />
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('常用提货网点')" v-show="showSearch">
           <el-select multiple v-model="queryParams.pickupPoints">
-          <el-option
-            v-for="item in getNodeLists"
-            :key="item.id"
-            :value="item.id"
-            :label="isChinese ? item.titleZh : item.titleEn"
-          ></el-option>
+            <el-option v-for="item in getNodeLists" :key="item.id" :value="item.id" :label="isChinese ? item.titleZh : item.titleEn"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('创建人')" v-show="showSearch">
           <el-select v-model="queryParams.founder">
-          <el-option
-            v-for="item in allSimplList"
-            :key="item.id"
-            :label="item.nickname"
-            :value="item.id"
-          >
-          </el-option>
+            <el-option v-for="item in allSimplList" :key="item.id" :label="item.nickname" :value="item.id"> </el-option>
           </el-select>
         </el-form-item>
-      <el-form-item :label="$t('创建时间')" v-show="showSearch">
-        <el-date-picker
-          type="datetimerange"
-          clearable
-          v-model="dateRangeCreateTime"
-          style="width: 240px"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          range-separator="-"
-          :start-placeholder="$t('开始日期')"
-          :end-placeholder="$t('结束日期')"
-        />
-      </el-form-item>
-      <el-form-item :label="$t('入公海时间')" v-show="showSearch">
-        <el-date-picker
-          type="datetimerange"
-          clearable
-          v-model="enterOpenSeaTime"
-          style="width: 240px"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          range-separator="-"
-          :start-placeholder="$t('开始日期')"
-          :end-placeholder="$t('结束日期')"
-        />
-      </el-form-item>
         <el-form-item :label="$t('业绩类型')" v-show="showSearch">
           <el-select clearable v-model="queryParams.isNew">
             <el-option :label="$t('新客户')" :value="true" />
@@ -216,91 +74,50 @@
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('年度发货量')" v-show="showSearch">
-        <el-input
-          v-model.trim="weightYearly.value"
-          :placeholder="$t('请输入数字')"
-          clearable
-          @keyup.enter.native="handleQuery"
-          @input="weightYearly.value=weightYearly.value.replace(/\s+/g, '')"
-        >
+          <el-input v-model.trim="weightYearly.value" :placeholder="$t('请输入数字')" clearable @keyup.enter.native="handleQuery" @input="weightYearly.value = weightYearly.value.replace(/\s+/g, '')">
             <template slot="prepend">
-            <dict-selector
-              :type="DICT_TYPE.CUSTOMER_QUERY_NUMBER_FIELD"
-              defaultable
-              v-model="weightYearly.key"
-              class="w-50"
-            />
+              <dict-selector :type="DICT_TYPE.CUSTOMER_QUERY_NUMBER_FIELD" defaultable v-model="weightYearly.key" />
             </template>
           </el-input>
         </el-form-item>
         <el-form-item :label="$t('商品类别')" v-show="showSearch">
-        <el-select
-          @change="handleSelectProductType"
-          multiple
-          v-model="queryParams.productTypes"
-          :placeholder="$t('请选择')"
-        >
-          <el-option
-            :label="item.titleZh"
-            :value="item.id"
-            v-for="item in productTypeList"
-            :key="item.id"
-          />
+          <el-select @change="handleSelectProductType" multiple v-model="queryParams.productTypes" :placeholder="$t('请选择')">
+            <el-option :label="item.titleZh" :value="item.id" v-for="item in productTypeList" :key="item.id" />
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('商品名称')" v-show="showSearch">
-        <el-select
-          multiple
-          filterable
-          clearable
-          v-model="queryParams.productIds"
-          :placeholder="$t('请选择商品名称')"
-        >
-          <el-option
-            :label="item.titleZh"
-            :value="parseInt(item.id)"
-            v-for="item in productList"
-            :key="item.id"
-          />
+          <el-select multiple filterable clearable v-model="queryParams.productIds" :placeholder="$t('请选择商品名称')">
+            <el-option :label="item.titleZh" :value="parseInt(item.id)" v-for="item in productList" :key="item.id" />
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('主要竞争对手')" v-show="showSearch">
           <competitor-selector v-model="queryParams.competitorIds" multiple clearable @change="handleQuery" />
         </el-form-item>
         <el-form-item :label="$t('年度发货次数')" v-show="showSearch">
-        <el-input
-          v-model.trim="numYearly.value"
-          :placeholder="$t('请输入数字')"
-          clearable
-          @keyup.enter.native="handleQuery"
-          @input="numYearly.value=numYearly.value.replace(/\s+/g, '')"
-        >
+          <el-input v-model.trim="numYearly.value" :placeholder="$t('请输入数字')" clearable @keyup.enter.native="handleQuery" @input="numYearly.value = numYearly.value.replace(/\s+/g, '')">
             <template slot="prepend">
-            <dict-selector
-              :type="DICT_TYPE.CUSTOMER_QUERY_NUMBER_FIELD"
-              defaultable
-              v-model="numYearly.key"
-              class="w-50"
-            />
+              <dict-selector :type="DICT_TYPE.CUSTOMER_QUERY_NUMBER_FIELD" defaultable v-model="numYearly.key" />
             </template>
           </el-input>
         </el-form-item>
         <el-form-item :label="$t('推介人')" v-show="showSearch">
-        <el-select
-          clearable
-          remote
-          :remote-method="remoteMethod"
-          v-model="queryParams.promoter"
-          :placeholder="$t('请输入推介人')"
-          filterable
-        >
-          <el-option
-            v-for="item in customerSelectFn"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-          >
-          </el-option>
+          <el-select clearable remote :remote-method="remoteMethod" v-model="queryParams.promoter" :placeholder="$t('请输入推介人')" filterable>
+            <el-option v-for="item in customerSelectFn" :key="item.id" :label="item.name" :value="item.id"> </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('获取方式')" v-show="showSearch">
+          <el-select v-model="queryParams.getMethod" multiple :placeholder="$t('请选择')">
+            <el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_GET_METHOD)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="parseInt(dict.value)" />
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('创建入口')" v-show="showSearch">
+          <el-select v-model="queryParams.createFroms" multiple :placeholder="$t('请选择')">
+            <el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_FROM)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="parseInt(dict.value)" />
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('结算方式')" v-show="showSearch">
+          <el-select v-model="queryParams.balances" multiple :placeholder="$t('请选择结算方式')">
+            <el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_BALANCE)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="parseInt(dict.value)" />
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('入仓确认')" v-show="showSearch">
@@ -309,85 +126,41 @@
             <el-option :label="$t('否')" :value="0" />
           </el-select>
         </el-form-item>
-      <el-form-item :label="$t('控货无收货人')" v-show="showSearch">
+        <el-form-item :label="$t('控货无收货人')" v-show="showSearch" label-width="100px">
+          <div style="width: 194px">
             <el-switch v-model="queryParams.noConsignee" />
+          </div>
         </el-form-item>
-      <el-form-item :label="$t('默认付款')" v-show="showSearch">
+        <el-form-item :label="$t('默认付款')" v-show="showSearch" label-width="70px">
+          <div style="width: 194px">
             <el-switch v-model="queryParams.defaultPay" />
+          </div>
         </el-form-item>
-      <el-form-item :label="$t('是否显示提单价格')" v-show="showSearch">
+        <el-form-item :label="$t('是否显示提单价格')" v-show="showSearch" label-width="130px">
+          <div style="width: 194px">
             <el-switch v-model="queryParams.isShowTidanPrice" />
+          </div>
+        </el-form-item>
+      </div>
+      <div class="search-time">
+        <el-form-item :label="$t('入公海时间')" v-show="showSearch">
+          <el-date-picker type="datetimerange" clearable v-model="enterOpenSeaTime" value-format="yyyy-MM-dd HH:mm:ss" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
         </el-form-item>
         <el-form-item :label="$t('归属时间')" v-show="showSearch">
-        <el-date-picker
-          type="datetimerange"
-          clearable
-          v-model="customerServiceConfirmedTime"
-          style="width: 240px"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          range-separator="-"
-          :start-placeholder="$t('开始日期')"
-          :end-placeholder="$t('结束日期')"
-        />
+          <el-date-picker type="datetimerange" clearable v-model="customerServiceConfirmedTime" value-format="yyyy-MM-dd HH:mm:ss" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
         </el-form-item>
         <el-form-item :label="$t('首次成交时间')" v-show="showSearch">
-        <el-date-picker
-          type="datetimerange"
-          clearable
-          v-model="firstDealTime"
-          style="width: 240px"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          range-separator="-"
-          :start-placeholder="$t('开始日期')"
-          :end-placeholder="$t('结束日期')"
-        />
-      </el-form-item>
-      <el-form-item :label="$t('获取方式')" v-show="showSearch">
-        <el-select
-          v-model="queryParams.getMethod"
-          multiple
-          :placeholder="$t('请选择')"
-        >
-          <el-option
-            v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_GET_METHOD)"
-            :key="dict.value"
-            :label="isChinese ? dict.label : dict.labelEn"
-            :value="parseInt(dict.value)"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item :label="$t('创建入口')" v-show="showSearch">
-        <el-select
-          v-model="queryParams.createFroms"
-          multiple
-          :placeholder="$t('请选择')"
-        >
-          <el-option
-            v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_FROM)"
-            :key="dict.value"
-            :label="isChinese ? dict.label : dict.labelEn"
-            :value="parseInt(dict.value)"
-          />
-        </el-select>
+          <el-date-picker type="datetimerange" clearable v-model="firstDealTime" value-format="yyyy-MM-dd HH:mm:ss" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
         </el-form-item>
-      <el-form-item :label="$t('结算方式')" v-show="showSearch">
-        <el-select
-          v-model="queryParams.balances"
-          multiple
-          :placeholder="$t('请选择结算方式')"
-        >
-          <el-option
-            v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_BALANCE)"
-            :key="dict.value"
-            :label="isChinese ? dict.label : dict.labelEn"
-            :value="parseInt(dict.value)"
-          />
-        </el-select>
+
+        <el-form-item :label="$t('创建时间')" v-show="showSearch">
+          <el-date-picker type="datetimerange" clearable v-model="dateRangeCreateTime" value-format="yyyy-MM-dd HH:mm:ss" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
         </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
-        <el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button>
+        <el-form-item style="padding-left: 20px">
+          <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{ $t("搜索") }}</el-button>
+          <el-button icon="el-icon-refresh" @click="resetQuery">{{ $t("重置") }}</el-button>
         </el-form-item>
+      </div>
     </el-form>
 
     <!-- 操作工具栏 -->
@@ -930,7 +703,7 @@ export default {
     transferCustomer,
     AreaCodeSelector,
     CustomerSetting,
-    customerFollow
+    CustomerFollow
   },
   data() {
     return {

src/views/ecw/customerToBeAssigned/index.vue

@@ -2,214 +2,72 @@
 <template>
   <div class="app-container">
     <!-- 搜索工作栏 -->
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="130px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px">
+      <div class="search-z">
         <el-form-item :label="$t('客户编号')" prop="number">
-        <el-input
-          v-model.trim="queryParams.number"
-          :placeholder="$t('请输入客户编号')"
-          clearable
-          @keyup.enter.native="handleQuery"
-          @input="queryParams.number=queryParams.number.replace(/\s+/g, '')"
-        />
+          <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.trim="queryParams.name"
-          :placeholder="$t('请输入客户名称')"
-          clearable
-          @keyup.enter.native="handleQuery"
-          @input="queryParams.name=queryParams.name.replace(/\s+/g, '')"
-        />
+          <el-input v-model.trim="queryParams.name" :placeholder="$t('请输入客户名称')" clearable @keyup.enter.native="handleQuery" @input="queryParams.name = queryParams.name.replace(/\s+/g, '')" />
         </el-form-item>
         <el-form-item :label="$t('区号')">
-        <el-select
-          v-model="queryParams.areaCode"
-          :placeholder="$t('请选择区号')"
-        >
-          <el-option
-            v-for="(item, index) in countryList"
-            :key="index"
-            :label="
-              item.nameShort +
-              (isChinese ? item.nameZh : item.nameEn) +
-              ' +' +
-              item.tel
-            "
-            :value="item.tel"
-          />
+          <el-select v-model="queryParams.areaCode" :placeholder="$t('请选择区号')">
+            <el-option v-for="(item, index) in countryList" :key="index" :label="item.nameShort + (isChinese ? item.nameZh : item.nameEn) + ' +' + item.tel" :value="item.tel" />
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('联系方式')">
-        <el-input
-          :placeholder="$t('请输入联系方式')"
-          v-model.trim="queryParams.defaultContactPhone"
-          @input="queryParams.defaultContactPhone=queryParams.defaultContactPhone.replace(/\s+/g, '')"
-        ></el-input>
+          <el-input :placeholder="$t('请输入联系方式')" clearable v-model.trim="queryParams.defaultContactPhone" @input="queryParams.defaultContactPhone = queryParams.defaultContactPhone.replace(/\s+/g, '')"></el-input>
         </el-form-item>
-      <el-form-item :label="$t('部门')">
+        <el-form-item :label="$t('部门')" v-if="path != '/customer/department-customers'">
           <el-select v-model="queryParams.deptIds" :placeholder="$t('请选择部门')">
-          <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id"/>
+            <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('客户经理')" prop="customerService">
-        <el-select
-          multiple
-          clearable
-          v-model="queryParams.customerService"
-          :placeholder="$t('请选择客户经理')"
-          size="small"
-          @change="handleQuery"
-        >
-          <el-option
-            v-for="dict in customerServiceList"
-            :key="dict.id"
-            :label="dict.nickname"
-            :value="dict.id"
-          />
+          <el-select multiple clearable v-model="queryParams.customerService" :placeholder="$t('请选择客户经理')" size="small" @change="handleQuery">
+            <el-option v-for="dict in customerServiceList" :key="dict.id" :label="dict.nickname" :value="dict.id" />
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('客户来源')" prop="source">
-        <el-select
-          multiple
-          clearable
-          v-model="queryParams.source"
-          :placeholder="$t('请选择客户来源')"
-          size="small"
-          @change="handleQuery"
-        >
-          <el-option
-            v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_SOURCE)"
-            :key="dict.value"
-            :label="isChinese ? dict.label : dict.labelEn"
-            :value="dict.value"
-          />
+          <el-select multiple clearable v-model="queryParams.source" :placeholder="$t('请选择客户来源')" size="small" @change="handleQuery">
+            <el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_SOURCE)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="dict.value" />
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('客户类别')" prop="level">
-        <dict-selector
-          multiple
-          clearable
-          :type="DICT_TYPE.CUSTOMER_TYPE"
-          v-model="queryParams.type"
-          @change="handleQuery"
-        ></dict-selector>
+          <dict-selector multiple clearable :type="DICT_TYPE.CUSTOMER_TYPE" v-model="queryParams.type" @change="handleQuery"></dict-selector>
         </el-form-item>
         <el-form-item :label="$t('角色')">
-        <dict-selector
-          multiple
-          clearable
-          :type="DICT_TYPE.CUSTOMER_ROLE"
-          v-model="queryParams.role"
-          formatter="number"
-          @change="handleQuery"
-          :placeholder="$t('请选择')"
-        ></dict-selector>
+          <dict-selector multiple clearable :type="DICT_TYPE.CUSTOMER_ROLE" v-model="queryParams.role" formatter="number" @change="handleQuery" :placeholder="$t('请选择')"></dict-selector>
         </el-form-item>
         <el-form-item :label="$t('客户状态')" prop="status">
-        <el-select
-        multiple
-          clearable
-          v-model="queryParams.status"
-          :placeholder="$t('请选择客户状态')"
-          size="small"
-          @change="handleQuery"
-        >
-          <el-option
-            v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_STATUS)"
-            :key="dict.value"
-            :label="isChinese ? dict.label : dict.labelEn"
-            :value="dict.value"
-          />
+          <el-select multiple clearable v-model="queryParams.status" :placeholder="$t('请选择客户状态')" size="small" @change="handleQuery">
+            <el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_STATUS)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="dict.value" />
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('国籍')" prop="country">
-        <el-select
-          multiple
-          clearable
-          v-model="queryParams.country"
-          :placeholder="$t('请选择')"
-          @change="handleQuery"
-        >
-          <el-option
-            v-for="dict in countryList"
-            :key="dict.id"
-            :label="isChinese ? dict.nameZh : dict.nameEn"
-            :value="parseInt(dict.id)"
-          />
+          <el-select multiple clearable v-model="queryParams.country" :placeholder="$t('请选择')" @change="handleQuery">
+            <el-option v-for="dict in countryList" :key="dict.id" :label="isChinese ? dict.nameZh : dict.nameEn" :value="parseInt(dict.id)" />
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('出货渠道')">
-        <dict-selector
-          multiple
-          clearable
-          :type="DICT_TYPE.ECW_CUSTOMER_TRANSPORT_TYPE"
-          v-model="queryParams.transportType"
-          formatter="number"
-          @change="handleQuery"
-        ></dict-selector>
+          <dict-selector multiple clearable :type="DICT_TYPE.ECW_CUSTOMER_TRANSPORT_TYPE" v-model="queryParams.transportType" formatter="number" @change="handleQuery"></dict-selector>
         </el-form-item>
 
         <el-form-item :label="$t('业务国家')" v-show="showSearch">
-        <el-select
-          multiple
-          clearable
-          v-model="queryParams.busiCountryIds"
-          :placeholder="$t('请选择')"
-          @change="handleQuery"
-        >
-          <el-option
-            v-for="dict in countryList"
-            :key="dict.id"
-            :label="isChinese ? dict.nameZh : dict.nameEn"
-            :value="parseInt(dict.id)"
-          />
+          <el-select multiple clearable v-model="queryParams.busiCountryIds" :placeholder="$t('请选择')" @change="handleQuery">
+            <el-option v-for="dict in countryList" :key="dict.id" :label="isChinese ? dict.nameZh : dict.nameEn" :value="parseInt(dict.id)" />
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('常用提货网点')" v-show="showSearch">
           <el-select multiple v-model="queryParams.pickupPoints">
-          <el-option
-            v-for="item in getNodeLists"
-            :key="item.id"
-            :value="item.id"
-            :label="isChinese ? item.titleZh : item.titleEn"
-          ></el-option>
+            <el-option v-for="item in getNodeLists" :key="item.id" :value="item.id" :label="isChinese ? item.titleZh : item.titleEn"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('创建人')" v-show="showSearch">
           <el-select v-model="queryParams.founder">
-          <el-option
-            v-for="item in allSimplList"
-            :key="item.id"
-            :label="item.nickname"
-            :value="item.id"
-          >
-          </el-option>
+            <el-option v-for="item in allSimplList" :key="item.id" :label="item.nickname" :value="item.id"> </el-option>
           </el-select>
         </el-form-item>
-      <el-form-item :label="$t('创建时间')" v-show="showSearch">
-        <el-date-picker
-          type="datetimerange"
-          clearable
-          v-model="dateRangeCreateTime"
-          style="width: 240px"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          range-separator="-"
-          :start-placeholder="$t('开始日期')"
-          :end-placeholder="$t('结束日期')"
-        />
-      </el-form-item>
-      <el-form-item :label="$t('入公海时间')" v-show="showSearch">
-        <el-date-picker
-          type="datetimerange"
-          clearable
-          v-model="enterOpenSeaTime"
-          style="width: 240px"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          range-separator="-"
-          :start-placeholder="$t('开始日期')"
-          :end-placeholder="$t('结束日期')"
-        />
-      </el-form-item>
         <el-form-item :label="$t('业绩类型')" v-show="showSearch">
           <el-select clearable v-model="queryParams.isNew">
             <el-option :label="$t('新客户')" :value="true" />
@@ -217,91 +75,50 @@
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('年度发货量')" v-show="showSearch">
-        <el-input
-          v-model.trim="weightYearly.value"
-          :placeholder="$t('请输入数字')"
-          clearable
-          @keyup.enter.native="handleQuery"
-          @input="weightYearly.value=weightYearly.value.replace(/\s+/g, '')"
-        >
+          <el-input v-model.trim="weightYearly.value" :placeholder="$t('请输入数字')" clearable @keyup.enter.native="handleQuery" @input="weightYearly.value = weightYearly.value.replace(/\s+/g, '')">
             <template slot="prepend">
-            <dict-selector
-              :type="DICT_TYPE.CUSTOMER_QUERY_NUMBER_FIELD"
-              defaultable
-              v-model="weightYearly.key"
-              class="w-50"
-            />
+              <dict-selector :type="DICT_TYPE.CUSTOMER_QUERY_NUMBER_FIELD" defaultable v-model="weightYearly.key" />
             </template>
           </el-input>
         </el-form-item>
         <el-form-item :label="$t('商品类别')" v-show="showSearch">
-        <el-select
-          @change="handleSelectProductType"
-          multiple
-          v-model="queryParams.productTypes"
-          :placeholder="$t('请选择')"
-        >
-          <el-option
-            :label="item.titleZh"
-            :value="item.id"
-            v-for="item in productTypeList"
-            :key="item.id"
-          />
+          <el-select @change="handleSelectProductType" multiple v-model="queryParams.productTypes" :placeholder="$t('请选择')">
+            <el-option :label="item.titleZh" :value="item.id" v-for="item in productTypeList" :key="item.id" />
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('商品名称')" v-show="showSearch">
-        <el-select
-          multiple
-          filterable
-          clearable
-          v-model="queryParams.productIds"
-          :placeholder="$t('请选择商品名称')"
-        >
-          <el-option
-            :label="item.titleZh"
-            :value="parseInt(item.id)"
-            v-for="item in productList"
-            :key="item.id"
-          />
+          <el-select multiple filterable clearable v-model="queryParams.productIds" :placeholder="$t('请选择商品名称')">
+            <el-option :label="item.titleZh" :value="parseInt(item.id)" v-for="item in productList" :key="item.id" />
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('主要竞争对手')" v-show="showSearch">
           <competitor-selector v-model="queryParams.competitorIds" multiple clearable @change="handleQuery" />
         </el-form-item>
         <el-form-item :label="$t('年度发货次数')" v-show="showSearch">
-        <el-input
-          v-model.trim="numYearly.value"
-          :placeholder="$t('请输入数字')"
-          clearable
-          @keyup.enter.native="handleQuery"
-          @input="numYearly.value=numYearly.value.replace(/\s+/g, '')"
-        >
+          <el-input v-model.trim="numYearly.value" :placeholder="$t('请输入数字')" clearable @keyup.enter.native="handleQuery" @input="numYearly.value = numYearly.value.replace(/\s+/g, '')">
             <template slot="prepend">
-            <dict-selector
-              :type="DICT_TYPE.CUSTOMER_QUERY_NUMBER_FIELD"
-              defaultable
-              v-model="numYearly.key"
-              class="w-50"
-            />
+              <dict-selector :type="DICT_TYPE.CUSTOMER_QUERY_NUMBER_FIELD" defaultable v-model="numYearly.key" />
             </template>
           </el-input>
         </el-form-item>
         <el-form-item :label="$t('推介人')" v-show="showSearch">
-        <el-select
-          clearable
-          remote
-          :remote-method="remoteMethod"
-          v-model="queryParams.promoter"
-          :placeholder="$t('请输入推介人')"
-          filterable
-        >
-          <el-option
-            v-for="item in customerSelectFn"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-          >
-          </el-option>
+          <el-select clearable remote :remote-method="remoteMethod" v-model="queryParams.promoter" :placeholder="$t('请输入推介人')" filterable>
+            <el-option v-for="item in customerSelectFn" :key="item.id" :label="item.name" :value="item.id"> </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('获取方式')" v-show="showSearch">
+          <el-select v-model="queryParams.getMethod" multiple :placeholder="$t('请选择')">
+            <el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_GET_METHOD)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="parseInt(dict.value)" />
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('创建入口')" v-show="showSearch">
+          <el-select v-model="queryParams.createFroms" multiple :placeholder="$t('请选择')">
+            <el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_FROM)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="parseInt(dict.value)" />
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('结算方式')" v-show="showSearch">
+          <el-select v-model="queryParams.balances" multiple :placeholder="$t('请选择结算方式')">
+            <el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_BALANCE)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="parseInt(dict.value)" />
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('入仓确认')" v-show="showSearch">
@@ -310,85 +127,41 @@
             <el-option :label="$t('否')" :value="0" />
           </el-select>
         </el-form-item>
-      <el-form-item :label="$t('控货无收货人')" v-show="showSearch">
+        <el-form-item :label="$t('控货无收货人')" v-show="showSearch" label-width="100px">
+          <div style="width: 194px">
             <el-switch v-model="queryParams.noConsignee" />
+          </div>
         </el-form-item>
-      <el-form-item :label="$t('默认付款')" v-show="showSearch">
+        <el-form-item :label="$t('默认付款')" v-show="showSearch" label-width="70px">
+          <div style="width: 194px">
             <el-switch v-model="queryParams.defaultPay" />
+          </div>
         </el-form-item>
-      <el-form-item :label="$t('是否显示提单价格')" v-show="showSearch">
+        <el-form-item :label="$t('是否显示提单价格')" v-show="showSearch" label-width="130px">
+          <div style="width: 194px">
             <el-switch v-model="queryParams.isShowTidanPrice" />
+          </div>
+        </el-form-item>
+      </div>
+      <div class="search-time">
+        <el-form-item :label="$t('入公海时间')" v-show="showSearch">
+          <el-date-picker type="datetimerange" clearable v-model="enterOpenSeaTime" value-format="yyyy-MM-dd HH:mm:ss" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
         </el-form-item>
         <el-form-item :label="$t('归属时间')" v-show="showSearch">
-        <el-date-picker
-          type="datetimerange"
-          clearable
-          v-model="customerServiceConfirmedTime"
-          style="width: 240px"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          range-separator="-"
-          :start-placeholder="$t('开始日期')"
-          :end-placeholder="$t('结束日期')"
-        />
+          <el-date-picker type="datetimerange" clearable v-model="customerServiceConfirmedTime" value-format="yyyy-MM-dd HH:mm:ss" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
         </el-form-item>
         <el-form-item :label="$t('首次成交时间')" v-show="showSearch">
-        <el-date-picker
-          type="datetimerange"
-          clearable
-          v-model="firstDealTime"
-          style="width: 240px"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          range-separator="-"
-          :start-placeholder="$t('开始日期')"
-          :end-placeholder="$t('结束日期')"
-        />
-      </el-form-item>
-      <el-form-item :label="$t('获取方式')" v-show="showSearch">
-        <el-select
-          v-model="queryParams.getMethod"
-          multiple
-          :placeholder="$t('请选择')"
-        >
-          <el-option
-            v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_GET_METHOD)"
-            :key="dict.value"
-            :label="isChinese ? dict.label : dict.labelEn"
-            :value="parseInt(dict.value)"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item :label="$t('创建入口')" v-show="showSearch">
-        <el-select
-          v-model="queryParams.createFroms"
-          multiple
-          :placeholder="$t('请选择')"
-        >
-          <el-option
-            v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_FROM)"
-            :key="dict.value"
-            :label="isChinese ? dict.label : dict.labelEn"
-            :value="parseInt(dict.value)"
-          />
-        </el-select>
+          <el-date-picker type="datetimerange" clearable v-model="firstDealTime" value-format="yyyy-MM-dd HH:mm:ss" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
         </el-form-item>
-      <el-form-item :label="$t('结算方式')" v-show="showSearch">
-        <el-select
-          v-model="queryParams.balances"
-          multiple
-          :placeholder="$t('请选择结算方式')"
-        >
-          <el-option
-            v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_BALANCE)"
-            :key="dict.value"
-            :label="isChinese ? dict.label : dict.labelEn"
-            :value="parseInt(dict.value)"
-          />
-        </el-select>
+
+        <el-form-item :label="$t('创建时间')" v-show="showSearch">
+          <el-date-picker type="datetimerange" clearable v-model="dateRangeCreateTime" value-format="yyyy-MM-dd HH:mm:ss" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
         </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
-        <el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button>
+        <el-form-item style="padding-left: 20px">
+          <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{ $t("搜索") }}</el-button>
+          <el-button icon="el-icon-refresh" @click="resetQuery">{{ $t("重置") }}</el-button>
         </el-form-item>
+      </div>
     </el-form>
 
     <!-- 操作工具栏 -->

src/views/ecw/myCustomerService/index.vue

 <template>
   <div class="app-container">
     <!-- 搜索工作栏 -->
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="130px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px">
+      <div class="search-z">
         <el-form-item :label="$t('客户编号')" prop="number">
           <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>
@@ -14,27 +15,18 @@
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('联系方式')">
-        <el-input :placeholder="$t('请输入联系方式')" v-model.trim="queryParams.defaultContactPhone" @input="queryParams.defaultContactPhone = queryParams.defaultContactPhone.replace(/\s+/g, '')"></el-input>
-      </el-form-item>
-      <!--
-      <el-form-item :label="$t('客户经理')" prop="customerService">
-        <el-select
-          multiple
-          clearable
-          v-model="queryParams.customerService"
-          :placeholder="$t('请选择客户经理')"
-          size="small"
-          @change="handleQuery"
-        >
-          <el-option
-            v-for="dict in customerServiceList"
-            :key="dict.id"
-            :label="dict.nickname"
-            :value="dict.id"
-          />
-        </el-select>
-      </el-form-item>
-      -->
+          <el-input :placeholder="$t('请输入联系方式')" clearable v-model.trim="queryParams.defaultContactPhone" @input="queryParams.defaultContactPhone = queryParams.defaultContactPhone.replace(/\s+/g, '')"></el-input>
+        </el-form-item>
+<!--        <el-form-item :label="$t('部门')" v-if="path != '/customer/department-customers'">-->
+<!--          <el-select v-model="queryParams.deptIds" :placeholder="$t('请选择部门')">-->
+<!--            <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id" />-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item :label="$t('客户经理')" prop="customerService">-->
+<!--          <el-select multiple clearable v-model="queryParams.customerService" :placeholder="$t('请选择客户经理')" size="small" @change="handleQuery">-->
+<!--            <el-option v-for="dict in customerServiceList" :key="dict.id" :label="dict.nickname" :value="dict.id" />-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
         <el-form-item :label="$t('客户来源')" prop="source">
           <el-select multiple clearable v-model="queryParams.source" :placeholder="$t('请选择客户来源')" size="small" @change="handleQuery">
             <el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_SOURCE)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="dict.value" />
@@ -75,12 +67,6 @@
             <el-option v-for="item in allSimplList" :key="item.id" :label="item.nickname" :value="item.id"> </el-option>
           </el-select>
         </el-form-item>
-      <el-form-item :label="$t('创建时间')" v-show="showSearch">
-        <el-date-picker type="datetimerange" clearable v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
-      </el-form-item>
-      <el-form-item :label="$t('入公海时间')" v-show="showSearch">
-        <el-date-picker type="datetimerange" clearable v-model="enterOpenSeaTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
-      </el-form-item>
         <el-form-item :label="$t('业绩类型')" v-show="showSearch">
           <el-select clearable v-model="queryParams.isNew">
             <el-option :label="$t('新客户')" :value="true" />
@@ -90,7 +76,7 @@
         <el-form-item :label="$t('年度发货量')" v-show="showSearch">
           <el-input v-model.trim="weightYearly.value" :placeholder="$t('请输入数字')" clearable @keyup.enter.native="handleQuery" @input="weightYearly.value = weightYearly.value.replace(/\s+/g, '')">
             <template slot="prepend">
-            <dict-selector :type="DICT_TYPE.CUSTOMER_QUERY_NUMBER_FIELD" defaultable v-model="weightYearly.key" class="w-50" />
+              <dict-selector :type="DICT_TYPE.CUSTOMER_QUERY_NUMBER_FIELD" defaultable v-model="weightYearly.key" />
             </template>
           </el-input>
         </el-form-item>
@@ -110,7 +96,7 @@
         <el-form-item :label="$t('年度发货次数')" v-show="showSearch">
           <el-input v-model.trim="numYearly.value" :placeholder="$t('请输入数字')" clearable @keyup.enter.native="handleQuery" @input="numYearly.value = numYearly.value.replace(/\s+/g, '')">
             <template slot="prepend">
-            <dict-selector :type="DICT_TYPE.CUSTOMER_QUERY_NUMBER_FIELD" defaultable v-model="numYearly.key" class="w-50" />
+              <dict-selector :type="DICT_TYPE.CUSTOMER_QUERY_NUMBER_FIELD" defaultable v-model="numYearly.key" />
             </template>
           </el-input>
         </el-form-item>
@@ -119,46 +105,62 @@
             <el-option v-for="item in customerSelectFn" :key="item.id" :label="item.name" :value="item.id"> </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item :label="$t('获取方式')" v-show="showSearch">
+          <el-select v-model="queryParams.getMethod" multiple :placeholder="$t('请选择')">
+            <el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_GET_METHOD)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="parseInt(dict.value)" />
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('创建入口')" v-show="showSearch">
+          <el-select v-model="queryParams.createFroms" multiple :placeholder="$t('请选择')">
+            <el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_FROM)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="parseInt(dict.value)" />
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('结算方式')" v-show="showSearch">
+          <el-select v-model="queryParams.balances" multiple :placeholder="$t('请选择结算方式')">
+            <el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_BALANCE)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="parseInt(dict.value)" />
+          </el-select>
+        </el-form-item>
         <el-form-item :label="$t('入仓确认')" v-show="showSearch">
           <el-select clearable v-model="queryParams.arrivalConfirm">
             <el-option :label="$t('是')" :value="1" />
             <el-option :label="$t('否')" :value="0" />
           </el-select>
         </el-form-item>
-      <el-form-item :label="$t('控货无收货人')" v-show="showSearch">
+        <el-form-item :label="$t('控货无收货人')" v-show="showSearch" label-width="100px">
+          <div style="width: 194px">
             <el-switch v-model="queryParams.noConsignee" />
+          </div>
         </el-form-item>
-      <el-form-item :label="$t('默认付款')" v-show="showSearch">
+        <el-form-item :label="$t('默认付款')" v-show="showSearch" label-width="70px">
+          <div style="width: 194px">
             <el-switch v-model="queryParams.defaultPay" />
+          </div>
         </el-form-item>
-      <el-form-item :label="$t('是否显示提单价格')" v-show="showSearch">
+        <el-form-item :label="$t('是否显示提单价格')" v-show="showSearch" label-width="130px">
+          <div style="width: 194px">
             <el-switch v-model="queryParams.isShowTidanPrice" />
+          </div>
+        </el-form-item>
+      </div>
+      <div class="search-time">
+        <el-form-item :label="$t('入公海时间')" v-show="showSearch">
+          <el-date-picker type="datetimerange" clearable v-model="enterOpenSeaTime" value-format="yyyy-MM-dd HH:mm:ss" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
         </el-form-item>
         <el-form-item :label="$t('归属时间')" v-show="showSearch">
-        <el-date-picker type="datetimerange" clearable v-model="customerServiceConfirmedTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
+          <el-date-picker type="datetimerange" clearable v-model="customerServiceConfirmedTime" value-format="yyyy-MM-dd HH:mm:ss" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
         </el-form-item>
         <el-form-item :label="$t('首次成交时间')" v-show="showSearch">
-        <el-date-picker type="datetimerange" clearable v-model="firstDealTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
-      </el-form-item>
-      <el-form-item :label="$t('获取方式')" v-show="showSearch">
-        <el-select v-model="queryParams.getMethod" multiple :placeholder="$t('请选择')">
-          <el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_GET_METHOD)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="parseInt(dict.value)" />
-        </el-select>
+          <el-date-picker type="datetimerange" clearable v-model="firstDealTime" value-format="yyyy-MM-dd HH:mm:ss" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
         </el-form-item>
-      <el-form-item :label="$t('创建入口')" v-show="showSearch">
-        <el-select v-model="queryParams.createFroms" multiple :placeholder="$t('请选择')">
-          <el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_FROM)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="parseInt(dict.value)" />
-        </el-select>
-      </el-form-item>
-      <el-form-item :label="$t('结算方式')" v-show="showSearch">
-        <el-select v-model="queryParams.balances" multiple :placeholder="$t('请选择结算方式')">
-          <el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_BALANCE)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="parseInt(dict.value)" />
-        </el-select>
+
+        <el-form-item :label="$t('创建时间')" v-show="showSearch">
+          <el-date-picker type="datetimerange" clearable v-model="dateRangeCreateTime" value-format="yyyy-MM-dd HH:mm:ss" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
         </el-form-item>
-      <el-form-item>
+        <el-form-item style="padding-left: 20px">
           <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{ $t("搜索") }}</el-button>
           <el-button icon="el-icon-refresh" @click="resetQuery">{{ $t("重置") }}</el-button>
         </el-form-item>
+      </div>
     </el-form>
 
     <!-- 操作工具栏 -->

src/views/ecw/oceanCustomer/index.vue

@@ -2,220 +2,72 @@
 <template>
   <div class="app-container">
     <!-- 搜索工作栏 -->
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      label-width="130px"
-    >
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px">
+      <div class="search-z">
         <el-form-item :label="$t('客户编号')" prop="number">
-        <el-input
-          v-model.trim="queryParams.number"
-          :placeholder="$t('请输入客户编号')"
-          clearable
-          @keyup.enter.native="handleQuery"
-          @input="queryParams.number=queryParams.number.replace(/\s+/g, '')"
-        />
+          <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.trim="queryParams.name"
-          :placeholder="$t('请输入客户名称')"
-          clearable
-          @keyup.enter.native="handleQuery"
-          @input="queryParams.name=queryParams.name.replace(/\s+/g, '')"
-        />
+          <el-input v-model.trim="queryParams.name" :placeholder="$t('请输入客户名称')" clearable @keyup.enter.native="handleQuery" @input="queryParams.name = queryParams.name.replace(/\s+/g, '')" />
         </el-form-item>
         <el-form-item :label="$t('区号')">
-        <el-select
-          v-model="queryParams.areaCode"
-          :placeholder="$t('请选择区号')"
-        >
-          <el-option
-            v-for="(item, index) in countryList"
-            :key="index"
-            :label="
-              item.nameShort +
-              (isChinese ? item.nameZh : item.nameEn) +
-              ' +' +
-              item.tel
-            "
-            :value="item.tel"
-          />
+          <el-select v-model="queryParams.areaCode" :placeholder="$t('请选择区号')">
+            <el-option v-for="(item, index) in countryList" :key="index" :label="item.nameShort + (isChinese ? item.nameZh : item.nameEn) + ' +' + item.tel" :value="item.tel" />
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('联系方式')">
-        <el-input
-          :placeholder="$t('请输入联系方式')"
-          v-model.trim="queryParams.defaultContactPhone"
-          @input="queryParams.defaultContactPhone=queryParams.defaultContactPhone.replace(/\s+/g, '')"
-        ></el-input>
+          <el-input :placeholder="$t('请输入联系方式')" clearable v-model.trim="queryParams.defaultContactPhone" @input="queryParams.defaultContactPhone = queryParams.defaultContactPhone.replace(/\s+/g, '')"></el-input>
         </el-form-item>
-      <el-form-item :label="$t('部门')">
+        <el-form-item :label="$t('部门')" v-if="path != '/customer/department-customers'">
           <el-select v-model="queryParams.deptIds" :placeholder="$t('请选择部门')">
-          <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id"/>
+            <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('客户经理')" prop="customerService">
-        <el-select
-          multiple
-          clearable
-          v-model="queryParams.customerService"
-          :placeholder="$t('请选择客户经理')"
-          size="small"
-          @change="handleQuery"
-        >
-          <el-option
-            v-for="dict in customerServiceList"
-            :key="dict.id"
-            :label="dict.nickname"
-            :value="dict.id"
-          />
+          <el-select multiple clearable v-model="queryParams.customerService" :placeholder="$t('请选择客户经理')" size="small" @change="handleQuery">
+            <el-option v-for="dict in customerServiceList" :key="dict.id" :label="dict.nickname" :value="dict.id" />
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('客户来源')" prop="source">
-        <el-select
-          multiple
-          clearable
-          v-model="queryParams.source"
-          :placeholder="$t('请选择客户来源')"
-          size="small"
-          @change="handleQuery"
-        >
-          <el-option
-            v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_SOURCE)"
-            :key="dict.value"
-            :label="isChinese ? dict.label : dict.labelEn"
-            :value="dict.value"
-          />
+          <el-select multiple clearable v-model="queryParams.source" :placeholder="$t('请选择客户来源')" size="small" @change="handleQuery">
+            <el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_SOURCE)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="dict.value" />
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('客户类别')" prop="level">
-        <dict-selector
-          multiple
-          clearable
-          :type="DICT_TYPE.CUSTOMER_TYPE"
-          v-model="queryParams.type"
-          @change="handleQuery"
-        ></dict-selector>
+          <dict-selector multiple clearable :type="DICT_TYPE.CUSTOMER_TYPE" v-model="queryParams.type" @change="handleQuery"></dict-selector>
         </el-form-item>
         <el-form-item :label="$t('角色')">
-        <dict-selector
-          multiple
-          clearable
-          :type="DICT_TYPE.CUSTOMER_ROLE"
-          v-model="queryParams.role"
-          formatter="number"
-          @change="handleQuery"
-          :placeholder="$t('请选择')"
-        ></dict-selector>
+          <dict-selector multiple clearable :type="DICT_TYPE.CUSTOMER_ROLE" v-model="queryParams.role" formatter="number" @change="handleQuery" :placeholder="$t('请选择')"></dict-selector>
         </el-form-item>
         <el-form-item :label="$t('客户状态')" prop="status">
-        <el-select
-        multiple
-          clearable
-          v-model="queryParams.status"
-          :placeholder="$t('请选择客户状态')"
-          size="small"
-          @change="handleQuery"
-        >
-          <el-option
-            v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_STATUS)"
-            :key="dict.value"
-            :label="isChinese ? dict.label : dict.labelEn"
-            :value="dict.value"
-          />
+          <el-select multiple clearable v-model="queryParams.status" :placeholder="$t('请选择客户状态')" size="small" @change="handleQuery">
+            <el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_STATUS)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="dict.value" />
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('国籍')" prop="country">
-        <el-select
-          multiple
-          clearable
-          v-model="queryParams.country"
-          :placeholder="$t('请选择')"
-          @change="handleQuery"
-        >
-          <el-option
-            v-for="dict in countryList"
-            :key="dict.id"
-            :label="isChinese ? dict.nameZh : dict.nameEn"
-            :value="parseInt(dict.id)"
-          />
+          <el-select multiple clearable v-model="queryParams.country" :placeholder="$t('请选择')" @change="handleQuery">
+            <el-option v-for="dict in countryList" :key="dict.id" :label="isChinese ? dict.nameZh : dict.nameEn" :value="parseInt(dict.id)" />
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('出货渠道')">
-        <dict-selector
-          multiple
-          clearable
-          :type="DICT_TYPE.ECW_CUSTOMER_TRANSPORT_TYPE"
-          v-model="queryParams.transportType"
-          formatter="number"
-          @change="handleQuery"
-        ></dict-selector>
+          <dict-selector multiple clearable :type="DICT_TYPE.ECW_CUSTOMER_TRANSPORT_TYPE" v-model="queryParams.transportType" formatter="number" @change="handleQuery"></dict-selector>
         </el-form-item>
 
         <el-form-item :label="$t('业务国家')" v-show="showSearch">
-        <el-select
-          multiple
-          clearable
-          v-model="queryParams.busiCountryIds"
-          :placeholder="$t('请选择')"
-          @change="handleQuery"
-        >
-          <el-option
-            v-for="dict in countryList"
-            :key="dict.id"
-            :label="isChinese ? dict.nameZh : dict.nameEn"
-            :value="parseInt(dict.id)"
-          />
+          <el-select multiple clearable v-model="queryParams.busiCountryIds" :placeholder="$t('请选择')" @change="handleQuery">
+            <el-option v-for="dict in countryList" :key="dict.id" :label="isChinese ? dict.nameZh : dict.nameEn" :value="parseInt(dict.id)" />
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('常用提货网点')" v-show="showSearch">
           <el-select multiple v-model="queryParams.pickupPoints">
-          <el-option
-            v-for="item in getNodeLists"
-            :key="item.id"
-            :value="item.id"
-            :label="isChinese ? item.titleZh : item.titleEn"
-          ></el-option>
+            <el-option v-for="item in getNodeLists" :key="item.id" :value="item.id" :label="isChinese ? item.titleZh : item.titleEn"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('创建人')" v-show="showSearch">
           <el-select v-model="queryParams.founder">
-          <el-option
-            v-for="item in allSimplList"
-            :key="item.id"
-            :label="item.nickname"
-            :value="item.id"
-          >
-          </el-option>
+            <el-option v-for="item in allSimplList" :key="item.id" :label="item.nickname" :value="item.id"> </el-option>
           </el-select>
         </el-form-item>
-      <el-form-item :label="$t('创建时间')" v-show="showSearch">
-        <el-date-picker
-          type="datetimerange"
-          clearable
-          v-model="dateRangeCreateTime"
-          style="width: 240px"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          range-separator="-"
-          :start-placeholder="$t('开始日期')"
-          :end-placeholder="$t('结束日期')"
-        />
-      </el-form-item>
-      <el-form-item :label="$t('入公海时间')" v-show="showSearch">
-        <el-date-picker
-          type="datetimerange"
-          clearable
-          v-model="enterOpenSeaTime"
-          style="width: 240px"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          range-separator="-"
-          :start-placeholder="$t('开始日期')"
-          :end-placeholder="$t('结束日期')"
-        />
-      </el-form-item>
         <el-form-item :label="$t('业绩类型')" v-show="showSearch">
           <el-select clearable v-model="queryParams.isNew">
             <el-option :label="$t('新客户')" :value="true" />
@@ -223,91 +75,50 @@
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('年度发货量')" v-show="showSearch">
-        <el-input
-          v-model.trim="weightYearly.value"
-          :placeholder="$t('请输入数字')"
-          clearable
-          @keyup.enter.native="handleQuery"
-          @input="weightYearly.value=weightYearly.value.replace(/\s+/g, '')"
-        >
+          <el-input v-model.trim="weightYearly.value" :placeholder="$t('请输入数字')" clearable @keyup.enter.native="handleQuery" @input="weightYearly.value = weightYearly.value.replace(/\s+/g, '')">
             <template slot="prepend">
-            <dict-selector
-              :type="DICT_TYPE.CUSTOMER_QUERY_NUMBER_FIELD"
-              defaultable
-              v-model="weightYearly.key"
-              class="w-50"
-            />
+              <dict-selector :type="DICT_TYPE.CUSTOMER_QUERY_NUMBER_FIELD" defaultable v-model="weightYearly.key" />
             </template>
           </el-input>
         </el-form-item>
         <el-form-item :label="$t('商品类别')" v-show="showSearch">
-        <el-select
-          @change="handleSelectProductType"
-          multiple
-          v-model="queryParams.productTypes"
-          :placeholder="$t('请选择')"
-        >
-          <el-option
-            :label="item.titleZh"
-            :value="item.id"
-            v-for="item in productTypeList"
-            :key="item.id"
-          />
+          <el-select @change="handleSelectProductType" multiple v-model="queryParams.productTypes" :placeholder="$t('请选择')">
+            <el-option :label="item.titleZh" :value="item.id" v-for="item in productTypeList" :key="item.id" />
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('商品名称')" v-show="showSearch">
-        <el-select
-          multiple
-          filterable
-          clearable
-          v-model="queryParams.productIds"
-          :placeholder="$t('请选择商品名称')"
-        >
-          <el-option
-            :label="item.titleZh"
-            :value="parseInt(item.id)"
-            v-for="item in productList"
-            :key="item.id"
-          />
+          <el-select multiple filterable clearable v-model="queryParams.productIds" :placeholder="$t('请选择商品名称')">
+            <el-option :label="item.titleZh" :value="parseInt(item.id)" v-for="item in productList" :key="item.id" />
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('主要竞争对手')" v-show="showSearch">
           <competitor-selector v-model="queryParams.competitorIds" multiple clearable @change="handleQuery" />
         </el-form-item>
         <el-form-item :label="$t('年度发货次数')" v-show="showSearch">
-        <el-input
-          v-model.trim="numYearly.value"
-          :placeholder="$t('请输入数字')"
-          clearable
-          @keyup.enter.native="handleQuery"
-          @input="numYearly.value=numYearly.value.replace(/\s+/g, '')"
-        >
+          <el-input v-model.trim="numYearly.value" :placeholder="$t('请输入数字')" clearable @keyup.enter.native="handleQuery" @input="numYearly.value = numYearly.value.replace(/\s+/g, '')">
             <template slot="prepend">
-            <dict-selector
-              :type="DICT_TYPE.CUSTOMER_QUERY_NUMBER_FIELD"
-              defaultable
-              v-model="numYearly.key"
-              class="w-50"
-            />
+              <dict-selector :type="DICT_TYPE.CUSTOMER_QUERY_NUMBER_FIELD" defaultable v-model="numYearly.key" />
             </template>
           </el-input>
         </el-form-item>
         <el-form-item :label="$t('推介人')" v-show="showSearch">
-        <el-select
-          clearable
-          remote
-          :remote-method="remoteMethod"
-          v-model="queryParams.promoter"
-          :placeholder="$t('请输入推介人')"
-          filterable
-        >
-          <el-option
-            v-for="item in customerSelectFn"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-          >
-          </el-option>
+          <el-select clearable remote :remote-method="remoteMethod" v-model="queryParams.promoter" :placeholder="$t('请输入推介人')" filterable>
+            <el-option v-for="item in customerSelectFn" :key="item.id" :label="item.name" :value="item.id"> </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('获取方式')" v-show="showSearch">
+          <el-select v-model="queryParams.getMethod" multiple :placeholder="$t('请选择')">
+            <el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_GET_METHOD)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="parseInt(dict.value)" />
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('创建入口')" v-show="showSearch">
+          <el-select v-model="queryParams.createFroms" multiple :placeholder="$t('请选择')">
+            <el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_FROM)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="parseInt(dict.value)" />
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('结算方式')" v-show="showSearch">
+          <el-select v-model="queryParams.balances" multiple :placeholder="$t('请选择结算方式')">
+            <el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_BALANCE)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="parseInt(dict.value)" />
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('入仓确认')" v-show="showSearch">
@@ -316,89 +127,41 @@
             <el-option :label="$t('否')" :value="0" />
           </el-select>
         </el-form-item>
-      <el-form-item :label="$t('控货无收货人')" v-show="showSearch">
+        <el-form-item :label="$t('控货无收货人')" v-show="showSearch" label-width="100px">
+          <div style="width: 194px">
             <el-switch v-model="queryParams.noConsignee" />
+          </div>
         </el-form-item>
-      <el-form-item :label="$t('默认付款')" v-show="showSearch">
+        <el-form-item :label="$t('默认付款')" v-show="showSearch" label-width="70px">
+          <div style="width: 194px">
             <el-switch v-model="queryParams.defaultPay" />
+          </div>
         </el-form-item>
-      <el-form-item :label="$t('是否显示提单价格')" v-show="showSearch">
+        <el-form-item :label="$t('是否显示提单价格')" v-show="showSearch" label-width="130px">
+          <div style="width: 194px">
             <el-switch v-model="queryParams.isShowTidanPrice" />
+          </div>
+        </el-form-item>
+      </div>
+      <div class="search-time">
+        <el-form-item :label="$t('入公海时间')" v-show="showSearch">
+          <el-date-picker type="datetimerange" clearable v-model="enterOpenSeaTime" value-format="yyyy-MM-dd HH:mm:ss" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
         </el-form-item>
         <el-form-item :label="$t('归属时间')" v-show="showSearch">
-        <el-date-picker
-          type="datetimerange"
-          clearable
-          v-model="customerServiceConfirmedTime"
-          style="width: 240px"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          range-separator="-"
-          :start-placeholder="$t('开始日期')"
-          :end-placeholder="$t('结束日期')"
-        />
+          <el-date-picker type="datetimerange" clearable v-model="customerServiceConfirmedTime" value-format="yyyy-MM-dd HH:mm:ss" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
         </el-form-item>
         <el-form-item :label="$t('首次成交时间')" v-show="showSearch">
-        <el-date-picker
-          type="datetimerange"
-          clearable
-          v-model="firstDealTime"
-          style="width: 240px"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          range-separator="-"
-          :start-placeholder="$t('开始日期')"
-          :end-placeholder="$t('结束日期')"
-        />
+          <el-date-picker type="datetimerange" clearable v-model="firstDealTime" value-format="yyyy-MM-dd HH:mm:ss" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
         </el-form-item>
-      <el-form-item :label="$t('获取方式')" v-show="showSearch">
-        <el-select
-          v-model="queryParams.getMethod"
-          multiple
-          :placeholder="$t('请选择')"
-        >
-          <el-option
-            v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_GET_METHOD)"
-            :key="dict.value"
-            :label="isChinese ? dict.label : dict.labelEn"
-            :value="parseInt(dict.value)"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item :label="$t('创建入口')" v-show="showSearch">
-        <el-select
-          v-model="queryParams.createFroms"
-          multiple
-          :placeholder="$t('请选择')"
-        >
-          <el-option
-            v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_FROM)"
-            :key="dict.value"
-            :label="isChinese ? dict.label : dict.labelEn"
-            :value="parseInt(dict.value)"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item :label="$t('结算方式')" v-show="showSearch">
-        <el-select
-          v-model="queryParams.balances"
-          multiple
-          :placeholder="$t('请选择结算方式')"
-        >
-          <el-option
-            v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_BALANCE)"
-            :key="dict.value"
-            :label="isChinese ? dict.label : dict.labelEn"
-            :value="parseInt(dict.value)"
-          />
-        </el-select>
+
+        <el-form-item :label="$t('创建时间')" v-show="showSearch">
+          <el-date-picker type="datetimerange" clearable v-model="dateRangeCreateTime" value-format="yyyy-MM-dd HH:mm:ss" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
         </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{
-          $t("搜索")
-        }}</el-button>
-        <el-button icon="el-icon-refresh" @click="resetQuery">{{
-          $t("重置")
-        }}</el-button>
+        <el-form-item style="padding-left: 20px">
+          <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{ $t("搜索") }}</el-button>
+          <el-button icon="el-icon-refresh" @click="resetQuery">{{ $t("重置") }}</el-button>
         </el-form-item>
+      </div>
     </el-form>
 
     <!-- 操作工具栏 -->