11482-【CR】【投资系统】增加审批流程-投资机会

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

@@ -15,11 +15,12 @@
         <el-tab-pane label="项目联系人信息" name="2"></el-tab-pane>
         <el-tab-pane label="项目融资信息" name="3"></el-tab-pane>
         <el-tab-pane label="商业计划书及其他" name="4"></el-tab-pane>
+        <el-tab-pane v-if="form.taskDefKey=='president' && formAssess !== null && formAssess !== undefined && formAssess !== ''"  label="软件工程院评估意见" name="5"></el-tab-pane>
       </el-tabs>
       <section>
         <el-form ref="form" :model="form" label-width="160px" class="special-el-form">
-        <div v-if="activeName === '0'" >
-          <el-row :gutter="20" style="margin-left: 0px;margin-right: 0px;">
+          <div v-if="activeName === '0'" >
+            <el-row :gutter="20" style="margin-left: 0px;margin-right: 0px;">
             <el-col :span="12">
               <el-form-item label="项目名称" prop="projectName">
                 <el-input maxlength="100" v-model="form.projectName" placeholder="请输入项目名称" :disabled="type === '2'"/>
@@ -534,6 +535,25 @@
             </el-row>
           </div>
         </el-form>
+        <el-form ref="formAssess" :model="formAssess" label-width="160px" class="special-el-form">
+          <div v-if="activeName === '5'">
+            <el-row :gutter="20">
+              <el-col>
+                <el-form-item label="评估意见" prop="context" class="special-el-form-item">
+                  <el-input
+                    :disabled="type === '2'"
+                    maxlength="200"
+                    :readonly="type === '2' ? true : false"
+                    rows="4"
+                    type="textarea"
+                    v-model="formAssess.context"
+                    placeholder="请输入评估意见"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </div>
+        </el-form>
       </section>
     </section>
     <section v-if="form.taskDefKey=='softwareDept'">
@@ -586,13 +606,11 @@
   </div>
 </template>
 <script>
-import {getPool,getInvestInfo, investmentOpportunityComplete} from "@/api/project/investOpp/pool";
+import { getInvestInfo, investmentOpportunityComplete} from "@/api/project/investOpp/pool";
 import { listChannel } from "@/api/invest/channel";
 import fileItem from "../../invest/components/fileItem";
 import flowBase from "../flowBase.vue";
 import { mapGetters } from "vuex";
-import channelItem from "../../invest/components/channelItem.vue";
-import selecDept from "../../invest/components/selecDept.vue";
 
 export default {
   props: {

ruoyi-ui/src/views/project/investOpp/edit.vue

@@ -485,7 +485,7 @@
   </div>
 </template>
 <script>
-import {getPool, getInvestInfo, investmentOpportunityComplete} from "@/api/project/investOpp/pool";
+import { getInvestInfo, investmentOpportunityComplete} from "@/api/project/investOpp/pool";
 import { listChannel } from "@/api/invest/channel";
 import fileItem from "../../invest/components/fileItem";
 import channelItem from "../../invest/components/channelItem";
@@ -523,6 +523,7 @@ export default {
       title: "新增项目",
       baseUrl: process.env.VUE_APP_BASE_API,
       pInstId:null,
+      localId: this.id, // 初始化用 prop 的 id
       // 表单参数
       form: {
         id: null,
@@ -694,27 +695,19 @@ export default {
         resolve();
       });
     }).then(() => {
-      this.id=this.$route.query.id;
+      //this.id=this.$route.query.id;
+      this.localId = this.$route.query.id; // 改这里！用 localId
       this.pInstId = this.$route.query.pInstId;
-      //console.log(this.pInstId+'--------------------------');
-      if (this.id) {
-
+      //console.log(this.localId+'--------------------------');
+      if (this.localId) {
         this.getPoolDetail(this.pInstId);
       } else {
-        this.reset();
+        //this.reset();
       }
     });
   },
   methods: {
-    // getListChannel() {
-    //   // 渠道
-    //   listChannel({
-    //     pageNum: 1,
-    //     pageSize: 100,
-    //   }).then((response) => {
-    //     this.channelList = response.rows;
-    //   });
-    // },
+
     // 选择部门人
     openSelectDept() {
       this.$refs.selecDepts.show(1, this.user.userId);
@@ -833,7 +826,7 @@ export default {
         }
         if (this.form.id != null) {
           investmentOpportunityComplete(params).then((response) => {
-            this.$modal.msgSuccess("暂存成功");
+            this.$modal.msgSuccess("审批成功");
             setTimeout(() => {
               that.goBack();
             }, 1500);
@@ -887,7 +880,7 @@ export default {
                 flowBaseInfo: this.flowBaseInfo
               }
               investmentOpportunityComplete(params).then((response) => {
-                this.$modal.msgSuccess("修改成功");
+                this.$modal.msgSuccess("提交成功");
                 setTimeout(() => {
                   that.goBack();
                 }, 1500);

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

@@ -137,7 +137,7 @@
                 />
               </template>
             </el-table-column>
-            <el-table-column
+<!--            <el-table-column
               label="项目状态"
               align="center"
               prop="projectState"
@@ -149,7 +149,7 @@
                   :value="scope.row.projectState"
                 />
               </template>
-            </el-table-column>
+            </el-table-column>-->
 
             <el-table-column
               label="备案时间"
@@ -193,6 +193,25 @@
                 </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="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)">
@@ -312,7 +331,7 @@
                 />
               </template>
             </el-table-column>
-            <el-table-column
+<!--            <el-table-column
               label="项目状态"
               align="center"
               prop="projectState"
@@ -324,7 +343,7 @@
                   :value="scope.row.projectState"
                 />
               </template>
-            </el-table-column>
+            </el-table-column>-->
 
             <el-table-column
               label="备案时间"
@@ -367,6 +386,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)">
@@ -476,7 +507,7 @@
                 />
               </template>
             </el-table-column>
-            <el-table-column
+<!--            <el-table-column
               label="项目状态"
               align="center"
               prop="projectState"
@@ -488,7 +519,7 @@
                   :value="scope.row.projectState"
                 />
               </template>
-            </el-table-column>
+            </el-table-column>-->
 
             <el-table-column
               label="备案时间"
@@ -531,6 +562,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)">
@@ -586,7 +629,7 @@
 
 <script>
 import { getMyTaskList,getMyDoneTaskList,getMyList } from "@/api/project/investOpp/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";
@@ -839,7 +882,6 @@ export default {
     handleReadImage(row){
       this.readImage.title = "流程图";
       this.readImage.open = true;
-      console.log(row)
       // this.readImage.src = process.env.VUE_APP_BASE_API + "/flowable/definition/readImage/" + deploymentId;
       flowXmlAndNode({procInsId: row.procInstId,deployId:row.deployId}).then(res => {
         this.flowData = res.data;