前端

ruoyi-ui/src/api/invest/pool.js

@@ -117,3 +117,11 @@ export function getInvestigatelist(id) {
     
   })
 }
+
+// 删除尽调关联
+export function delInvestigate(id) {
+  return request({
+    url: '/invest/investigate/' + id,
+    method: 'delete'
+  })
+}

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

@@ -466,4 +466,23 @@
 
 .el-upload-list__item {
   transition: none !important;
+}
+
+.yichu1 {
+  text-overflow: -o-ellipsis-lastline;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-line-clamp: 1;
+  line-clamp: 1;
+  -webkit-box-orient: vertical;
+}
+.yichu2 {
+  text-overflow: -o-ellipsis-lastline;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  line-clamp: 2;
+  -webkit-box-orient: vertical;
 }

ruoyi-ui/src/components/flow/User/index.vue

@@ -246,7 +246,7 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 5,
+        pageSize: 10,
         userName: undefined,
         phonenumber: undefined,
         status: undefined,

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

@@ -197,9 +197,10 @@
         </el-form-item>
         <el-form-item label="项目名称" prop="projectName">
           <div
-            class="el-input__inner inputSimulation"
+            class="el-input__inner inputSimulation yichu1"
             @click="handleProjectItem"
             :class="{ show_disabled: pageType === '1' }"
+            :title="form.projectName"
           >
             {{ form.projectName ? form.projectName : "请选择项目" }}
           </div>

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

@@ -34,14 +34,14 @@
             @click="handleUpdate(scope.row)"
             >修改</el-button
           >
-          <!-- <el-button
+          <el-button
             class="custom-red-color"
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             >删除</el-button
-          > -->
+          >
         </template>
       </el-table-column>
       <!-- 添加或修改尽调申请 -->
@@ -65,12 +65,9 @@
               placeholder="请输入尽调名称"
             />
           </el-form-item>
-          <!-- <el-form-item label="项目名称" prop="projectName">
-            <el-input
-              disabled
-              v-model="dueForm.projectName"
-            />
-          </el-form-item> -->
+          <el-form-item label="项目名称" prop="projectName">
+            <el-input disabled v-model="dueForm.projectName" />
+          </el-form-item>
           <el-form-item label="尽调人员" prop="investigatePerson">
             <div
               class="el-input__inner inputSimulation"
@@ -212,28 +209,35 @@
           <el-button @click="cancelduePeportForm">取 消</el-button>
         </div>
       </el-dialog>
-      <!--选择人员-->
-      <el-dialog
-        title="选择人员"
-        :visible.sync="userVisible"
-        width="60%"
-        :show-close="false"
-      >
-        <flow-user
-          :checkType="checkType"
-          :selectValues="selectValues"
-          @handleUserSelect="handleUserSelect"
-        ></flow-user>
-        <span slot="footer" class="dialog-footer">
-          <el-button @click="userVisible = false">取 消</el-button>
-          <el-button type="primary" @click="checkUserComplete">确 定</el-button>
-        </span>
-      </el-dialog>
     </el-table>
+    <!--选择人员-->
+    <el-dialog
+      title="选择人员"
+      :visible.sync="userVisible"
+      width="80%"
+      :show-close="false"
+    >
+      <flow-user
+        :checkType="checkType"
+        :selectValues="selectValues"
+        @handleUserSelect="handleUserSelect"
+      ></flow-user>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="userVisible = false">取 消</el-button>
+        <el-button type="primary" @click="checkUserComplete">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 <script>
-import { getInvestigatelist, getlistProjectPoolId } from "@/api/invest/pool";
+import {
+  getInvestigatelist,
+  getlistProjectPoolId,
+  delInvestigate,
+  updateInvestigate,
+  addInvestigatePerson,
+  getProjectInvestigateId,
+} from "@/api/invest/pool";
 import projectItem from "./projectItem";
 import fileItem from "./fileItem";
 import selecDept from "./selecDept";
@@ -244,6 +248,9 @@ export default {
     projectId: {
       type: String,
     },
+    projectName: {
+      type: String,
+    },
   },
   dicts: ["up_way", "project_stage"],
   components: { projectItem, fileItem, selecDept, FlowUser },
@@ -325,6 +332,14 @@ export default {
       dueDiligenceType: "0",
     };
   },
+  watch: {
+    open: function (newValue, oldValue) {
+      if (newValue === false) {
+        this.selectValues = null;
+        // this.queryParams.projectPoolId = null;
+      }
+    },
+  },
   mounted() {
     this.getList();
   },
@@ -346,6 +361,8 @@ export default {
       getlistProjectPoolId(id).then((response) => {
         if (response.tProjectInvestigate) {
           this.dueForm = response.tProjectInvestigate;
+          this.dueForm.projectName = this.projectName;
+          this.selectValues = response.tProjectInvestigate.investigatePersonId;
           this.dueDiligenceTit = "修改尽调申请";
           this.dueDiligenceOpen = true;
           setTimeout(() => {
@@ -357,7 +374,7 @@ export default {
     /*用户选中赋值*/
     checkUserComplete() {
       this.userVisible = false;
-      this.checkType = "";
+      //   this.checkType = "";
     },
 
     // 获取fileList
@@ -469,6 +486,7 @@ export default {
               this.dueDiligenceOpen = false;
             });
           }
+          this.getList();
         }
       });
     },
@@ -501,11 +519,13 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      const idsName = row.fileName ? row.fileName : this.idsName;
+      const investigateName = row.investigateName
+        ? row.investigateName
+        : "此项";
       this.$modal
-        .confirm('是否确认删除"' + idsName + '"？')
+        .confirm('是否确认删除"' + investigateName + '"？')
         .then(function () {
-          //   return delInformation(ids);
+          return delInvestigate(ids);
         })
         .then(() => {
           this.getList();

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

@@ -212,9 +212,10 @@
         </el-form-item>
         <el-form-item label="项目名称" prop="projectName">
           <div
-            class="el-input__inner inputSimulation"
+            class="el-input__inner inputSimulation yichu1"
             @click="handleProjectItem"
             :class="{ show_disabled: pageType === '1' }"
+            :title="form.projectName"
           >
             {{ form.projectName ? form.projectName : "请选择项目" }}
           </div>

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

@@ -229,9 +229,10 @@
       >
         <el-form-item label="项目名称" prop="projectName">
           <div
-            class="el-input__inner inputSimulation"
+            class="el-input__inner inputSimulation yichu1"
             @click="handleProjectItem"
             :class="{ show_disabled: pageType === '1' }"
+            :title="form.projectName"
           >
             {{ form.projectName ? form.projectName : "请选择 " }}
           </div>

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

@@ -358,9 +358,10 @@
           ]"
         >
           <div
-            class="el-input__inner inputSimulation"
+            class="el-input__inner inputSimulation yichu1"
             @click="handleProjectItem"
             :class="{ show_disabled: pageType === '1' }"
+            :title="form.projectName"
           >
             {{ form.projectName ? form.projectName : "请选择 " }}
           </div>
@@ -439,8 +440,9 @@
         </el-form-item>
         <el-form-item label="会议参与人" prop="participants">
           <div
-            class="el-input__inner inputSimulation"
+            class="el-input__inner inputSimulation yichu1"
             @click="handleSelectPeople()"
+            :title="form.participants"
           >
             <!-- @click="openSelectDept(2)" -->
             {{ form.participants ? form.participants : "请选择会议参与人" }}
@@ -849,6 +851,7 @@ export default {
         this.form.projectPoolId = projectItemMessage.id;
         this.form.projectName = projectItemMessage.projectName;
         this.form.projectStage = projectItemMessage.projectStage;
+        this.form.projectGroup = projectItemMessage.projectGroup;
         this.form.meetingType = this.meetingType;
       }
       this.open = true;
@@ -859,6 +862,7 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
+      this.selectValues = null;
       this.reset();
       const id = row.id || this.ids;
       getMeeting(id).then((response) => {

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

@@ -317,7 +317,12 @@
           <span>{{ parseTime(scope.row.decisionDate, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="项目所属行业" width="120" align="center" prop="industry" />
+      <el-table-column
+        label="项目所属行业"
+        width="120"
+        align="center"
+        prop="industry"
+      />
       <el-table-column
         label="项目所属公司"
         width="300"
@@ -366,8 +371,18 @@
         </template>
       </el-table-column>
       <el-table-column label="投前估值" align="center" prop="investValuation" />
-      <el-table-column label="预计投资金额"  width="120" align="center" prop="investMoney" />
-      <el-table-column label="投资类型"  width="120" align="center" prop="investType">
+      <el-table-column
+        label="预计投资金额"
+        width="120"
+        align="center"
+        prop="investMoney"
+      />
+      <el-table-column
+        label="投资类型"
+        width="120"
+        align="center"
+        prop="investType"
+      >
         <template slot-scope="scope">
           <dict-tag
             :options="dict.type.invest_type"
@@ -383,7 +398,12 @@
           />
         </template>
       </el-table-column>
-      <el-table-column label="投资价值"  width="120" align="center" prop="investWorth">
+      <el-table-column
+        label="投资价值"
+        width="120"
+        align="center"
+        prop="investWorth"
+      >
         <template slot-scope="scope">
           <dict-tag
             :options="dict.type.invest_worth"
@@ -391,7 +411,12 @@
           />
         </template>
       </el-table-column>
-      <el-table-column label="创建人" width="120" align="center" prop="createBy" />
+      <el-table-column
+        label="创建人"
+        width="120"
+        align="center"
+        prop="createBy"
+      />
       <el-table-column
         label="创建时间"
         align="center"
@@ -480,7 +505,7 @@
                 >更多</el-button
               >
             </span>
-            <el-dropdown-menu slot="dropdown" style="width:150px;">
+            <el-dropdown-menu slot="dropdown" style="width: 150px">
               <el-dropdown-item
                 command="1"
                 v-if="isInitiator && needInitiate"
@@ -1154,6 +1179,9 @@ export default {
           if (investigatePersonIdList.indexOf(this.user.userId) > -1) {
             this.needUpload = true;
           }
+          if (!this.needUpload && !this.isInitiator) {
+            this.$message.warning("暂无更多操作权限");
+          }
         } else {
           // 发起尽调申请
           this.needInitiate = true;

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

@@ -618,7 +618,8 @@
             </th>
             <th>总人数</th>
             <th>
-              <textarea class="table-textarea" name="" disabled></textarea>
+              <textarea
+                v-model="collectForm.totalPerson" class="table-textarea" name="" disabled></textarea>
             </th>
           </tr>
           <tr class="bg-blue">
@@ -1563,7 +1564,7 @@
           </tr>
           <tr class="specificTr">
             <th>项目名称</th>
-            <th>
+            <th >
               <textarea
                 class="table-textarea"
                 v-model="form.projectName"
@@ -1591,7 +1592,7 @@
             </th>
             <th>总人数</th>
             <th>
-              <textarea class="table-textarea" name="" disabled></textarea>
+              <textarea  v-model="collectForm.totalPerson" class="table-textarea" name="" disabled></textarea>
             </th>
           </tr>
           <tr class="bg-blue">

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

@@ -126,7 +126,7 @@
             ref="projectList"
             :projectId="id"
           ></projectList> -->
-          <dueDiligenceList ref="dueDiligenceList" :projectId="id"></dueDiligenceList>
+          <dueDiligenceList ref="dueDiligenceList" :projectId="id" :projectName="detailInfo.projectName"></dueDiligenceList>
         </div>
         <div v-show="activeName === '5'">
           <tableForm

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

@@ -19,8 +19,9 @@
         </el-form-item>
         <el-form-item label="项目名称" prop="projectName">
           <div
-            class="el-input__inner inputSimulation"
+            class="el-input__inner inputSimulation yichu1"
             @click="handleProjectItem"
+            :title="form.projectName"
           >
             {{ form.projectName ? form.projectName : "请选择 " }}
           </div>