11482-【CR】【投资系统】增加审批流程-其他前端页面更改

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

@@ -1120,7 +1120,6 @@
           </el-tabs>
           <!-- 会议信息开始         -->
           <section v-if="formLXApply.taskDefKey==='meeting'">
-            <h3>会议信息</h3>
             <el-form
               v-if="formLXApply.id"
               class="special-el-form public-padded-t-20"
@@ -1164,6 +1163,7 @@
                 </label>
               </el-form-item>
             </el-form>
+            <h3 v-if="formLXApply.needMeeting === '1'">会议信息</h3>
             <el-form
               class="special-el-form"
               ref="meetingForm"

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

@@ -624,7 +624,7 @@
       </section>
     </section>
     <section>
-      <flowBase :procInstId="pInstId" v-if="pInstId"></flowBase>
+      <flowBase :procInstId="pInstId" :id="id" v-if="pInstId"></flowBase>
     </section>
   </div>
 </template>

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

@@ -1112,7 +1112,6 @@
           </el-tabs>
           <!-- 会议信息开始         -->
           <section v-if="formTJApply.taskDefKey==='meeting'">
-            <h3>会议信息</h3>
             <el-form
               v-if="formTJApply.id"
               class="special-el-form public-padded-t-20"
@@ -1156,6 +1155,7 @@
                 </label>
               </el-form-item>
             </el-form>
+            <h3 v-if="formTJApply.needMeeting === '1'">会议信息</h3>
             <el-form
               class="special-el-form"
               ref="meetingForm"

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

@@ -624,7 +624,7 @@
       </section>
     </section>
     <section>
-      <flowBase :procInstId="pInstId" v-if="pInstId"></flowBase>
+      <flowBase :procInstId="pInstId" :id="id" v-if="pInstId"></flowBase>
     </section>
   </div>
 </template>

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

@@ -15,7 +15,7 @@
         <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-tab-pane v-if="form.taskDefKey=='presidents' && 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">

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

@@ -15,11 +15,11 @@
         <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 label="评估意见" name="5"></el-tab-pane>
+        <el-tab-pane v-if="formAssess!=null" 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'" >
+          <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">