Merge remote-tracking branch 'origin/master'

2024-06-02 22:36:09 +08:00
parent f6ada88026 2a0e193374
commit 83fd1b37e2
9 changed files with 217 additions and 143 deletions
--- a/src/views/project-management/filing/detail.vue
+++ b/src/views/project-management/filing/detail.vue
@@ -9,13 +9,13 @@
          :loading="loading"
      />
      <summary-detail v-show="showActive == '10'" :formData="commonForm.formData" :data="commonForm"
-                      :processViewer="commonProvessViewer" :loading="loading"/>
+                      :processViewer="commonProvessViewer" :loading="loading" :fileListShow="fileListShow"/>
      <ApprovalDetail type="approval" v-show="showActive == '20'" :formData="commonForm.formData" :data="commonForm"
-                      :processViewer="commonProvessViewer" :loading="loading"></ApprovalDetail>
+                      :processViewer="commonProvessViewer" :loading="loading" :fileListShow="fileListShow"/>
      <ApprovalDetail type="execute" v-show="showActive == '40'" :formData="commonForm.formData" :data="commonForm"
-                      :processViewer="commonProvessViewer" :loading="loading"></ApprovalDetail>
+                      :processViewer="commonProvessViewer" :loading="loading" :fileListShow="fileListShow"/>
      <ApprovalDetail type="archivist" v-show="showActive == '50'" :formData="commonForm.formData" :data="commonForm"
-                      :processViewer="commonProvessViewer" :loading="loading"></ApprovalDetail>
+                      :processViewer="commonProvessViewer" :loading="loading" :fileListShow="fileListShow"/>
    </template>
  </steps>
  <opinion v-if="commonForm.taskId" :formData="commonForm.formData" :taskId="commonForm.taskId"/>
@@ -36,6 +36,7 @@ const loading = ref(false)
 const processStore = useProcessStore()
 const activeName = ref('first')
 const commonForm = ref({})
+const fileListShow = ref('READ')
 const commonProvessViewer = ref(true)

 const getAllInfo = async (state) => {
@@ -43,17 +44,17 @@ const getAllInfo = async (state) => {
  try {
    commonProvessViewer.value = false
    loading.value = true
-    const {data, code,msg} = await getMapProjectStateInfo(route.query.projectId, state)
-    if(code===1000){
+    const {data, code, msg} = await getMapProjectStateInfo(route.query.projectId, state)
+    if (code === 1000) {
      loading.value = false
-    }else {
+    } else {
      ElNotification({
        title: '提示',
        message: msg,
-        type:  'error'
+        type: 'error'
      })
    }
-    if(data===undefined)return;
+    if (data === undefined) return;
    commonForm.value = data
    processStore.setDesign(data)
    processStore.runningList.value = data.runningList;
@@ -63,6 +64,9 @@ const getAllInfo = async (state) => {
    processStore.passList.value = data.passList;
    nextTick(() => {
      commonProvessViewer.value = true
+      if (data.formPermMap["fileList"]) {
+        fileListShow.value = data.formPermMap["fileList"].perm
+      }
    })
    loading.close()
  } catch {
--- a/src/views/project-management/implementation/detail.vue
+++ b/src/views/project-management/implementation/detail.vue
@@ -1,18 +1,24 @@
 <template>
-  <steps :active="cuurentStep" @setDetail="setDetail" @stepChange="stepChange">
+  <steps :active="route.query.id==='-1'?currentStep-1:currentStep" @setDetail="setDetail" @stepChange="stepChange"
+         :reportType="route.query.id==='-1'?'direct':''">
    <template #content>
      <collection-detail
-        :formData="commonForm.formData"
-        :data="commonForm"
-        :processViewer="commonProvessViewer"
-        v-show="showActive == '00'"
-        :loading="loading"
+          :formData="commonForm.formData"
+          :data="commonForm"
+          :processViewer="commonProvessViewer"
+          v-show="showActive == '00'"
+          :loading="loading"
      />
-      <summary-detail v-show="showActive == '10'" :formData="commonForm.formData" :data="commonForm" :processViewer="commonProvessViewer" :loading="loading"/>
-      <ApprovalDetail type="approval" v-show="showActive == '20'" :formData="commonForm.formData" :data="commonForm" :processViewer="commonProvessViewer" :loading="loading"></ApprovalDetail>
-      <ApprovalDetail type="execute" v-show="showActive == '40'" :formData="commonForm.formData" :data="commonForm" :processViewer="commonProvessViewer" :loading="loading"></ApprovalDetail>
+      <summary-detail v-show="showActive == '10'" :formData="commonForm.formData" :data="commonForm"
+                      :processViewer="commonProvessViewer" :loading="loading" :fileListShow="fileListShow"/>
+      <ApprovalDetail type="approval" v-show="showActive == '20'" :formData="commonForm.formData"
+                      :data="commonForm" :processViewer="commonProvessViewer" :loading="loading"
+                      :fileListShow="fileListShow"/>
+      <ApprovalDetail type="execute" v-show="showActive == '40'" :formData="commonForm.formData"
+                      :data="commonForm" :processViewer="commonProvessViewer" :loading="loading"
+                      :fileListShow="fileListShow"/>
      <ApprovalDetail type="archivist" v-show="showActive == '50'" :formData="commonForm.formData" :data="commonForm"
-                      :processViewer="commonProvessViewer" :loading="loading"></ApprovalDetail>
+                      :processViewer="commonProvessViewer" :loading="loading" :fileListShow="fileListShow"/>

    </template>
  </steps>
@@ -24,7 +30,7 @@ import {useProcessStore} from '@/stores/processStore.js';
 import CollectionDetail from "@/components/DetailComponent/CollectionDetail.vue";
 import SummaryDetail from "@/components/DetailComponent/SummaryDetail.vue";
 import ApprovalDetail from "@/components/DetailComponent/ApprovalDetail.vue";
-import { getMapProjectStateInfo } from '@/components/steps/api';
+import {getMapProjectStateInfo} from '@/components/steps/api';
 import {ElLoading, ElNotification} from "element-plus";
 import Opinion from "@/components/DetailComponent/Opinion.vue";

@@ -32,11 +38,12 @@ const route = useRoute()
 const activeName = ref('first')
 const loading = ref(false)
 const processStore = useProcessStore()
-const cuurentStep = ref()
-route.query.step == '10' && (cuurentStep.value = 1)
-route.query.step == '20' && (cuurentStep.value = 2)
-route.query.step == '40' && (cuurentStep.value = 3)
-route.query.step == '50' && (cuurentStep.value = 4)
+const fileListShow = ref('READ')
+const currentStep = ref()
+route.query.step == '10' && (currentStep.value = 1)
+route.query.step == '20' && (currentStep.value = 2)
+route.query.step == '40' && (currentStep.value = 3)
+route.query.step == '50' && (currentStep.value = 4)
 const showActive = ref()
 const commonForm = ref({})
 const commonProvessViewer = ref(true)
@@ -46,18 +53,18 @@ const getAllInfo = async (state) => {
  try {
    commonProvessViewer.value = false
    loading.value = true
-    const { data, code ,msg} = await getMapProjectStateInfo(route.query.projectId, state)
-    if(code===1000){
+    const {data, code, msg} = await getMapProjectStateInfo(route.query.projectId, state)
+    if (code === 1000) {
      loading.value = false
-    }else {
+    } else {
      ElNotification({
        title: '提示',
        message: msg,
-        type:  'error'
+        type: 'error'
      })
      loading.close()
    }
-    if(data===undefined)return;
+    if (data === undefined) return;
    commonForm.value = data
    processStore.setDesign(data)
    processStore.runningList.value = data.runningList;
@@ -67,6 +74,9 @@ const getAllInfo = async (state) => {
    processStore.passList.value = data.passList;
    nextTick(() => {
      commonProvessViewer.value = true
+      if (data.formPermMap["fileList"]) {
+        fileListShow.value = data.formPermMap["fileList"].perm
+      }
    })
    loading.close()
  } catch {
@@ -87,19 +97,23 @@ const stepChange = (data) => {
 </script>

 <style scoped lang="scss">
-.detail-block{
+.detail-block {
  padding-top: 15px;
-  :deep(.el-tabs__nav-scroll){
+
+  :deep(.el-tabs__nav-scroll) {
    width: 100%;
    display: flex;
-    .el-tabs__nav{
+
+    .el-tabs__nav {
      display: flex;
      flex: 1;
-      .el-tabs__item{
+
+      .el-tabs__item {
        flex: 1;
        font-size: 16px;
      }
-      .is-active{
+
+      .is-active {
        color: black;
        background-color: #DED0B2;
      }
--- a/src/views/project-management/initiation/detail.vue
+++ b/src/views/project-management/initiation/detail.vue
@@ -8,12 +8,14 @@
        v-show="showActive == '00'"
        :loading="loading"
      />
-      <summary-detail v-show="showActive == '10'" :formData="commonForm.formData" :data="commonForm" :processViewer="commonProvessViewer" :loading="loading"/>
-      <ApprovalDetail v-show="showActive == '20'" :formData="commonForm.formData" :data="commonForm" :processViewer="commonProvessViewer" :loading="loading"></ApprovalDetail>
+      <summary-detail v-show="showActive == '10'" :formData="commonForm.formData" :data="commonForm"
+                      :processViewer="commonProvessViewer" :loading="loading" :fileListShow="fileListShow"/>
+      <ApprovalDetail v-show="showActive == '20'" :formData="commonForm.formData" :data="commonForm"
+                      :processViewer="commonProvessViewer" :loading="loading" :fileListShow="fileListShow"/>
      <ApprovalDetail type="execute" v-show="showActive == '40'" :formData="commonForm.formData" :data="commonForm"
-                      :processViewer="commonProvessViewer" :loading="loading"></ApprovalDetail>
+                      :processViewer="commonProvessViewer" :loading="loading" :fileListShow="fileListShow"/>
      <ApprovalDetail type="archivist" v-show="showActive == '50'" :formData="commonForm.formData" :data="commonForm"
-                      :processViewer="commonProvessViewer" :loading="loading"></ApprovalDetail>
+                      :processViewer="commonProvessViewer" :loading="loading" :fileListShow="fileListShow"/>

    </template>
  </steps>
@@ -31,6 +33,7 @@ import Opinion from "@/components/DetailComponent/Opinion.vue";

 const route = useRoute()
 const activeName = ref('first')
+const fileListShow = ref('READ')
 const loading = ref(false)
 const active = ref(route.query.state)
 const processStore = useProcessStore()
@@ -63,6 +66,9 @@ const getAllInfo = async (state) => {
    processStore.passList.value = data.passList;
    nextTick(() => {
      commonProvessViewer.value = true
+      if (data.formPermMap["fileList"]) {
+        fileListShow.value = data.formPermMap["fileList"].perm
+      }
    })
    loading.close()
  } catch {