armg hace 1 año
padre
commit
fcfd5938f1

+ 21 - 4
ruoyi-ui/src/assets/styles/public.scss

@@ -447,11 +447,11 @@
 }
 
 .show_disabled {
-  cursor: not-allowed !important;
   background-color: #F5F7FA !important;
   border-color: #E4E7ED !important;
-  color: #C0C4CC !important;
+  // color: #C0C4CC;
   pointer-events: none !important;
+  cursor: not-allowed !important;
 }
 
 .custom-blue-color {
@@ -495,7 +495,24 @@
     height: 30px !important;
     line-height: 30px !important;
   }
+
+  td.el-table__cell:not(:last-child) div {
+    text-overflow: -o-ellipsis-lastline;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-line-clamp: 1;
+    line-clamp: 1;
+    -webkit-box-orient: vertical;
+  }
+}
+
+.searchWrapper {
+  margin-left: 22px;
+}
+.el-input.is-disabled .el-input__inner,.el-textarea.is-disabled .el-textarea__inner{
+  color:#333!important;
 }
-.searchWrapper{
-  margin-left:22px;
+.inputSimulation{
+  height:40px!important;
 }

+ 24 - 4
ruoyi-ui/src/views/invest/channel/index.vue

@@ -90,7 +90,7 @@
           >新增</el-button
         >
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="success"
           plain
@@ -101,8 +101,8 @@
           v-hasPermi="['invest:channel:edit']"
           >修改</el-button
         >
-      </el-col>
-      <el-col :span="1.5">
+      </el-col> -->
+      <!-- <el-col :span="1.5">
         <el-button
           type="danger"
           plain
@@ -113,7 +113,7 @@
           v-hasPermi="['invest:channel:remove']"
           >删除</el-button
         >
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -214,6 +214,7 @@
       >
         <template slot-scope="scope">
           <el-button
+            v-if="user.nickName === scope.row.createBy"
             size="mini"
             type="text"
             icon="el-icon-edit"
@@ -222,6 +223,16 @@
             >修改</el-button
           >
           <el-button
+            v-if="user.nickName !== scope.row.createBy"
+            class="custom-blue-color"
+            size="mini"
+            type="text"
+            icon="el-icon-search"
+            @click="handleUpdate(scope.row)"
+            >详情</el-button
+          >
+          <el-button
+            v-if="user.nickName === scope.row.createBy"
             class="custom-red-color"
             size="mini"
             type="text"
@@ -459,9 +470,17 @@ export default {
         channelHead: [{ required: true, trigger: "change", message: "请选择" }],
         status: [{ required: true, trigger: "change", message: "请选择" }],
       },
+
+      user: {
+        userId: "",
+        nickName: "",
+      },
+      popType: 2, //弹窗类型 1=修改 2=详情
     };
   },
   created() {
+    this.user = this.$store.getters.user;
+    this.user.userId = this.user.userId.toString();
     this.getList();
   },
   methods: {
@@ -561,6 +580,7 @@ export default {
         }, 300);
       });
     },
+
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate((valid) => {

+ 18 - 2
ruoyi-ui/src/views/invest/components/contractList.vue

@@ -67,7 +67,7 @@
           >新增</el-button
         >
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="success"
           plain
@@ -90,7 +90,7 @@
           v-hasPermi="['invest:contract:remove']"
           >删除</el-button
         >
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -202,6 +202,7 @@
       >
         <template slot-scope="scope">
           <el-button
+            v-if="user.nickName === scope.row.createBy"
             size="mini"
             type="text"
             icon="el-icon-edit"
@@ -210,6 +211,16 @@
             >修改</el-button
           >
           <el-button
+            v-if="user.nickName !== scope.row.createBy"
+            class="custom-blue-color"
+            size="mini"
+            type="text"
+            icon="el-icon-search"
+            @click="handleUpdate(scope.row)"
+            >详情</el-button
+          >
+          <el-button
+            v-if="user.nickName === scope.row.createBy"
             class="custom-red-color"
             size="mini"
             type="text"
@@ -425,6 +436,11 @@ export default {
         // fileType: [{ required: true, trigger: "change", message: "请选择" }],
         listFile: [{ required: true, validator: validateLogo }],
       },
+      user: {
+        userId: "",
+        nickName: "",
+      },
+      popType: 2, //弹窗类型 1=修改 2=详情
     };
   },
   created() {

+ 4 - 1
ruoyi-ui/src/views/invest/components/fileItem.vue

@@ -76,6 +76,9 @@ export default {
     handleButton() {
       this.forbid = true;
     },
+    handleForbid() {
+      this.forbid = false;
+    },
     handleChange(file, fileList) {
       //   console.log("----", file, fileList);
     },
@@ -134,7 +137,7 @@ export default {
 .uploadWrapper ::v-deep .el-upload-list__item {
   transition: none !important;
 }
-.name{
+.name {
   cursor: pointer;
 }
 </style>

+ 41 - 9
ruoyi-ui/src/views/invest/components/followList.vue

@@ -84,7 +84,7 @@
           >新增</el-button
         >
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="success"
           plain
@@ -107,7 +107,7 @@
           v-hasPermi="['invest:record:remove']"
           >删除</el-button
         >
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -152,7 +152,12 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="跟进人" align="center" prop="upPerson">
+      <el-table-column
+        label="跟进人"
+        width="100"
+        align="center"
+        prop="upPerson"
+      >
         <template slot-scope="scope">
           <div :title="scope.row.upPerson">
             {{ scope.row.upPerson }}
@@ -164,7 +169,12 @@
           <dict-tag :options="dict.type.up_way" :value="scope.row.upWay" />
         </template>
       </el-table-column>
-      <el-table-column label="公司联系人" align="center" prop="contacts">
+      <el-table-column
+        label="公司联系人"
+        width="80"
+        align="center"
+        prop="contacts"
+      >
         <template slot-scope="scope">
           <div :title="scope.row.contacts">
             {{ scope.row.contacts }}
@@ -178,36 +188,41 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="跟进日期" align="center" prop="realityUpDate">
+      <el-table-column
+        label="跟进日期"
+        width="100"
+        align="center"
+        prop="realityUpDate"
+      >
         <template slot-scope="scope">
           <span :title="scope.row.realityUpDate">{{
             parseTime(scope.row.realityUpDate, "{y}-{m}-{d}")
           }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="创建人" align="center" prop="createBy">
+      <el-table-column label="创建人" width="80" 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 }}
           </div>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <!-- fixed="right" -->
       <el-table-column
         label="操作"
-        width="120"
         align="center"
         class-name="small-padding fixed-width"
       >
         <template slot-scope="scope">
           <el-button
+            v-if="user.nickName === scope.row.createBy"
             size="mini"
             type="text"
             icon="el-icon-edit"
@@ -216,6 +231,16 @@
             >修改</el-button
           >
           <el-button
+            v-if="user.nickName !== scope.row.createBy"
+            class="custom-blue-color"
+            size="mini"
+            type="text"
+            icon="el-icon-search"
+            @click="handleUpdate(scope.row)"
+            >详情</el-button
+          >
+          <el-button
+            v-if="user.nickName === scope.row.createBy"
             class="custom-red-color"
             size="mini"
             type="text"
@@ -447,9 +472,15 @@ export default {
         upContent: [{ required: true, trigger: "blur", message: "请输入" }],
         upPerson: [{ required: true, trigger: "blur", message: "请选择" }],
       },
+      user: {
+        userId: "",
+        nickName: "",
+      },
     };
   },
   created() {
+    this.user = this.$store.getters.user;
+    this.user.userId = this.user.userId.toString();
     // 查询该id下的列表信息
     if (this.$route.query.id) {
       this.queryParams.projectId = this.$route.query.id;
@@ -600,6 +631,7 @@ export default {
         }, 300);
       });
     },
+    handleDetail(){},
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate((valid) => {

+ 18 - 6
ruoyi-ui/src/views/invest/components/meetingList.vue

@@ -98,7 +98,7 @@
           >新增</el-button
         >
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="success"
           plain
@@ -121,7 +121,7 @@
           v-hasPermi="['invest:meeting:remove']"
           >删除</el-button
         >
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -295,14 +295,25 @@
       >
         <template slot-scope="scope">
           <el-button
+            v-if="user.nickName === scope.row.createBy"
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['invest:meeting:edit']"
             >修改</el-button
+          >
+           <el-button
+            v-if="user.nickName !== scope.row.createBy"
+            class="custom-blue-color"
+            size="mini"
+            type="text"
+            icon="el-icon-search"
+            @click="handleUpdate(scope.row)"
+            >详情</el-button
           >
           <el-button
+            v-if="user.nickName === scope.row.createBy"
             class="custom-red-color"
             size="mini"
             type="text"
@@ -715,10 +726,6 @@ export default {
         promoter: [{ required: true, trigger: "blur", message: "请选择" }],
         participants: [{ required: true, trigger: "blur", message: "请选择" }],
       },
-      user: {
-        userId: null,
-        nickName: null,
-      },
       isInitiator: false, //是否是发起人
       showLookMark: false, //是否查看打分表
       showMarkBtn: false,
@@ -751,6 +758,11 @@ export default {
         },
       ],
       showAllType: false,
+      user: {
+        userId: "",
+        nickName: "",
+      },
+      popType: 2, //弹窗类型 1=修改 2=详情
     };
   },
   created() {

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

@@ -65,9 +65,9 @@
           ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="投资负责人" prop="investHead">
+      <el-form-item label="项目负责人" prop="investHead">
         <div class="el-input__inner inputSimulation" @click="openSelectDept">
-          {{ form.investHead ? form.investHead : "请选择投资负责人" }}
+          {{ form.investHead ? form.investHead : "请选择项目负责人" }}
         </div>
         <selecDept
           ref="selecDepts"

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

@@ -49,7 +49,7 @@
         </el-table-column>
         <!-- <el-table-column label="项目编号" align="center" prop="projectCode" /> -->
 
-        <el-table-column label="投资负责人" align="center" prop="investHead" />
+        <el-table-column label="项目负责人" align="center" prop="investHead" />
         <el-table-column label="项目阶段" align="center" prop="projectStage">
           <template slot-scope="scope">
             <dict-tag

+ 91 - 87
ruoyi-ui/src/views/invest/components/projectList.vue

@@ -18,10 +18,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="投资负责人" prop="investHead">
+      <el-form-item label="项目负责人" prop="investHead">
         <el-input
           v-model.trim="queryParams.investHead"
-          placeholder="请输入投资负责人"
+          placeholder="请输入项目负责人"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -179,7 +179,7 @@
     >
       <el-col :span="1.5">
         <el-button
-          v-if="type === '1' && (stage == '0' || stage == '1')"
+          v-if="type === '1' && stage == '1'"
           type="primary"
           plain
           icon="el-icon-plus"
@@ -191,6 +191,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
+          v-if="type === '1' && stage == '1'"
           type="success"
           plain
           icon="el-icon-edit"
@@ -203,6 +204,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
+          v-if="type === '1' && stage !== '0'"
           type="danger"
           plain
           icon="el-icon-switch-button"
@@ -215,6 +217,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
+          v-if="type === '1' && stage == '0'"
           type="warning"
           plain
           icon="el-icon-download"
@@ -229,7 +232,6 @@
         @queryTable="getList"
       ></right-toolbar>
     </el-row>
-
     <el-table
       class="tableWrapper"
       v-loading="loading"
@@ -237,65 +239,47 @@
       :data="poolList"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column type="selection" width="40" align="center" />
+      <el-table-column type="index" width="30"></el-table-column>
       <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
-      <el-table-column
-        label="项目名称"
-        align="center"
-        prop="projectName"
-        width="300"
-      >
+      <el-table-column label="项目名称" 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="投资负责人"
+        label="公司名称"
         align="center"
-        prop="investHead"
-        width="100px"
+        prop="tProjectCompany.companyName"
       >
         <template slot-scope="scope">
-          <div :title="scope.row.investHead">
-            {{ scope.row.investHead }}
+          <div :title="scope.row.tProjectCompany.companyName">
+            {{ scope.row.tProjectCompany.companyName }}
           </div>
         </template>
       </el-table-column>
-      <!-- <el-table-column label="项目编号" align="center" prop="projectCode" /> -->
       <el-table-column
-        label="渠道"
+        label="注册地址"
         align="center"
-        width="150"
-        prop="tProjectChannel.channelName"
+        prop="tProjectCompany.registeredAddress"
       >
         <template slot-scope="scope">
-          <div :title="scope.row.tProjectChannel.channelName">
-            {{ scope.row.tProjectChannel.channelName }}
+          <div :title="scope.row.tProjectCompany.registeredAddress">
+            {{ scope.row.tProjectCompany.registeredAddress }}
           </div>
         </template>
       </el-table-column>
-      <el-table-column
-        label="所属组别"
-        align="center"
-        prop="tProjectChannel.channelGroup"
-      >
-        <template slot-scope="scope">
+      <el-table-column label="项目所属行业" align="center" prop="industry"
+        ><template slot-scope="scope">
           <dict-tag
-            :options="dict.type.project_group"
-            :value="scope.row.tProjectChannel.channelGroup"
+            :options="dict.type.CUSTOMER_TRADE"
+            :value="scope.row.industry"
           />
         </template>
       </el-table-column>
-
-      <el-table-column
-        label="项目阶段"
-        width="120"
-        align="center"
-        prop="projectStage"
-      >
+      <el-table-column label="项目阶段" align="center" prop="projectStage">
         <template slot-scope="scope">
           <dict-tag
             :options="dict.type.project_stage"
@@ -303,11 +287,10 @@
           />
         </template>
       </el-table-column>
-      <el-table-column
+      <!-- <el-table-column
         label="项目状态"
         align="center"
         prop="projectState"
-        width="150"
       >
         <template slot-scope="scope">
           <dict-tag
@@ -315,65 +298,62 @@
             :value="scope.row.projectState"
           />
         </template>
+      </el-table-column> -->
+      <el-table-column label="立项通过日期" align="center" prop="projectDate">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.projectDate, "{y}-{m}-{d}") }}</span>
+        </template>
       </el-table-column>
-      <!-- <el-table-column
-        label="初次接触日期"
-        align="center"
-        prop="contactDate"
-        width="100"
-      >
+      <el-table-column label="投决通过日期" align="center" prop="decisionDate">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.contactDate, "{y}-{m}-{d}") }}</span>
+          <span>{{ parseTime(scope.row.decisionDate, "{y}-{m}-{d}") }}</span>
         </template>
-      </el-table-column> -->
-      <el-table-column
-        label="立项通过日期"
-        align="center"
-        prop="projectDate"
-        width="100"
-      >
+      </el-table-column>
+
+      <el-table-column label="项目负责人" align="center" prop="investHead">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.projectDate, "{y}-{m}-{d}") }}</span>
+          <div :title="scope.row.investHead">
+            {{ scope.row.investHead }}
+          </div>
         </template>
       </el-table-column>
+      <!-- <el-table-column label="项目编号" align="center" prop="projectCode" /> -->
       <el-table-column
-        label="投决通过日期"
+        label="渠道"
         align="center"
-        prop="decisionDate"
-        width="100"
+        prop="tProjectChannel.channelName"
       >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.decisionDate, "{y}-{m}-{d}") }}</span>
+          <div :title="scope.row.tProjectChannel.channelName">
+            {{ scope.row.tProjectChannel.channelName }}
+          </div>
         </template>
       </el-table-column>
-      <el-table-column
-        label="项目所属行业"
-        width="120"
+      <!-- <el-table-column
+        label="所属组别"
         align="center"
-        prop="industry"
-        ><template slot-scope="scope">
+        prop="tProjectChannel.channelGroup"
+      >
+        <template slot-scope="scope">
           <dict-tag
-            :options="dict.type.CUSTOMER_TRADE"
-            :value="scope.row.industry"
+            :options="dict.type.project_group"
+            :value="scope.row.tProjectChannel.channelGroup"
           />
         </template>
-      </el-table-column>
+      </el-table-column> -->
 
-      <el-table-column
-        label="项目所属公司"
-        width="250"
+      <!-- <el-table-column
+        label="初次接触日期"
         align="center"
-        prop="tProjectCompany.companyName"
+        prop="contactDate"
       >
         <template slot-scope="scope">
-          <div :title="scope.row.tProjectCompany.companyName">
-            {{ scope.row.tProjectCompany.companyName }}
-          </div>
+          <span>{{ parseTime(scope.row.contactDate, "{y}-{m}-{d}") }}</span>
         </template>
-      </el-table-column>
-      <el-table-column
+      </el-table-column> -->
+
+      <!-- <el-table-column
         label="项目联系人"
-        width="120"
         align="center"
         prop="tProjectContacts.name"
       >
@@ -382,7 +362,7 @@
             {{ scope.row.tProjectContacts.name }}
           </div>
         </template>
-      </el-table-column>
+      </el-table-column> -->
 
       <!-- <el-table-column
         label="历次融资"
@@ -466,7 +446,7 @@
         label="状态"
         align="center"
         prop="investHead"
-        width="100px"
+        width="50px"
       >
         <template slot-scope="scope">
           <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
@@ -474,24 +454,23 @@
           </div>
         </template>
       </el-table-column>
+      <!-- fixed="right" -->
       <el-table-column
-        :width="stage == '0' || stage == '2' ? 300 : 400"
-        fixed="right"
         label="操作"
         align="center"
-        class-name="small-padding fixed-width"
+        :width="stage === '0' ? 100 : 400"
       >
+        <!-- class-name="small-padding fixed-width" -->
         <template slot-scope="scope">
           <!-- stage//0=全部 1=项目报备  2=评估考察 3=项目立项 4=尽职背调 5=项目投决 -->
-          <el-button
+          <!-- <el-button
             class="custom-orange-color"
             v-if="stage == '1'"
             size="mini"
             type="text"
             icon="el-icon-thumb"
             @click="handlefollowRecord(scope.row)"
-            >上传跟进记录</el-button
-          >
+            >上传跟进记录</el-button> -->
           <el-button
             class="custom-orange-color"
             v-if="stage == '3' && scope.row.delFlag !== '1'"
@@ -521,15 +500,16 @@
             >尽职背调</el-button
           >
           <el-button
+            v-if="scope.row.delFlag !== '1' && stage !== '0'"
             size="mini"
             type="text"
             icon="el-icon-setting"
-            v-if="scope.row.delFlag !== '1'"
             @click="handleBusinessUpdate(scope.row)"
             >设置项目阶段</el-button
           >
 
           <el-button
+            v-if="scope.row.delFlag !== '1'&& stage !== '0'"
             size="mini"
             type="text"
             icon="el-icon-edit"
@@ -548,6 +528,7 @@
           >
 
           <el-button
+            v-if="scope.row.delFlag !== '1' && stage !== '0'"
             class="custom-red-color"
             size="mini"
             type="text"
@@ -848,7 +829,7 @@ export default {
       // 非多个禁用
       multiple: true,
       // 显示搜索条件
-      showSearch: true,
+      showSearch: false,
       // 总条数
       total: 0,
       // 项目池表格数据
@@ -926,6 +907,10 @@ export default {
       },
       verifyProjectDate: false,
       verifyDecisionDate: false,
+      user:{
+        userId:"",
+        nickName:""
+      }
     };
   },
   watch: {
@@ -1175,4 +1160,23 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.tableWrapper {
+  font-size: 12px;
+  color: #000;
+  ::v-deep .el-table__header-wrapper th {
+    font-size: 12px;
+    font-weight: bolder;
+    color: #000;
+  }
+
+  ::v-deep td.el-table__cell:not(:last-child) div {
+    text-overflow: -o-ellipsis-lastline;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-line-clamp: 1;
+    line-clamp: 1;
+    -webkit-box-orient: vertical;
+  }
+}
 </style>

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

@@ -84,7 +84,7 @@
           </p>
         </div>
         <div class="public-flex-center-column">
-          <div>投资负责人</div>
+          <div>项目负责人</div>
           <p>{{ detailInfo.investHead }}</p>
         </div>
         <div class="public-flex-center-column">

+ 1 - 3
ruoyi-ui/src/views/invest/pool/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <!-- 项目池 -->
-    <projectList :type="type" :stage="stage"></projectList>
+    <projectList ref="projectList" type="1" stage="0"></projectList>
   </div>
 </template>
 
@@ -12,8 +12,6 @@ export default {
   components: { projectList },
   data() {
     return {
-      type: "1",
-      stage: "0",
     };
   },
   created() {},

+ 3 - 4
ruoyi-ui/src/views/invest/pool/index1.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <!-- 项目报备 -->
-    <projectList :type="type" :stage="stage"></projectList>
+    <projectList ref="projectList1" type="1" stage="1"></projectList>
   </div>
 </template>
 
@@ -12,11 +12,10 @@ export default {
   components: { projectList },
   data() {
     return {
-      type: "1",
-      stage:"1"
     };
   },
-  created() {},
+  created() {
+  },
   methods: {},
 };
 </script>

+ 3 - 4
ruoyi-ui/src/views/invest/pool/index2.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <!-- 评估考察 -->
-    <projectList :type="type" :stage="stage"></projectList>
+    <projectList ref="projectList2" type="1" stage="2"></projectList>
   </div>
 </template>
 
@@ -12,11 +12,10 @@ export default {
   components: { projectList },
   data() {
     return {
-      type: "1",
-      stage:"2",
     };
   },
-  created() {},
+  created() {
+  },
   methods: {},
 };
 </script>

+ 3 - 4
ruoyi-ui/src/views/invest/pool/index3.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <!-- 项目立项 -->
-    <projectList :type="type" :stage="stage"></projectList>
+    <projectList ref="projectList3" type="1" stage="3"></projectList>
   </div>
 </template>
 
@@ -12,11 +12,10 @@ export default {
   components: { projectList },
   data() {
     return {
-      type: "1",
-      stage:"3",
     };
   },
-  created() {},
+  created() {
+  },
   methods: {},
 };
 </script>

+ 1 - 3
ruoyi-ui/src/views/invest/pool/index4.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <!-- 尽职背调 -->
-    <projectList :type="type" :stage="stage"></projectList>
+    <projectList ref="projectList4" type="1" stage="4"></projectList>
   </div>
 </template>
 
@@ -12,8 +12,6 @@ export default {
   components: { projectList },
   data() {
     return {
-      type: "1",
-      stage:"4",
     };
   },
   created() {},

+ 1 - 3
ruoyi-ui/src/views/invest/pool/index5.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <!-- 项目投决 -->
-    <projectList :type="type" :stage="stage"></projectList>
+    <projectList ref="projectList5" type="1" stage="5"></projectList>
   </div>
 </template>
 
@@ -12,8 +12,6 @@ export default {
   components: { projectList },
   data() {
     return {
-      type: "1",
-      stage:"5",
     };
   },
   created() {},

+ 18 - 2
ruoyi-ui/src/views/study/gen/index.vue

@@ -56,7 +56,7 @@
           >新增</el-button
         >
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="success"
           plain
@@ -79,7 +79,7 @@
           v-hasPermi="['study:gen:remove']"
           >删除</el-button
         >
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -155,6 +155,7 @@
       >
         <template slot-scope="scope">
           <el-button
+            v-if="user.nickName === scope.row.createBy"
             size="mini"
             type="text"
             icon="el-icon-edit"
@@ -163,6 +164,16 @@
             >修改</el-button
           >
           <el-button
+            v-if="user.nickName !== scope.row.createBy"
+            class="custom-blue-color"
+            size="mini"
+            type="text"
+            icon="el-icon-search"
+            @click="handleUpdate(scope.row)"
+            >详情</el-button
+          >
+          <el-button
+            v-if="user.nickName === scope.row.createBy"
             class="custom-red-color"
             size="mini"
             type="text"
@@ -306,6 +317,11 @@ export default {
         ],
         listFile: [{ required: true, validator: validateLogo }],
       },
+      user: {
+        userId: "",
+        nickName: "",
+      },
+      popType: 2, //弹窗类型 1=修改 2=详情
     };
   },
   created() {