前端

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

@@ -138,7 +138,6 @@
       <!-- <el-table-column label="主键ID" align="center" prop="id" /> -->
       <el-table-column
         label="渠道编号"
-        width="100"
         align="center"
         prop="channelCode"
       >
@@ -150,7 +149,6 @@
       </el-table-column>
       <el-table-column
         label="渠道名称"
-        width="150"
         align="center"
         prop="channelName"
       >
@@ -163,7 +161,6 @@
 
       <el-table-column
         label="渠道类别"
-        width="450"
         align="center"
         prop="channelType"
       >
@@ -174,7 +171,7 @@
           />
         </template>
       </el-table-column>
-      <el-table-column label="联系人" width="80" align="center" prop="contacts">
+      <el-table-column label="联系人" align="center" prop="contacts">
         <template slot-scope="scope">
           <div :title="scope.row.contacts">
             {{ scope.row.contacts }}
@@ -183,7 +180,6 @@
       </el-table-column>
       <el-table-column
         label="联系电话"
-        width="120"
         align="center"
         prop="telephone"
       >
@@ -195,7 +191,6 @@
       </el-table-column>
       <el-table-column
         label="渠道负责人"
-        width="120"
         align="center"
         prop="channelHead"
       >
@@ -205,7 +200,7 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="状态" width="60" align="center" prop="status">
+      <el-table-column label="状态"  align="center" prop="status">
         <template slot-scope="scope">
           <dict-tag
             :options="dict.type.channel_status"
@@ -215,7 +210,6 @@
       </el-table-column>
       <el-table-column
         label="创建人"
-        width="120"
         align="center"
         prop="createBy"
       >
@@ -229,7 +223,6 @@
         label="创建时间"
         align="center"
         prop="createTime"
-        width="160"
       >
         <template slot-scope="scope">
           <div :title="scope.row.createTime">
@@ -239,7 +232,6 @@
       </el-table-column>
       <el-table-column
         label="操作"
-        fixed="right"
         align="center"
         width="120"
         class-name="small-padding fixed-width"

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

@@ -296,6 +296,7 @@ import {
   delInvestigate,
   updateInvestigate,
   addInvestigatePerson,
+  addInvestigate,
   getProjectInvestigateId,
   dueAllPeportList,
 } from "@/api/invest/pool";

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

@@ -137,7 +137,6 @@
         label="项目名称"
         align="center"
         prop="tProjectPool.projectName"
-        width="200"
       >
         <template slot-scope="scope">
           <div :title="scope.row.tProjectPool.projectName">
@@ -145,76 +144,57 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column
-        label="跟进人"
-        width="150"
-        align="center"
-        prop="upPerson"
-      >
+      <el-table-column label="跟进人" align="center" prop="upPerson">
         <template slot-scope="scope">
           <div :title="scope.row.upPerson">
             {{ scope.row.upPerson }}
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="跟进方式" width="150" align="center" prop="upWay">
+      <el-table-column label="跟进方式" width="120" align="center" prop="upWay">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.up_way" :value="scope.row.upWay" />
         </template>
       </el-table-column>
-
-      <el-table-column
-        label="跟进内容"
-        width="300"
-        align="center"
-        prop="upContent"
-      >
+      <el-table-column label="公司联系人" align="center" prop="contacts">
+        <template slot-scope="scope">
+          <div :title="scope.row.contacts">
+            {{ scope.row.contacts }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="跟进内容" align="center" prop="upContent">
         <template slot-scope="scope">
           <div :title="scope.row.upContent">
             {{ scope.row.upContent }}
           </div>
         </template>
       </el-table-column>
-      <el-table-column
-        label="跟进日期"
-        align="center"
-        prop="realityUpDate"
-        width="120"
-      >
+      <el-table-column label="跟进日期" align="center" prop="realityUpDate">
         <template slot-scope="scope">
           <span :title="scope.row.realityUpDate">{{
             parseTime(scope.row.realityUpDate, "{y}-{m}-{d}")
           }}</span>
         </template>
       </el-table-column>
-      <el-table-column
-        label="创建人"
-        width="120"
-        align="center"
-        prop="createBy"
-      >
+      <el-table-column label="创建人" align="center" prop="createBy">
         <template slot-scope="scope">
           <div :title="scope.row.createBy">
             {{ scope.row.createBy }}
           </div>
         </template>
       </el-table-column>
-      <el-table-column
-        label="创建时间"
-        align="center"
-        prop="createTime"
-        width="160"
-      >
+      <el-table-column label="创建时间" align="center" prop="createTime">
         <template slot-scope="scope">
           <div :title="scope.row.createTime">
             {{ scope.row.createTime }}
           </div>
         </template>
       </el-table-column>
+      <!-- fixed="right" -->
       <el-table-column
         label="操作"
         width="120"
-        fixed="right"
         align="center"
         class-name="small-padding fixed-width"
       >

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

@@ -39,8 +39,18 @@
           />
         </el-select>
       </el-form-item>
-
-      <el-form-item label="开始时间" prop="startTime">
+      <el-form-item label="会议日期" prop="startTime">
+        <el-date-picker
+          v-model="queryParams.timeVal"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="会议开始日期"
+          end-placeholder="会议结束日期"
+          value-format="yyyy-MM-dd"
+        >
+        </el-date-picker>
+      </el-form-item>
+      <!-- <el-form-item label="开始时间" prop="startTime">
         <el-date-picker
           style="width: 205px"
           clearable
@@ -61,7 +71,7 @@
           placeholder="请选择会议结束时间"
         >
         </el-date-picker>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button
           type="primary"
@@ -139,6 +149,18 @@
     >
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="主键ID" align="center" prop="id" /> -->
+      <el-table-column
+        label="会议编号"
+        width="120"
+        align="center"
+        prop="meetingCode"
+      >
+        <template slot-scope="scope">
+          <div :title="scope.row.meetingCode">
+            {{ scope.row.meetingCode }}
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column
         label="会议主题"
         width="200"
@@ -487,7 +509,11 @@
           </el-date-picker> -->
         </el-form-item>
         <el-form-item label="会议地点" prop="place">
-          <el-input maxlength="100" v-model="form.place" placeholder="请输入会议地点" />
+          <el-input
+            maxlength="100"
+            v-model="form.place"
+            placeholder="请输入会议地点"
+          />
         </el-form-item>
         <el-form-item label="会议发起人" prop="promoter">
           <div
@@ -634,6 +660,7 @@ export default {
         meetingType: null,
         startTime: null,
         endTime: null,
+        timeVal:null,
         orderByColumn: "createTime",
         isAsc: "desc",
       },
@@ -890,6 +917,8 @@ export default {
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
+      this.queryParams.startTime = this.queryParams.timeVal[0];
+      this.queryParams.endTime = this.queryParams.timeVal[1];
       this.getList();
     },
     /** 重置按钮操作 */

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

@@ -146,7 +146,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item> -->
-      <el-form-item label="创建日期" prop="createTime">
+      <!-- <el-form-item label="创建日期" prop="createTime">
         <el-date-picker
           style="width: 205px"
           clearable
@@ -156,7 +156,7 @@
           placeholder="请选择创建日期"
         >
         </el-date-picker>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button
           type="primary"
@@ -816,6 +816,7 @@ export default {
         projectState: null,
         orderByColumn: "createTime",
         isAsc: "desc",
+        createTime:null
       },
       form: {
         id: null,

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

@@ -2027,10 +2027,10 @@
           </tr>
         </tbody>
       </table>
-      <el-form-item class="btnList" v-if="!readonly">
+      <el-form-item class="btnList" >
         <el-button @click="goBack">返 回</el-button>
-        <el-button type="primary" @click="submitForm" v-preventReClick>提 交</el-button>
-      </el-form-item>
+        <el-button v-if="!readonly" type="primary" @click="submitForm" v-preventReClick>提 交</el-button>
+      </el-form-item >
     </el-form>
   </div>
   <div v-else class="public-flex-center public-padded-t-20" style="color:#909399;">暂无数据</div>