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

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

@@ -94,7 +94,7 @@ export function dueAllPeportList(id) {
   return request({
     url: '/invest/person/list',
     method: 'get',
-    params: { id: id }
+    params: { projectInvestigateId: id }
 
   })
 }

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

@@ -495,4 +495,7 @@
     height: 30px !important;
     line-height: 30px !important;
   }
+}
+.searchWrapper{
+  margin-left:22px;
 }

ruoyi-ui/src/components/SearchFilter/index.vue

@@ -40,7 +40,7 @@ export default {
       default: "small",
     },
     queryParams: {
-      type: Object
+      type: Object,
     },
   },
   data() {
@@ -51,7 +51,7 @@ export default {
   },
   created() {},
   mounted() {
-    console.log("queryParams=",this.queryParams)
+    console.log("queryParams=", this.queryParams);
     // 通过最大显示个数控制展开/折叠
     if (this.maxShow > 0) {
       this.minShowCtrol();
@@ -92,7 +92,7 @@ export default {
 <style lang="scss" scoped>
 .searchBtnWrapper {
   ::v-deep .el-form-item__content {
-    margin-left: 0 !important;
+    margin-left: 22px !important;
   }
 }
 </style>

ruoyi-ui/src/utils/preventReClick.js

@@ -8,7 +8,7 @@ export default {
                         el.disabled = true
                         setTimeout(() => {
                             el.disabled = false
-                        }, binding.value || 1000)
+                        }, binding.value || 2000)
                     }
                 })
             }

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

@@ -6,7 +6,7 @@
       size="small"
       :inline="true"
       v-show="showSearch"
-      label-width="90px"
+      label-width="70px"
     >
       <!-- style="margin-left: -22px" -->
       <el-form-item label="渠道名称" prop="channelName">
@@ -52,7 +52,11 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="渠道负责人" prop="channelHead">
+      <el-form-item
+        label="渠道负责人"
+        prop="channelHead"
+        style="white-space: nowrap"
+      >
         <el-input
           v-model="queryParams.channelHead"
           placeholder="请输入渠道负责人"
@@ -136,22 +140,14 @@
     >
       <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="channelCode"
-      >
+      <el-table-column label="渠道编号" 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="渠道名称"
-        align="center"
-        prop="channelName"
-      >
+      <el-table-column label="渠道名称" align="center" prop="channelName">
         <template slot-scope="scope">
           <div :title="scope.row.channelName">
             {{ scope.row.channelName }}
@@ -159,11 +155,7 @@
         </template>
       </el-table-column>
 
-      <el-table-column
-        label="渠道类别"
-        align="center"
-        prop="channelType"
-      >
+      <el-table-column label="渠道类别" align="center" prop="channelType">
         <template slot-scope="scope">
           <dict-tag
             :options="dict.type.channel_type"
@@ -178,29 +170,21 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column
-        label="联系电话"
-        align="center"
-        prop="telephone"
-      >
+      <el-table-column label="联系电话" 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="渠道负责人"
-        align="center"
-        prop="channelHead"
-      >
+      <el-table-column label="渠道负责人" 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="状态"  align="center" prop="status">
+      <el-table-column label="状态" align="center" prop="status">
         <template slot-scope="scope">
           <dict-tag
             :options="dict.type.channel_status"
@@ -208,22 +192,14 @@
           />
         </template>
       </el-table-column>
-      <el-table-column
-        label="创建人"
-        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"
-      >
+      <el-table-column label="创建时间" align="center" prop="createTime">
         <template slot-scope="scope">
           <div :title="scope.row.createTime">
             {{ scope.row.createTime }}
@@ -579,8 +555,9 @@ export default {
         this.open = true;
         this.title = "修改渠道信息";
         setTimeout(() => {
+          this.$refs.fileItems.fileList = [];
           this.$refs.fileItems.getListFileBusinessId(id);
-        }, 200);
+        }, 300);
       });
     },
     /** 提交按钮 */

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

@@ -90,6 +90,7 @@ export default {
       channelQueryParams: {
         pageNum: 1,
         pageSize: 10,
+        notStatus:"3",
         orderByColumn: "createTime",
         isAsc: "desc",
       },

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

@@ -115,7 +115,12 @@
       :data="contractList"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column
+        v-if="type === '1'"
+        type="selection"
+        width="55"
+        align="center"
+      />
       <!-- <el-table-column label="主键ID" align="center" prop="id" /> -->
       <el-table-column label="合同名称" align="center" prop="contractName">
         <template slot-scope="scope">
@@ -124,6 +129,14 @@
           </div>
         </template>
       </el-table-column>
+      <el-table-column label="合同类别" align="center" prop="contractType">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.contract_type"
+            :value="scope.row.contractType"
+          />
+        </template>
+      </el-table-column>
       <el-table-column
         label="项目名称"
         align="center"
@@ -180,9 +193,7 @@
           </div>
         </template>
       </el-table-column>
-      <!-- <el-table-column label="合同类别" align="center" prop="contractType">
-        
-      </el-table-column> -->
+
       <!-- <el-table-column label="会议编号" align="center" prop="fileBusinessId" /> -->
       <el-table-column
         label="操作"
@@ -240,6 +251,16 @@
             placeholder="请输入合同名称"
           />
         </el-form-item>
+        <el-form-item label="合同类别" prop="contractType">
+          <el-select v-model="form.contractType" placeholder="请选择合同类别">
+            <el-option
+              v-for="dict in dict.type.contract_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item label="项目名称" prop="projectName">
           <div
             class="el-input__inner inputSimulation yichu1"
@@ -330,7 +351,7 @@ export default {
       type: String,
     },
   },
-  dicts: ["project_stage"],
+  dicts: ["project_stage", "contract_type"],
   components: { projectItem, fileItem, meetingItem },
   data() {
     const validateLogo = (rule, value, callback) => {
@@ -396,6 +417,9 @@ export default {
       // 表单校验
       rules: {
         contractName: [{ required: true, trigger: "blur", message: "请输入" }],
+        contractType: [
+          { required: true, trigger: "change", message: "请选择" },
+        ],
         // projectPoolId: [{ required: true, trigger: "blur", message: "请输入" }],
         projectName: [{ required: true, trigger: "blur", message: "请选择" }],
         // fileType: [{ required: true, trigger: "change", message: "请选择" }],
@@ -437,6 +461,9 @@ export default {
     // 获取fileList
     getFileList(fileList) {
       this.fileList = fileList;
+      if (fileList.length > 0) {
+        this.$refs.form.clearValidate(["listFile"]);
+      }
     },
     /** 查询合同管理列表 */
     getList() {
@@ -524,8 +551,9 @@ export default {
         this.open = true;
         this.title = "修改合同管理";
         setTimeout(() => {
+          this.$refs.fileItems.fileList = [];
           this.$refs.fileItems.getListFileBusinessId(id);
-        }, 200);
+        }, 300);
       });
     },
     /** 提交按钮 */

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

@@ -1,8 +1,8 @@
 <template>
-  <div>
+  <div class="app-container">
     <div v-show="type == 1">
       <el-table border :data="dueList">
-        <el-table-column type="selection" width="55" align="center" />
+        <!-- <el-table-column  type="selection" width="55" align="center" /> -->
         <el-table-column
           label="尽调名称"
           align="center"
@@ -15,7 +15,7 @@
           prop="investigatePerson"
         />
         <el-table-column
-          label="尽调费用"
+          label="尽调费用(元)"
           align="center"
           prop="investigateCost"
         />
@@ -37,6 +37,14 @@
               @click="handleLook(scope.row)"
               >查看尽调报告</el-button
             >
+            <el-button
+              v-show="scope.row.investigatePersonId.indexOf(user.userId) > -1"
+              size="mini"
+              type="text"
+              icon="el-icon-upload2"
+              @click="handleSurvey('3', scope.row, scope.row)"
+              >上传尽调报告</el-button
+            >
             <el-button
               size="mini"
               type="text"
@@ -66,7 +74,7 @@
             class="special-el-form"
             :model="dueForm"
             :rules="dueRules"
-            label-width="100px"
+            label-width="120px"
           >
             <el-form-item label="尽调名称" prop="investigateName">
               <el-input
@@ -91,11 +99,12 @@
                 }}
               </div>
             </el-form-item>
-            <el-form-item label="尽调费用" prop="investigateCost">
+            <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, '')"
               />
             </el-form-item>
             <el-form-item label="文件" prop="file" class="special-el-form-item">
@@ -169,12 +178,12 @@
             <el-form-item label="尽调人员">
               <el-input disabled v-model="dueForm.investigatePerson" />
             </el-form-item>
-            <el-form-item label="尽调费用">
+            <el-form-item label="尽调费用(元)">
               <el-input disabled v-model="dueForm.investigateCost" />
             </el-form-item>
             <el-form-item label="文件" class="special-el-form-item">
+              <!-- class="show_disabled" -->
               <fileItem
-                class="show_disabled"
                 ref="fileItems1"
                 :id="dueForm.id"
                 @getFileList="getFileList"
@@ -241,35 +250,45 @@
           append-to-body
           class="examineDialog"
         >
-          <el-form
-            v-for="(item, index) in dueAllPeportList"
-            :key="index"
-            class="special-el-form"
-            :model="item"
-            label-width="100px"
+          <div v-if="dueAllPeportList.length > 0">
+            <el-form
+              v-for="(item, index) in dueAllPeportList"
+              :key="index"
+              class="special-el-form"
+              :model="item"
+              label-width="100px"
+            >
+              <el-form-item label="尽调人员" class="special-el-form-item">
+                <el-input disabled v-model="item.investigatePerson" />
+              </el-form-item>
+              <el-form-item label="文件" class="special-el-form-item">
+                <!-- class="show_disabled" -->
+                <fileItem
+                  ref="dueAllreportFileItems"
+                  :id="item.id"
+                  @getFileList="getreportFileList"
+                ></fileItem>
+              </el-form-item>
+              <el-form-item label="备注" class="special-el-form-item">
+                <el-input
+                  disabled
+                  rows="4"
+                  type="textarea"
+                  v-model="item.remark"
+                  placeholder="请输入备注"
+                />
+              </el-form-item>
+              <el-divider></el-divider>
+            </el-form>
+          </div>
+          <div
+            v-else
+            class="public-flex-center public-padded-t-20"
+            style="color: #909399"
           >
-            <el-form-item label="尽调人员" class="special-el-form-item">
-              <el-input disabled v-model="item.investigatePerson" />
-            </el-form-item>
-            <el-form-item label="文件" class="special-el-form-item">
-              <fileItem
-                class="show_disabled"
-                ref="dueAllreportFileItems"
-                :id="item.id"
-                @getFileList="getreportFileList"
-              ></fileItem>
-            </el-form-item>
-            <el-form-item label="备注" class="special-el-form-item">
-              <el-input
-                disabled
-                rows="4"
-                type="textarea"
-                v-model="item.remark"
-                placeholder="请输入备注"
-              />
-            </el-form-item>
-            <el-divider></el-divider>
-          </el-form>
+            暂无数据
+          </div>
+
           <div slot="footer" class="dialog-footer">
             <el-button type="primary" @click="dueDiligenceOpen2 = false"
               >确 定</el-button
@@ -310,9 +329,11 @@ export default {
     projectId: {
       type: String,
     },
-    // projectName: {
-    //   type: String,
-    // },
+    projectName: {
+      type: String,
+      default: null,
+      required: false,
+    },
     type: {
       type: Number, //1显示表格  2不显示
     },
@@ -409,12 +430,14 @@ export default {
     },
   },
   mounted() {
+    this.user = this.$store.getters.user;
+    this.user.userId = this.user.userId.toString();
     this.getList();
   },
   methods: {
-    getProjectName(projectName) {
-      this.projectName = projectName;
-    },
+    // getProjectName(projectName) {
+    //   this.projectName = projectName;
+    // },
     /** 查询文件资料列表 */
     getList() {
       //   this.loading = true;
@@ -437,6 +460,7 @@ export default {
         if (rows && rows.length > 0) {
           for (let i in rows) {
             setTimeout(() => {
+              this.$refs.dueAllreportFileItems[i].handleButton();
               this.$refs.dueAllreportFileItems[i].getListFileBusinessId(
                 rows[i].id
               );
@@ -460,6 +484,7 @@ export default {
           this.dueDiligenceTit = "修改尽调申请";
           this.dueDiligenceOpen = true;
           setTimeout(() => {
+            that.$refs.fileItems.fileList = [];
             that.$refs.fileItems.getListFileBusinessId(this.dueForm.id);
           }, 300);
         }
@@ -495,11 +520,12 @@ export default {
           this.selectNameValues = selection.nickName;
           this.selectValues = selection.userId;
         }
+        this.$refs.dueForm.clearValidate(["investigatePerson"]);
       }
     },
     // 发起尽调申请
     handleSurvey(type, row, transmitForm) {
-      console.log(type, row, transmitForm);
+      // console.log(type, row, transmitForm);
       let that = this;
       this.dueDiligenceType = type;
       //type 1=发起  2=修改  3=上传
@@ -514,9 +540,10 @@ export default {
         this.handleUpdate(row);
       } else if (type === "3") {
         this.dueForm = transmitForm;
-        this.dueForm.projectName = row.projectName;
+        this.dueForm.projectName = this.projectName;
         this.duePeportForm.projectInvestigateId = this.dueForm.id;
         setTimeout(() => {
+          that.$refs.fileItems1.handleButton();
           that.$refs.fileItems1.getListFileBusinessId(this.dueForm.id);
         }, 300);
         this.dueDiligenceTit1 = "上传尽调报告";
@@ -534,7 +561,8 @@ export default {
         });
       }
       this.dueForm.projectName = row.projectName;
-      this.dueForm.projectPoolId = row.id;
+      // this.dueForm.projectPoolId = row.id;
+      this.dueForm.projectPoolId = this.projectId;
     },
     // 尽调报告
     submitduePeportForm() {
@@ -574,15 +602,21 @@ export default {
       this.$refs["dueForm"].validate((valid) => {
         if (valid) {
           this.dueForm.listFile = this.fileList;
+          this.dueForm.investigateCost = this.dueForm.investigateCost.replace(
+            /-/g,
+            ""
+          );
           if (this.dueForm.id != null) {
             updateInvestigate(this.dueForm).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.dueDiligenceOpen = false;
+              this.getList();
             });
           } else {
             addInvestigate(this.dueForm).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.dueDiligenceOpen = false;
+              this.getList();
             });
           }
           this.getList();

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

@@ -13,7 +13,7 @@
       :on-success="handleUploadSuccess"
       :on-preview="handlePreview"
     >
-      <el-button size="small" type="primary">点击上传</el-button>
+      <el-button size="small" type="primary" :disabled="forbid">点击上传</el-button>
     </el-upload>
   </div>
 </template>
@@ -28,6 +28,7 @@ export default {
   props: {},
   data() {
     return {
+      forbid:false,
       fileList: [],
       uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传文件服务器地址
       headers: {
@@ -41,6 +42,7 @@ export default {
     }
   },
   methods: {
+    
     // 根据附件业务ID()获取附件详情信息列表
     getListFileBusinessId(id) {
       if (id) {
@@ -56,6 +58,9 @@ export default {
         });
       }
     },
+    handleButton(){
+      this.forbid = true;
+    },
     handleChange(file, fileList) {
       //   console.log("----", file, fileList);
     },

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

@@ -102,7 +102,12 @@
       :data="informationList"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column
+        v-if="type === '1'"
+        type="selection"
+        width="55"
+        align="center"
+      />
       <!-- <el-table-column label="主键ID" align="center" prop="id" /> -->
       <el-table-column
         label="文件名称"
@@ -440,6 +445,9 @@ export default {
     // 获取fileList
     getFileList(fileList) {
       this.fileList = fileList;
+      if (fileList.length > 0) {
+        this.$refs.fileForm.clearValidate(["listFile"]);
+      }
     },
     /** 查询文件资料列表 */
     getList() {
@@ -527,8 +535,9 @@ export default {
         this.open = true;
         this.title = "修改文件资料";
         setTimeout(() => {
+          this.$refs.fileItems.fileList = [];
           this.$refs.fileItems.getListFileBusinessId(id);
-        }, 200);
+        }, 300);
       });
     },
     /** 提交按钮 */

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

@@ -7,7 +7,7 @@
       size="small"
       :inline="true"
       v-show="showSearch"
-      label-width="90px"
+      label-width="70px"
     >
       <el-form-item label="项目名称" prop="projectName">
         <el-input
@@ -17,7 +17,11 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="公司联系人" prop="contacts">
+      <el-form-item
+        label="公司联系人"
+        prop="contacts"
+        style="white-space: nowrap"
+      >
         <el-input
           v-model="queryParams.contacts"
           placeholder="请输入公司联系人"
@@ -129,7 +133,12 @@
       :data="recordList"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column
+        v-if="type === '1'"
+        type="selection"
+        width="55"
+        align="center"
+      />
       <!-- <el-table-column label="主键ID" align="center" prop="id" /> -->
       <!-- <el-table-column label="项目编号" align="center" prop="projectId" /> -->
       <el-table-column
@@ -581,8 +590,9 @@ export default {
         this.open = true;
         this.title = "修改跟进记录";
         setTimeout(() => {
+          this.$refs.fileItems.fileList = [];
           this.$refs.fileItems.getListFileBusinessId(id);
-        }, 200);
+        }, 300);
       });
     },
     /** 提交按钮 */

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

@@ -9,10 +9,22 @@
         <div slot="header" class="clearfix">
           <span>{{ item.uploadTypeName }}</span>
         </div>
-        <div v-for="(items, indexs) in item.children" :key="indexs">
-          <div class="fileItems" title="点击下载" @click="handlePreview(items)">
-            {{ items.newUploadName }}
+        <div
+          class="public-flex-between"
+          v-for="(items, indexs) in item.children"
+          :key="indexs"
+        >
+          <div class="public-flex">
+            <div class="public-margin-r-10">{{ items.createBy }}: </div>
+            <div
+              class="fileItems"
+              title="点击下载"
+              @click="handlePreview(items)"
+            >
+              {{ items.newUploadName }}
+            </div>
           </div>
+          <span class="public-font-size-12">{{ items.createTime }}</span>
         </div>
       </el-card>
     </div>

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

@@ -147,7 +147,12 @@
       :data="meetingList"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column
+        v-if="type === '1'"
+        type="selection"
+        width="55"
+        align="center"
+      />
       <!-- <el-table-column label="主键ID" align="center" prop="id" /> -->
       <el-table-column
         label="会议编号"
@@ -186,18 +191,7 @@
           </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"
@@ -244,7 +238,7 @@
       >
         <template slot-scope="scope">
           <span :title="scope.row.startTime">{{
-            parseTime(scope.row.startTime, "{y}-{m}-{d} {h}:{i}:{s}")
+            parseTime(scope.row.startTime, "{y}-{m}-{d} {h}:{i}")
           }}</span>
         </template>
       </el-table-column>
@@ -256,7 +250,7 @@
       >
         <template slot-scope="scope">
           <span :title="scope.row.startTime">{{
-            parseTime(scope.row.endTime, "{y}-{m}-{d} {h}:{i}:{s}")
+            parseTime(scope.row.endTime, "{y}-{m}-{d} {h}:{i}")
           }}</span>
         </template>
       </el-table-column>
@@ -479,7 +473,8 @@
             v-model="form.startTime"
             type="datetime"
             placeholder="请选择会议开始时间"
-            value-format="yyyy-MM-dd HH:mm:ss"
+            format="yyyy-MM-dd HH:mm"
+            value-format="yyyy-MM-dd HH:mm"
           >
           </el-date-picker>
           <!-- <el-date-picker
@@ -494,7 +489,8 @@
         <el-form-item label="会议结束时间" prop="endTime">
           <el-date-picker
             v-model="form.endTime"
-            value-format="yyyy-MM-dd HH:mm:ss"
+            format="yyyy-MM-dd HH:mm"
+            value-format="yyyy-MM-dd HH:mm"
             type="datetime"
             placeholder="请选择会议结束时间"
           >
@@ -660,7 +656,7 @@ export default {
         meetingType: null,
         startTime: null,
         endTime: null,
-        timeVal:null,
+        timeVal: null,
         orderByColumn: "createTime",
         isAsc: "desc",
       },
@@ -759,6 +755,7 @@ export default {
           this.selectNameValues = selection.nickName;
           this.selectValues = selection.userId;
         }
+        this.$refs.form.clearValidate(["participants"]);
       }
     },
     getButtonItem(row) {
@@ -766,29 +763,30 @@ export default {
       this.isInitiator = false;
       // 是否是发起人
       let isInitiator = row.promoterId == this.user.userId;
+      this.isInitiator = isInitiator;
       // 参与人数组
       let participantsIdList = row.participantsId.split(",");
       // console.log("是否是发起人",this.isInitiator)
       // console.log("参与人数组",participantsIdList,"this.user.userId=",this.user.userId,participantsIdList.indexOf(this.user.userId) > -1)
-      // if (isInitiator) {
       // 参与人里面包含发起人
       if (participantsIdList.indexOf(this.user.userId) > -1) {
         this.showMarkBtn = true;
       }
-      // }
       // console.log("this.showMarkBtn=",this.showMarkBtn)
       getCanScoringMeetingId(row.id).then((response) => {
         // 查看打分
         if (response.tProjectScoring) {
           this.showLookMark = true;
           this.$store.commit("SET_TPROJECTSCORING", response.tProjectScoring);
-          this.isInitiator = true;
         } else {
           // 去打分
           this.showLookMark = false;
-          this.isInitiator = false;
-          if (!this.showMarkBtn) {
-            this.$message.warning("暂无更多操作权限");
+          if (!this.showMarkBtn && !isInitiator) {
+            this.$message({
+              message: "暂无更多操作权限",
+              duration: 1200,
+              type: "warning",
+            });
           }
         }
       });
@@ -981,8 +979,9 @@ export default {
         this.selectValues = response.data.participantsId;
         this.selectNameValues = response.data.participants;
         setTimeout(() => {
+          this.$refs.fileItems.fileList = [];
           this.$refs.fileItems.getListFileBusinessId(id);
-        }, 200);
+        }, 300);
       });
     },
     /** 提交按钮 */

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

@@ -132,27 +132,32 @@
         <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')"
+          onkeyup="value=value.replace(/[^0-9.]/g,'').replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/,'$1$2.$3').replace(/-/g, '')"
           placeholder="请输入注册资本"
         />
       </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')"
+          onkeyup="value=value.replace(/[^0-9.]/g,'').replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/,'$1$2.$3').replace(/-/g, '')"
           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="请输入办公地址"
@@ -224,7 +229,7 @@
         <el-input
           maxlength="20"
           v-model="form.financingMoney"
-          onkeyup="this.value=this.value.replace(/\D/g,'')"
+          onkeyup="this.value=this.value.replace(/\D/g,'').replace(/-/g, '')"
           placeholder="请输入预期融资金额"
         />
       </el-form-item>
@@ -232,7 +237,7 @@
         <el-input
           maxlength="20"
           v-model="form.investValuation"
-          onkeyup="this.value=this.value.replace(/\D/g,'')"
+          onkeyup="value=value.replace(/[^0-9.]/g,'').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3').replace(/-/g, '')"
           placeholder="请输入投前估值"
         />
       </el-form-item>
@@ -240,7 +245,7 @@
         <el-input
           maxlength="20"
           v-model="form.investMoney"
-          onkeyup="this.value=this.value.replace(/\D/g,'')"
+          onkeyup="this.value=this.value.replace(/\D/g,'').replace(/-/g, '')"
           placeholder="请输入预计投资金额"
         />
       </el-form-item>
@@ -572,6 +577,11 @@ export default {
       this.$refs["form"].validate((valid, rules) => {
         if (valid) {
           this.form.listFile = this.fileList;
+          this.form.tProjectCompany.registeredCapital =
+            this.form.tProjectCompany.registeredCapital.replace(/-/g, "");
+          this.form.tProjectCompany.paidCapital =
+            this.form.tProjectCompany.paidCapital.replace(/-/g, "");
+
           if (this.form.id != null) {
             updatePool(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");

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

@@ -8,6 +8,7 @@
       append-to-body
     >
       <el-table
+        class="tableWrapper"
         @row-click="clickRow"
         ref="multipleTable"
         :data="poolList"
@@ -16,12 +17,24 @@
         <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="projectName" />
+        <el-table-column label="项目名称" width="150" align="center" prop="projectName">
+          <template slot-scope="scope">
+            <div :title="scope.row.projectName">
+              {{ scope.row.projectName }}
+            </div>
+          </template>
+        </el-table-column>
         <el-table-column
           label="渠道"
           align="center"
           prop="tProjectChannel.channelName"
-        />
+        >
+          <template slot-scope="scope">
+            <div :title="scope.row.tProjectChannel.channelName">
+              {{ scope.row.tProjectChannel.channelName }}
+            </div>
+          </template>
+        </el-table-column>
         <el-table-column
           label="所属组别"
           align="center"
@@ -62,7 +75,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/projectList.vue

@@ -58,7 +58,7 @@
           />
         </el-select>
       </el-form-item>
-      
+
       <el-form-item label="项目公司" prop="company">
         <el-input
           v-model="queryParams.company"
@@ -158,7 +158,7 @@
         >
         </el-date-picker>
       </el-form-item> -->
-      <el-form-item>
+      <el-form-item class="searchWrapper">
         <el-button
           type="primary"
           icon="el-icon-search"
@@ -289,7 +289,12 @@
         </template>
       </el-table-column>
 
-      <el-table-column label="项目阶段" width="120" align="center" prop="projectStage">
+      <el-table-column
+        label="项目阶段"
+        width="120"
+        align="center"
+        prop="projectStage"
+      >
         <template slot-scope="scope">
           <dict-tag
             :options="dict.type.project_stage"
@@ -527,7 +532,15 @@
             v-hasPermi="['invest:pool:remove']"
             >终止</el-button
           >
-          <el-dropdown
+          <el-button
+            v-if="stage == '4'"
+            size="mini"
+            type="text"
+            icon="el-icon-tickets"
+            @click="handleDropdown($event, scope.row)"
+            >尽职背调</el-button
+          >
+          <!-- <el-dropdown
             v-if="stage == '4'"
             trigger="click"
             @command="handleDropdown($event, scope.row)"
@@ -561,7 +574,7 @@
                 >上传尽调报告</el-dropdown-item
               >
             </el-dropdown-menu>
-          </el-dropdown>
+          </el-dropdown> -->
         </template>
       </el-table-column>
     </el-table>
@@ -573,9 +586,9 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-    <!-- 添加或修改文件资料对话框 -->
+    <!-- 设置项目状态对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="项目阶段" prop="projectStage">
           <el-select
             v-model="form.projectStage"
@@ -592,8 +605,13 @@
           </el-select>
         </el-form-item>
         <el-form-item label="项目状态" prop="projectState">
-          <el-select v-model="form.projectState" placeholder="请选择项目状态">
+          <el-select
+            ref="selectState"
+            v-model="form.projectState"
+            placeholder="请选择项目状态"
+          >
             <el-option
+              @click.native="handleProjectStateSelect(dict)"
               v-for="dict in project_state"
               :key="dict.dictValue"
               :label="dict.dictLabel"
@@ -601,6 +619,44 @@
             />
           </el-select>
         </el-form-item>
+        <el-form-item
+          v-if="form.projectState == 'e'"
+          label="立项通过日期"
+          prop="projectDate"
+          :rules="[
+            { required: verifyProjectDate, trigger: 'blur', message: '请选择' },
+          ]"
+        >
+          <el-date-picker
+            clearable
+            v-model="form.projectDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择立项通过日期"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item
+          v-if="form.projectState == 'i'"
+          label="投决通过日期"
+          prop="decisionDate"
+          :rules="[
+            {
+              required: verifyDecisionDate,
+              trigger: 'blur',
+              message: '请选择',
+            },
+          ]"
+        >
+          <el-date-picker
+            clearable
+            v-model="form.decisionDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择投决通过日期"
+          >
+          </el-date-picker>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm" v-preventReClick
@@ -637,10 +693,6 @@ import {
   delPool,
   editStage,
   getlistProjectPoolId,
-  addInvestigate,
-  updateInvestigate,
-  addInvestigatePerson,
-  getProjectInvestigateId,
 } from "@/api/invest/pool";
 import { selectByFlowKey } from "@/api/flowable/definition";
 import { listChannel } from "@/api/invest/channel";
@@ -718,11 +770,11 @@ export default {
         [
           {
             dictValue: "f",
-            dictLabel: "尽调背调",
+            dictLabel: "尽职背调",
           },
           {
             dictValue: "g",
-            dictLabel: "尽调背调通过",
+            dictLabel: "尽职背调通过",
           },
         ],
         [
@@ -817,13 +869,14 @@ export default {
         projectState: null,
         orderByColumn: "createTime",
         isAsc: "desc",
-        createTime:null
+        createTime: null,
       },
       form: {
         id: null,
         projectStage: "",
         projectState: "",
         stageName: "",
+        stateName: "",
       },
       channelList: [],
       // 尽职调查表单
@@ -854,11 +907,31 @@ export default {
         projectPoolId: null,
         projectName: null,
       },
+      verifyProjectDate: false,
+      verifyDecisionDate: false,
     };
   },
-  mounted() {
+  watch: {
+    "form.projectState": function (newValue, oldValue) {
+      // 项目立项通过
+      if (newValue == "e") {
+        this.verifyProjectDate = true;
+      } else {
+        this.verifyProjectDate = false;
+      }
+      // 项目投决通过
+      if (newValue == "i") {
+        this.verifyDecisionDate = true;
+      } else {
+        this.verifyDecisionDate = false;
+      }
+    },
+  },
+  created() {
     this.user = this.$store.getters.user;
     this.user.userId = this.user.userId.toString();
+  },
+  mounted() {
     // 项目阶段
     if (this.stage != "0") {
       this.queryParams.projectStage = this.stage;
@@ -896,10 +969,16 @@ export default {
       this.project_state = this.projectState[index];
       // 给个默认值
       this.form.projectState = this.project_state[0].dictValue;
+      this.form.stateName = this.project_state[0].dictLabel;
       if (dict && dict.label) {
         this.form.stageName = dict.label;
       }
     },
+    handleProjectStateSelect(dict) {
+      if (dict && dict.dictLabel) {
+        this.form.stateName = dict.dictLabel;
+      }
+    },
 
     /** 查询项目池列表 */
     getList() {
@@ -952,6 +1031,7 @@ export default {
       this.title = "设置项目阶段";
       setTimeout(() => {
         this.form.stageName = this.$refs.selectLable.selected.label;
+        this.form.stateName = this.$refs.selectState.selected.label;
       }, 300);
     },
     // 发起会议
@@ -982,21 +1062,34 @@ export default {
             this.needUpload = true;
           }
           if (!this.needUpload && !this.isInitiator) {
-            this.$message.warning("暂无更多操作权限");
+            this.$message({
+              message: "暂无更多操作权限",
+              duration: 1200,
+              type: "warning",
+            });
           }
         } else {
           // 发起尽调申请
           this.needInitiate = true;
           if (!this.isInitiator) {
-            this.$message.warning("暂无更多操作权限");
+            this.$message({
+              message: "暂无更多操作权限",
+              duration: 1200,
+              type: "warning",
+            });
           }
         }
       });
     },
     // 发起尽调申请
     handleDropdown(type, row) {
-      this.$refs.dueDiligenceLists.getProjectName(row.projectName);
-      this.$refs.dueDiligenceLists.handleSurvey(type, row, this.dueForm);
+      const id = row.id || this.ids;
+      this.$router.push({
+        path: "/invest/pool/detail",
+        query: { id: id, activeName: "4" },
+      });
+      // this.$refs.dueDiligenceLists.getProjectName(row.projectName);
+      // this.$refs.dueDiligenceLists.handleSurvey(type, row, this.dueForm);
     },
     // 上传跟进记录
     handlefollowRecord(row) {
@@ -1014,6 +1107,7 @@ export default {
         projectStage: null,
         projectState: null,
         stageName: null,
+        stateName: null,
       };
       this.resetForm("form");
     },

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

@@ -43,10 +43,10 @@
             v-show="showSearch"
             label-width="68px"
           >
-            <el-form-item label="用户名称" prop="userName">
+            <el-form-item label="用户姓名" prop="nickName">
               <el-input
-                v-model="queryParams.userName"
-                placeholder="请输入用户名称"
+                v-model="queryParams.nickName"
+                placeholder="请输入用户姓名"
                 clearable
                 style="width: 150px"
                 @keyup.enter.native="handleQuery"
@@ -96,14 +96,14 @@
               prop="userId"
               v-if="columns[0].visible"
             />
-            <el-table-column
-              label="登录账号"
+            <!-- <el-table-column
+              label="用户昵称"
               align="center"
-              key="userName"
-              prop="userName"
+              key="nickName"
+              prop="nickName"
               v-if="columns[1].visible"
               :show-overflow-tooltip="true"
-            />
+            /> -->
             <el-table-column
               label="用户姓名"
               align="center"
@@ -152,8 +152,8 @@
             <el-table-column
               label="登录账号"
               align="center"
-              key="userName"
-              prop="userName"
+              key="nickName"
+              prop="nickName"
               v-if="columns[1].visible"
               :show-overflow-tooltip="true"
             />
@@ -265,7 +265,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        userName: undefined,
+        nickName: undefined,
         phonenumber: undefined,
         status: undefined,
         deptId: undefined,
@@ -309,10 +309,10 @@ export default {
     //       // console.log("选中的userId=", this.selectUserList);
     //       // console.log("选中的昵称=", newVal);
     //       let userIdList = this.selectUserList.split(",");
-    //       let userNameList = newVal.split(",");
-    //       // console.log(userIdList,userNameList)
+    //       let nickNameList = newVal.split(",");
+    //       // console.log(userIdList,nickNameList)
     //       for (let i in userIdList) {
-    //         this.handleCheckList(userIdList[i], userNameList[i]);
+    //         this.handleCheckList(userIdList[i], nickNameList[i]);
     //         console.log("2222");
     //       }
     //     }
@@ -393,7 +393,7 @@ export default {
       this.queryParams = {
         pageNum: 1,
         pageSize: 10,
-        userName: undefined,
+        nickName: undefined,
         phonenumber: undefined,
         status: undefined,
         deptId: undefined,
@@ -405,10 +405,10 @@ export default {
         // console.log("选中的userId=", this.selectUserList);
         // console.log("选中的昵称=", newVal);
         let userIdList = this.selectUserList.split(",");
-        let userNameList = this.selectNameValues.split(",");
-        // console.log("接收的数据", userIdList, userNameList);
+        let nickNameList = this.selectNameValues.split(",");
+        // console.log("接收的数据", userIdList, nickNameList);
         for (let i in userIdList) {
-          this.handleCheckList(userIdList[i], userNameList[i]);
+          this.handleCheckList(userIdList[i], nickNameList[i]);
         }
       } else {
         this.selectUserList = null;

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

@@ -42,8 +42,9 @@
           disabled
           clearable
           v-model="form1.startTime"
-          type="date"
-          value-format="yyyy-MM-dd"
+          type="datetime"
+          format="yyyy-MM-dd HH:mm"
+          value-format="yyyy-MM-dd HH:mm"
         >
         </el-date-picker>
       </el-form-item>
@@ -52,8 +53,9 @@
           disabled
           clearable
           v-model="form1.endTime"
-          type="date"
-          value-format="yyyy-MM-dd"
+          type="datetime"
+          format="yyyy-MM-dd HH:mm"
+          value-format="yyyy-MM-dd HH:mm"
         >
         </el-date-picker>
       </el-form-item>
@@ -619,7 +621,11 @@
             <th>总人数</th>
             <th>
               <textarea
-                v-model="collectForm.totalPerson" class="table-textarea" name="" disabled></textarea>
+                v-model="collectForm.totalPerson"
+                class="table-textarea"
+                name=""
+                disabled
+              ></textarea>
             </th>
           </tr>
           <tr class="bg-blue">
@@ -1564,7 +1570,7 @@
           </tr>
           <tr class="specificTr">
             <th>项目名称</th>
-            <th >
+            <th>
               <textarea
                 class="table-textarea"
                 v-model="form.projectName"
@@ -1592,7 +1598,12 @@
             </th>
             <th>总人数</th>
             <th>
-              <textarea  v-model="collectForm.totalPerson" class="table-textarea" name="" disabled></textarea>
+              <textarea
+                v-model="collectForm.totalPerson"
+                class="table-textarea"
+                name=""
+                disabled
+              ></textarea>
             </th>
           </tr>
           <tr class="bg-blue">
@@ -2027,13 +2038,25 @@
           </tr>
         </tbody>
       </table>
-      <el-form-item class="btnList" >
-        <el-button @click="goBack">返 回</el-button>
-        <el-button v-if="!readonly" type="primary" @click="submitForm" v-preventReClick>提 交</el-button>
-      </el-form-item >
+      <el-form-item class="btnList">
+        <el-button v-if="showBack" @click="goBack">返 回</el-button>
+        <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>
+  <div
+    v-else
+    class="public-flex-center public-padded-t-20"
+    style="color: #909399"
+  >
+    暂无数据
+  </div>
 </template>
  
 <script>
@@ -2042,7 +2065,6 @@ import {
   addScoring,
   getScoring,
   selectMeetingId,
-  
 } from "@/api/invest/meeting";
 export default {
   props: {
@@ -2053,11 +2075,15 @@ export default {
     readonly: {
       type: Boolean,
     },
+    showBack: {
+      type: Boolean,
+      required: false,
+    },
   },
   dicts: ["meeting_type", "project_stage", "project_group"],
   data() {
     return {
-      id:"",
+      id: "",
       // 打分表单参数
       form: {
         businessModel: null,
@@ -2236,6 +2262,7 @@ export default {
         this.form.scoringPerson = this.user.userId;
         //  投资总监
         this.form.investCommissioner = response.data.tProjectPool.investHead;
+        this.collectForm.investCommissioner = response.data.tProjectPool.investHead;
         this.form.meetingId = response.data.id;
       });
     },
@@ -2303,7 +2330,7 @@ export default {
   //   // border: 1px solid transparent!important;
   // }
   table {
-  // width:80%;
+    // width:80%;
     // width: 600px;
     margin: 0 80px;
     -moz-user-select: none;

ruoyi-ui/src/views/invest/meeting/mark.vue

@@ -4,6 +4,7 @@
       ref="tableForm"
       :formType="formType"
       :readonly="readonly"
+      :showBack="true"
     ></tableForm>
   </div>
 </template>

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

@@ -18,6 +18,13 @@
           @click="handleTab('8', 'contractList')"
           >上传合同</el-button
         >
+        <el-button
+          v-if="user.nickName === this.detailInfo.investHead"
+          type="primary"
+          icon="el-icon-tickets"
+          @click="handleTab('4', 'dueDiligenceList')"
+          >发起尽调申请</el-button
+        >
         <el-button
           type="primary"
           icon="el-icon-plus"
@@ -44,7 +51,7 @@
         <el-step title="项目报备"></el-step>
         <el-step title="评估考察"></el-step>
         <el-step title="项目立项"></el-step>
-        <el-step title="尽调背调"></el-step>
+        <el-step title="尽职背调"></el-step>
         <el-step title="项目投决"></el-step>
         <el-step title="签约"></el-step>
         <el-step title="投后"></el-step>
@@ -116,6 +123,7 @@
             :formType="2"
             ref="approvalTableForm"
             :readonly="true"
+            :showBack="false"
           ></tableForm>
         </div>
         <div v-if="activeName === '4'">
@@ -130,6 +138,7 @@
           <dueDiligenceList
             :type="1"
             ref="dueDiligenceLists"
+            :projectName="detailInfo.projectName"
             :projectId="id"
           ></dueDiligenceList>
         </div>
@@ -138,6 +147,7 @@
             :formType="4"
             ref="voteTableForm"
             :readonly="true"
+            :showBack="false"
           ></tableForm>
         </div>
         <div v-if="activeName === '6'">
@@ -200,6 +210,10 @@ export default {
       active: 0,
       detailInfo: {},
       activeName: "0",
+      user: {
+        userId: null,
+        nickName: null,
+      },
       activities: [
         {
           content: "活动按期开始",
@@ -217,9 +231,14 @@ export default {
     };
   },
   created() {
+    this.user = this.$store.getters.user;
+    this.user.userId = this.user.userId.toString();
     this.id = this.$route.query.id;
     this.getDetail();
     this.getListProjectPoolId();
+    if (this.$route.query.activeName) {
+      this.activeName = this.$route.query.activeName;
+    }
   },
   methods: {
     // 切换tab并且打开新增
@@ -227,7 +246,11 @@ export default {
       this.activeName = activeName.toString();
       this.$store.commit("SET_PROJECTITEMMESSAGE", this.detailInfo);
       setTimeout(() => {
-        this.$refs[name].handleAdd(this.id);
+        if (activeName === "4") {
+          this.$refs.dueDiligenceLists.handleSurvey("1", this.detailInfo);
+        } else {
+          this.$refs[name].handleAdd(this.id);
+        }
       }, 300);
     },
     getMettingId(type) {
@@ -259,11 +282,6 @@ export default {
       } else if (this.activeName === "3") {
         this.getMettingId("LX");
       } else if (this.activeName === "4") {
-        setTimeout(() => {
-          this.$refs.dueDiligenceLists.getProjectName(
-            this.detailInfo.projectName
-          );
-        }, 300);
       } else if (this.activeName === "5") {
         this.getMettingId("TJ");
       }
@@ -271,7 +289,12 @@ export default {
     getDetail() {
       getPool(this.id).then((response) => {
         this.detailInfo = response.data;
-        this.active = parseInt(response.data.projectStage) - 1;
+        // 项目退出完成n
+        if (response.data.projectState === "n") {
+          this.active = parseInt(response.data.projectStage);
+        } else {
+          this.active = parseInt(response.data.projectStage) - 1;
+        }
       });
     },
 
@@ -296,10 +319,12 @@ export default {
       margin: 0;
     }
     > div:first-child {
-      width: calc(100% - 600px);
+      width: calc(100% - 700px);
     }
     .btnList {
-      width: 600px;
+      width: 700px;
+      display: flex;
+      justify-content: flex-end;
     }
   }
   .basicsInfo {

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

@@ -315,6 +315,9 @@ export default {
     // 获取fileList
     getFileList(fileList) {
       this.fileList = fileList;
+      if (fileList.length > 0) {
+        this.$refs.form.clearValidate(["listFile"]);
+      }
     },
 
     /** 查询研究资料管理列表 */
@@ -386,8 +389,9 @@ export default {
         this.open = true;
         this.title = "修改研究资料管理";
         setTimeout(() => {
+          this.$refs.fileItems.fileList = [];
           this.$refs.fileItems.getListFileBusinessId(id);
-        }, 200);
+        }, 300);
       });
     },
     /** 提交按钮 */

ruoyi-ui/src/views/system/user/index.vue

@@ -30,7 +30,7 @@
       <!--用户数据-->
       <el-col :span="20" :xs="24">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-          <el-form-item label="用户名称" prop="userName">
+          <!-- <el-form-item label="用户名称" prop="userName">
             <el-input
               v-model="queryParams.userName"
               placeholder="请输入用户名称"
@@ -38,6 +38,15 @@
               style="width: 240px"
               @keyup.enter.native="handleQuery"
             />
+          </el-form-item> -->
+           <el-form-item label="用户昵称" prop="nickName">
+            <el-input
+              v-model="queryParams.nickName"
+              placeholder="请输入用户昵称"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
           </el-form-item>
           <el-form-item label="手机号码" prop="phonenumber">
             <el-input
@@ -429,6 +438,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         userName: undefined,
+        nickName:null,
         phonenumber: undefined,
         status: undefined,
         deptId: undefined

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:8091`,
-        // 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]: ''