fix : 修复权限按钮细节

2024-05-23 23:42:09 +08:00
parent 43c9cb03d3
commit 549e307b3e
17 changed files with 276 additions and 118 deletions
--- a/src/views/project-management/filing/conclusion.vue
+++ b/src/views/project-management/filing/conclusion.vue
@@ -229,6 +229,11 @@ const getDetailInfo = async () => {
 }
 const init =  () => {
  getProjectConclusionProcess().then(res => {
+    ElNotification({
+      title: '提示',
+      message: res.msg,
+      type: res.code === 1000 ? 'success' : 'error'
+    })
    processDiagramViewer.value = false
    if (res.code === 1000) {
      let data = res.data
--- a/src/views/project-management/filing/detail.vue
+++ b/src/views/project-management/filing/detail.vue
@@ -1,21 +1,26 @@
 <template>
  <steps :active="'0'" @setDetail="setDetail" @stepChange="stepChange">
    <template #content>
-      <collection-detail 
-        :formData="collectionData.formData" 
-        :data="collectionData"
-        :processViewer="commonProvessViewer"
-        :companyOption="companyOption"
-        @getInfo="getDemandCollectionInfo"
-        v-show="showActive == '00'"
+      <collection-detail
+          :formData="commonForm.formData"
+          :data="commonForm"
+          :processViewer="commonProvessViewer"
+          :companyOption="companyOption"
+          v-show="showActive == '00'"
+          :loading="loading"
      />
-      <summary-detail v-show="showActive == '10'" :formData="summaryData.formData" :data="summaryData" :processViewer="commonProvessViewer"/>
-      <ApprovalDetail type="approval" v-show="showActive == '20'" :formData="commonForm.formData" :data="commonForm" :processViewer="commonProvessViewer"></ApprovalDetail>
-      <ApprovalDetail type="execute" v-show="showActive == '40'" :formData="commonForm.formData" :data="commonForm" :processViewer="commonProvessViewer"></ApprovalDetail>
-      <ApprovalDetail type="archivist" v-show="showActive == '50'" :formData="commonForm.formData" :data="commonForm" :processViewer="commonProvessViewer"></ApprovalDetail>
-
+      <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>
+      <ApprovalDetail type="archivist" v-show="showActive == '50'" :formData="commonForm.formData" :data="commonForm"
+                      :processViewer="commonProvessViewer" :loading="loading"></ApprovalDetail>
    </template>
  </steps>
+  <opinion v-if="commonForm.taskId" :formData="commonForm.formData" :taskId="commonForm.taskId"/>
+
 </template>

 <script setup lang="jsx">
@@ -25,19 +30,23 @@ 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 { ElLoading } from "element-plus";
+import {getMapProjectStateInfo} from '@/components/steps/api';
+import {ElLoading} from "element-plus";

+const route = useRoute()
+const companyOption = ref([])
+const loading = ref(false)
+
+const processStore = useProcessStore()
 const activeName = ref('first')
 const handleClick = (tab, event) => {
  console.log(tab, event)
-  if(tab.index.value === 0){
+  if (tab.index.value === 0) {

  }
 }


-
 const getCompanyOption = async () => {
  const res = await getSubCompOpt()
  companyOption.value = res.data
@@ -50,13 +59,17 @@ const commonProvessViewer = ref(true)
 const getAllInfo = async (state) => {
  const loading = ElLoading.service({fullscreen: true})
  try {
-    state == '00' && ( await getCompanyOption() )
+    state == '00' && (await getCompanyOption())
    commonProvessViewer.value = false
-    const { data, code } = await getMapProjectStateInfo(route.query.projectId, state)
-    if(state == '00') {
-      collectionData.value = data;
-    } else if(state == '10') {
-      summaryData.value = data;
+    loading.value = true
+    const {data, code} = await getMapProjectStateInfo(route.query.projectId, state)
+    // if(state == '00') {
+    //   collectionData.value = data;
+    // } else if(state == '10') {
+    //   summaryData.value = data;
+    // }
+    if(code===1000){
+      loading.value = false
    }
    commonForm.value = data
    processStore.setDesign(data)
@@ -73,7 +86,7 @@ const getAllInfo = async (state) => {
  } catch {
    loading.close()
  }
-  
+
 }

 const showActive = ref()
@@ -90,19 +103,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/filing/index.vue
+++ b/src/views/project-management/filing/index.vue
@@ -102,6 +102,11 @@ const tableConfig = reactive({
      label: '所属公司',
      align: 'center'
    },
+    {
+      prop: 'approveName',
+      label: '审批人',
+      align: 'center'
+    },
    {
      prop: 'projectType',
      label: '项目类型',
@@ -127,6 +132,11 @@ const tableConfig = reactive({
      label: '起止时间',
      align: 'center'
    },
+    {
+      prop: 'taskNode',
+      label: '当前节点',
+      align: 'center'
+    },
    {
      prop: 'state',
      label: '状态',
@@ -146,20 +156,27 @@ const tableConfig = reactive({
      align: 'center',
      showOverflowTooltip: false,
      currentRender: ({row, index}) => {
-        let btn = [{label: '详情', func: () => handleDetail(row), type: 'primary'}]
-        // if (row.state === '3') {
-          btn.push({label: '附件', func: () => handleAttachment(row), type: 'primary'})
-        // } else if (row.state === '4') {
-          btn.push({label: '结项', func: () => handleConclusion(row), type: 'primary'})
-          btn.push({label: '编辑', func: () => handleEdit(row), type: 'primary'})
-        // }
+        let btn = []
+        let buttons = new Set(Array.from(row.buttons))
+        if (buttons.has("details")) {
+          btn.push({label: '详情', prem: ['mosr:requirement:info'], func: () => handleDetail(row), type: 'primary'})
+        }
+        if (buttons.has("attachments")) {
+          btn.push({label: '附件',prem: ['mosr:requirement:resubmit'], func: () => handleAttachment(row), type: 'primary'})
+        }
+        if (buttons.has("entry")) {
+          btn.push({label: '结项',prem: ['mosr:requirement:del'], func: () => handleConclusion(row), type: 'primary'})
+        }
+        if (buttons.has("edit")) {
+          btn.push({label: '编辑',prem: ['mosr:requirement:info'], func: () => handleEdit(row), type: 'primary'})
+        }
        return (
            <div style={{width: '100%'}}>
              {
                btn.map(item => (
                    <el-button
                        type={item.type}
-                        // v-perm={item.auth}
+                        v-perm={item.prem}
                        onClick={() => item.func()}
                        link
                    >
@@ -185,7 +202,8 @@ const handleDetail = (row) => {
  router.push({
    name:'Filing/detail',
    query: {
-      id: row.requirementId
+      id: row.requirementId,
+      projectId: row.projectId
    }
  })
 }