Merge pull request 'fix : 对接需求征集详情接口' (#133) from dd into master

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/133

src/assets/styles/index.scss

@@ -379,7 +379,7 @@ html, body, #app, .el-container, .el-aside, .el-main {
   margin-top: 10px;
   z-index: 666;
   position: absolute;
-  top: -20px;
+  //top: -20px;
 }
 
 .el-overlay-dialog {

src/views/projectdemand/demandcollection/add.vue

@@ -4,7 +4,7 @@
     <el-form :model="queryParams" inline class="query-form" ref="demandForm">
       <div class="left-info">
         <el-form-item label="名称" prop="name">
-          <el-input v-model="queryParams.name" placeholder="请输入子公司编码" clearable></el-input>
+          <el-input v-model="queryParams.name" placeholder="请输入名称" clearable></el-input>
         </el-form-item>
         <el-form-item label="所属公司" prop="company">
           <el-select v-model="queryParams.company" placeholder="登录状态" clearable filterable>

src/views/projectdemand/demandcollection/detail.vue

@@ -1,71 +1,74 @@
 <template>
   <div class="detail-block">
     <el-form :model="form" label-width="auto">
-          <baseTitle title="需求征集详情"></baseTitle>
-          <div class="left-info">
-            <el-row>
-              <el-col :span="12">
-                <el-form-item label="名称">
-                  <span>{{ formData.requirementName }}</span>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="所属公司">
-                  <span>{{ formData.affiliatedCompany }}</span>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="征集类型">
-                  <span>{{ formData.collectType }}</span>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="截止时间">
-                  <span>{{ formData.deadline }}</span>
-                </el-form-item>
-              </el-col>
-              <baseTitle title="征集说明"></baseTitle>
-              <el-col :span="24">
-                <el-form-item>
-                  <el-card style="width: 100%">
-                    <div v-html="formData.collectExplain">
-                    </div>
-                  </el-card>
-                </el-form-item>
-              </el-col>
-              <baseTitle title="申请文件"></baseTitle>
-              <el-col :span="24">
-                <el-form-item>
-                  <fvTable ref="tableIns" style="max-height: 200px;width: 100%" :tableConfig="tableConfig"
-                           @headBtnClick="headBtnClick"
-                           :pagination="false"></fvTable>
-                </el-form-item>
-              </el-col>
+      <baseTitle title="需求征集详情"></baseTitle>
+      <div class="left-info">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="名称">
+              <span>{{ formData.requirementName }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="所属公司">
+              <span>{{ formData.affiliatedCompany }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="征集类型">
+              <span>{{ formData.collectType }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="截止时间">
+              <span>{{ formData.deadline }}</span>
+            </el-form-item>
+          </el-col>
+          <baseTitle title="征集说明"></baseTitle>
+          <el-col :span="24">
+            <el-form-item>
+              <el-card style="width: 100%">
+                <div v-html="formData.collectExplain">
+                </div>
+              </el-card>
+            </el-form-item>
+          </el-col>
+          <baseTitle title="申请文件"></baseTitle>
+          <el-col :span="24">
+            <el-form-item>
+              <fvTable ref="tableIns" style="max-height: 200px;width: 100%" :tableConfig="tableConfig"
+                       @headBtnClick="headBtnClick"
+                       :pagination="false"></fvTable>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <div v-if="processInstanceData.taskId">
               <baseTitle title="审核意见"></baseTitle>
-              <el-col :span="24">
-                <el-form-item>
-                  <el-input
-                      v-model="auditOpinion"
-                      :rows="3"
-                      type="textarea"
-                      placeholder="请输入审核意见"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </div>
-<!--        </el-col>-->
-<!--        <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="10">-->
-          <div class="approval-record">
-            <baseTitle title="审批记录"></baseTitle>
-            <div class="process">
-              <process-diagram-viewer v-if="processDiagramViewer"/>
+
+              <el-form-item>
+                <el-input
+                    v-model="auditOpinion"
+                    :rows="3"
+                    type="textarea"
+                    placeholder="请输入审核意见"
+                />
+              </el-form-item>
             </div>
-          </div>
-<!--        </el-col>-->
-<!--      </el-row>-->
+          </el-col>
+        </el-row>
+      </div>
+      <!--        </el-col>-->
+      <!--        <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="10">-->
+      <div class="approval-record">
+        <baseTitle title="审批记录"></baseTitle>
+        <div class="process">
+          <process-diagram-viewer v-if="processDiagramViewer"/>
+        </div>
+      </div>
+      <!--        </el-col>-->
+      <!--      </el-row>-->
     </el-form>
-    <div class="oper-page-btn">
+    <div class="oper-page-btn" v-if="processInstanceData.taskId">
       <el-button @click="handleSubmit">驳回</el-button>
       <el-button color="#DED0B2" @click="handleBack">同意</el-button>
     </div>
@@ -73,16 +76,14 @@
 </template>
 
 <script setup lang="jsx">
-import {getInitiateInfo} from "@/api/workflow/process-definition.js";
-import ProcessTree from '@/views/workflow/process/ProcessTree.vue';
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue'
 import {useProcessStore} from '@/stores/processStore.js';
 import {getInfo} from "@/api/project-demand/index.js";
-import {ElMessage} from "element-plus";
+
 const route = useRoute()
 const form = ref();
 const processStore = useProcessStore()
-const processInstanceData = ref()
+const processInstanceData = ref({})
 const processDiagramViewer = ref(false)
 
 const processTree = ref()
@@ -129,8 +130,8 @@ const getTree = async () => {
     processStore.noTakeList.value = data.noTakeList;
     processStore.refuseList.value = data.refuseList;
     processStore.passList.value = data.passList;
-    nextTick(()=>{
-      processDiagramViewer.value=true
+    nextTick(() => {
+      processDiagramViewer.value = true
     })
   })
 }
@@ -143,7 +144,23 @@ getTree()
   justify-content: space-between;
   overflow-x: hidden;
   overflow-y: auto;
+  padding-right: 10px;
+  &::-webkit-scrollbar {
+    width: 6px;
+    height: 6px;
+  }
 
+  // 滚动条轨道
+  &::-webkit-scrollbar-track {
+    background: rgb(239, 239, 239);
+    border-radius: 2px;
+  }
+
+  // 小滑块
+  &::-webkit-scrollbar-thumb {
+    background: rgba(80, 81, 82, 0.29);
+    border-radius: 10px;
+  }
   .left-info {
     flex: 0.6;
 
@@ -168,11 +185,12 @@ getTree()
   .approval-record {
     flex: 0.4;
     .process {
+      //padding-top: 20px;
       position: relative;
       //max-height: calc(100vh - 96px);
       //height: calc(100vh - 250px);
       //height: auto;
-      //overflow: hidden;
+      //overflow: scroll;
 
       &::-webkit-scrollbar {
         width: 6px;