Merge branch 'master' of http://git.feashow.cn/clay/mosr-web

2024-06-01 23:15:39 +08:00
parent e2d6722ec6 13386303e8
commit a796e7622f
8 changed files with 136 additions and 34 deletions
--- a/src/components/AttachmentUpload.vue
+++ b/src/components/AttachmentUpload.vue
@@ -114,9 +114,14 @@ watch(() => props.showTable, (newVal) => {
 watch(() => props.otherFileList, (newVal) => {
  console.log('newotherFileList',newVal)
  if (props.preview) {
-    newVal?.forEach(item => {
-      allFileList.value.push(item)
-    })
+    if(props.formData.fileList==null){
+      allFileList.value=newVal
+    }else {
+      newVal?.forEach(item => {
+        allFileList.value.push(item)
+      })
+    }
+
  }else {
    allFileList.value=newVal
  }
@@ -124,9 +129,9 @@ watch(() => props.otherFileList, (newVal) => {
 watch(() => props.formData.fileList, (newVal) => {
  console.log('newVal-fileList',newVal)
  if (props.preview) {
-    newVal?.forEach(item => {
-      allFileList.value.push(item)
-    })
+      newVal?.forEach(item => {
+        allFileList.value.push(item)
+      })
  }
 }, {deep: true})
 watch(() => props.formData.singleFile, (newVal) => {
--- a/src/views/expense-management/share/index.vue
+++ b/src/views/expense-management/share/index.vue
@@ -90,18 +90,18 @@ const tableConfig = reactive({
        if(row.buttons){
          buttons = new Set(Array.from(row.buttons))
        }
-        // if (buttons.has("details")) {
+        if (buttons.has("details")) {
          btn.push({label: '详情', prem: ['mosr:requirement:info'], func: () => handleDetail(row), type: 'primary'})
-        // }
-        // if (buttons.has("edit")) {
+        }
+        if (buttons.has("edit")) {
          btn.push({label: '编辑', prem: ['mosr:requirement:resubmit'], func: () => handleEdit(row), type: 'primary'})
-        // }
-        // if (buttons.has("report")) {
+        }
+        if (buttons.has("report")) {
          btn.push({label: '明细导出', prem: ['mosr:requirement:info'], func: () => handleReport(row), type: 'primary'})
-        // }
-        // if (buttons.has("report")) {
+        }
+        if (buttons.has("report")) {
          btn.push({label: '汇总导出', prem: ['mosr:requirement:info'], func: () => handleReport(row), type: 'primary'})
-        // }
+        }
        return (
            <div style={{width: '100%'}}>
              {
@@ -117,11 +117,11 @@ const tableConfig = reactive({
                ))
              }
              {
-                // buttons.has("delete") ?
+                buttons.has("delete") ?
                    <popover-delete name={row.requirementName} type={'费用分摊'} btnType={'danger'}
                                    perm={['mosr:requirement:del']}
                                    onDelete={() => handleDelete(row)}/>
-                // : ''
+                : ''
              }
            </div>
        )
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -393,6 +393,7 @@ const handleSubmit = debounce(async (instance) => {
    // }
    let params = {
      ...formData.value,
+      isSpecialFund:false,
      deploymentId: deploymentId.value,
      fileList: otherFiles,
      singleFile: singleFile,
--- a/src/views/project-demand/summary/index.vue
+++ b/src/views/project-demand/summary/index.vue
@@ -96,17 +96,41 @@ const tableConfig = reactive({
    {
      prop: 'projectType',
      label: '项目类型',
-      align: 'center'
+      align: 'center',
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => {
+        if (row.state !== null) {
+          return (<Tag dictType={'project_type'} value={row.projectType}/>)
+        } else {
+          return '--'
+        }
+      }
    },
    {
      prop: 'rdSubject',
      label: '研发主体',
-      align: 'center'
+      align: 'center',
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => {
+        if (row.state !== null) {
+          return (<Tag dictType={'rd_subject'} value={row.rdSubject}/>)
+        } else {
+          return '--'
+        }
+      }
    },
    {
      prop: 'projectImpact',
      label: '项目影响',
-      align: 'center'
+      align: 'center',
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => {
+        if (row.state !== null) {
+          return (<Tag dictType={'project_impact'} value={row.projectImpact}/>)
+        } else {
+          return '--'
+        }
+      }
    },
    {
      prop: 'startTime',
--- a/src/views/project-management/filing/index.vue
+++ b/src/views/project-management/filing/index.vue
@@ -153,21 +153,45 @@ const tableConfig = reactive({
    {
      prop: 'projectType',
      label: '项目类型',
-      align: 'center'
+      align: 'center',
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => {
+        if (row.state !== null) {
+          return (<Tag dictType={'project_type'} value={row.projectType}/>)
+        } else {
+          return '--'
+        }
+      }
    },
    {
      prop: 'rdSubject',
      label: '研发主体',
-      align: 'center'
+      align: 'center',
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => {
+        if (row.state !== null) {
+          return (<Tag dictType={'rd_subject'} value={row.rdSubject}/>)
+        } else {
+          return '--'
+        }
+      }
    },
    {
      prop: 'projectImpact',
      label: '项目影响',
-      align: 'center'
+      align: 'center',
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => {
+        if (row.state !== null) {
+          return (<Tag dictType={'project_impact'} value={row.projectImpact}/>)
+        } else {
+          return '--'
+        }
+      }
    },
    {
      prop: 'economicEstimate',
-      label: '经济概算',
+      label: '经济概算(万元)',
      align: 'center'
    },
    {
--- a/src/views/project-management/implementation/index.vue
+++ b/src/views/project-management/implementation/index.vue
@@ -158,21 +158,45 @@ const tableConfig = reactive({
    {
      prop: 'projectType',
      label: '项目类型',
-      align: 'center'
+      align: 'center',
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => {
+        if (row.state !== null) {
+          return (<Tag dictType={'project_type'} value={row.projectType}/>)
+        } else {
+          return '--'
+        }
+      }
    },
    {
      prop: 'rdSubject',
      label: '研发主体',
-      align: 'center'
+      align: 'center',
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => {
+        if (row.state !== null) {
+          return (<Tag dictType={'rd_subject'} value={row.rdSubject}/>)
+        } else {
+          return '--'
+        }
+      }
    },
    {
      prop: 'projectImpact',
      label: '项目影响',
-      align: 'center'
+      align: 'center',
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => {
+        if (row.state !== null) {
+          return (<Tag dictType={'project_impact'} value={row.projectImpact}/>)
+        } else {
+          return '--'
+        }
+      }
    },
    {
      prop: 'economicEstimate',
-      label: '经济概算',
+      label: '经济概算(万元)',
      align: 'center'
    },
    {
--- a/src/views/project-management/initiation/index.vue
+++ b/src/views/project-management/initiation/index.vue
@@ -152,21 +152,45 @@ const tableConfig = reactive({
    {
      prop: 'projectType',
      label: '项目类型',
-      align: 'center'
+      align: 'center',
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => {
+        if (row.state !== null) {
+          return (<Tag dictType={'project_type'} value={row.projectType}/>)
+        } else {
+          return '--'
+        }
+      }
    },
    {
      prop: 'rdSubject',
      label: '研发主体',
-      align: 'center'
+      align: 'center',
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => {
+        if (row.state !== null) {
+          return (<Tag dictType={'rd_subject'} value={row.rdSubject}/>)
+        } else {
+          return '--'
+        }
+      }
    },
    {
      prop: 'projectImpact',
      label: '项目影响',
-      align: 'center'
+      align: 'center',
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => {
+        if (row.state !== null) {
+          return (<Tag dictType={'project_impact'} value={row.projectImpact}/>)
+        } else {
+          return '--'
+        }
+      }
    },
    {
      prop: 'economicEstimate',
-      label: '经济概算',
+      label: '经济概算(万元)',
      align: 'center'
    },
    {
@@ -187,7 +211,7 @@ const tableConfig = reactive({
      label: '状态',
      align: 'center',
      showOverflowTooltip: false,
-      currentRender: ({row, index}) =>{
+      currentRender: ({row, index}) => {
        if (row.state !== null) {
          return (<Tag dictType={'project_initiation'} value={row.state}/>)
        } else {
@@ -207,7 +231,7 @@ const tableConfig = reactive({
          btn.push({label: '详情', prem: ['mosr:requirement:info'], func: () => handleDetail(row), type: 'primary'})
        }
        if (buttons.has("edit")) {
-          btn.push({label: '编辑',prem: ['mosr:requirement:resubmit'], func: () => handleEdit(row), type: 'primary'})
+          btn.push({label: '编辑', prem: ['mosr:requirement:resubmit'], func: () => handleEdit(row), type: 'primary'})
        }
        // if (buttons.has("delete")) {
        //   btn.push({label: '删除',prem: ['mosr:requirement:del'], func: () => handleDelete(row), type: 'primary'})
--- a/src/views/special-fund/detail.vue
+++ b/src/views/special-fund/detail.vue
@@ -6,7 +6,7 @@
 <script setup lang="jsx">
 import {ElNotification} from "element-plus";
 import {useProcessStore} from '@/stores/processStore.js';
-import {getFundDetailProcess} from "@api/special-fund";
+import {getFundDetailProcess} from "@/api/special-fund";
 const processStore = useProcessStore()
 const route = useRoute()
 const fundData = ref({})