Merge branch 'invest-dev' of http://git.dgtis.com/15896567520/RuoYi-flowable-master into invest-dev

ruoyi-ui/src/views/invest/channel/index.vue

@@ -7,8 +7,8 @@
       :inline="true"
       v-show="showSearch"
       label-width="90px"
-      style="margin-left: -22px"
     >
+      <!-- style="margin-left: -22px" -->
       <el-form-item label="渠道名称" prop="channelName">
         <el-input
           v-model="queryParams.channelName"

ruoyi-ui/src/views/invest/components/followList.vue

@@ -8,7 +8,6 @@
       :inline="true"
       v-show="showSearch"
       label-width="90px"
-      style="margin-left: -22px"
     >
       <el-form-item label="项目名称" prop="projectName">
         <el-input

ruoyi-ui/src/views/invest/components/projectList.vue

@@ -18,6 +18,22 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="投资负责人" prop="investHead">
+        <el-input
+          v-model="queryParams.investHead"
+          placeholder="请输入投资负责人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="公司联系人" prop="projectContacts">
+        <el-input
+          v-model="queryParams.projectContacts"
+          placeholder="请输入公司联系人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="渠道" prop="channel">
         <el-select v-model="queryParams.channel" placeholder="全部" clearable>
           <el-option
@@ -42,14 +58,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="投资负责人" prop="investHead">
-        <el-input
-          v-model="queryParams.investHead"
-          placeholder="请输入投资负责人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+      
       <el-form-item label="项目公司" prop="company">
         <el-input
           v-model="queryParams.company"
@@ -58,14 +67,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="公司联系人" prop="projectContacts">
-        <el-input
-          v-model="queryParams.projectContacts"
-          placeholder="请输入公司联系人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
 
       <!-- <el-form-item label="初次接触日期" prop="contactDate">
         <el-date-picker