Merge pull request 'fix : 修复专项资金页面功能细节' (#238) from dj into master

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

src/api/special-fund/index.js

@@ -0,0 +1,22 @@
+import request from '@/utils/request.js'
+
+export const getFundDetail = (specialFundId) => {
+  return request({
+    url: `/workflow/mosr/special/fund/info/${specialFundId}`,
+    method: "get"
+  });
+};
+export const addFund= (data) => {
+  return request({
+    url: '/workflow/mosr/special/fund',
+    method: "post",
+    data
+  });
+};
+export const resubmitFund= (data) => {
+  return request({
+    url: '/workflow/mosr/special/fund/resubmit',
+    method: "post",
+    data
+  });
+};

src/components/DetailComponent/CollectionDetail.vue

@@ -146,7 +146,7 @@ const handleDownload = (row) => {
     a.click()
   })
 }
-const getDataSourceOptionItem = (val) => {
+const getCompanyOptionItem = (val) => {
   if (val instanceof Array) {
     val.forEach(item => {
       matterTree(companyNameArray.value, props.companyOption, item)
@@ -165,7 +165,7 @@ watch(() => props.companyOption, (newVal) => {
 }, {deep: true})
 watch(() => props.formData, (newVal) => {
   if(newVal!=null){
-    props.formData.companyIds = getDataSourceOptionItem(newVal.companyIds)
+    props.formData.companyIds = getCompanyOptionItem(newVal.companyIds)
   }
 }, {deep: true})
 watch(() => props.processViewer, (newVal) => {

src/components/DetailComponent/SpecialFundDetail.vue

@@ -0,0 +1,204 @@
+<template>
+  <div v-loading="loading">
+    <baseTitle title="专项资金详情"></baseTitle>
+    <el-form :model="formData" ref="form" label-width="auto">
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="专项名称">
+            <span>{{ formData.name }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="金额">
+            <span>{{ formData.fundAmount }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="剩余金额">
+            <span>{{ formData.residualAmount }}</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.introduce">
+              </div>
+            </el-card>
+          </el-form-item>
+        </el-col>
+        <baseTitle title="关联项目"></baseTitle>
+        <el-col :span="24">
+          <el-form-item>
+            <fvTable style="width: 100%;max-height: 200px" v-if="showTable" :tableConfig="projectTable"
+                     :data="formData.projects" :isSettingCol="false" :pagination="false">
+              <template #empty>
+                <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
+              </template>
+            </fvTable>
+          </el-form-item>
+        </el-col>
+        <baseTitle title="附件列表"></baseTitle>
+        <el-col :span="24">
+          <el-form-item>
+            <fvTable style="width: 100%;max-height: 200px" v-if="showTable" :tableConfig="fileTable"
+                     :data="formData.files" :isSettingCol="false" :pagination="false">
+              <template #empty>
+                <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
+              </template>
+            </fvTable>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <div v-if="formData.taskId">
+            <baseTitle title="审核意见"></baseTitle>
+            <el-form-item prop="auditOpinion">
+              <el-input
+                  v-model="formData.auditOpinion"
+                  :rows="3"
+                  type="textarea"
+                  placeholder="请输入审核意见"
+              />
+            </el-form-item>
+          </div>
+        </el-col>
+      </el-row>
+      <div class="approval-record">
+        <baseTitle title="审批记录"></baseTitle>
+        <div class="process">
+          <operation-render v-if="processViewer" :operation-list="data.operationList"
+                            :state="data.state"/>
+          <process-diagram-viewer v-if="processViewer" id-name="fundProcess"/>
+        </div>
+      </div>
+    </el-form>
+  </div>
+</template>
+
+<script setup lang="jsx">
+import OperationRender from '@/views/workflow/common/OperationRender.vue'
+import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue'
+import {downloadFile} from "@/api/project-demand";
+
+const emit = defineEmits(['getInfo',"update:formData"])
+const form = ref()
+
+const props = defineProps({
+  formData: {
+    type: Array,
+    default: []
+  },
+  data: {
+    type: Array,
+    default: []
+  },
+  processViewer: {
+    type: Boolean,
+    default: false
+  }, showTable: {
+    type: Boolean,
+    default: false
+  },
+  loading: {
+    type: Boolean,
+    default: false
+  }
+})
+const projectTable = reactive({
+  columns: [
+    {
+      prop: 'index',
+      type: 'index',
+      label: '序号',
+      align: 'center',
+      width: '80',
+    },
+    {
+      prop: 'projectName',
+      label: '项目名称',
+      align: 'center',
+    },
+    {
+      prop: 'specialFundAmount',
+      label: '项目金额',
+      align: 'center'
+    },
+    {
+      prop: 'startTime',
+      label: '项目时间',
+      align: 'center'
+    },
+    {
+      prop: 'oper',
+      label: '操作',
+      align: 'center',
+      currentRender: ({row, index}) => {
+        return (
+            <el-button type="primary" link onClick={() => handleView(row)}>查看</el-button>
+        )
+      }
+    }
+  ]
+})
+const fileTable = reactive({
+  columns: [
+    {
+      prop: 'index',
+      type: 'index',
+      label: '序号',
+      align: 'center',
+      width: '80',
+    },
+    {
+      prop: 'originalFileName',
+      label: '文件名',
+      align: 'center',
+    },
+    {
+      prop: 'tag',
+      label: '标签',
+      align: 'center'
+    },
+    {
+      prop: 'size',
+      label: '文件大小',
+      align: 'center',
+      currentRender: ({row, index}) => (parseInt(row.size / 1024) + 'KB')
+    },
+    {
+      prop: 'oper',
+      label: '操作',
+      align: 'center',
+      currentRender: ({row, index}) => {
+        return (
+            <el-button type="primary" link onClick={() => handleDownload(row)}>下载</el-button>
+        )
+      }
+    }
+  ]
+})
+const handleDownload = (row) => {
+  downloadFile(row.fileId).then(res => {
+    const blob = new Blob([res])
+    let a = document.createElement('a')
+    a.href = URL.createObjectURL(blob)
+    a.download = row.originalFileName
+    a.click()
+  })
+}
+
+watch(() => props.loading, (newVal) => {
+  props.loading = newVal
+}, {deep: true})
+
+watch(() => props.processViewer, (newVal) => {
+  props.processViewer = newVal
+}, {deep: true})
+watch(() => props.showTable, (newVal) => {
+  props.showTable = newVal
+}, {deep: true})
+</script>
+
+<style scoped>
+
+</style>

src/views/project-demand/requirement/add.vue

@@ -2,7 +2,6 @@
   <div v-loading="loading" class="add-block">
     <baseTitle title="需求征集信息录入"></baseTitle>
     <el-form :model="formData" inline class="query-form" ref="demandForm" :rules="rules">
-      <div class="left-info">
         <el-form-item v-if="checkFormPrem('requirementName')" label="名称" prop="requirementName">
           <el-input v-model="formData.requirementName" placeholder="请输入名称" clearable></el-input>
         </el-form-item>
@@ -30,7 +29,6 @@
             />
           </el-config-provider>
         </el-form-item>
-      </div>
     </el-form>
     <baseTitle title="征集说明"></baseTitle>
     <Tinymce  v-if="checkFormPrem('collectExplain') && showTinymce" image-url="/notice/file" file-url="/notice/file"
@@ -148,10 +146,10 @@ const tableConfig = reactive({
         return (
             <div>
               <el-button type="primary" link onClick={() => handleDownload(row)}>下载</el-button>
-              <el-button type="primary" size="large" link onClick={() => handleDelete(row)}>删除</el-button>
             </div>
         )
       }
+    // <el-button type="primary" size="large" link onClick={() => handleDelete(row)}>删除</el-button>
     }
   ]
 })
@@ -176,11 +174,13 @@ const handleDownload = (row) => {
   })
 }
 const compositeParam = (item) => {
-  console.log('router.currentRoute.value.path',router.currentRoute.value.path)
+  let name=router.currentRoute.value.name
   let tag = ''
-  // if (!formData.value.collectType && router.currentRoute.value.path === 'Requirement/add') {
-  //   tag = '需求征集'
-  // }
+  if (!formData.value.collectType && name === 'Requirement/add') {
+    tag = '需求征集'
+  }else if(name === 'Requirement/edit'){
+    tag = '需求征集'
+  }
   return {
     fileId: item.id,
     size: item.size,
@@ -254,28 +254,32 @@ const handleSubmit = async (instance) => {
   if (!instance) return
   instance.validate(async (valid) => {
     if (!valid) return
-    let res = await addRequirement(submitParam(formData.value))
-    if (res.code === 1000) {
-      ElMessage.success(res.msg)
+    const {msg,code} = await addRequirement(submitParam(formData.value))
+    ElNotification({
+      title: '提示',
+      message: msg,
+      type: code === 1000 ? 'success' : 'error'
+    })
+    if (code === 1000) {
       tagsViewStore.delVisitedViews(router.currentRoute.value.path)
       await router.push({
         name: 'Requirement'
       })
-    } else {
-      ElMessage.error(res.msg)
     }
   })
 }
 const handleResubmit = () => {
   resubmit(submitParam(formData.value)).then(res => {
+    ElNotification({
+      title: '提示',
+      message: res.msg,
+      type: res.code === 1000 ? 'success' : 'error'
+    })
     if (res.code === 1000) {
-      ElMessage.success(res.msg)
       tagsViewStore.delVisitedViews(router.currentRoute.value.path)
       router.push({
         name: 'Requirement'
       })
-    } else {
-      ElMessage.error(res.msg)
     }
   })
 }

src/views/project-demand/requirement/index.vue

@@ -148,19 +148,15 @@ const handleAdd = () => {
   try{
     router.push({
       name:'Requirement/add',
-      query: {
-        isAdd: 1
-      }
+      query:{}
     })
   }catch (err){
-    ElNotification({
-      title: '提示',
-      message: '该用户无新增权限',
-      type: 'warning'
-    })
+    // ElNotification({
+    //   title: '提示',
+    //   message: '该用户无新增权限',
+    //   type: 'warning'
+    // })
   }
-  //新增
-
 }
 const handleEdit = (row) => {
   router.push({

src/views/project-demand/summary/index.vue

@@ -123,7 +123,6 @@ const tableConfig = reactive({
       currentRender: ({row, index}) => {
         let btn = []
         let buttons = new Set(Array.from(row.buttons))
-        console.log('buttons',buttons.has("details"))
         if (buttons.has("details")) {
           btn.push({label: '详情', prem: ['mosr:collect:info'], func: () => handleDetail(row), type: 'primary'})
         }

src/views/project-management/implementation/attachment.vue

@@ -71,7 +71,6 @@ const tableConfig = reactive({
         return (
             <div>
               <el-button type="primary" link onClick={() => handleDownload(row)}>下载</el-button>
-              <el-button type="primary" size="large" link onClick={() => beforeRemove(row)}>删除</el-button>
             </div>
         )
       }

src/views/special-fund/add.vue

@@ -0,0 +1,241 @@
+<template>
+  <div v-loading="loading" class="add-block">
+    <baseTitle title="专项资金信息录入"></baseTitle>
+    <el-form :model="formData" inline class="query-form" ref="fundForm" :rules="rules">
+      <el-form-item label="名称" prop="name">
+        <el-input v-model="formData.name" placeholder="请输入名称" clearable></el-input>
+      </el-form-item>
+      <el-form-item label="金额" prop="fundAmount">
+        <el-input v-model="formData.fundAmount" placeholder="请输入金额" clearable></el-input>
+      </el-form-item>
+    </el-form>
+    <baseTitle title="介绍"></baseTitle>
+    <Tinymce image-url="/notice/file" file-url="/notice/file" v-if="showTinymce"
+             v-model:value="formData.introduce" height="300"/>
+    <baseTitle title="申请文件"></baseTitle>
+    <file-upload @getFile="getFile"/>
+    <fvTable style="width: 100%;max-height: 200px" v-if="showTable"
+             :tableConfig="tableConfig" :data="formData.files"
+             :isSettingCol="false" :pagination="false">
+      <template #empty>
+        <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
+      </template>
+    </fvTable>
+        <div class="approval-record">
+          <baseTitle title="流程"></baseTitle>
+          <process-diagram-viewer mode="view" v-if="processDiagramViewer"/>
+        </div>
+    <div class="oper-page-btn">
+      <el-button color="#DED0B2" @click="handleSubmit(fundForm)">提交</el-button>
+      <el-button color="#DED0B2" @click="handleResubmit">重新提交</el-button>
+      <el-button @click="handleBack">返回</el-button>
+    </div>
+  </div>
+</template>
+
+<script setup lang="jsx">
+import {ElNotification} from "element-plus";
+import {addFund, resubmitFund,getFundDetail} from "@/api/special-fund";
+import {useRouter} from "vue-router";
+import {useTagsView} from '@/stores/tagsview.js'
+
+import {useProcessStore} from '@/stores/processStore.js';
+const tagsViewStore = useTagsView()
+const router = useRouter()
+const route = useRoute()
+const processStore = useProcessStore()
+const loading = ref(false)
+const showTinymce = ref(true)
+const showTable = ref(true)
+const processInstanceData = ref()
+const fundForm = ref()
+const processDiagramViewer = ref(false)
+const formData = ref({
+  name: '',
+  fundAmount: '',
+  introduce: '',
+  files: []
+})
+const tableConfig = reactive({
+  columns: [
+    {
+      prop: 'index',
+      type: 'index',
+      label: '序号',
+      align: 'center',
+      width: '80',
+    },
+    {
+      prop: 'originalFileName',
+      label: '文件名',
+      align: 'center',
+    },
+    {
+      prop: 'tag',
+      label: '标签',
+      align: 'center'
+    },
+    {
+      prop: 'size',
+      label: '文件大小',
+      align: 'center',
+      currentRender: ({row, index}) => (parseInt(row.size / 1024) + 'KB')
+    },
+    {
+      prop: 'oper',
+      label: '操作',
+      align: 'center',
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => {
+        return (
+            <div>
+              <el-button type="primary" link onClick={() => handleDownload(row)}>下载</el-button>
+            </div>
+        )
+      }
+    }
+  ]
+})
+
+const rules = reactive({
+  name: [{required: true, message: '请输入名称', trigger: 'blur'}],
+  fundAmount: [{required: true, message: '请输入金额', trigger: 'blur'}],
+  introduce: [{required: true, message: '请输入介绍', trigger: 'blur'}],
+})
+
+const compositeParam = (item) => {
+  let name=router.currentRoute.value.name
+  let tag = ''
+  if (name === 'Fund/add'||name === 'Fund/edit') {
+    tag = '专项资金'
+  }
+  return {
+    fileId: item.id,
+    size: item.size,
+    originalFileName: item.originalFilename,
+    fileType: item.fileType,
+    url: item.url,
+    tag: tag
+  }
+}
+const getFile = (val) => {
+  console.log('上传文件', val)
+  showTable.value = false
+  let fileObj = compositeParam(val)
+  formData.value.files.push(fileObj)
+  nextTick(() => {
+    showTable.value = true
+  })
+}
+const handleBack = () => {
+  history.back()
+}
+
+const submitParam = (item) => {
+  let files = []
+  item.files.forEach(item => {
+    let obj = {
+      fileId: item.fileId,
+      tag: item.tag
+    }
+    files.push(obj)
+  })
+  return {
+    fundAmount: item.fundAmount,
+    introduce: item.introduce,
+    name: item.name,
+    files: files,
+    // deploymentId: processInstanceData.value.deploymentId
+  }
+}
+const handleSubmit = async (instance) => {
+  if (!instance) return
+  instance.validate(async (valid) => {
+    if (!valid) return
+    const {msg,code} = await addFund(submitParam(formData.value))
+    ElNotification({
+      title: '提示',
+      message: msg,
+      type: code === 1000 ? 'success' : 'error'
+    })
+    if (code === 1000) {
+      tagsViewStore.delVisitedViews(router.currentRoute.value.path)
+      await router.push({
+        name: 'Fund'
+      })
+    }
+  })
+}
+const handleResubmit = () => {
+  if(!route.query.id)return
+  let params={
+    id:route.query.id,
+    ...submitParam(formData.value)
+  }
+  resubmitFund(params).then(res => {
+    ElNotification({
+      title: '提示',
+      message: res.msg,
+      type: res.code === 1000 ? 'success' : 'error'
+    })
+    if (res.code === 1000) {
+      tagsViewStore.delVisitedViews(router.currentRoute.value.path)
+      router.push({
+        name: 'Fund'
+      })
+    }
+  })
+}
+const init = async () => {
+  getWorkflowInfo().then(res => {
+    ElNotification({
+      title: '提示',
+      message: res.msg,
+      type: res.code === 1000 ? 'success' : 'error'
+    })
+    if (res.code === 1000) {
+      let data = res.data
+      processInstanceData.value = data
+      processStore.setDesign(data)
+      processStore.runningList.value = data.runningList;
+      processStore.endList.value = data.endList;
+      processStore.noTakeList.value = data.noTakeList;
+      processStore.refuseList.value = data.refuseList;
+      processStore.passList.value = data.passList;
+      nextTick(() => {
+        processDiagramViewer.value = true
+      })
+    }
+  })
+}
+const getDetailInfo = async () => {
+  getFundDetail(route.query.id).then(res => {
+    ElNotification({
+      title: '提示',
+      message: res.msg,
+      type: res.code === 1000 ? 'success' : 'error'
+    })
+    if (res.code === 1000) {
+      formData.value = res.data.formData
+      showTinymce.value = false
+      showTable.value = false
+      nextTick(() => {
+        showTinymce.value = true
+        showTable.value = true
+      })
+    }
+  })
+}
+onMounted(async () => {
+  loading.value = true
+  // await init()
+  if (route.query.id) {
+    await getDetailInfo()
+  }
+  loading.value = false
+})
+</script>
+
+<style scoped>
+
+</style>

src/views/special-fund/detail.vue

@@ -0,0 +1,48 @@
+<template>
+  <special-fund-detail :formData="fundData.formData" :data="fundData" :showTable="showTable" :processViewer="fundProcessViewer"
+                       :loading="loading"/>
+</template>
+
+<script setup lang="jsx">
+import {ElNotification} from "element-plus";
+import {getFundDetail} from "@/api/special-fund";
+import {useProcessStore} from '@/stores/processStore.js';
+const processStore = useProcessStore()
+const route = useRoute()
+const fundData = ref({})
+const fundProcessViewer = ref(true)
+const showTable = ref(true)
+const loading = ref(false)
+const getDetail = async () => {
+  const specialFundId = route.query.id
+  showTable.value = false
+  loading.value = true
+  const {code, data, msg} = await getFundDetail(specialFundId)
+  ElNotification({
+    title: '提示',
+    message: msg,
+    type: code === 1000 ? 'success' : 'error'
+  })
+  if (code === 1000) {
+    fundData.value = data
+    loading.value = false
+    nextTick(() => {
+      showTable.value = true
+    })
+    // if(data.operationList==null)return;
+    // processStore.setDesign(data)
+    // processStore.runningList.value = data.runningList;
+    // processStore.endList.value = data.endList;
+    // processStore.noTakeList.value = data.noTakeList;
+    // processStore.refuseList.value = data.refuseList;
+    // processStore.passList.value = data.passList;
+
+  }else {
+    loading.value = false
+  }
+}
+getDetail()
+</script>
+<style scoped>
+
+</style>

src/views/special-fund/index.vue

@@ -0,0 +1,140 @@
+<template>
+  <fvSearchForm :searchConfig="searchConfig" @search="search"></fvSearchForm>
+  <fvTable ref="tableIns" :tableConfig="tableConfig" @headBtnClick="headBtnClick"></fvTable>
+</template>
+
+
+<script setup lang="jsx">
+import fvSelect from '@/fvcomponents/fvSelect/index.vue'
+
+const router = useRouter()
+const searchConfig = reactive([
+  {
+    label: '专项资金名称',
+    prop: 'requirementName',
+    component: 'el-input',
+    props: {
+      placeholder: '请输入名称查询'
+    }
+  },
+  {
+    label: '状态',
+    prop: 'state',
+    component: shallowRef(fvSelect),
+    props: {
+      placeholder: '请选择状态',
+      clearable: true,
+      cacheKey: 'special_fund'
+    }
+  },
+])
+const tableConfig = reactive({
+  columns: [
+    {
+      prop: 'name',
+      label: '专项资金名称',
+      align: 'center'
+    },
+    {
+      prop: 'fundAmount',
+      label: '专项资金金额',
+      align: 'center'
+    },
+    {
+      prop: 'residualAmount',
+      label: '剩余金额',
+      align: 'center'
+    },
+    {
+      prop: 'state',
+      label: '状态',
+      align: 'center',
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => {
+        if (row.state == undefined) {
+          return '--'
+        } else {
+          return (<Tag dictType={'special_fund'} value={row.state}/>)
+        }
+      }
+    },
+    {
+      prop: 'oper',
+      label: '操作',
+      align: 'center',
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => {
+        let btn = []
+        // let buttons = new Set(Array.from(row.buttons))
+        // if (buttons.has("details")) {
+          btn.push({label: '详情', prem: ['mosr:collect:info'], func: () => handleDetail(row), type: 'primary'})
+        // }
+        // if (buttons.has("edit")) {
+          btn.push({label: '编辑',prem: ['mosr:collect:resubmit'], func: () => handleEdit(row), type: 'primary'})
+        // }
+        // if (buttons.has("delete")) {
+        //   btn.push({label: '删除',prem: ['mosr:requirement:del'], func: () => handleDelete(row), type: 'primary'})
+        // }
+        return (
+            <div style={{width: '100%'}}>
+              {
+                btn.map(item => (
+                    <el-button
+                        type={item.type}
+                        // v-perm={item.prem}
+                        onClick={() => item.func()}
+                        link
+                    >
+                      {item.label}
+                    </el-button>
+                ))
+              }
+            </div>
+        )
+      }
+    }
+  ],
+  api: '/workflow/mosr/special/fund',
+  params: {},
+  btns: [
+    {name: '新增', key: 'add', color: '#DED0B2', auth: ''},
+    {name: '导出', key: '_export', color: '#DED0B2', auth: ''},
+  ]
+})
+const handleDetail = (row) => {
+  router.push({
+    name:'Fund/detail',
+    query: {
+      id:row.id
+    }
+  })
+}
+const handleAdd = () => {
+  router.push({
+    name:'Fund/add',
+    query: {}
+  })
+}
+const handleEdit = (row) => {
+  router.push({
+    name:'Fund/edit',
+    query: {
+      id:row.id
+    }
+  })
+}
+const headBtnClick = (key) => {
+  switch (key) {
+    case 'add':
+      handleAdd()
+      break;
+    case 'export':
+      handleExport()
+      break;
+  }
+}
+</script>
+
+<style scoped>
+
+</style>