Merge branch 'master' of https://gitee.com/guochang-hongyun/warm-kingdom-vue3-oa

src/views/crm/customer/index.vue

@@ -44,21 +44,6 @@
           />
         </el-select>
       </el-form-item>
-     <el-form-item label="创建时间" prop="timeType">
-        <el-select
-          v-model="queryParams.timeType"
-          class="!w-240px"
-          clearable
-          placeholder="请选择时间类型"
-        >
-          <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.TIME_TYPE)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
       <el-form-item label="合作状态" prop="customerStatus">
         <el-select
           v-model="queryParams.customerStatus"
@@ -74,7 +59,22 @@
           />
         </el-select>
       </el-form-item>
-     <el-form-item label="客户来源" prop="source">
+      <el-form-item label="创建时间" prop="timeType">
+        <el-select
+            v-model="queryParams.timeType"
+            class="!w-240px"
+            clearable
+            placeholder="请选择时间类型"
+        >
+          <el-option
+              v-for="dict in getIntDictOptions(DICT_TYPE.TIME_TYPE)"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+<!--     <el-form-item label="客户来源" prop="source">
         <el-select
           v-model="queryParams.source"
           class="!w-240px"
@@ -88,7 +88,7 @@
             :value="dict.value"
           />
         </el-select>
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item>
         <el-button @click="handleQuery">
           <Icon class="mr-5px" icon="ep:search" />

src/views/crm/customer/pool/index.vue

@@ -42,21 +42,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="创建时间" prop="timeType">
+
-        <el-select
-          v-model="queryParams.timeType"
-          class="!w-240px"
-          clearable
-          placeholder="请选择时间类型"
-        >
-          <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.TIME_TYPE)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
       <el-form-item label="合作状态" prop="customerStatus">
         <el-select
           v-model="queryParams.customerStatus"
@@ -72,7 +58,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="客户来源" prop="source">
+<!--      <el-form-item label="客户来源" prop="source">
         <el-select
           v-model="queryParams.source"
           class="!w-240px"
@@ -86,6 +72,21 @@
             :value="dict.value"
           />
         </el-select>
+      </el-form-item>-->
+      <el-form-item label="创建时间" prop="timeType">
+        <el-select
+            v-model="queryParams.timeType"
+            class="!w-240px"
+            clearable
+            placeholder="请选择时间类型"
+        >
+          <el-option
+              v-for="dict in getIntDictOptions(DICT_TYPE.TIME_TYPE)"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button @click="handleQuery">