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

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

@@ -109,11 +109,11 @@ export function addInvestigatePerson(data) {
 }
 
 //  /dev-api/invest/investigate/list
-export function getInvestigatelist(id) {
+export function getInvestigatelist(data) {
   return request({
     url: '/invest/investigate/list',
     method: 'get',
-    params: { projectPoolId: id }
+    params: data
 
   })
 }
@@ -134,3 +134,11 @@ export function getProjectInvestigateId(id) {
     params: { projectInvestigateId: id }
   })
 }
+// 获取尽调关联详细信息
+// /dev-api/invest/investigate/{id}
+export function getInvestigateById(id) {
+  return request({
+    url: '/invest/investigate/' + id,
+    method: 'get'
+  })
+}

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

@@ -11,7 +11,7 @@
       <!-- style="margin-left: -22px" -->
       <el-form-item label="渠道名称" prop="channelName">
         <el-input
-          v-model="queryParams.channelName"
+          v-model.trim="queryParams.channelName"
           placeholder="请输入渠道名称"
           clearable
           @keyup.enter.native="handleQuery"
@@ -19,7 +19,7 @@
       </el-form-item>
       <el-form-item label="渠道编号" prop="channelCode">
         <el-input
-          v-model="queryParams.channelCode"
+          v-model.trim="queryParams.channelCode"
           placeholder="请输入渠道编号"
           clearable
           @keyup.enter.native="handleQuery"
@@ -37,7 +37,7 @@
       </el-form-item>
       <el-form-item label="联系人" prop="contacts">
         <el-input
-          v-model="queryParams.contacts"
+          v-model.trim="queryParams.contacts"
           placeholder="请输入联系人"
           clearable
           @keyup.enter.native="handleQuery"
@@ -45,7 +45,7 @@
       </el-form-item>
       <el-form-item label="联系电话" prop="telephone">
         <el-input
-          v-model="queryParams.telephone"
+          v-model.trim="queryParams.telephone"
           placeholder="请输入联系电话"
           clearable
           maxlength="11"
@@ -324,7 +324,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="附件" prop="file">
+        <el-form-item label="附件" prop="file" class="special-el-form-item">
           <fileItem
             ref="fileItems"
             :id="form.id"

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

@@ -3,7 +3,7 @@
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="公司名称" prop="companyName">
         <el-input
-          v-model="queryParams.companyName"
+          v-model.trim="queryParams.companyName"
           placeholder="请输入公司名称"
           clearable
           @keyup.enter.native="handleQuery"
@@ -11,7 +11,7 @@
       </el-form-item>
       <el-form-item label="企业统一社会信用代码" prop="companyCode">
         <el-input
-          v-model="queryParams.companyCode"
+          v-model.trim="queryParams.companyCode"
           placeholder="请输入企业统一社会信用代码"
           clearable
           @keyup.enter.native="handleQuery"
@@ -35,7 +35,7 @@
       </el-form-item>
       <el-form-item label="实控人" prop="actualBod">
         <el-input
-          v-model="queryParams.actualBod"
+          v-model.trim="queryParams.actualBod"
           placeholder="请输入实控人"
           clearable
           @keyup.enter.native="handleQuery"

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

@@ -11,7 +11,7 @@
     >
       <el-form-item label="合同名称" prop="contractName">
         <el-input
-          v-model="queryParams.contractName"
+          v-model.trim="queryParams.contractName"
           placeholder="请输入合同名称"
           clearable
           @keyup.enter.native="handleQuery"
@@ -302,7 +302,7 @@
             @getMeetingInfo="getMeetingInfo"
           ></meetingItem>
         </el-form-item> -->
-        <el-form-item label="文件" prop="listFile">
+        <el-form-item label="文件" prop="listFile" class="special-el-form-item">
           <fileItem
             ref="fileItems"
             :id="form.id"

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

@@ -78,7 +78,6 @@
           >
             <el-form-item label="尽调名称" prop="investigateName">
               <el-input
-                :disabled="dueDiligenceType === '3'"
                 v-model="dueForm.investigateName"
                 placeholder="请输入尽调名称"
               />
@@ -90,7 +89,6 @@
               <div
                 class="el-input__inner inputSimulation"
                 @click="handleSelectPeople"
-                :class="{ show_disabled: dueDiligenceType === '3' }"
               >
                 {{
                   dueForm.investigatePerson
@@ -101,7 +99,6 @@
             </el-form-item>
             <el-form-item label="尽调费用(元)" prop="investigateCost">
               <el-input
-                :disabled="dueDiligenceType === '3'"
                 v-model="dueForm.investigateCost"
                 placeholder="请输入尽调费用"
                 onkeyup="value=value.replace(/[^0-9.]/g,'').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3').replace(/-/g, '')"
@@ -109,7 +106,6 @@
             </el-form-item>
             <el-form-item label="文件" prop="file" class="special-el-form-item">
               <fileItem
-                :class="{ show_disabled: dueDiligenceType === '3' }"
                 ref="fileItems"
                 :id="dueForm.id"
                 @getFileList="getFileList"
@@ -121,7 +117,6 @@
               class="special-el-form-item"
             >
               <el-input
-                :disabled="dueDiligenceType === '3'"
                 rows="4"
                 v-model="dueForm.describe"
                 type="textarea"
@@ -134,7 +129,6 @@
               class="special-el-form-item"
             >
               <el-input
-                :disabled="dueDiligenceType === '3'"
                 rows="4"
                 type="textarea"
                 v-model="dueForm.remark"
@@ -311,7 +305,7 @@
 <script>
 import {
   getInvestigatelist,
-  getlistProjectPoolId,
+  getInvestigateById,
   delInvestigate,
   updateInvestigate,
   addInvestigatePerson,
@@ -441,7 +435,12 @@ export default {
     /** 查询文件资料列表 */
     getList() {
       //   this.loading = true;
-      getInvestigatelist(this.projectId).then((response) => {
+      let queryParams = {
+        orderByColumn: "createTime",
+        isAsc: "desc",
+        projectPoolId: this.projectId,
+      };
+      getInvestigatelist(queryParams).then((response) => {
         this.dueList = response.rows;
         this.total = response.total;
         // this.loading = false;
@@ -473,14 +472,13 @@ export default {
     handleUpdate(row) {
       let that = this;
       this.resetDueForm();
-      const id = row.projectPoolId || row.id;
-      getlistProjectPoolId(id).then((response) => {
-        if (response.tProjectInvestigate) {
-          this.dueForm = response.tProjectInvestigate;
+      const id = row.id;
+      getInvestigateById(id).then((response) => {
+        if (response.data) {
+          this.dueForm = response.data;
           this.dueForm.projectName = this.projectName;
-          this.selectValues = response.tProjectInvestigate.investigatePersonId;
-          this.selectNameValues =
-            response.tProjectInvestigate.investigatePerson;
+          this.selectValues = response.data.investigatePersonId;
+          this.selectNameValues = response.data.investigatePerson;
           this.dueDiligenceTit = "修改尽调申请";
           this.dueDiligenceOpen = true;
           setTimeout(() => {
@@ -602,10 +600,10 @@ export default {
       this.$refs["dueForm"].validate((valid) => {
         if (valid) {
           this.dueForm.listFile = this.fileList;
-          this.dueForm.investigateCost = this.dueForm.investigateCost.replace(
-            /-/g,
-            ""
-          );
+          this.dueForm.investigateCost = this.dueForm.investigateCost
+            .replace(/[^0-9.]/g, "")
+            .replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")
+            .replace(/-/g, "");
           if (this.dueForm.id != null) {
             updateInvestigate(this.dueForm).then((response) => {
               this.$modal.msgSuccess("修改成功");

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

@@ -13,7 +13,23 @@
       :on-success="handleUploadSuccess"
       :on-preview="handlePreview"
     >
-      <el-button size="small" type="primary" :disabled="forbid">点击上传</el-button>
+      <el-button size="small" type="primary" :disabled="forbid"
+        >点击上传</el-button
+      >
+      <template v-slot:file="{ file }">
+        <div class="public-flex-between">
+          <div @click="handlePreview(file)" class="name">{{ file.name }}</div>
+
+          <!-- 自定义删除按钮，通过条件判断是否显示 -->
+          <el-button
+            v-if="!forbid"
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleRemove(file)"
+          ></el-button>
+        </div>
+      </template>
     </el-upload>
   </div>
 </template>
@@ -28,7 +44,7 @@ export default {
   props: {},
   data() {
     return {
-      forbid:false,
+      forbid: false,
       fileList: [],
       uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传文件服务器地址
       headers: {
@@ -42,7 +58,6 @@ export default {
     }
   },
   methods: {
-    
     // 根据附件业务ID()获取附件详情信息列表
     getListFileBusinessId(id) {
       if (id) {
@@ -58,21 +73,30 @@ export default {
         });
       }
     },
-    handleButton(){
+    handleButton() {
       this.forbid = true;
     },
     handleChange(file, fileList) {
       //   console.log("----", file, fileList);
     },
     handleRemove(file, fileList) {
-      this.fileList = fileList;
-      if (file.id) {
-        const id = file.id;
-        delFile(id).then((response) => {
-          // 给父组件传值
-          this.$emit("getFileList", this.fileList);
+      let that = this;
+      that.$modal
+        .confirm('确定移除"' + file.name + '"？')
+        .then(function () {
+          that.fileList = fileList;
+          if (file.id) {
+            const id = file.id;
+            delFile(id).then((response) => {
+              // 给父组件传值
+              that.$emit("getFileList", that.fileList);
+            });
+          }
+        })
+        .catch(() => {
+          console.log("取消");
+          return false;
         });
-      }
     },
     beforeRemove(file, fileList) {
       return this.$confirm(`确定移除 ${file.name}？`);
@@ -83,6 +107,9 @@ export default {
         fileList.map((item) => {
           if (item.response) {
             item.response.file.name = item.response.file.newUploadName;
+            if (!this.fileList) {
+              this.fileList = [];
+            }
             this.fileList.push(item.response.file);
             that.$emit("getFileList", this.fileList);
           }
@@ -107,4 +134,7 @@ export default {
 .uploadWrapper ::v-deep .el-upload-list__item {
   transition: none !important;
 }
+.name{
+  cursor: pointer;
+}
 </style>

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

@@ -11,7 +11,7 @@
     >
       <el-form-item label="文件名称" prop="fileName">
         <el-input
-          v-model="queryParams.fileName"
+          v-model.trim="queryParams.fileName"
           placeholder="请输入文件名称"
           clearable
           @keyup.enter.native="handleQuery"
@@ -291,7 +291,7 @@
             @getMeetingInfo="getMeetingInfo"
           ></meetingItem>
         </el-form-item> -->
-        <el-form-item label="文件" prop="listFile">
+        <el-form-item label="文件" prop="listFile" class="special-el-form-item">
           <fileItem
             ref="fileItems"
             :id="form.id"

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

@@ -11,7 +11,7 @@
     >
       <el-form-item label="项目名称" prop="projectName">
         <el-input
-          v-model="queryParams.projectName"
+          v-model.trim="queryParams.projectName"
           placeholder="请输入项目名称"
           clearable
           @keyup.enter.native="handleQuery"
@@ -23,7 +23,7 @@
         style="white-space: nowrap"
       >
         <el-input
-          v-model="queryParams.contacts"
+          v-model.trim="queryParams.contacts"
           placeholder="请输入公司联系人"
           clearable
           @keyup.enter.native="handleQuery"
@@ -31,7 +31,7 @@
       </el-form-item>
       <el-form-item label="跟进人" prop="upPerson">
         <el-input
-          v-model="queryParams.upPerson"
+          v-model.trim="queryParams.upPerson"
           placeholder="请输入跟进人"
           clearable
           @keyup.enter.native="handleQuery"
@@ -307,7 +307,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="附件" prop="file">
+        <el-form-item label="附件" prop="file" class="special-el-form-item">
           <fileItem
             ref="fileItems"
             :id="form.id"

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

@@ -11,7 +11,7 @@
     >
       <el-form-item label="会议主题" prop="meetingTheme">
         <el-input
-          v-model="queryParams.meetingTheme"
+          v-model.trim="queryParams.meetingTheme"
           placeholder="请输入会议主题"
           clearable
           @keyup.enter.native="handleQuery"
@@ -19,7 +19,7 @@
       </el-form-item>
       <el-form-item label="会议编号" prop="meetingCode">
         <el-input
-          v-model="queryParams.meetingCode"
+          v-model.trim="queryParams.meetingCode"
           placeholder="请输入会议编号"
           clearable
           @keyup.enter.native="handleQuery"
@@ -191,7 +191,7 @@
           </div>
         </template>
       </el-table-column>
-     
+
       <el-table-column
         label="会议类别"
         width="120"
@@ -524,7 +524,7 @@
             :deptId="deptId"
           ></selecDept>
         </el-form-item>
-        <el-form-item label="会议参与人" prop="participants">
+        <el-form-item label="会议参与人" prop="participants" class="special-el-form-item">
           <div
             class="el-input__inner inputSimulation yichu1"
             @click="handleSelectPeople()"
@@ -540,7 +540,7 @@
             :isSolo="false"
           ></selecDept> -->
         </el-form-item>
-        <el-form-item label="附件" prop="file">
+        <el-form-item label="附件" prop="file" class="special-el-form-item">
           <fileItem
             ref="fileItems"
             :id="form.id"
@@ -915,8 +915,10 @@ export default {
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
-      this.queryParams.startTime = this.queryParams.timeVal[0];
-      this.queryParams.endTime = this.queryParams.timeVal[1];
+      if (this.queryParams.timeVal && this.queryParams.timeVal.length > 0) {
+        this.queryParams.startTime = this.queryParams.timeVal[0];
+        this.queryParams.endTime = this.queryParams.timeVal[1];
+      }
       this.getList();
     },
     /** 重置按钮操作 */

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

@@ -144,25 +144,7 @@
           placeholder="请输入实缴资本"
         />
       </el-form-item>
-      <el-form-item label="注册地址" prop="tProjectCompany.registeredAddress">
-        <el-input
-          type="textarea"
-          rows="4"
-          maxlength="100"
-          v-model="form.tProjectCompany.registeredAddress"
-          placeholder="请输入注册地址"
-        />
-      </el-form-item>
 
-      <el-form-item label="办公地址" prop="tProjectCompany.businessAddress">
-        <el-input
-          type="textarea"
-          rows="4"
-          maxlength="100"
-          v-model="form.tProjectCompany.businessAddress"
-          placeholder="请输入办公地址"
-        />
-      </el-form-item>
       <el-form-item label="实控人" prop="tProjectCompany.actualBod">
         <el-input
           maxlength="25"
@@ -184,7 +166,34 @@
           placeholder="请输入所属类型"
         />
       </el-form-item>
-      <el-form-item label="附件" prop="listFile">
+      <el-form-item
+        label="注册地址"
+        prop="tProjectCompany.registeredAddress"
+        class="special-el-form-item"
+      >
+        <el-input
+          type="textarea"
+          rows="4"
+          maxlength="100"
+          v-model="form.tProjectCompany.registeredAddress"
+          placeholder="请输入注册地址"
+        />
+      </el-form-item>
+
+      <el-form-item
+        label="办公地址"
+        prop="tProjectCompany.businessAddress"
+        class="special-el-form-item"
+      >
+        <el-input
+          type="textarea"
+          rows="4"
+          maxlength="100"
+          v-model="form.tProjectCompany.businessAddress"
+          placeholder="请输入办公地址"
+        />
+      </el-form-item>
+      <el-form-item label="附件" prop="listFile" class="special-el-form-item">
         <fileItem :id="form.id" @getFileList="getFileList"></fileItem>
       </el-form-item>
       <h3>项目公司联系人信息</h3>
@@ -333,6 +342,8 @@
           placeholder="请输入股权架构"
         />
       </el-form-item>
+      <h3>其他</h3>
+      <el-divider></el-divider>
       <el-form-item label="备注" prop="mark" class="special-el-form-item">
         <el-input
           maxlength="200"
@@ -578,10 +589,19 @@ export default {
         if (valid) {
           this.form.listFile = this.fileList;
           this.form.tProjectCompany.registeredCapital =
-            this.form.tProjectCompany.registeredCapital.replace(/-/g, "");
+            this.form.tProjectCompany.registeredCapital
+              .replace(/[^0-9.]/g, "")
+              .replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/, "$1$2.$3")
+              .replace(/-/g, "");
           this.form.tProjectCompany.paidCapital =
-            this.form.tProjectCompany.paidCapital.replace(/-/g, "");
-
+            this.form.tProjectCompany.paidCapital
+              .replace(/[^0-9.]/g, "")
+              .replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/, "$1$2.$3")
+              .replace(/-/g, "");
+          this.form.investValuation = this.form.investValuation
+            .replace(/[^0-9.]/g, "")
+            .replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")
+            .replace(/-/g, "");
           if (this.form.id != null) {
             updatePool(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");

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

@@ -12,7 +12,7 @@
     >
       <el-form-item label="项目名称" prop="projectName">
         <el-input
-          v-model="queryParams.projectName"
+          v-model.trim="queryParams.projectName"
           placeholder="请输入项目名称"
           clearable
           @keyup.enter.native="handleQuery"
@@ -20,7 +20,7 @@
       </el-form-item>
       <el-form-item label="投资负责人" prop="investHead">
         <el-input
-          v-model="queryParams.investHead"
+          v-model.trim="queryParams.investHead"
           placeholder="请输入投资负责人"
           clearable
           @keyup.enter.native="handleQuery"
@@ -28,7 +28,7 @@
       </el-form-item>
       <el-form-item label="公司联系人" prop="projectContacts">
         <el-input
-          v-model="queryParams.projectContacts"
+          v-model.trim="queryParams.projectContacts"
           placeholder="请输入公司联系人"
           clearable
           @keyup.enter.native="handleQuery"
@@ -61,7 +61,7 @@
 
       <el-form-item label="项目公司" prop="company">
         <el-input
-          v-model="queryParams.company"
+          v-model.trim="queryParams.company"
           placeholder="请输入项目所属公司"
           clearable
           @keyup.enter.native="handleQuery"

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

@@ -16,7 +16,7 @@
     >
       <el-form-item label="用户名称" prop="userName">
         <el-input
-          v-model="queryParams.userName"
+          v-model.trim="queryParams.userName"
           placeholder="请输入用户名称"
           clearable
           style="width: 240px"
@@ -25,7 +25,7 @@
       </el-form-item>
       <el-form-item label="手机号码" prop="phonenumber">
         <el-input
-          v-model="queryParams.phonenumber"
+          v-model.trim="queryParams.phonenumber"
           placeholder="请输入手机号码"
           clearable
           style="width: 240px"

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

@@ -45,7 +45,7 @@
           >
             <el-form-item label="用户姓名" prop="nickName">
               <el-input
-                v-model="queryParams.nickName"
+                v-model.trim="queryParams.nickName"
                 placeholder="请输入用户姓名"
                 clearable
                 style="width: 150px"
@@ -54,7 +54,7 @@
             </el-form-item>
             <el-form-item label="手机号码" prop="phonenumber">
               <el-input
-                v-model="queryParams.phonenumber"
+                v-model.trim="queryParams.phonenumber"
                 placeholder="请输入手机号码"
                 clearable
                 style="width: 150px"
@@ -75,6 +75,7 @@
             </el-form-item>
           </el-form>
           <el-table
+            @row-click="clickRow"
             v-show="checkType === 'multiple'"
             ref="dataTable"
             v-loading="loading"
@@ -152,7 +153,6 @@
             <el-table-column
               label="登录账号"
               align="center"
-              key="nickName"
               prop="nickName"
               v-if="columns[1].visible"
               :show-overflow-tooltip="true"
@@ -325,7 +325,7 @@ export default {
           if (this.selectUserList && this.selectUserList.length > 0) {
             this.$nextTick(() => {
               this.$refs.dataTable.clearSelection();
-              console.log("this.selectUserList=", this.selectUserList);
+              // console.log("this.selectUserList=", this.selectUserList);
               this.selectUserList?.split(",").forEach((key) => {
                 let item = newVal.find((item) => key == item.userId);
                 if (item) {
@@ -418,6 +418,9 @@ export default {
         }
       }
     },
+    clickRow(row) {
+      this.$refs.dataTable.toggleRowSelection(row);
+    },
     /** 查询用户列表 */
     getList() {
       this.loading = true;

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

@@ -10,7 +10,7 @@
     >
       <el-form-item label="资料名称" prop="contractName">
         <el-input
-          v-model="queryParams.contractName"
+          v-model.trim="queryParams.contractName"
           placeholder="请输入资料名称"
           clearable
           @keyup.enter.native="handleQuery"
@@ -213,7 +213,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="文件" prop="listFile">
+        <el-form-item label="文件" prop="listFile" class="special-el-form-item">
           <fileItem
             ref="fileItems"
             :id="form.id"