Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/project-demand/requirement/detail.vue

src/api/special-fund/index.js

@@ -38,3 +38,9 @@ export const resubmitFund= (data) => {
     data
   });
 };
+export const deleteFund = (id) => {
+  return request({
+    url: `/workflow/mosr/special/fund/${id}`,
+    method: "delete"
+  });
+};

src/components/AttachmentUpload.vue

@@ -19,7 +19,7 @@
         <el-form-item label="其他文件">
           <el-card style="width: 100%">
             <file-upload @getFile="getOtherFile"/>
-            <fvTable style="width: 100%;max-height: 250px;height: 250px" v-if="showTable" :tableConfig="tableConfig"
+            <fvTable style="width: 100%;max-height: 300px;" v-if="showTable" :tableConfig="tableConfig"
                      :data="allFileList" :isSettingCol="false" :pagination="false">
               <template #empty>
                 <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
@@ -226,5 +226,7 @@ defineExpose({
 </script>
 
 <style scoped>
-
+:deep(.el-table--fit ){
+  height: 300px!important;
+}
 </style>

src/components/DetailComponent/Opinion.vue

@@ -11,7 +11,8 @@
 import {ElNotification} from 'element-plus';
 import {agreeTask, rejectTask} from "@/api/project-demand/index.js";
 
-import { useTagsView } from '@/stores/tagsview.js'
+import {useTagsView} from '@/stores/tagsview.js'
+
 const tagsViewStore = useTagsView()
 const route = useRoute()
 const router = useRouter()
@@ -84,7 +85,11 @@ const back = () => {
       }
       break;
     case 'Fund/detail':
-      router.push({name: 'Fund'})
+      if (route.query.source === 'home') {
+        router.push('/home')
+      } else {
+        router.push({name: 'Fund'})
+      }
       break;
     case 'Share/detail':
       router.push({name: 'Expense/share'})

src/components/DetailComponent/SpecialFundDetail.vue

@@ -30,7 +30,7 @@
         <baseTitle title="关联项目"></baseTitle>
         <el-col :span="24">
           <el-form-item>
-            <fvTable style="width: 100%;max-height: 200px" v-if="showTable" :tableConfig="projectTable"
+            <fvTable style="width: 100%;max-height:300px" v-if="showTable" :tableConfig="projectTable"
                      :data="formData.projects" :isSettingCol="false" :pagination="false">
               <template #empty>
                 <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
@@ -41,7 +41,7 @@
         <baseTitle title="附件列表"></baseTitle>
         <el-col :span="24">
           <el-form-item>
-            <fvTable style="width: 100%;max-height: 200px" v-if="showTable" :tableConfig="fileTable"
+            <fvTable style="width: 100%;max-height: 300px;" v-if="showTable" :tableConfig="fileTable"
                      :data="formData.files" :isSettingCol="false" :pagination="false">
               <template #empty>
                 <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
@@ -201,6 +201,8 @@ watch(() => props.showTable, (newVal) => {
 }, {deep: true})
 </script>
 
-<style scoped>
+<style scoped lang="scss">
-
+:deep(.el-table--fit ){
+  height: 300px!important;
+}
 </style>

src/components/DetailComponent/SummaryDetail.vue

@@ -103,7 +103,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="其中申请公司总部科技创新专项资金(元)" prop="specialFundAmount">
+          <el-form-item label="其中申请公司总部科技创新专项资金(元)" prop="specialFundAmount" v-if="localFormData.isSpecialFund!==null||localFormData.isSpecialFund">
             <span>{{ localFormData.specialFundAmount }}</span>
           </el-form-item>
         </el-col>

src/components/Tinymce.vue

@@ -74,7 +74,7 @@ const props = defineProps({
   },
   height:{
     type: Number,
-    default: 650
+    default: 500
   }
 })
 const content = ref(props.value);

src/views/expense-management/share/add.vue

@@ -232,11 +232,6 @@ const getDetailInfo = async () => {
 const init = async () => {
   processDiagramViewer.value = false
   getAllocationProcess().then(res => {
-    ElNotification({
-      title: '提示',
-      message: res.msg,
-      type: res.code === 1000 ? 'success' : 'error'
-    })
     if (res.code === 1000) {
       let data = res.data
       processInstanceData.value = data
@@ -249,6 +244,12 @@ const init = async () => {
       nextTick(() => {
         processDiagramViewer.value = true
       })
+    }else {
+      ElNotification({
+        title: '提示',
+        message: res.msg,
+        type: 'error'
+      })
     }
   })
 }

src/views/expense-management/share/index.vue

@@ -77,7 +77,13 @@ const tableConfig = reactive({
       label: '状态',
       align: 'center',
       showOverflowTooltip: false,
-      // currentRender: ({row, index}) => (<Tag dictType={'special_fund'} value={row.state}/>)
+      currentRender: ({row, index}) => {
+        if (row.state == undefined||row.state == 0) {
+          return '--'
+        } else {
+          return (<Tag dictType={'special_fund'} value={row.state}/>)
+        }
+      }
     },
     {
       prop: 'oper',

src/views/home/index.vue

@@ -148,7 +148,6 @@ const tableConfig = reactive({
         return (
             <div>
               <el-button type="primary" link onClick={() => handleView(row)}>查看</el-button>
-              <el-button type="primary" link onClick={() => handleEdit(row)}>已读</el-button>
             </div>
         )
       }
@@ -175,7 +174,7 @@ const handleView = (row) => {
         source: 'home'
       }
     })
-  } else {
+  } else if (row.targetState == '20'||row.targetState == '40'||row.targetState == '50'){
     router.push({
       name: 'Implementation/detail',
       query: {
@@ -185,6 +184,15 @@ const handleView = (row) => {
         source: 'home'
       }
     })
+  }else if (row.targetState == '70' && row.targetId) {
+    router.push({
+      name: 'Fund/detail',
+      query: {
+        id: row.targetId,
+        state: row.state,
+        source: 'home'
+      }
+    })
   }
 }
 </script>

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

@@ -57,7 +57,7 @@
               v-model:value="formData.collectExplain"  />
     <baseTitle title="申请文件"></baseTitle>
     <file-upload v-if="checkFormPrem('fileList')" @getFile="getFile"/>
-    <fvTable style="width: 100%;max-height: 600px;height: 600px" v-if="showTable"
+    <fvTable style="width: 100%;max-height: 300px;" v-if="showTable"
              :tableConfig="tableConfig" :data="formData.fileList"
              :isSettingCol="false" :pagination="false" perm="EDIT">
       <template #empty>
@@ -74,7 +74,6 @@
     <div class="oper-page-btn">
       <el-button color="#DED0B2" v-if="routerName==='Requirement/add'" @click="handleSubmit(demandForm)">提交</el-button>
       <el-button color="#DED0B2" v-else @click="handleResubmit">重新提交</el-button>
-      <el-button @click="handleBack">返回</el-button>
     </div>
   </div>
 </template>
@@ -367,7 +366,7 @@ onMounted(async () => {
   margin-top: 0;
 }
 :deep(.el-table--fit ){
-  height: 600px;
+  height: 300px!important;
 }
 .add-block {
   //display: flex;

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

@@ -76,7 +76,7 @@
       </el-row>
     </el-form>
     <div class="oper-page-btn" v-if="processInstanceData.state === '1' && processInstanceData.taskId">
-      <el-button @click="handleReject(demandForm)">驳回</el-button>
+      <el-button type="danger" @click="handleReject(demandForm)">驳回</el-button>
       <el-button color="#DED0B2" @click="handleSubmit">同意</el-button>
     </div>
   </div>
@@ -247,6 +247,13 @@ const init = async () => {
   await getCompanyOption()
   await getFundOptions()
   getInfo(route.query.id).then(res => {
+    if (res.code !== 1000) {
+      ElNotification({
+        title: '提示',
+        message: res.msg,
+        type: 'error'
+      })
+    }
     loading.value = false
     let data = res.data
     formData.value = data.formData;
@@ -335,9 +342,8 @@ const handleDelete = (row) => {
 }
 
 :deep(.el-table--fit ) {
-  height: 600px;
+  height: 300px !important;
 }
-
 .detail-block {
   overflow: hidden;
   padding-right: 10px;

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

@@ -531,9 +531,4 @@ const staging = async () => {
   overflow: hidden;
   padding-bottom: 30px;
 }
-
-:deep(.el-table--fit) {
-  height: auto !important;
-}
-
 </style>

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

@@ -8,7 +8,7 @@
   <baseTitle title="上传附件"></baseTitle>
   <el-card style="width: 100%;margin: 15px 0">
     <file-upload @getFile="getFile"/>
-    <fvTable style="width: 100%;max-height: 250px;height: 250px" v-if="showTable" :tableConfig="tableConfig"
+    <fvTable style="width: 100%;max-height: 300px;" v-if="showTable" :tableConfig="tableConfig"
              :data="fileList" :isSettingCol="false" :pagination="false">
       <template #empty>
         <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
@@ -129,5 +129,7 @@ const handleSubmit = async () => {
 </script>
 
 <style scoped>
-
+:deep(.el-table--fit ){
+  height: 300px!important;
+}
 </style>

src/views/project-management/filing/conclusion.vue

@@ -69,19 +69,18 @@ const tableConfig = reactive({
       align: 'center',
       currentRender: ({row, index}) => (parseInt(row.size / 1024) + 'KB')
     },
-    // {
+    {
-    //   prop: 'oper',
+      prop: 'oper',
-    //   label: '操作',
+      label: '操作',
-    //   align: 'center',
+      align: 'center',
-    //   currentRender: ({row, index}) => {
+      currentRender: ({row, index}) => {
-    //     return (
+        return (
-    //         <div>
+            <div>
-    //           <el-button type="primary" link onClick={() => handleDownload(row)}>下载</el-button>
+              <el-button type="primary" link onClick={() => handleDownload(row)}>下载</el-button>
-    //           <el-button type="primary" size="large" link onClick={() => beforeRemove(row)}>删除</el-button>
+            </div>
-    //         </div>
+        )
-    //     )
+      }
-    //   }
+    }
-    // }
   ]
 })
 const handleDownload = (row) => {

src/views/project-management/filing/upload.vue

@@ -8,7 +8,7 @@
   <baseTitle title="上传附件"></baseTitle>
   <el-card style="width: 100%;margin: 15px 0">
     <file-upload @getFile="getFile" />
-    <fvTable style="width: 100%;max-height: 250px;height: 250px" v-if="showTable" :tableConfig="tableConfig"
+    <fvTable style="width: 100%;max-height: 300px;" v-if="showTable" :tableConfig="tableConfig"
              :data="fileList" :isSettingCol="false" :pagination="false">
       <template #empty>
         <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
@@ -128,5 +128,7 @@ const handleSubmit = async () => {
 </script>
 
 <style scoped>
-
+:deep(.el-table--fit ){
+  height: 300px!important;
+}
 </style>

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

@@ -120,11 +120,6 @@ const handleSubmit = (instance) => {
 
 const init = async () => {
   const {msg, code,data} = await getProjectCheckProcess(route.query.projectId)
-  ElNotification({
-    title: '提示',
-    message: msg,
-    type: code === 1000 ? 'success' : 'error'
-  })
   processDiagramViewer.value = false
   if (code === 1000) {
     deploymentId.value = data.deploymentId
@@ -138,6 +133,12 @@ const init = async () => {
     nextTick(() => {
       processDiagramViewer.value = true
     })
+  }else {
+    ElNotification({
+      title: '提示',
+      message: msg,
+      type:'error'
+    })
   }
 }
 onMounted(async () => {

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

@@ -17,7 +17,7 @@
   <baseTitle title="其他文件"></baseTitle>
   <el-card style="width: 100%;margin: 15px 0">
     <file-upload @getFile="getFile" :disabled="!formData.tagName" :title="!formData.tagName?'请先选择/输入标签！':''"/>
-    <fvTable style="width: 100%;max-height: 250px;height: 250px" v-if="showTable" :tableConfig="tableConfig"
+    <fvTable style="width: 100%;max-height: 300px;" v-if="showTable" :tableConfig="tableConfig"
              :data="fileList" :isSettingCol="false" :pagination="false">
       <template #empty>
         <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
@@ -183,5 +183,7 @@ getTagsOption()
 </script>
 
 <style scoped>
-
+:deep(.el-table--fit ){
+  height: 300px!important;
+}
 </style>

src/views/project-management/initiation/apply.vue

@@ -27,10 +27,11 @@
 
 <script setup lang="jsx">
 import {useTagsView} from '@/stores/tagsview.js'
-import {ElMessage, ElNotification} from "element-plus";
+import { ElNotification} from "element-plus";
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
 import {getApplyProcess, projectApply, resubmitApply, getApplyDetail} from "@/api/project-manage";
 import {useProcessStore} from '@/stores/processStore.js';
+import {downloadFile} from "@/api/project-demand";
 
 const tagsViewStore = useTagsView()
 const router = useRouter()
@@ -71,25 +72,31 @@ const tableConfig = reactive({
       align: 'center',
       currentRender: ({row, index}) => (parseInt(row.size / 1024) + 'KB')
     },
-    // {
+    {
-    //   prop: 'oper',
+      prop: 'oper',
-    //   label: '操作',
+      label: '操作',
-    //   align: 'center',
+      align: 'center',
-    //   currentRender: ({row, index}) => {
+      currentRender: ({row, index}) => {
-    //     return (
+        return (
-    //         <div>
+            <el-button type="primary" link onClick={() => handleDownload(row)}>下载</el-button>
-    //           <a style="cursor: pointer;font-size: 14px;color: #2a99ff;" href={row.url}>下载</a>
+        )
-    //           <el-button type="primary" size="large" link onClick={() => beforeRemove(row)}>删除</el-button>
+      }
-    //         </div>
+    }
-    //     )
-    //   }
-    // }
   ]
 })
 const loading = ref(false)
 const processInstanceData = ref()
 const processDiagramViewer = ref(true)
 const name = ref(router.currentRoute.value.name)
+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()
+  })
+}
 const compositeParam = (item) => {
   let tag = ''
   if (name.value === 'Initiation/apply' || name.value === 'Initiation/edit') {
@@ -146,7 +153,7 @@ const handleSubmit = (instance) => {
         type: 'error'
       })
       return;
-    }else {
+    } else {
       attachment.value.clearValidate()
     }
     let params = {
@@ -207,7 +214,7 @@ const handleResubmit = async () => {
       type: 'error'
     })
     return;
-  }else {
+  } else {
     attachment.value.clearValidate()
   }
   console.log('params', params)
@@ -253,7 +260,7 @@ const init = () => {
       nextTick(() => {
         processDiagramViewer.value = true
       })
-    }else {
+    } else {
       ElNotification({
         title: '提示',
         message: res.msg,

src/views/project-management/initiation/upload.vue

@@ -8,7 +8,7 @@
   <baseTitle title="上传附件"></baseTitle>
   <el-card style="width: 100%;margin: 15px 0">
     <file-upload @getFile="getFile"/>
-    <fvTable style="width: 100%;max-height: 250px;height: 250px" v-if="showTable" :tableConfig="tableConfig"
+    <fvTable style="width: 100%;max-height: 300px;" v-if="showTable" :tableConfig="tableConfig"
              :data="fileList" :isSettingCol="false" :pagination="false">
       <template #empty>
         <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
@@ -127,5 +127,7 @@ const handleSubmit = async () => {
 </script>
 
 <style scoped>
-
+:deep(.el-table--fit ){
+  height: 300px!important;
+}
 </style>

src/views/special-fund/add.vue

@@ -6,7 +6,7 @@
         <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-input-number v-model="formData.fundAmount"  placeholder="请输入金额" :controls="false"/>
       </el-form-item>
     </el-form>
     <baseTitle title="介绍"></baseTitle>
@@ -14,7 +14,7 @@
              v-model:value="formData.introduce"/>
     <baseTitle title="申请文件"></baseTitle>
     <file-upload @getFile="getFile"/>
-    <fvTable style="width: 100%;max-height: 650px;" v-if="showTable"
+    <fvTable style="width: 100%;max-height: 300px;" v-if="showTable"
              :tableConfig="tableConfig" :data="formData.files"
              :isSettingCol="false" :pagination="false">
       <template #empty>
@@ -170,7 +170,7 @@ const handleSubmit = async (instance) => {
 const handleResubmit = () => {
   if (!route.query.id) return
   let params = {
-    id: route.query.id,
+    specialFundId: route.query.id,
     ...submitParam(formData.value)
   }
   resubmitFund(params).then(res => {
@@ -190,11 +190,6 @@ const handleResubmit = () => {
 const init = async () => {
   processDiagramViewer.value = false
   getFundProcess().then(res => {
-    ElNotification({
-      title: '提示',
-      message: res.msg,
-      type: res.code === 1000 ? 'success' : 'error'
-    })
     if (res.code === 1000) {
       let data = res.data
       processInstanceData.value = data
@@ -207,6 +202,12 @@ const init = async () => {
       nextTick(() => {
         processDiagramViewer.value = true
       })
+    }else {
+      ElNotification({
+        title: '提示',
+        message: msg,
+        type:'error'
+      })
     }
   })
 }
@@ -238,6 +239,8 @@ onMounted(async () => {
 })
 </script>
 
-<style scoped>
+<style scoped lang="scss">
-
+:deep(.el-table--fit ){
+  height: 300px!important;
+}
 </style>

src/views/special-fund/index.vue

@@ -10,6 +10,8 @@
 
 <script setup lang="jsx">
 import fvSelect from '@/fvcomponents/fvSelect/index.vue'
+import { ElNotification} from "element-plus";
+import {deleteFund} from "@/api/special-fund";
 
 const router = useRouter()
 const searchConfig = reactive([
@@ -117,9 +119,6 @@ const tableConfig = reactive({
         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%'}}>
               {
@@ -162,7 +161,7 @@ const handleDetail = (row) => {
   router.push({
     name: 'Fund/detail',
     query: {
-      id: row.id
+      id: row.specialFundId
     }
   })
 }
@@ -176,7 +175,19 @@ const handleEdit = (row) => {
   router.push({
     name: 'Fund/edit',
     query: {
-      id: row.id
+      id: row.specialFundId
+    }
+  })
+}
+const handleDelete = async (row) => {
+  deleteFund(row.specialFundId).then(res => {
+    ElNotification({
+      title: '提示',
+      message: res.msg,
+      type: res.code === 1000 ? 'success' : 'error'
+    })
+    if (res.code === 1000) {
+      tableIns.value.refresh()
     }
   })
 }

src/views/workflow/process/ProcessEdit.vue

@@ -324,6 +324,7 @@ const doPublish = () => {
         type: res.code === 1000 ? 'success' : 'error'
       })
       if (res.code === 1000) {
+        validVisible.value = false
         tagsViewStore.delVisitedViews(router.currentRoute.value.path)
         router.push("/workflow/process")
       }

src/views/workflow/process/index.vue

@@ -142,14 +142,15 @@ const selectDefinition = ref(null)
 const historyVersionList = ref([])
 const singleTable = ref()
 const isVisited = ref(false)
-
+onActivated(()=>{
+  getList()
+})
 //重置搜索
 const handleReset = () => {
   queryForm.value.resetFields()
   getList()
 }
 
-
 //获取数据
 const getList = async () => {
   let params = {