前端

ruoyi-ui/.env.development

@@ -7,7 +7,8 @@ ENV = 'development'
 # 若依管理系统/开发环境
 # 部署
 # VUE_APP_BASE_API = 'http://47.103.79.143:8091/dev-api'  
-VUE_APP_BASE_API = '/dev-api'
+# VUE_APP_BASE_API = '/dev-api'  
+VUE_APP_BASE_API = '/prod-api'
 VUE_APP_CORPID = "ding4ab75ecd53106cde4ac5d6980864d335"
 # 投资部的部门id
 VUE_APP_DEPTID = '103'

ruoyi-ui/.env.production

@@ -5,9 +5,10 @@ VUE_APP_TITLE = 投资系统
 ENV = 'production'
 
 # 若依管理系统/生产环境
-VUE_APP_BASE_API = 'http://47.103.79.143:8091/prod-api'
+VUE_APP_BASE_API = 'http://47.103.79.143:8091'
+# VUE_APP_BASE_API = '/prod-api'
 #部署
-# VUE_APP_BASE_API = 'http://47.103.79.143:8091/' 
+# VUE_APP_BASE_API = 'http://47.103.79.143:8092/' 
 VUE_APP_CORPID = "ding4ab75ecd53106cde4ac5d6980864d335"
 # 投资部的部门id
 VUE_APP_DEPTID = '103'

ruoyi-ui/src/api/system/user.js

@@ -9,6 +9,13 @@ export function listUser(query) {
     params: query
   })
 }
+export function listUserNew(query) {
+  return request({
+    url: '/system/user/listUser',
+    method: 'get',
+    params: query
+  })
+}
 
 // 查询用户详细
 export function getUser(userId) {

ruoyi-ui/src/assets/styles/public.scss

@@ -457,9 +457,11 @@
 .custom-blue-color {
   color: #1890ff !important;
 }
+
 .custom-red-color {
   color: #fd0e0e !important;
 }
+
 .custom-orange-color {
   color: orange !important;
 }
@@ -477,6 +479,7 @@
   line-clamp: 1;
   -webkit-box-orient: vertical;
 }
+
 .yichu2 {
   text-overflow: -o-ellipsis-lastline;
   overflow: hidden;
@@ -485,4 +488,11 @@
   -webkit-line-clamp: 2;
   line-clamp: 2;
   -webkit-box-orient: vertical;
+}
+
+.tableWrapper {
+  .cell {
+    height: 30px !important;
+    line-height: 30px !important;
+  }
 }

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

@@ -6,7 +6,8 @@
       size="small"
       :inline="true"
       v-show="showSearch"
-      label-width="100px"
+      label-width="90px"
+      style="margin-left: -22px"
     >
       <el-form-item label="渠道名称" prop="channelName">
         <el-input
@@ -135,11 +136,33 @@
     >
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="主键ID" align="center" prop="id" /> -->
-      <el-table-column label="渠道名称"  width="150" align="center" prop="channelName" />
-      <el-table-column label="渠道编号"  width="100"  align="center" prop="channelCode" />
+      <el-table-column
+        label="渠道名称"
+        width="150"
+        align="center"
+        prop="channelName"
+      >
+        <template slot-scope="scope">
+          <div :title="scope.row.channelName">
+            {{ scope.row.channelName }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="渠道编号"
+        width="100"
+        align="center"
+        prop="channelCode"
+      >
+        <template slot-scope="scope">
+          <div :title="scope.row.channelCode">
+            {{ scope.row.channelCode }}
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column
         label="渠道类别"
-        width="260"
+        width="450"
         align="center"
         prop="channelType"
       >
@@ -150,9 +173,37 @@
           />
         </template>
       </el-table-column>
-      <el-table-column label="联系人" width="80" align="center" prop="contacts" />
-      <el-table-column label="联系电话" width="120" align="center" prop="telephone" />
-      <el-table-column label="渠道负责人" width="120" align="center" prop="channelHead" />
+      <el-table-column label="联系人" width="80" 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="联系电话"
+        width="120"
+        align="center"
+        prop="telephone"
+      >
+        <template slot-scope="scope">
+          <div :title="scope.row.telephone">
+            {{ scope.row.telephone }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="渠道负责人"
+        width="120"
+        align="center"
+        prop="channelHead"
+      >
+        <template slot-scope="scope">
+          <div :title="scope.row.channelHead">
+            {{ scope.row.channelHead }}
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column label="状态" width="60" align="center" prop="status">
         <template slot-scope="scope">
           <dict-tag
@@ -161,13 +212,30 @@
           />
         </template>
       </el-table-column>
-      <el-table-column label="创建人"  width="120" align="center" prop="createBy" />
+      <el-table-column
+        label="创建人"
+        width="120"
+        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"
-      />
+      >
+        <template slot-scope="scope">
+          <div :title="scope.row.createTime">
+            {{ scope.row.createTime }}
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column
         label="操作"
         fixed="right"
@@ -220,7 +288,11 @@
         label-width="120px"
       >
         <el-form-item label="渠道名称" prop="channelName">
-          <el-input v-model="form.channelName" placeholder="请输入渠道名称" />
+          <el-input
+            maxlength="100"
+            v-model="form.channelName"
+            placeholder="请输入渠道名称"
+          />
         </el-form-item>
         <el-form-item label="组别" prop="channelGroup">
           <el-select v-model="form.channelGroup" placeholder="请选择组别">
@@ -243,13 +315,25 @@
           </el-select>
         </el-form-item>
         <el-form-item label="联系人" prop="contacts">
-          <el-input v-model="form.contacts" placeholder="请输入联系人" />
+          <el-input
+            maxlength="25"
+            v-model="form.contacts"
+            placeholder="请输入联系人"
+          />
         </el-form-item>
         <el-form-item label="联系电话" prop="telephone">
-          <el-input v-model="form.telephone" placeholder="请输入联系电话" />
+          <el-input
+            maxlength="20"
+            v-model="form.telephone"
+            placeholder="请输入联系电话"
+          />
         </el-form-item>
         <el-form-item label="地址" prop="address">
-          <el-input v-model="form.address" placeholder="请输入地址" />
+          <el-input
+            maxlength="100"
+            v-model="form.address"
+            placeholder="请输入地址"
+          />
         </el-form-item>
         <el-form-item label="渠道负责人" prop="channelHead">
           <div class="el-input__inner inputSimulation" @click="openSelectDept">
@@ -284,6 +368,7 @@
           class="special-el-form-item"
         >
           <el-input
+            maxlength="200"
             rows="4"
             type="textarea"
             v-model="form.channelBlurb"
@@ -292,6 +377,7 @@
         </el-form-item>
         <el-form-item label="备注" prop="mark" class="special-el-form-item">
           <el-input
+            maxlength="200"
             rows="4"
             type="textarea"
             v-model="form.mark"
@@ -300,7 +386,9 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm" v-preventReClick>确 定</el-button>
+        <el-button type="primary" @click="submitForm" v-preventReClick
+          >确 定</el-button
+        >
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -553,10 +641,4 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.tableWrapper {
-  ::v-deep .cell {
-    height: 30px;
-    line-height: 30px !important;
-  }
-}
 </style>

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

@@ -8,6 +8,7 @@
       append-to-body
     >
       <el-table
+        class="tableWrapper"
         ref="channelTable"
         @row-click="clickRow"
         :data="channelList"
@@ -15,9 +16,25 @@
       >
         <el-table-column type="selection" width="55" align="center" />
         <!-- <el-table-column label="主键ID" align="center" prop="id" /> -->
-        <el-table-column label="渠道名称" align="center" prop="channelName" />
+        <el-table-column
+          label="渠道名称"
+          width="150"
+          align="center"
+          prop="channelName"
+        >
+          <template slot-scope="scope">
+            <div :title="scope.row.channelName">
+              {{ scope.row.channelName }}
+            </div>
+          </template>
+        </el-table-column>
         <el-table-column label="渠道编号" align="center" prop="channelCode" />
-        <el-table-column label="渠道类别" align="center" prop="channelType">
+        <el-table-column
+          label="渠道类别"
+          width="450"
+          align="center"
+          prop="channelType"
+        >
           <template slot-scope="scope">
             <dict-tag
               :options="dict.type.channel_type"
@@ -26,7 +43,12 @@
           </template>
         </el-table-column>
         <el-table-column label="联系人" align="center" prop="contacts" />
-        <el-table-column label="联系电话" align="center" prop="telephone" />
+        <el-table-column
+          label="联系电话"
+          width="150"
+          align="center"
+          prop="telephone"
+        />
         <el-table-column label="渠道负责人" align="center" prop="channelHead" />
         <el-table-column label="状态" align="center" prop="status">
           <template slot-scope="scope">
@@ -45,7 +67,9 @@
         @pagination="getList"
       />
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submit" v-preventReClick>确 定</el-button>
+        <el-button type="primary" @click="submit" v-preventReClick
+          >确 定</el-button
+        >
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>

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

@@ -109,6 +109,7 @@
     </el-row>
 
     <el-table
+      class="tableWrapper"
       v-loading="loading"
       border
       :data="contractList"
@@ -116,13 +117,30 @@
     >
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="主键ID" align="center" prop="id" /> -->
-      <el-table-column label="合同名称" align="center" prop="contractName" />
+      <el-table-column label="合同名称" align="center" prop="contractName">
+        <template slot-scope="scope">
+          <div :title="scope.row.contractName">
+            {{ scope.row.contractName }}
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column
         label="项目名称"
         align="center"
         prop="tProjectPool.projectName"
-      />
-      <el-table-column label="项目阶段" align="center" prop="projectStage">
+      >
+        <template slot-scope="scope">
+          <div :title="scope.row.tProjectPool.projectName">
+            {{ scope.row.tProjectPool.projectName }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="项目阶段"
+        width="150"
+        align="center"
+        prop="projectStage"
+      >
         <template slot-scope="scope">
           <dict-tag
             :options="dict.type.project_stage"
@@ -131,14 +149,37 @@
         </template>
       </el-table-column>
 
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="创建人" align="center" prop="createBy" />
+      <el-table-column label="备注" align="center" prop="remark">
+        <template slot-scope="scope">
+          <div :title="scope.row.remark">
+            {{ scope.row.remark }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="创建人"
+        width="120"
+        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="创建时间"
+        width="160"
         align="center"
         prop="createTime"
-        width="160"
-      />
+      >
+        <template slot-scope="scope">
+          <div :title="scope.row.createTime">
+            {{ scope.row.createTime }}
+          </div>
+        </template>
+      </el-table-column>
       <!-- <el-table-column label="合同类别" align="center" prop="contractType">
         
       </el-table-column> -->
@@ -193,7 +234,11 @@
         label-width="80px"
       >
         <el-form-item label="合同名称" prop="contractName">
-          <el-input v-model="form.contractName" placeholder="请输入合同名称" />
+          <el-input
+            maxlength="100"
+            v-model="form.contractName"
+            placeholder="请输入合同名称"
+          />
         </el-form-item>
         <el-form-item label="项目名称" prop="projectName">
           <div
@@ -245,6 +290,7 @@
         </el-form-item>
         <el-form-item label="备注" prop="remark" class="special-el-form-item">
           <el-input
+            maxlength="200"
             rows="4"
             type="textarea"
             v-model="form.remark"
@@ -253,7 +299,9 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm" v-preventReClick>确 定</el-button>
+        <el-button type="primary" @click="submitForm" v-preventReClick
+          >确 定</el-button
+        >
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>

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

@@ -96,6 +96,7 @@
     </el-row>
 
     <el-table
+      class="tableWrapper"
       v-loading="loading"
       border
       :data="informationList"
@@ -108,8 +109,19 @@
         width="300"
         align="center"
         prop="fileName"
-      />
-      <el-table-column label="文件类别" width="160" align="center" prop="fileType">
+      >
+        <template slot-scope="scope">
+          <div :title="scope.row.fileName">
+            {{ scope.row.fileName }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="文件类别"
+        width="160"
+        align="center"
+        prop="fileType"
+      >
         <template slot-scope="scope">
           <dict-tag
             :options="dict.type.file_type"
@@ -119,10 +131,16 @@
       </el-table-column>
       <el-table-column
         label="项目名称"
-        width="300"
+        width="200"
         align="center"
         prop="tProjectPool.projectName"
-      />
+      >
+        <template slot-scope="scope">
+          <div :title="scope.row.tProjectPool.projectName">
+            {{ scope.row.tProjectPool.projectName }}
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column label="项目阶段" align="center" prop="projectStage">
         <template slot-scope="scope">
           <dict-tag
@@ -132,19 +150,37 @@
         </template>
       </el-table-column>
 
-      <el-table-column label="备注" width="120" align="center" prop="remark" />
+      <el-table-column label="备注" width="120" align="center" prop="remark">
+        <template slot-scope="scope">
+          <div :title="scope.row.remark">
+            {{ scope.row.remark }}
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column
         label="创建人"
         width="120"
         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="创建时间"
         width="160"
         align="center"
         prop="createTime"
-      />
+      >
+        <template slot-scope="scope">
+          <div :title="scope.row.createTime">
+            {{ scope.row.createTime }}
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column
         width="120"
         fixed="right"
@@ -197,7 +233,11 @@
         label-width="90px"
       >
         <el-form-item label="文件名称" prop="fileName">
-          <el-input v-model="form.fileName" placeholder="请输入文件名称" />
+          <el-input
+            maxlength="100"
+            v-model="form.fileName"
+            placeholder="请输入文件名称"
+          />
         </el-form-item>
 
         <el-form-item label="文件类别" prop="fileType">
@@ -255,6 +295,7 @@
         </el-form-item>
         <el-form-item label="备注" prop="remark" class="special-el-form-item">
           <el-input
+            maxlength="200"
             rows="4"
             type="textarea"
             v-model="form.remark"
@@ -263,7 +304,9 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm" v-preventReClick>确 定</el-button>
+        <el-button type="primary" @click="submitForm" v-preventReClick
+          >确 定</el-button
+        >
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>

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

@@ -1,13 +1,14 @@
 <template>
   <div class="app-container">
     <el-form
-      v-if="type !== '2'"
+      v-if="type === '1'"
       :model="queryParams"
       ref="queryForm"
       size="small"
       :inline="true"
       v-show="showSearch"
       label-width="90px"
+      style="margin-left: -22px"
     >
       <el-form-item label="项目名称" prop="projectName">
         <el-input
@@ -68,7 +69,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8" v-if="type !== '2'">
+    <el-row :gutter="10" class="mb8" v-if="type === '1'">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -122,6 +123,8 @@
     </el-row>
 
     <el-table
+      class="tableWrapper"
+      v-if="type !== '3'"
       v-loading="loading"
       border
       :data="recordList"
@@ -134,15 +137,27 @@
         label="项目名称"
         align="center"
         prop="tProjectPool.projectName"
-        width="300"
-      />
+        width="200"
+      >
+        <template slot-scope="scope">
+          <div :title="scope.row.tProjectPool.projectName">
+            {{ scope.row.tProjectPool.projectName }}
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column
         label="跟进人"
         width="150"
         align="center"
         prop="upPerson"
-      />
-      <el-table-column label="跟进方式" align="center" prop="upWay">
+      >
+        <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">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.up_way" :value="scope.row.upWay" />
         </template>
@@ -153,15 +168,23 @@
         width="300"
         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="180"
+        width="120"
       >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.realityUpDate, "{y}-{m}-{d}") }}</span>
+          <span :title="scope.row.realityUpDate">{{
+            parseTime(scope.row.realityUpDate, "{y}-{m}-{d}")
+          }}</span>
         </template>
       </el-table-column>
       <el-table-column
@@ -169,13 +192,25 @@
         width="120"
         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"
-      />
+      >
+        <template slot-scope="scope">
+          <div :title="scope.row.createTime">
+            {{ scope.row.createTime }}
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column
         label="操作"
         width="120"
@@ -206,7 +241,7 @@
     </el-table>
 
     <pagination
-      v-show="total > 0"
+      v-show="total > 0 && type !== '3'"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -297,6 +332,7 @@
           class="special-el-form-item"
         >
           <el-input
+            maxlength="200"
             rows="4"
             type="textarea"
             v-model="form.upContent"
@@ -306,6 +342,7 @@
 
         <el-form-item label="备注" prop="mark" class="special-el-form-item">
           <el-input
+            maxlength="200"
             rows="4"
             type="textarea"
             v-model="form.mark"
@@ -314,7 +351,9 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm" v-preventReClick>确 定</el-button>
+        <el-button type="primary" @click="submitForm" v-preventReClick
+          >确 定</el-button
+        >
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -337,7 +376,7 @@ export default {
   props: {
     type: {
       type: String,
-      default: "1", //1=显示全部列表  2=显示某项目下的详情列表
+      default: "1", //1=显示全部列表  2=显示某项目下的详情列表  3=只展示弹窗
     },
     projectId: {
       type: String,
@@ -435,7 +474,9 @@ export default {
     if (this.projectId) {
       this.queryParams.projectId = this.projectId;
     }
-    this.getList();
+    if (this.type !== "3") {
+      this.getList();
+    }
   },
   methods: {
     // 选择部门人

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

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form
-      v-if="type !== '2'"
+      v-if="type === '1'"
       :model="queryParams"
       ref="queryForm"
       size="small"
@@ -76,7 +76,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8" v-if="type !== '2'">
+    <el-row :gutter="10" class="mb8" v-if="type === '1'">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -130,6 +130,8 @@
     </el-row>
 
     <el-table
+      class="tableWrapper"
+      v-if="type !== '3'"
       v-loading="loading"
       border
       :data="meetingList"
@@ -142,19 +144,38 @@
         width="200"
         align="center"
         prop="meetingTheme"
-      />
+        title="meetingTheme"
+      >
+        <template slot-scope="scope">
+          <div :title="scope.row.meetingTheme">
+            {{ scope.row.meetingTheme }}
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column
         label="项目名称"
         align="center"
-        width="300"
+        width="200"
         prop="tProjectPool.projectName"
-      />
+      >
+        <template slot-scope="scope">
+          <div :title="scope.row.tProjectPool.projectName">
+            {{ scope.row.tProjectPool.projectName }}
+          </div>
+        </template>
+      </el-table-column>
       <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="120"
@@ -166,58 +187,89 @@
             :options="dict.type.meeting_type"
             :value="scope.row.meetingType"
           />
+          <!-- :title="scope.row.meetingType" -->
         </template>
       </el-table-column>
       <el-table-column
-        label="会议开始时间"
+        label="会议发起人"
         width="120"
         align="center"
-        prop="startTime"
+        prop="promoter"
       >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.startTime, "{y}-{m}-{d}") }}</span>
+          <div :title="scope.row.promoter">
+            {{ scope.row.promoter }}
+          </div>
         </template>
       </el-table-column>
       <el-table-column
-        label="会议结束时间"
-        width="120"
+        label="会议参与人"
+        width="300"
         align="center"
-        prop="endTime"
+        prop="participants"
       >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.endTime, "{y}-{m}-{d}") }}</span>
+          <div :title="scope.row.participants">
+            {{ scope.row.participants }}
+          </div>
         </template>
       </el-table-column>
       <el-table-column
-        label="会议地点"
-        width="150"
-        align="center"
-        prop="place"
-      />
-      <el-table-column
-        label="会议发起人"
-        width="120"
+        label="会议开始时间"
+        width="160"
         align="center"
-        prop="promoter"
-      />
+        prop="startTime"
+      >
+        <template slot-scope="scope">
+          <span :title="scope.row.startTime">{{
+            parseTime(scope.row.startTime, "{y}-{m}-{d} {h}:{i}:{s}")
+          }}</span>
+        </template>
+      </el-table-column>
       <el-table-column
-        label="会议参与人"
-        width="300"
+        label="会议结束时间"
+        width="160"
         align="center"
-        prop="participants"
-      />
+        prop="endTime"
+      >
+        <template slot-scope="scope">
+          <span :title="scope.row.startTime">{{
+            parseTime(scope.row.endTime, "{y}-{m}-{d} {h}:{i}:{s}")
+          }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="会议地点" width="150" align="center" prop="place">
+        <template slot-scope="scope">
+          <div :title="scope.row.place">
+            {{ scope.row.place }}
+          </div>
+        </template>
+      </el-table-column>
+
       <el-table-column
         label="创建人"
         width="120"
         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"
-      />
+      >
+        <template slot-scope="scope">
+          <div :title="scope.row.createTime">
+            {{ scope.row.createTime }}
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column
         label="操作"
         fixed="right"
@@ -311,7 +363,7 @@
     </el-table>
 
     <pagination
-      v-show="total > 0"
+      v-show="total > 0 && type !== '3'"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -333,7 +385,11 @@
         label-width="120px"
       >
         <el-form-item label="会议主题" prop="meetingTheme">
-          <el-input v-model="form.meetingTheme" placeholder="请输入会议主题" />
+          <el-input
+            maxlength="100"
+            v-model="form.meetingTheme"
+            placeholder="请输入会议主题"
+          />
         </el-form-item>
 
         <!-- <el-form-item label="会议编号" prop="meetingCode">
@@ -401,6 +457,7 @@
             v-model="form.startTime"
             type="datetime"
             placeholder="请选择会议开始时间"
+            value-format="yyyy-MM-dd HH:mm:ss"
           >
           </el-date-picker>
           <!-- <el-date-picker
@@ -415,6 +472,7 @@
         <el-form-item label="会议结束时间" prop="endTime">
           <el-date-picker
             v-model="form.endTime"
+            value-format="yyyy-MM-dd HH:mm:ss"
             type="datetime"
             placeholder="请选择会议结束时间"
           >
@@ -429,7 +487,7 @@
           </el-date-picker> -->
         </el-form-item>
         <el-form-item label="会议地点" prop="place">
-          <el-input v-model="form.place" placeholder="请输入会议地点" />
+          <el-input maxlength="100" v-model="form.place" placeholder="请输入会议地点" />
         </el-form-item>
         <el-form-item label="会议发起人" prop="promoter">
           <div
@@ -504,7 +562,7 @@ export default {
   props: {
     type: {
       type: String,
-      default: "1", //1=显示全部列表  2=显示某项目下的详情列表
+      default: "1", //1=显示全部列表  2=显示某项目下的详情列表  3=只展示弹窗
     },
     projectId: {
       type: String,
@@ -643,7 +701,9 @@ export default {
     if (this.projectId) {
       this.queryParams.projectPoolId = this.projectId;
     }
-    this.getList();
+    if (this.type !== "3") {
+      this.getList();
+    }
   },
   methods: {
     handleSelectPeople() {
@@ -847,12 +907,16 @@ export default {
       this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
-    handleAdd(projectId) {
+    handleAdd(projectId, meetingType) {
       let that = this;
       this.meetingTypeDisabled = false;
       this.selectValues = null;
       this.selectNameValues = null;
       this.reset();
+      if (meetingType) {
+        this.meetingType = meetingType;
+        this.meetingTypeDisabled = true;
+      }
       if (projectId && typeof projectId === "string") {
         this.pageType = "1";
       }

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

@@ -10,7 +10,11 @@
       <h3>项目基础信息</h3>
       <el-divider></el-divider>
       <el-form-item label="项目名称" prop="projectName">
-        <el-input v-model="form.projectName" placeholder="请输入项目名称" />
+        <el-input
+          maxlength="100"
+          v-model="form.projectName"
+          placeholder="请输入项目名称"
+        />
       </el-form-item>
 
       <el-form-item label="渠道" prop="channel">
@@ -78,6 +82,7 @@
         class="special-el-form-item"
       >
         <el-input
+          maxlength="200"
           rows="4"
           type="textarea"
           v-model="form.description"
@@ -88,12 +93,14 @@
       <el-divider></el-divider>
       <el-form-item label="公司名称" prop="tProjectCompany.companyName">
         <el-input
+          maxlength="100"
           v-model="form.tProjectCompany.companyName"
           placeholder="请输入公司名称"
         />
       </el-form-item>
       <el-form-item label="统一社会信用代码" prop="tProjectCompany.companyCode">
         <el-input
+          maxlength="35"
           v-model="form.tProjectCompany.companyCode"
           placeholder="请输入企业统一社会信用代码"
         />
@@ -123,6 +130,7 @@
         prop="tProjectCompany.registeredCapital"
       >
         <el-input
+          maxlength="20"
           v-model="form.tProjectCompany.registeredCapital"
           onkeyup="value=value.replace(/[^0-9.]/g,'').replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/,'$1$2.$3')"
           placeholder="请输入注册资本"
@@ -130,12 +138,14 @@
       </el-form-item>
       <el-form-item label="注册地址" prop="tProjectCompany.registeredAddress">
         <el-input
+          maxlength="100"
           v-model="form.tProjectCompany.registeredAddress"
           placeholder="请输入注册地址"
         />
       </el-form-item>
       <el-form-item label="实缴资本(万元)" prop="tProjectCompany.paidCapital">
         <el-input
+          maxlength="20"
           v-model="form.tProjectCompany.paidCapital"
           onkeyup="value=value.replace(/[^0-9.]/g,'').replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/,'$1$2.$3')"
           placeholder="请输入实缴资本"
@@ -143,24 +153,28 @@
       </el-form-item>
       <el-form-item label="办公地址" prop="tProjectCompany.businessAddress">
         <el-input
+          maxlength="100"
           v-model="form.tProjectCompany.businessAddress"
           placeholder="请输入办公地址"
         />
       </el-form-item>
       <el-form-item label="实控人" prop="tProjectCompany.actualBod">
         <el-input
+          maxlength="25"
           v-model="form.tProjectCompany.actualBod"
           placeholder="请输入实控人"
         />
       </el-form-item>
       <el-form-item label="联系电话" prop="tProjectCompany.phone">
         <el-input
+          maxlength="20"
           v-model="form.tProjectCompany.phone"
           placeholder="请输入联系电话"
         />
       </el-form-item>
       <el-form-item label="所属类型" prop="tProjectCompany.type">
         <el-input
+          maxlength="25"
           v-model="form.tProjectCompany.type"
           placeholder="请输入所属类型"
         />
@@ -172,18 +186,21 @@
       <el-divider></el-divider>
       <el-form-item label="联系人姓名" prop="tProjectContacts.name">
         <el-input
+          maxlength="25"
           v-model="form.tProjectContacts.name"
           placeholder="请输入联系人姓名"
         />
       </el-form-item>
       <el-form-item label="职位" prop="tProjectContacts.position">
         <el-input
+          maxlength="25"
           v-model="form.tProjectContacts.position"
           placeholder="请输入职位"
         />
       </el-form-item>
       <el-form-item label="联系电话/微信" prop="tProjectContacts.contact">
         <el-input
+          maxlength="25"
           v-model="form.tProjectContacts.contact"
           placeholder="请输入联系电话/微信"
         />
@@ -205,6 +222,7 @@
       </el-form-item>
       <el-form-item label="预期融资金额(万元)" prop="financingMoney">
         <el-input
+          maxlength="20"
           v-model="form.financingMoney"
           onkeyup="this.value=this.value.replace(/\D/g,'')"
           placeholder="请输入预期融资金额"
@@ -212,6 +230,7 @@
       </el-form-item>
       <el-form-item label="投前估值(万元)" prop="investValuation">
         <el-input
+          maxlength="20"
           v-model="form.investValuation"
           onkeyup="this.value=this.value.replace(/\D/g,'')"
           placeholder="请输入投前估值"
@@ -219,6 +238,7 @@
       </el-form-item>
       <el-form-item label="预计投资金额(万元)" prop="investMoney">
         <el-input
+          maxlength="20"
           v-model="form.investMoney"
           onkeyup="this.value=this.value.replace(/\D/g,'')"
           placeholder="请输入预计投资金额"
@@ -261,6 +281,7 @@
         class="special-el-form-item"
       >
         <el-input
+          maxlength="200"
           rows="4"
           type="textarea"
           v-model="form.previousFinancing"
@@ -273,6 +294,7 @@
         class="special-el-form-item"
       >
         <el-input
+          maxlength="200"
           rows="4"
           type="textarea"
           v-model="form.financingCondition"
@@ -285,6 +307,7 @@
         class="special-el-form-item"
       >
         <el-input
+          maxlength="200"
           rows="4"
           type="textarea"
           v-model="form.investSparkle"
@@ -298,6 +321,7 @@
         class="special-el-form-item"
       >
         <el-input
+          maxlength="200"
           rows="4"
           type="textarea"
           v-model="form.shareholding"
@@ -306,6 +330,7 @@
       </el-form-item>
       <el-form-item label="备注" prop="mark" class="special-el-form-item">
         <el-input
+          maxlength="200"
           :readonly="type === '2' ? true : false"
           rows="4"
           type="textarea"

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

@@ -8,6 +8,7 @@
       :inline="true"
       v-show="showSearch"
       label-width="90px"
+      style="margin-left: -22px"
     >
       <el-form-item label="项目名称" prop="projectName">
         <el-input
@@ -49,6 +50,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="项目公司" prop="company">
+        <el-input
+          v-model="queryParams.company"
+          placeholder="请输入项目所属公司"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="公司联系人" prop="projectContacts">
         <el-input
           v-model="queryParams.projectContacts"
@@ -88,14 +97,7 @@
         >
         </el-date-picker>
       </el-form-item> -->
-      <el-form-item label="项目公司" prop="company">
-        <el-input
-          v-model="queryParams.company"
-          placeholder="请输入项目所属公司"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+
       <!-- <el-form-item label="项目编号" prop="projectCode">
         <el-input
           v-model="queryParams.projectCode"
@@ -421,7 +423,7 @@
         width="160"
       /> -->
       <el-table-column
-        width="350"
+        :width="stage == '0'||stage == '2' ? 300:400"
         fixed="right"
         label="操作"
         align="center"
@@ -574,13 +576,25 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-
+    <!-- 尽调 -->
     <dueDiligenceList
       :type="2"
       ref="dueDiligenceLists"
       :projectId="projectId"
       :projectName="form.projectName"
     ></dueDiligenceList>
+    <!-- 跟进记录 -->
+    <followList
+      :type="'3'"
+      ref="followList"
+      :projectId="projectId"
+    ></followList>
+    <!-- 会议管理 -->
+    <meetingList
+      :type="'3'"
+      ref="meetingList"
+      :projectId="projectId"
+    ></meetingList>
   </div>
 </template>
 
@@ -600,6 +614,8 @@ import { listChannel } from "@/api/invest/channel";
 import projectItem from "./projectItem";
 import fileItem from "./fileItem";
 import dueDiligenceList from "./dueDiligenceList";
+import followList from "./followList";
+import meetingList from "./meetingList";
 export default {
   props: {
     type: {
@@ -624,7 +640,13 @@ export default {
     "financing_stage",
     "CUSTOMER_TRADE",
   ],
-  components: { projectItem, fileItem, dueDiligenceList },
+  components: {
+    projectItem,
+    fileItem,
+    dueDiligenceList,
+    followList,
+    meetingList,
+  },
   data() {
     return {
       // 人员选择器
@@ -901,10 +923,11 @@ export default {
     // 发起会议
     handleMeeting(row, meetingType) {
       this.$store.commit("SET_PROJECTITEMMESSAGE", row);
-      this.$router.push({
-        path: "/resource/meeting",
-        query: { id: row.id, type: "1", meetingType: meetingType },
-      });
+      // this.$router.push({
+      //   path: "/resource/meeting",
+      //   query: { id: row.id, type: "1", meetingType: meetingType },
+      // });
+      this.$refs.meetingList.handleAdd(row.id, meetingType);
     },
     getButtonItem(row) {
       let that = this;
@@ -939,15 +962,16 @@ export default {
     // 发起尽调申请
     handleDropdown(type, row) {
       this.$refs.dueDiligenceLists.getProjectName(row.projectName);
-      this.$refs.dueDiligenceLists.handleSurvey(type, row,this.dueForm);
+      this.$refs.dueDiligenceLists.handleSurvey(type, row, this.dueForm);
     },
     // 上传跟进记录
     handlefollowRecord(row) {
       this.$store.commit("SET_PROJECTITEMMESSAGE", row);
-      this.$router.push({
-        path: "/resource/record",
-        query: { id: row.id, type: "1" },
-      });
+      // this.$router.push({
+      //   path: "/resource/record",
+      //   query: { id: row.id, type: "1" },
+      // });
+      this.$refs.followList.handleAdd(row.id);
     },
     // 表单重置
     reset() {

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

@@ -114,7 +114,7 @@
 </template>
 
 <script>
-import { listUser } from "@/api/system/user";
+import { listUserNew } from "@/api/system/user";
 import { number } from "echarts";
 export default {
   dicts: ["sys_normal_disable"],
@@ -193,7 +193,7 @@ export default {
     },
     // 查询表数据
     getList(promoterId) {
-      listUser(this.queryParams).then((res) => {
+      listUserNew(this.queryParams).then((res) => {
         this.userList = res.rows;
         this.total = res.total;
         if (promoterId) {

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

@@ -201,7 +201,7 @@
 </template>
 
 <script>
-import { listUser, deptTreeSelect } from "@/api/system/user";
+import { listUserNew, deptTreeSelect } from "@/api/system/user";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import { StrUtil } from "@/utils/StrUtil";
@@ -413,13 +413,15 @@ export default {
       } else {
         this.selectUserList = null;
         this.checkList = [];
-        this.$refs.dataTable.clearSelection();
+        if (this.$refs.dataTable) {
+          this.$refs.dataTable.clearSelection();
+        }
       }
     },
     /** 查询用户列表 */
     getList() {
       this.loading = true;
-      listUser(this.queryParams).then((response) => {
+      listUserNew(this.queryParams).then((response) => {
         this.userList = response.rows;
         this.total = response.total;
         this.loading = false;

ruoyi-ui/src/views/invest/pool/detail.vue

@@ -226,7 +226,9 @@ export default {
     handleTab(activeName, name) {
       this.activeName = activeName.toString();
       this.$store.commit("SET_PROJECTITEMMESSAGE", this.detailInfo);
-      this.$refs[name].handleAdd(this.id);
+      setTimeout(() => {
+        this.$refs[name].handleAdd(this.id);
+      }, 300);
     },
     getMettingId(type) {
       let queryParams = {

ruoyi-ui/src/views/study/gen/index.vue

@@ -98,6 +98,7 @@
     </el-row>
 
     <el-table
+      class="tableWrapper"
       v-loading="loading"
       border
       :data="genList"
@@ -105,7 +106,13 @@
     >
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="主键ID" align="center" prop="id" /> -->
-      <el-table-column label="资料名称" align="center" prop="contractName" />
+      <el-table-column label="资料名称" align="center" prop="contractName">
+        <template slot-scope="scope">
+          <div :title="scope.row.contractName">
+            {{ scope.row.contractName }}
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column label="资料类别" align="center" prop="contractType">
         <template slot-scope="scope">
           <dict-tag
@@ -115,9 +122,27 @@
         </template>
       </el-table-column>
 
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="创建人" align="center" prop="createBy" />
-      <el-table-column label="创建时间" align="center" prop="createTime" />
+      <el-table-column label="备注" align="center" prop="remark">
+        <template slot-scope="scope">
+          <div :title="scope.row.remark">
+            {{ scope.row.remark }}
+          </div>
+        </template>
+      </el-table-column>
+      <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">
+        <template slot-scope="scope">
+          <div :title="scope.row.createTime">
+            {{ scope.row.createTime }}
+          </div>
+        </template>
+      </el-table-column>
       <!-- <el-table-column
         label="附件业务ID"
         align="center"
@@ -168,7 +193,11 @@
         label-width="80px"
       >
         <el-form-item label="资料名称" prop="contractName">
-          <el-input v-model="form.contractName" placeholder="请输入资料名称" />
+          <el-input
+            maxlength="100"
+            v-model="form.contractName"
+            placeholder="请输入资料名称"
+          />
         </el-form-item>
         <el-form-item label="资料类别" prop="contractType">
           <el-select
@@ -193,6 +222,7 @@
         </el-form-item>
         <el-form-item label="备注" prop="remark" class="special-el-form-item">
           <el-input
+            maxlength="200"
             rows="4"
             type="textarea"
             v-model="form.remark"

ruoyi-ui/vue.config.js

@@ -35,8 +35,8 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://localhost:8080`,
-        // target: `http://192.168.100.234:8080`,
-        target: `http://47.103.79.143:8091`,
+        target: `http://192.168.100.234:8091`,
+        // target: `http://47.103.79.143:8091`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''