前端

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

@@ -128,6 +128,7 @@
 
     <el-table
       v-loading="loading"
+      border
       :data="channelList"
       @selection-change="handleSelectionChange"
     >

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

@@ -55,7 +55,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <el-row :gutter="10" class="mb8" v-if="type !== '2'">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -110,6 +110,7 @@
 
     <el-table
       v-loading="loading"
+      border
       :data="contractList"
       @selection-change="handleSelectionChange"
     >
@@ -132,7 +133,12 @@
 
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="创建人" align="center" prop="createBy" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="150"/>
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        width="150"
+      />
       <!-- <el-table-column label="合同类别" align="center" prop="contractType">
         
       </el-table-column> -->

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

@@ -42,7 +42,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <el-row :gutter="10" class="mb8" v-if="type !== '2'">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -97,6 +97,7 @@
 
     <el-table
       v-loading="loading"
+      border
       :data="informationList"
       @selection-change="handleSelectionChange"
     >
@@ -287,10 +288,10 @@ export default {
       fileList: [],
       // 遮罩层
       loading: true,
-      
-    // 选中数组
+
+      // 选中数组
       ids: [],
-      idsName:[],
+      idsName: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -413,7 +414,7 @@ export default {
       this.queryParams.pageNum = 1;
       this.getList();
     },
-     /** 重置按钮操作 */
+    /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
       this.queryParams.orderByColumn = "createTime";
@@ -486,9 +487,9 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      const idsName = row.fileName ? row.fileName  : this.idsName;
+      const idsName = row.fileName ? row.fileName : this.idsName;
       this.$modal
-        .confirm('是否确认删除"' +idsName + '"？')
+        .confirm('是否确认删除"' + idsName + '"？')
         .then(function () {
           return delInformation(ids);
         })

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

@@ -68,7 +68,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <el-row :gutter="10" class="mb8" v-if="type !== '2'">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -123,6 +123,7 @@
 
     <el-table
       v-loading="loading"
+      border
       :data="recordList"
       @selection-change="handleSelectionChange"
     >
@@ -153,7 +154,12 @@
         </template>
       </el-table-column>
       <el-table-column label="创建人" align="center" prop="createBy" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="150" />
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        width="150"
+      />
       <el-table-column
         label="操作"
         align="center"
@@ -322,6 +328,7 @@ export default {
   components: { projectItem, fileItem, selecDept },
   watch: {
     open: function (newValue, oldValue) {
+      console.log("newValue=", newValue);
       if (newValue === false) {
         this.queryParams.projectId = null;
         this.pageType = null;
@@ -478,7 +485,7 @@ export default {
       this.queryParams.pageNum = 1;
       this.getList();
     },
-     /** 重置按钮操作 */
+    /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
       this.queryParams.orderByColumn = "createTime";

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

@@ -76,7 +76,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <el-row :gutter="10" class="mb8" v-if="type !== '2'">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -131,6 +131,7 @@
 
     <el-table
       v-loading="loading"
+      border
       :data="meetingList"
       @selection-change="handleSelectionChange"
     >
@@ -165,7 +166,12 @@
       <el-table-column label="会议发起人" align="center" prop="promoter" />
       <el-table-column label="会议参与人" align="center" prop="participants" />
       <el-table-column label="创建人" align="center" prop="createBy" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="150"/>
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        width="150"
+      />
       <el-table-column
         label="操作"
         align="center"
@@ -747,7 +753,7 @@ export default {
       this.queryParams.pageNum = 1;
       this.getList();
     },
-     /** 重置按钮操作 */
+    /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
       this.queryParams.orderByColumn = "createTime";

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

@@ -229,6 +229,7 @@
 
     <el-table
       v-loading="loading"
+      border
       :data="poolList"
       @selection-change="handleSelectionChange"
     >

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

@@ -2290,7 +2290,7 @@ export default {
   // }
   table {
     width: 600px;
-    // margin-left: 120px;
+    margin-left: 120px;
     -moz-user-select: none;
     -webkit-user-select: none;
     -ms-user-select: none;
@@ -2316,8 +2316,8 @@ export default {
     text-align: left;
   }
   .table-textarea {
-    // width: 180px;
-    width: 60px;
+    width: 180px;
+    // width: 60px;
     border: none;
     height: 50px;
     resize: none;

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

@@ -92,15 +92,15 @@
         <el-tab-pane label="文件资料" name="7"></el-tab-pane>
         <el-tab-pane label="合同" name="8"></el-tab-pane>
       </el-tabs>
-      <section class="public-padded-20">
+      <section>
         <div v-show="activeName === '0'">
-          <el-timeline :reverse="false">
+          <el-timeline :reverse="false" class="public-padded-20">
             <el-timeline-item
               v-for="(activity, index) in activeTimeList"
               :key="index"
               :timestamp="activity.createTime"
             >
-              {{activity.createBy}}：创建{{ activity.stageName }}
+              {{ activity.createBy }}：创建{{ activity.stageName }}
             </el-timeline-item>
           </el-timeline>
         </div>
@@ -115,7 +115,12 @@
         </div> -->
         <div v-show="activeName === '4'">
           <!-- 尽职调查 -->
-          <projectList :type="'2'" :stage="'4'" ref="projectList" :projectId="id"></projectList>
+          <projectList
+            :type="'2'"
+            :stage="'4'"
+            ref="projectList"
+            :projectId="id"
+          ></projectList>
         </div>
         <!-- <div v-show="activeName === '5'">
           <tableForm :formType="4" :id="meetingId" ref="tableForm" :projectId="id"></tableForm>
@@ -163,8 +168,8 @@ export default {
   },
   data() {
     return {
-      meetingId:"0",
-      activeTimeList:[],
+      meetingId: "0",
+      activeTimeList: [],
       type: "2",
       id: "",
       active: 0,
@@ -204,7 +209,7 @@ export default {
     getDetail() {
       getPool(this.id).then((response) => {
         this.detailInfo = response.data;
-        this.active = parseInt(response.data.projectStage);
+        this.active = parseInt(response.data.projectStage) - 1;
       });
     },
 

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

@@ -99,6 +99,7 @@
 
     <el-table
       v-loading="loading"
+      border
       :data="genList"
       @selection-change="handleSelectionChange"
     >