11482-【CR】【投资系统】增加审批流程-项目投决

ruoyi-ui/src/views/project/decision/applyList.vue

@@ -141,17 +141,6 @@
           </div>
         </template>
       </el-table-column>
-      <!-- <el-table-column
-        label="项目所属城市"
-        align="center"
-        prop="tProjectCompany.registeredAddress"
-      >
-        <template slot-scope="scope">
-          <div :title="scope.row.tProjectCompany.registeredAddress">
-            {{ scope.row.tProjectCompany.registeredAddress }}
-          </div>
-        </template>
-      </el-table-column> -->
       <el-table-column label="所属行业" align="center" prop="industry"
         ><template slot-scope="scope">
           <dict-tag
@@ -191,11 +180,11 @@
           <span>{{ parseTime(scope.row.projectDate, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="投决通过日期" align="center" prop="decisionDate">
+<!--      <el-table-column label="投决通过日期" align="center" prop="decisionDate">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.decisionDate, "{y}-{m}-{d}") }}</span>
         </template>
-      </el-table-column>
+      </el-table-column>-->
       <el-table-column
         label="已发起投决申请"
         align="center"
@@ -215,7 +204,6 @@
           </div>
         </template>
       </el-table-column>
-      <!-- <el-table-column label="项目编号" align="center" prop="projectCode" /> -->
       <el-table-column
         label="渠道"
         align="center"
@@ -232,49 +220,12 @@
           </div>
         </template>
       </el-table-column>
-      <!-- <el-table-column
-        label="所属组别"
-        align="center"
-        prop="tProjectChannel.channelGroup"
-      >
-        <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.project_group"
-            :value="scope.row.tProjectChannel.channelGroup"
-          />
-        </template>
-      </el-table-column> -->
-
-      <!-- <el-table-column
-        label="项目联系人"
-        align="center"
-        prop="tProjectContacts.name"
-      >
-        <template slot-scope="scope">
-          <div :title="scope.row.tProjectContacts.name">
-            {{ scope.row.tProjectContacts.name }}
-          </div>
-        </template>
-      </el-table-column> -->
-
-      <!--<el-table-column
-        label="创建人"
-        width="120"
-        align="center"
-        prop="createBy"
-      />
-      <el-table-column
-        label="创建时间"
-        align="center"
-        prop="createTime"
-        width="160"
-      /> -->
       <!-- delFlag -->
       <el-table-column
         label="状态"
         align="center"
         prop="investHead"
-        width="50px"
+        width="70px"
       >
         <template slot-scope="scope">
           <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
@@ -307,8 +258,6 @@
 import {
   listDecisionList,
   delPool,
-  editStage,
-  addDecision,
 } from "@/api/invest/pool";
 import { listChannel } from "@/api/invest/channel";
 import meetingList from "../meetingList.vue";
@@ -379,9 +328,10 @@ export default {
   computed: {
     ...mapGetters(["user"]),
   },
-  created() {},
-  mounted() {
+  created() {
     this.getList();
+  },
+  mounted() {
     // 渠道
     listChannel({
       pageNum: 1,

ruoyi-ui/src/views/project/decision/audit.vue

@@ -10,44 +10,6 @@
         </h4>
         <p class="projectNameTit">{{ detailInfo.projectName }}</p>
       </div>
-      <!-- <div class="btnList">
-        <el-button
-          type="primary"
-          icon="el-icon-upload2"
-          @click="handleTab('7', 'fileList')"
-          >上传文件资料</el-button
-        >
-        <el-button
-          type="primary"
-          icon="el-icon-upload2"
-          @click="handleTab('8', 'contractList')"
-          >上传合同</el-button
-        >
-        <el-button
-          v-if="
-            user.nickName === detailInfo.investHead &&
-            detailInfo.delFlag !== '1' &&
-            showDueApply &&
-            active == 3
-          "
-          type="primary"
-          icon="el-icon-tickets"
-          @click="handleTab('4', 'dueDiligenceList')"
-          >发起尽调申请</el-button
-        >
-        <el-button
-          type="primary"
-          icon="el-icon-plus"
-          @click="handleTab('2', 'followList')"
-          >新增跟进记录</el-button
-        >
-        <el-button
-          type="primary"
-          icon="el-icon-plus"
-          @click="handleTab('6', 'meetingList')"
-          >新增会议</el-button
-        >
-      </div> -->
     </section>
     <el-divider></el-divider>
     <section>
@@ -106,13 +68,13 @@
     </section>
     <section class="section3">
       <el-tabs v-model="activeName" @tab-click="handleClick">
-        <el-tab-pane label="投决申请信息" name="0"></el-tab-pane>
+        <el-tab-pane label="投决信息" name="0"></el-tab-pane>
         <el-tab-pane label="项目基本信息" name="1"></el-tab-pane>
       </el-tabs>
       <section>
         <div v-if="activeName === '0'" class="public-padded-20 detail-meeting">
-          <el-tabs type="border-card">
-            <el-tab-pane label="项目投决申请表">
+          <el-tabs type="border-card" v-model="activeTab">
+            <el-tab-pane label="项目投决申请表" name="apply">
               <el-form
                 v-if="formTJApply.id"
                 class="special-el-form public-padded-t-20"
@@ -143,18 +105,6 @@
                     :id="formTJApply.id"
                   ></fileItem>
                 </el-form-item>
-<!--                <el-form-item
-                  label="通知名单"
-                  prop="participants"
-                  class="special-el-form-item"
-                >
-                  <el-input
-                    rows="4"
-                    type="textarea"
-                    v-model="formTJApply.participants"
-                    disabled
-                  />
-                </el-form-item>-->
               </el-form>
               <div
                 v-else
@@ -164,7 +114,7 @@
                 暂无数据
               </div>
             </el-tab-pane>
-            <el-tab-pane :label="formType === 3 ? '项目投决会评估评审表':'项目投决评估评审汇总表' "  v-if="formTJApply.taskDefKey!='deptLeader'&&formTJApply.taskDefKey!='meeting'">
+            <el-tab-pane :label="formType === 3 ? '项目投决会评估评审表':'项目投决评估评审汇总表' "  v-if="formTJApply.taskDefKey!='deptLeader'&&formTJApply.taskDefKey!='meeting'" name="review">
               <el-form
                 class="table-form ss_scoreTable"
                 ref="scoreForm"
@@ -1183,155 +1133,164 @@
                   {{ formTJApply.participants ? formTJApply.participants : "请选择" }}
                 </div>
               </el-form-item>
-              <el-form-item label="附件" prop="file" class="special-el-form-item">
+              <el-form-item
+                label="附件"
+                prop="listFile"
+                class="special-el-form-item"
+              >
                 <fileItem
-                  ref="fileItems"
-                  :id="meetingForm.id"
-                  @getFileList="getFileList"
+                  ref="fileItemTJApply"
+                  :id="formTJApply.id"
+                  @getFileList="getFileListTJApply"
                 ></fileItem>
               </el-form-item>
               <!-- 关键代码：el-form-item 包裹单选组 -->
-              <el-form-item label="是否需要投决会议">
-                <el-radio-group v-model="formTJApply.needMeeting">
-                  <el-radio label="0">否</el-radio>
-                  <el-radio label="1">是</el-radio>
-                </el-radio-group>
+              <el-form-item label="是否需要立项会议">
+                <label>
+                  <input type="radio" name="needMeeting" value="0" v-model="formTJApply.needMeeting">
+                  否
+                </label>
+                <label>
+                  <input type="radio" name="needMeeting" value="1" v-model="formTJApply.needMeeting">
+                  是
+                </label>
               </el-form-item>
             </el-form>
-          </section>
-          <el-form
-            class="special-el-form"
-            ref="meetingForm"
-            :model="meetingForm"
-            :rules="meetingRules"
-            label-width="120px"
-            v-if="formTJApply.needMeeting === '1'"
-          >
-            <el-form-item
-              label="项目名称"
-              prop="projectName"
-              class="special-el-form-item public-input-height-2"
-              :rules="[
+            <el-form
+              class="special-el-form"
+              ref="meetingForm"
+              :model="meetingForm"
+              :rules="meetingRules"
+              label-width="120px"
+              v-if="formTJApply.needMeeting === '1'"
+            >
+              <el-form-item
+                label="项目名称"
+                prop="projectName"
+                class="special-el-form-item public-input-height-2"
+                :rules="[
             { required: verifyProjectName, trigger: 'blur', message: '请选择' },
           ]"
-            >
-              <div
-                class="el-input__inner inputSimulation yichu1"
-                @click="handleProjectItem"
-                :class="{ show_disabled: pageType === '1' }"
-                :title="meetingForm.projectName"
               >
-                {{ meetingForm.projectName ? meetingForm.projectName : "请选择 " }}
-              </div>
-              <projectItem
-                ref="projectItem"
-                @getProjectInfo="getProjectInfo"
-              ></projectItem>
-            </el-form-item>
-            <el-form-item
-              label="项目阶段"
-              prop="projectStage"
-              class="special-el-form-item"
-            >
-              <el-select v-model="meetingForm.projectStage" disabled placeholder="">
-                <el-option
-                  v-for="dict in dict.type.project_stage"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
+                <div
+                  class="el-input__inner inputSimulation yichu1"
+                  @click="handleProjectItem"
+                  :class="{ show_disabled: pageType === '1' }"
+                  :title="meetingForm.projectName"
+                >
+                  {{ meetingForm.projectName ? meetingForm.projectName : "请选择 " }}
+                </div>
+                <projectItem
+                  ref="projectItem"
+                  @getProjectInfo="getProjectInfo"
+                ></projectItem>
+              </el-form-item>
+              <el-form-item
+                label="项目阶段"
+                prop="projectStage"
+                class="special-el-form-item"
+              >
+                <el-select v-model="meetingForm.projectStage" disabled placeholder="">
+                  <el-option
+                    v-for="dict in dict.type.project_stage"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="会议主题" prop="meetingTheme">
+                <el-input
+                  maxlength="100"
+                  v-model="meetingForm.meetingTheme"
+                  placeholder="请输入会议主题"
                 />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="会议主题" prop="meetingTheme">
-              <el-input
-                maxlength="100"
-                v-model="meetingForm.meetingTheme"
-                placeholder="请输入会议主题"
-              />
-            </el-form-item>
+              </el-form-item>
 
-            <!-- <el-form-item label="会议编号" prop="meetingCode">
-              <el-input v-model="form.meetingCode" placeholder="请输入会议编号" />
-            </el-form-item> -->
-            <el-form-item label="会议类别" prop="meetingType">
-              <el-select
-                v-model="meetingForm.meetingType"
-                placeholder="请选择会议类别"
-                :disabled="
+              <!-- <el-form-item label="会议编号" prop="meetingCode">
+                <el-input v-model="form.meetingCode" placeholder="请输入会议编号" />
+              </el-form-item> -->
+              <el-form-item label="会议类别" prop="meetingType">
+                <el-select
+                  v-model="meetingForm.meetingType"
+                  placeholder="请选择会议类别"
+                  :disabled="
               meetingTypeDisabled || (pageType === '1' && meetingType != null)
             "
-              >
-                <el-option
-                  v-for="dict in meetingTypeList"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
+                >
+                  <el-option
+                    v-for="dict in meetingTypeList"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
 
-            <el-form-item label="会议开始时间" prop="startTime">
-              <el-date-picker
-                v-model="meetingForm.startTime"
-                type="datetime"
-                placeholder="请选择会议开始时间"
-                format="yyyy-MM-dd HH:mm"
-                value-format="yyyy-MM-dd HH:mm"
-              >
-              </el-date-picker>
-            </el-form-item>
-            <el-form-item label="会议结束时间" prop="endTime">
-              <el-date-picker
-                v-model="meetingForm.endTime"
-                format="yyyy-MM-dd HH:mm"
-                value-format="yyyy-MM-dd HH:mm"
-                type="datetime"
-                placeholder="请选择会议结束时间"
+              <el-form-item label="会议开始时间" prop="startTime">
+                <el-date-picker
+                  v-model="meetingForm.startTime"
+                  type="datetime"
+                  placeholder="请选择会议开始时间"
+                  format="yyyy-MM-dd HH:mm"
+                  value-format="yyyy-MM-dd HH:mm"
+                >
+                </el-date-picker>
+              </el-form-item>
+              <el-form-item label="会议结束时间" prop="endTime">
+                <el-date-picker
+                  v-model="meetingForm.endTime"
+                  format="yyyy-MM-dd HH:mm"
+                  value-format="yyyy-MM-dd HH:mm"
+                  type="datetime"
+                  placeholder="请选择会议结束时间"
+                >
+                </el-date-picker>
+              </el-form-item>
+              <el-form-item label="会议地点" prop="place">
+                <el-input
+                  maxlength="100"
+                  v-model="meetingForm.place"
+                  placeholder="请输入会议地点"
+                />
+              </el-form-item>
+              <el-form-item
+                label="会议发起人"
+                prop="promoter"
+                class="public-input-height"
               >
-              </el-date-picker>
-            </el-form-item>
-            <el-form-item label="会议地点" prop="place">
-              <el-input
-                maxlength="100"
-                v-model="meetingForm.place"
-                placeholder="请输入会议地点"
-              />
-            </el-form-item>
-            <el-form-item
-              label="会议发起人"
-              prop="promoter"
-              class="public-input-height"
-            >
-              <div class="el-input__inner" @click="openSelectDept(1)">
-                {{ meetingForm.promoter ? meetingForm.promoter : "请选择会议发起人" }}
-              </div>
-              <selecDept
-                ref="selecDepts"
-                @getDeptUserInfo="getDeptUserInfo"
-                :deptId="deptId"
-              ></selecDept>
-            </el-form-item>
-            <el-form-item
-              label="会议参与人"
-              prop="participants"
-              class="special-el-form-item public-input-height-2"
-            >
-              <div
-                class="el-input__inner inputSimulation yichu1"
-                @click="handleSelectPeople(2)"
-                :title="meetingForm.participants"
+                <div class="el-input__inner" @click="openSelectDept(1)">
+                  {{ meetingForm.promoter ? meetingForm.promoter : "请选择会议发起人" }}
+                </div>
+                <selecDept
+                  ref="selecDepts"
+                  @getDeptUserInfo="getDeptUserInfo"
+                  :deptId="deptId"
+                ></selecDept>
+              </el-form-item>
+              <el-form-item
+                label="会议参与人"
+                prop="participants"
+                class="special-el-form-item public-input-height-2"
               >
-                {{ meetingForm.participants ? meetingForm.participants : "请选择会议参与人" }}
-              </div>
-            </el-form-item>
-            <el-form-item label="附件" prop="file" class="special-el-form-item">
-              <fileItem
-                ref="fileItems"
-                :id="meetingForm.id"
-                @getFileList="getFileList"
-              ></fileItem>
-            </el-form-item>
-          </el-form>
+                <div
+                  class="el-input__inner inputSimulation yichu1"
+                  @click="handleSelectPeople(2)"
+                  :title="meetingForm.participants"
+                >
+                  {{ meetingForm.participants ? meetingForm.participants : "请选择会议参与人" }}
+                </div>
+              </el-form-item>
+              <el-form-item label="附件" prop="file" class="special-el-form-item">
+                <fileItem
+                  ref="fileItems"
+                  :id="meetingForm.id"
+                  @getFileList="getFileList"
+                ></fileItem>
+              </el-form-item>
+            </el-form>
+          </section>
+
         </div>
         <div v-show="activeName === '1'">
           <poolForm :type="type" :id="id"></poolForm>
@@ -1362,7 +1321,7 @@
           <!--          <div class="btn-group">-->
           <el-button @click="goBack">返 回</el-button>
           <el-button type="success" @click="handleComplete(true)">同意</el-button>
-          <el-button type="warning" @click="handleComplete(false)">驳回</el-button>
+          <el-button v-if="formTJApply.taskDefKey!='decision'" type="warning" @click="handleComplete(false)">驳回</el-button>
           <!--          </div>-->
         </el-form-item>
       </el-form>
@@ -1379,7 +1338,6 @@
 </template>
 <script>
 import poolForm from "../../invest/components/poolForm";
-import tableForm from "../../invest/components/tableForm";
 import fileItem from "../../invest/components/fileItem";
 import flowBase from "../flowBase.vue";
 
@@ -1419,7 +1377,6 @@ export default {
     projectItem, selecDept,
     flowBase,
     poolForm,
-    tableForm,
     fileItem,
   },
   data() {
@@ -1432,6 +1389,7 @@ export default {
         projectName: "",
       },
       activeName: "0",
+      activeTab: 'apply', // 默认激活“项目立项申请表”
       formType:3,
       formTJApply: {
         id: null,
@@ -1662,10 +1620,6 @@ export default {
     }
     //发起会议节点
     this.openMeetingPage(this.id,'TJ');
-    //会议投决节点
-    this.getMeeting();
-    //总裁室之后节点
-    this.getSelectMeetingId();
   },
   methods: {
 
@@ -1714,10 +1668,16 @@ export default {
       getDecisionInfo(this.$route.query.pInstId).then((response) => {
         if (response && response.data) {
           that.formTJApply = response.data;
-          console.log(response.data.procInstId);
+          // 接口返回值存在（非 undefined/null）则用接口值，否则用 '0'
+          that.formTJApply.needMeeting = response.data.needMeeting || '0';
           if(response.data.taskDefKey==='decision'){
+            //会议投决节点
+            this.getMeeting();
             this.formType=3;
-          }else{
+          }else if(response.data.taskDefKey==='president'||response.data.taskDefKey === "file"){
+            //总裁室之后节点
+            this.getMeeting();
+            this.getSelectMeetingId();
             this.formType=4;
           }
           setTimeout(() => {
@@ -1787,11 +1747,11 @@ export default {
         this.collectForm.investCommissioner =
           response.data.tProjectPool.investHead;
         this.scoreForm.meetingId = response.data.id;
-        setTimeout(() => {
+        /*setTimeout(() => {
           this.$refs.fileItems.fileList = [];
           this.$refs.fileItems.getListFileBusinessId(id);
           this.$refs.fileItems.handleButton();
-        }, 300);
+        }, 300);*/
       });
     },
     //总裁室
@@ -1809,7 +1769,7 @@ export default {
     // 获取公司信息
     getProjectInfo(info) {
       if (info.length > 0) {
-        console.log("info=", info);
+        //console.log("info=", info);
         this.form.projectPoolId = info[0].id;
         this.form.projectName = info[0].projectName;
         this.form.projectStage = info[0].projectStage;
@@ -1830,14 +1790,6 @@ export default {
       }
     },
 
-    // 会议申请附件回显
-    getFileList(fileList) {
-      if (fileList && fileList.length > 0) {
-        this.fileList = fileList;
-      } else {
-        this.fileList = [];
-      }
-    },
     //显示用户信息
     handleSelectPeople(number) {
       // this.userVisible = true;
@@ -1873,8 +1825,8 @@ export default {
           this.selectNameValues = selection.nickName;
           this.selectValues = selection.userId;
         }
-        this.$refs.meetingForm.clearValidate(["participants"]);
-        this.$refs.formTJApply.clearValidate(["participants"]);
+        //this.$refs.meetingForm.clearValidate(["participants"]);
+        //this.$refs.formTJApply.clearValidate(["participants"]);
       }
     },
     /** 加载审批任务弹框 */
@@ -1883,6 +1835,33 @@ export default {
     },
     /** 用户审批任务 */
     taskComplete(flag) {
+      let allValid = true;
+      if(this.formTJApply.taskDefKey==="meeting") {//发起会议节点
+        this.formTJApply.listFile = this.fileListTJApply;
+        this.meetingForm.listFile = this.fileList;
+        if (!this.formTJApply.participants) {
+          this.$modal.msgError("请选择立项审批人!");
+          return;
+        }
+        if (this.formTJApply.needMeeting==='1') {
+          this.$refs["meetingForm"].validate((valid) => {
+            if (!valid) {
+              allValid = false;
+              return;
+            }
+          })
+        }
+      }else if(this.formTJApply.taskDefKey==="decision"){//会议投决
+        this.$refs["scoreForm"].validate((valid) => {
+          if (!valid) {
+            allValid = false;
+            // 4. 评审表校验失败：切换标签 + 提示
+            this.activeTab = 'review'; // 切换到评审表标签
+            this.$message.error('项目投决评估评审表未填写完整，请检查！');
+            return;
+          }
+        })
+      }
       if (!flag&&!this.flowBaseInfo.comment) {
         this.$modal.msgError("请输入审批意见!");
         return;
@@ -1895,10 +1874,18 @@ export default {
         projectScoring: this.scoreForm,
         flowBaseInfo: this.flowBaseInfo
       }
-      decisionComplete(params).then(response => {
-        this.$modal.msgSuccess(response.msg);
-        this.goMyTask();
-      });
+      if(allValid) {
+        try{
+            decisionComplete(params).then(response => {
+              this.$modal.msgSuccess(response.msg);
+              this.$store.dispatch("getMyTaskDecisionNumber"); //更新代办数量
+              this.goMyTask();
+            });
+        } catch (err) {
+          // 捕获重复提交错误
+          this.$message.error(err.message);
+        }
+      }
     },
     /*返回*/
     goBack() {
@@ -1911,6 +1898,23 @@ export default {
       const obj = { path: "/myTask/project/decision/myTask", query: { t: Date.now()} };
       this.$tab.closeOpenPage(obj);
     },
+    // 投决申请附件回显
+    getFileListTJApply(fileList) {
+      this.fileListTJApply = fileList;
+      if (fileList && fileList.length > 0) {
+        this.$refs.formTJApply.clearValidate(["listFile"]);
+      } else {
+        this.fileListTJApply = [];
+      }
+    },
+    // 会议申请附件回显
+    getFileList(fileList) {
+      if (fileList && fileList.length > 0) {
+        this.fileList = fileList;
+      } else {
+        this.fileList = [];
+      }
+    },
   },
 };
 </script>

ruoyi-ui/src/views/project/decision/detail.vue

@@ -69,7 +69,7 @@
     </section>
     <section class="section3">
       <el-tabs v-model="activeName" @tab-click="handleClick">
-        <el-tab-pane label="投决申请信息" name="0"></el-tab-pane>
+        <el-tab-pane label="投决信息" name="0"></el-tab-pane>
         <el-tab-pane label="项目基本信息" name="1"></el-tab-pane>
       </el-tabs>
       <section>
@@ -127,13 +127,494 @@
                 暂无数据
               </div>
             </el-tab-pane>
-            <el-tab-pane label="项目投决评估评审汇总表">
-              <tableForm
-                :formType="4"
-                ref="voteTableForm"
-                :readonly="true"
-                :showBack="false"
-              ></tableForm>
+            <el-tab-pane label="项目投决评估评审汇总表" v-if="formTJApply.participantsId!=null&&formTJApply.taskDefKey!='modifyApply'&&formTJApply.taskDefKey!='deptLeader'&&formTJApply.taskDefKey!='meeting'&&formTJApply.taskDefKey!='decision'">
+              <el-form
+                class="table-form ss_scoreTable"
+                ref="scoreForm"
+                :model="scoreForm"
+                label-width="0px"
+              >
+                <table
+                  border="1"
+                  cellpadding="0"
+                  cellspacing="0"
+                  class="allScoring"
+                >
+                  <thead>
+                  <tr>
+                    <th colspan="10" class="bg-blue">项目投决会评估评审汇总表</th>
+                  </tr>
+                  <tr class="specificTr">
+                    <th>项目名称</th>
+                    <th>
+                <textarea
+                  class="table-textarea"
+                  v-model="scoreForm.projectName"
+                  name=""
+                  disabled
+                ></textarea>
+                    </th>
+                    <th>项目所属公司</th>
+                    <th colspan="3">
+                <textarea
+                  class="table-textarea"
+                  v-model="form1.tProjectPool.company"
+                  name=""
+                  disabled
+                ></textarea>
+                    </th>
+                    <th>项目负责人</th>
+                    <th>
+                <textarea
+                  class="table-textarea"
+                  v-model="collectForm.investCommissioner"
+                  name=""
+                  disabled
+                ></textarea>
+                    </th>
+                    <th>总人数</th>
+                    <th>
+                <textarea
+                  v-model="collectForm.totalPerson"
+                  class="table-textarea"
+                  name=""
+                  disabled
+                ></textarea>
+                    </th>
+                  </tr>
+                  <tr class="bg-blue">
+                    <th>序号</th>
+                    <th>评审类别</th>
+                    <th>评审事项</th>
+                    <th colspan="3">评审指标</th>
+                    <th>标准分值（满分50）</th>
+                    <th colspan="2">汇总分数</th>
+                    <th>平均分数</th>
+                  </tr>
+                  </thead>
+
+                  <tbody class="text-center">
+                  <tr>
+                    <td rowspan="2">1</td>
+                    <td rowspan="2">模式先进</td>
+                    <td>产业优势</td>
+                    <td colspan="3" class="text-left">
+                      满足以下条件之一：市场热点、新经济、强势传统产业
+                    </td>
+                    <td>
+                      阶段性：0-1<br />
+                      持久：2-3<br />
+                      持久重大：4-5
+                    </td>
+                    <td colspan="2">
+                      <input
+                        autocomplete="off"
+                        v-model="collectForm.industryAdvantageSum"
+                        name="industryAdvantageSum"
+                        type="text"
+                        class="table-input"
+                        disabled
+                      />
+                    </td>
+                    <td>
+                      <input
+                        autocomplete="off"
+                        type="text"
+                        v-model="collectForm.industryAdvantageAvg"
+                        name="industryAdvantageAvg"
+                        class="table-input"
+                        disabled
+                      />
+                    </td>
+                  </tr>
+                  <tr>
+                    <td>商业模式</td>
+                    <td colspan="3" class="text-left">
+                      满足以下条件之一：技术/行业/渠道优势明显、模式创新度高、降本增效显著
+                    </td>
+                    <td>
+                      先进：0-3<br />
+                      非常先进：4-5<br />
+                      超级先进：6-7<br />
+                      颠覆性的：8-9
+                    </td>
+                    <td colspan="2">
+                      <input
+                        autocomplete="off"
+                        type="text"
+                        v-model="collectForm.businessModelSum"
+                        name="businessModelSum"
+                        class="table-input"
+                        disabled
+                      />
+                    </td>
+                    <td>
+                      <input
+                        autocomplete="off"
+                        type="text"
+                        v-model="collectForm.businessModelAvg"
+                        name="businessModelAvg"
+                        class="table-input"
+                        disabled
+                      />
+                    </td>
+                  </tr>
+                  <tr>
+                    <td rowspan="4">2</td>
+                    <td rowspan="4">团队优秀</td>
+                    <td rowspan="4">核心团队优秀</td>
+                    <td colspan="3">
+                      创业团队专业，产业背景出身，至少十年以上行业经验
+                    </td>
+                    <td>
+                      10年以上产业经验：0-2<br />
+                      15年以上产业经验：3-4
+                    </td>
+                    <td colspan="2">
+                      <input
+                        autocomplete="off"
+                        type="text"
+                        v-model="collectForm.teamExperienceSum"
+                        name="teamExperienceSum"
+                        class="table-input"
+                        disabled
+                      />
+                    </td>
+                    <td>
+                      <input
+                        autocomplete="off"
+                        type="text"
+                        v-model="collectForm.teamExperienceAvg"
+                        name="teamExperienceAvg"
+                        class="table-input"
+                        disabled
+                      />
+                    </td>
+                  </tr>
+                  <tr>
+                    <td colspan="3">
+                      创始团队背景为行业内专家/教授/名校哈佛大学博士/行业内龙头企业技术团队等
+                    </td>
+                    <td>
+                      硕士博士团队：0-2<br />
+                      行业内知名专家、世界名校博士、行业内龙头企业技术团队：3-4
+                    </td>
+                    <td colspan="2">
+                      <input
+                        autocomplete="off"
+                        type="text"
+                        v-model="collectForm.teamBackgroundSum"
+                        name="teamBackgroundSum"
+                        class="table-input"
+                        disabled
+                      />
+                    </td>
+                    <td>
+                      <input
+                        autocomplete="off"
+                        type="text"
+                        v-model="collectForm.teamBackgroundAvg"
+                        name="teamBackgroundAvg"
+                        class="table-input"
+                        disabled
+                      />
+                    </td>
+                  </tr>
+                  <tr>
+                    <td colspan="3">
+                      拥有3位以上德才兼备、同心同德的核心团队成员，能够支撑企业快速扩张
+                    </td>
+                    <td>
+                      强：0-2 <br />
+                      很强：3-4
+                    </td>
+                    <td colspan="2">
+                      <input
+                        autocomplete="off"
+                        type="text"
+                        v-model="collectForm.teamHeartSum"
+                        name="teamHeartSum"
+                        class="table-input"
+                        disabled
+                      />
+                    </td>
+                    <td>
+                      <input
+                        autocomplete="off"
+                        type="text"
+                        v-model="collectForm.teamHeartAvg"
+                        name="teamHeartAvg"
+                        class="table-input"
+                        disabled
+                      />
+                    </td>
+                  </tr>
+                  <tr>
+                    <td colspan="3">
+                      团队领袖诚信、学习能力意愿强，具有很强的职业精神、职业道德、职业技能
+                    </td>
+                    <td>
+                      合格：0-2<br />
+                      优秀：3-5 <br />
+                      卓越：6-8
+                    </td>
+                    <td colspan="2">
+                      <input
+                        autocomplete="off"
+                        type="text"
+                        v-model="collectForm.teamFaithSum"
+                        name="teamFaithSum"
+                        class="table-input"
+                        disabled
+                      />
+                    </td>
+                    <td>
+                      <input
+                        autocomplete="off"
+                        type="text"
+                        v-model="collectForm.teamFaithAvg"
+                        name="teamFaithAvg"
+                        class="table-input"
+                        disabled
+                      />
+                    </td>
+                  </tr>
+                  <tr>
+                    <td rowspan="5">3</td>
+                    <td rowspan="5">企业价值</td>
+                    <td rowspan="2">初步产品原型</td>
+                    <td colspan="3">
+                      具备一定的技术基础和原型，能够证明产品的可行性和创新性，能够为用户真正带来价值。
+                    </td>
+                    <td>2</td>
+                    <td colspan="2">
+                      <input
+                        autocomplete="off"
+                        type="text"
+                        v-model="collectForm.productBaseSum"
+                        name="productBaseSum"
+                        class="table-input"
+                        disabled
+                      />
+                    </td>
+                    <td>
+                      <input
+                        autocomplete="off"
+                        type="text"
+                        v-model="collectForm.productBaseAvg"
+                        name="productBaseAvg"
+                        class="table-input"
+                        disabled
+                      />
+                    </td>
+                  </tr>
+                  <tr>
+                    <td colspan="3">具有明确的盈利模式</td>
+                    <td>2</td>
+                    <td colspan="2">
+                      <input
+                        autocomplete="off"
+                        type="text"
+                        v-model="collectForm.productProfitSum"
+                        name="productProfitSum"
+                        class="table-input"
+                        disabled
+                      />
+                    </td>
+                    <td>
+                      <input
+                        autocomplete="off"
+                        type="text"
+                        v-model="collectForm.productProfitAvg"
+                        name="productProfitAvg"
+                        class="table-input"
+                        disabled
+                      />
+                    </td>
+                  </tr>
+                  <tr>
+                    <td rowspan="2">机构认可</td>
+                    <td colspan="3">
+                      清科、投中年度排行前一百位的投资机构或上市公司、中国500强知名企业或知名投资人投资。
+                    </td>
+                    <td>1</td>
+                    <td colspan="2">
+                      <input
+                        autocomplete="off"
+                        type="text"
+                        v-model="collectForm.organInvestSum"
+                        name="organInvestSum"
+                        class="table-input"
+                        disabled
+                      />
+                    </td>
+                    <td>
+                      <input
+                        autocomplete="off"
+                        type="text"
+                        v-model="collectForm.organInvestAvg"
+                        name="organInvestAvg"
+                        class="table-input"
+                        disabled
+                      />
+                    </td>
+                  </tr>
+                  <tr>
+                    <td colspan="3">
+                      公司近期12个月内估值XX万元以上，且与项目公司无关联关系的专业化投资机构（人）的投资超过500万元。
+                    </td>
+                    <td>1</td>
+                    <td colspan="2">
+                      <input
+                        autocomplete="off"
+                        v-model="collectForm.organValuationSum"
+                        name="organValuationSum"
+                        type="text"
+                        class="table-input"
+                        disabled
+                      />
+                    </td>
+                    <td>
+                      <input
+                        autocomplete="off"
+                        v-model="collectForm.organValuationAvg"
+                        name="organValuationAvg"
+                        type="text"
+                        class="table-input"
+                        disabled
+                      />
+                    </td>
+                  </tr>
+                  <tr>
+                    <td>估值</td>
+                    <td colspan="3">估值水平、预期收益合理</td>
+                    <td>1</td>
+                    <td colspan="2">
+                      <input
+                        type="text"
+                        v-model="collectForm.valuationSum"
+                        name="valuationSum"
+                        class="table-input"
+                        disabled
+                      />
+                    </td>
+                    <td>
+                      <input
+                        autocomplete="off"
+                        type="text"
+                        v-model="collectForm.valuationAvg"
+                        name="valuationAvg"
+                        class="table-input"
+                        disabled
+                      />
+                    </td>
+                  </tr>
+                  <tr>
+                    <td rowspan="2">4</td>
+                    <td rowspan="2">市场广阔</td>
+                    <td>市场空间大</td>
+                    <td colspan="3">
+                      行业具有高成长性，细分市场年销售规模已经达到或五年内达到50亿元。
+                    </td>
+                    <td>
+                      50-100亿：0.5<br />
+                      100-200亿：1<br />
+                      200亿以上：2
+                    </td>
+                    <td colspan="2">
+                      <input
+                        autocomplete="off"
+                        type="text"
+                        v-model="collectForm.marketSpaceSum"
+                        name="marketSpaceSum"
+                        class="table-input"
+                        disabled
+                      />
+                    </td>
+                    <td>
+                      <input
+                        autocomplete="off"
+                        type="text"
+                        v-model="collectForm.marketSpaceAvg"
+                        name="marketSpaceAvg"
+                        class="table-input"
+                        disabled
+                      />
+                    </td>
+                  </tr>
+                  <tr>
+                    <td>成长空间大</td>
+                    <td colspan="3">预计年增长率在30%以上</td>
+                    <td>
+                      收入年增长率30%以上：1<br />
+                      收入年增长率50%以上：2<br />
+                      收入年增长率70%以上：3
+                    </td>
+                    <td colspan="2">
+                      <input
+                        autocomplete="off"
+                        type="text"
+                        v-model="collectForm.developSpaceSum"
+                        name="developSpaceSum"
+                        class="table-input"
+                        disabled
+                      />
+                    </td>
+                    <td>
+                      <input
+                        autocomplete="off"
+                        type="text"
+                        v-model="collectForm.developSpaceAvg"
+                        name="developSpaceAvg"
+                        class="table-input"
+                        disabled
+                      />
+                    </td>
+                  </tr>
+                  <tr>
+                    <td>5</td>
+                    <td>股权收益</td>
+                    <td>退出方式</td>
+                    <td colspan="3">通过并购、股权转让、股权回购等方式退出</td>
+                    <td>
+                      退出收益5%-15%：1<br />
+                      退出收益15%-50%：2<br />
+                      退出收益50%-100%：3<br />
+                      退出收益1倍以上：4
+                    </td>
+                    <td colspan="2">
+                      <input
+                        autocomplete="off"
+                        type="text"
+                        v-model="collectForm.quitWaySum"
+                        name="quitWaySum"
+                        class="table-input"
+                        disabled
+                      />
+                    </td>
+                    <td>
+                      <input
+                        autocomplete="off"
+                        type="text"
+                        v-model="collectForm.quitWayAvg"
+                        name="quitWayAvg"
+                        class="table-input"
+                        disabled
+                      />
+                    </td>
+                  </tr>
+                  <tr>
+                    <td colspan="10" class="text-left big-font">
+                      评分说明：<br />
+                      1.
+                      固定指标分值部分，评分人需根据项目实际情况，评分范围仅有0分和满分，满分为各评审指标对应的标准分值。<br />
+                      2.
+                      浮动指标分值部分，最高分值为各评审指标对应的最高区间分值，最低分值为0分，分值保留小数点后一位数字。
+                    </td>
+                  </tr>
+                  </tbody>
+                </table>
+              </el-form>
             </el-tab-pane>
           </el-tabs>
         </div>
@@ -143,26 +624,26 @@
       </section>
     </section>
     <section>
-      <flowBase :procInstId="formTJApply.procInstId" v-if="formTJApply.procInstId"></flowBase>
+      <flowBase :procInstId="pInstId" v-if="pInstId"></flowBase>
     </section>
   </div>
 </template>
 <script>
 import poolForm from "../../invest/components/poolForm";
-import tableForm from "../../invest/components/tableForm";
 import fileItem from "../../invest/components/fileItem";
 import flowBase from "../flowBase.vue";
 
 import {
   getPool,
-  listProjectPoolId,
-  getInvestigatelist,
-  getInvestReviewList,
 } from "@/api/invest/pool";
 import {
   listMeeting,
-  listProjectPoolIdNewDecision,
 } from "@/api/invest/meeting";
+import{
+  getDecisionInfo,
+  getMeetingInfo,
+  getSumScore
+} from "@/api/project/decision/pool"
 
 import { mapGetters } from "vuex";
 
@@ -170,7 +651,6 @@ export default {
   name: "decisionDetail",
   components: {
     poolForm,
-    tableForm,
     fileItem,
     flowBase
   },
@@ -184,6 +664,7 @@ export default {
         projectName: "",
       },
       activeName: "0",
+      pInstId: null,
       formTJApply: {
         id: null,
         procInstId:null,
@@ -194,6 +675,109 @@ export default {
         participants: null,
         participantsId: null,
       },
+      // 打分表单参数
+      scoreForm: {
+        businessModel: null,
+        businessModelNote: null,
+        createBy: null,
+        createTime: null,
+        delFlag: null,
+        developSpace: null,
+        developSpaceNote: null,
+        examine: null,
+        id: null,
+        illustrate: null, //说明
+        industryAdvantage: null,
+        industryAdvantageNote: null,
+        investCommissioner: null, //项目负责人
+        marketSpace: null, //市场空间
+        marketSpaceNote: null,
+        meetingId: null, //
+        organInvest: null,
+        organInvestNote: null,
+        organValuation: null,
+        organValuationNote: null,
+        params: {},
+        productBase: null,
+        productBaseNote: null,
+        productProfit: null,
+        productProfitNote: null,
+        projectPoolId: null,
+        quitWay: null,
+        quitWayNote: null,
+        remark: null,
+        scoringPerson: null, //打分人
+        teamBackground: null,
+        teamBackgroundNote: null,
+        teamExperience: null,
+        teamExperienceNote: null,
+        teamFaith: null,
+        teamFaithNote: null,
+        teamHeart: null,
+        teamHeartNote: null,
+        type: null,
+        updateBy: null,
+        updateTime: null,
+        valuation: null,
+        valuationNote: null,
+      },
+      // 会议详情表单
+      form1: {
+        meetingTheme: null,
+        meetingCode: null,
+        meetingType: null,
+        projectPoolId: null,
+        projectName: null,
+        projectStage: null,
+        projectGroup: "",
+        startTime: null,
+        endTime: null,
+        place: null,
+        promoter: null,
+        promoterId: null,
+        participants: null,
+        participantsId: null,
+        tProjectPool: {
+          company: null,
+          projectName: null,
+          projectStage: null,
+        },
+      },
+      // 汇总分数表单
+      collectForm: {
+        businessModelAvg: null,
+        businessModelSum: null,
+        developSpaceAvg: null,
+        developSpaceSum: null,
+        industryAdvantageAvg: null,
+        industryAdvantageSum: null,
+        investCommissioner: null,
+        marketSpaceAvg: null,
+        marketSpaceSum: null,
+        meetingId: null,
+        organInvestAvg: null,
+        organInvestSum: null,
+        organValuationAvg: null,
+        organValuationSum: null,
+        productBaseAvg: null,
+        productBaseSum: null,
+        productProfitAvg: null,
+        productProfitSum: null,
+        projectPoolId: null,
+        quitWayAvg: null,
+        quitWaySum: null,
+        scoringPerson: null,
+        teamBackgroundAvg: null,
+        teamBackgroundSum: null,
+        teamExperienceAvg: null,
+        teamExperienceSum: null,
+        teamFaithAvg: null,
+        teamFaithSum: null,
+        teamHeartAvg: null,
+        teamHeartSum: null,
+        valuationAvg: null,
+        valuationSum: null,
+      },
     };
   },
   computed: {
@@ -201,6 +785,7 @@ export default {
   },
   created() {
     this.id = this.$route.query.id;
+    this.pInstId=this.$route.query.pInstId;
     this.getDetail();
     this.getlistProjectPoolIdNewDecision();
     if (this.$route.query.activeName) {
@@ -250,9 +835,14 @@ export default {
     // 获取投决申请
     getlistProjectPoolIdNewDecision() {
       let that = this;
-      listProjectPoolIdNewDecision(this.id).then((response) => {
+      getDecisionInfo(this.$route.query.pInstId).then((response) => {
         if (response && response.data) {
           that.formTJApply = response.data;
+          if(response.data.participantsId!=null&&response.data.taskDefKey!='modifyApply'
+              &&response.data.taskDefKey != "deptLeader"&&response.data.taskDefKey != "decision"&&response.data.taskDefKey != "meeting"){
+            this.getMeeting();
+            this.getSelectMeetingId();
+          }
           setTimeout(() => {
             that.$refs.fileItemTJApply.handleButton();
             that.$refs.fileItemTJApply.fileList = [];
@@ -274,6 +864,38 @@ export default {
         }
       });
     },
+    //会议投决
+    getMeeting(){
+      getMeetingInfo(this.$route.query.pInstId).then((response) => {
+        this.form1 = response.data;
+        this.form1.projectPoolId = response.data.projectPoolId;
+        this.form1.projectName = response.data.tProjectPool.projectName;
+        this.form1.projectStage = response.data.tProjectPool.projectStage;
+
+        this.scoreForm.projectPoolId = response.data.projectPoolId;
+        this.scoreForm.projectName = response.data.tProjectPool.projectName;
+        // 打分人
+        this.scoreForm.scoringPerson = this.user.userId;
+        //  项目负责人
+        this.scoreForm.investCommissioner = response.data.tProjectPool.investHead;
+        this.collectForm.investCommissioner =
+          response.data.tProjectPool.investHead;
+        this.scoreForm.meetingId = response.data.id;
+        /*setTimeout(() => {
+          this.$refs.fileItems.fileList = [];
+          this.$refs.fileItems.getListFileBusinessId(id);
+          this.$refs.fileItems.handleButton();
+        }, 300);*/
+      });
+    },
+    //总裁室
+    // 根据会议ID查询汇总分数和平均分数
+    getSelectMeetingId() {
+      getSumScore(this.$route.query.pInstId).then((response) => {
+        this.collectForm = response.data;
+        this.collectForm.investCommissioner = this.scoreForm.investCommissioner;
+      });
+    },
 
   },
 };
@@ -329,5 +951,101 @@ export default {
   padding: 5px 10px;
   margin-left: 10px;
 }
-
+/*表格样式开始*/
+.ss_scoreTable {
+  padding-bottom: 50px;
+  ::v-deep .el-input.is-disabled .el-input__inner {
+    background-color: #fff !important;
+    color: #606266;
+  }
+  ::v-deep .el-input__inner {
+    border: 1px solid transparent;
+    text-align: center;
+  }
+  ::v-deep.el-textarea__inner {
+    border: none;
+    height: 50px;
+    resize: none;
+  }
+  ::v-deep .el-textarea.is-disabled .el-textarea__inner {
+    background-color: #fff !important;
+  }
+  textarea:disabled,
+  input:disabled {
+    background-color: #fff !important;
+  }
+  // ::v-deep .el-textarea__inner {
+  //   // border: 1px solid transparent!important;
+  // }
+  table {
+    // width:80%;
+    // width: 600px;
+    margin: 0 30px;
+    -moz-user-select: none;
+    -webkit-user-select: none;
+    -ms-user-select: none;
+    -khtml-user-selece: none;
+    /*上面都是兼容性问题，具体看浏览器版本或什么浏览器*/
+    user-select: none; /*内容禁止选中*/
+  }
+  tbody td {
+    font-size: 14px;
+  }
+  thead th,
+  .big-font {
+    font-size: 16px !important;
+    font-weight: bold;
+  }
+  .public-pedded-0 {
+    padding: 0;
+  }
+  .text-center {
+    text-align: center;
+  }
+  .text-left {
+    text-align: left;
+  }
+  .table-textarea {
+    width: 100%;
+    // width: 180px;
+    border: none;
+    height: 50px;
+    resize: none;
+  }
+  .table-input {
+    width: 100%;
+    // width: 100%;
+    // height: 80px;
+    border: none;
+    font-size: 20px;
+    font-weight: bold;
+    text-align: center;
+    margin-top: 20px;
+  }
+  .bg-blue,
+  .specificTr > th:nth-child(2n-1) {
+    background-color: #9bc2e6;
+  }
+  .specificTr > th:nth-child(2n-1) {
+    white-space: nowrap;
+    padding: 0 15px;
+  }
+  .specificTr .table-textarea {
+    padding-top: 16px;
+    background-color: #fff;
+  }
+  tr > th {
+    height: 50px;
+  }
+  input:disabled {
+    // background-color: #fff !important;
+  }
+  .btnList {
+    width: 100%;
+    display: flex;
+    justify-content: center;
+    padding-bottom: 40px;
+    margin-top: 30px;
+  }
+}
 </style>

ruoyi-ui/src/views/project/decision/myTask.vue

@@ -73,7 +73,7 @@
                 />
               </template>
             </el-table-column>
-            <el-table-column
+<!--            <el-table-column
               label="项目状态"
               align="center"
               prop="projectState"
@@ -85,7 +85,7 @@
                   :value="scope.row.projectState"
                 />
               </template>
-            </el-table-column>
+            </el-table-column>-->
 
             <el-table-column label="项目负责人" align="center" prop="investHead">
               <template slot-scope="scope">
@@ -109,6 +109,18 @@
                 </div>
               </template>
             </el-table-column>
+            <el-table-column label="申请人" align="center" prop="startUserName">
+              <template slot-scope="scope">
+                <div :title="scope.row.startUserName">
+                  {{ scope.row.startUserName }}
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column label="申请日期" align="center" prop="createTime">
+              <template slot-scope="scope">
+                <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="当前节点" align="center" prop="taskName">
               <template slot-scope="scope">
                 <div :title="scope.row.taskName"  class="public-text-blue public-cursor" @click="handleReadImage(scope.row)">
@@ -209,7 +221,7 @@
                 />
               </template>
             </el-table-column>
-            <el-table-column
+<!--            <el-table-column
               label="项目状态"
               align="center"
               prop="projectState"
@@ -221,7 +233,7 @@
                   :value="scope.row.projectState"
                 />
               </template>
-            </el-table-column>
+            </el-table-column>-->
             <el-table-column label="项目负责人" align="center" prop="investHead">
               <template slot-scope="scope">
                 <div :title="scope.row.investHead">
@@ -244,6 +256,18 @@
                 </div>
               </template>
             </el-table-column>
+            <el-table-column label="申请人" align="center" prop="startUserName">
+              <template slot-scope="scope">
+                <div :title="scope.row.startUserName">
+                  {{ scope.row.startUserName }}
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column label="申请日期" align="center" prop="createTime">
+              <template slot-scope="scope">
+                <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="处理节点" align="center" prop="taskName">
               <template slot-scope="scope">
                 <div  v-if="scope.row.deployId !== null && scope.row.deployId !== undefined && scope.row.deployId !== ''"  :title="scope.row.taskName" class="public-text-blue public-cursor" @click="handleReadImage(scope.row)">
@@ -334,7 +358,7 @@
                 />
               </template>
             </el-table-column>
-            <el-table-column
+<!--            <el-table-column
               label="项目状态"
               align="center"
               prop="projectState"
@@ -346,7 +370,7 @@
                   :value="scope.row.projectState"
                 />
               </template>
-            </el-table-column>
+            </el-table-column>-->
             <el-table-column label="项目负责人" align="center" prop="investHead">
               <template slot-scope="scope">
                 <div :title="scope.row.investHead">
@@ -369,6 +393,18 @@
                 </div>
               </template>
             </el-table-column>
+            <el-table-column label="申请人" align="center" prop="startUserName">
+              <template slot-scope="scope">
+                <div :title="scope.row.startUserName">
+                  {{ scope.row.startUserName }}
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column label="申请日期" align="center" prop="createTime">
+              <template slot-scope="scope">
+                <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="当前节点" align="center" prop="taskName">
               <template slot-scope="scope">
                 <div :title="scope.row.taskName" class="public-text-blue public-cursor" @click="handleReadImage(scope.row)">
@@ -424,7 +460,7 @@
 
 <script>
 import { getMyTaskList,getMyDoneTaskList,getMyList } from "@/api/project/decision/pool";
-import { selectByFlowKey,flowXmlAndNode } from "@/api/flowable/definition";
+import { flowXmlAndNode } from "@/api/flowable/definition";
 import { listChannel } from "@/api/invest/channel";
 import dueDiligenceList from "../../invest/components/dueDiligenceList.vue";
 import followList from "../../invest/components/followList.vue";
@@ -436,7 +472,6 @@ import {
 } from "@/api/invest/pool";
 
 import { mapGetters } from "vuex";
-import pool from "../../invest/pool/index.vue";
 export default {
   dicts: ["project_group", "project_stage", "project_state", "CUSTOMER_TRADE"],
   components: {
@@ -628,15 +663,6 @@ export default {
     },
     // 跳转到处理页面
     handleProcess(row){
-      /*this.$router.push({ path: '/flowable/task/todo/detail/index',
-        query: {
-          procInsId: row.procInsId,
-          executionId: row.executionId,
-          deployId: row.deployId,
-          taskId: row.taskId,
-          taskName: row.taskName,
-          startUser: row.startUserName + '-' + row.startDeptName,
-        }})*/
       const id = row.id || this.ids;
       const poolId=row.projectPoolId;
       const pInstId=row.procInstId;