odjbin/mosr-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix : 修复项目实施附件查询及上传功能、代码文件优化

Browse Source
This commit is contained in:
odjbin
2024-06-03 15:39:22 +08:00
parent 1ee92f698e
commit abe80eafdc
21 changed files with 86 additions and 1164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/api/project-demand/index.js
View File

@@ -82,18 +82,3 @@ export const deleteDemand = (id) => {
method: "delete"
});
};
//需求征集附件列表(归档)
export const getRequirementAttachment = (params) => {
return request({
url: '/workflow/mosr/requirement/attachments',
method: "get",
params:params
});
};
export const uploadRequirementAttachment= (data) => {
return request({
url: '/workflow/mosr/requirement/upload',
method: "post",
data: data
});
};

0
src/views/project-demand/summary/api/index.js → src/api/project-demand/summary/index.js
View File

7
src/api/project-manage/attachment.js
View File

@@ -8,3 +8,10 @@ export const searchFileList = (params) => {
params: params
});
};
export const uploadFileList = (data) => {
return request({
url: '/workflow/mosr/attachment/upload',
method: "post",
data: data
});
};

36
src/api/project-manage/index.js
View File

@@ -34,13 +34,6 @@ export const getInitiationAttachment = (params) => {
params:params
});
};
export const uploadInitiationAttachment= (data) => {
return request({
url: '/workflow/mosr/project/approval/upload',
method: "post",
data: data
});
};
//项目实施
export const getCheckDetail = (projectId) => {
return request({
@@ -69,20 +62,7 @@ export const getProjectCheckProcess = (projectId) => {
method: "get"
});
};
export const getImplementationAttachment = (params) => {
return request({
url: '/workflow/mosr/project/implementation/attachments',
method: "get",
params:params
});
};
export const uploadAttachment= (data) => {
return request({
url: '/workflow/mosr/project/implementation/upload',
method: "post",
data: data
});
};
export const addLedger = (data) => {
return request({
url: '/workflow/mosr/expense/ledger',
@@ -125,17 +105,3 @@ export const getProjectConclusionProcess = () => {
method: "get"
});
};
export const getFilingAttachment = (params) => {
return request({
url: '/workflow/mosr/project/filing/attachments',
method: "get",
params:params
});
};
export const uploadFilingAttachment= (data) => {
return request({
url: '/workflow/mosr/project/filing/upload',
method: "post",
data: data
});
};

2
src/components/SearchFilesByTag.vue
View File

@@ -61,7 +61,7 @@ const tableConfig = reactive({
},
{
prop: 'tag',
label: '自定义标签',
label: '标签',
align: 'center'
},
{

133
src/views/project-demand/requirement/upload.vue
View File

@@ -1,133 +0,0 @@
<template>
<!-- <baseTitle title="标签名称"></baseTitle>-->
<!-- <el-form :model="formData" ref="tagForm" label-width="auto" :rules="rules">-->
<!-- <el-form-item label="标签名称" prop="tagName">-->
<!-- <el-input v-model="formData.tagName" placeholder="请输入标签名称" style="width: 300px"/>-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<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"
:data="fileList" :isSettingCol="false" :pagination="false">
<template #empty>
<el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
</template>
</fvTable>
</el-card>
<div class="oper-page-btn">
<el-button color="#DED0B2" @click="handleSubmit">提交</el-button>
</div>
</template>
<script setup lang="jsx">
import {ElNotification} from "element-plus";
import {useTagsView} from '@/stores/tagsview.js'
import {uploadRequirementAttachment} from "@/api/project-demand";
const tagsViewStore = useTagsView()
const route = useRoute()
const router = useRouter()
const fileList = ref([])
const formData = ref({
tagName:''
})
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'
},
{
prop: 'oper',
label: '操作',
align: 'center',
currentRender: ({row, index}) => {
return (
<div>
<el-button type="primary" link onClick={() => handleDownload(row)}>下载</el-button>
</div>
)
}
}
]
})
const showTable = ref(true)
const name = ref(router.currentRoute.value.name)
const rules = reactive({
tagName: [{required: true, message: '请输入标签名称', trigger: 'blur'}],
})
const compositeParam = (item) => {
return {
fileId: item.id,
size: item.size,
originalFileName: item.originalFilename,
fileType: item.fileType,
url: item.url,
newFile: true,
tag:'需求征集'
}
}
const getFile = (val) => {
showTable.value = false
let fileObj = compositeParam(val)
fileList.value.push(fileObj)
nextTick(() => {
showTable.value = true
})
}
const getFileParam = (item) => {
return {
fileId: item.fileId,
tag:item.tag
}
}
const handleSubmit = async () => {
let files = []
fileList.value.forEach(item => {
files.push(getFileParam(item))
})
let params = {
mosrUserFileDtoList: files,
projectId: route.query.id,
}
console.log('params', params)
let res = await uploadRequirementAttachment(params)
ElNotification({
title: '提示',
message: res.msg,
type: res.code === 1000 ? 'success' : 'error'
})
if (res.code === 1000) {
tagsViewStore.delVisitedViews(router.currentRoute.value.path)
await router.push({
name: 'Filing/attachment',
query:{
id: route.query.id
}
})
}
}
</script>
<style scoped>
</style>

2
src/views/project-demand/summary/add.vue
View File

@@ -247,7 +247,7 @@
<script setup lang="jsx">
import {debounce} from 'lodash'
import {getDetail, getProcessInfo, requirementReported, resubmitReported} from "./api";
import {getDetail, getProcessInfo, requirementReported, resubmitReported} from "@/api/project-demand/summary";
import {ElNotification} from "element-plus";
import {useTagsView} from '@/stores/tagsview.js'
import {useCacheStore} from '@/stores/cache.js'

75
src/views/project-demand/summary/components/FileUpload.vue
View File

@@ -1,75 +0,0 @@
<template>
<el-upload
ref="uploadRef"
class="upload-demo"
v-bind="$attrs"
drag
:action="url"
multiple
:on-change="change"
:on-progress="progress"
:on-remove="remove"
:before-remove="beforeRemove"
v-model:file-list="fileList"
:http-request="uploadRequest"
style="width: 50%;"
>
<el-icon class="el-icon--upload"><upload-filled /></el-icon>
<div class="el-upload__text">
拖拽上传/<em>点击上传</em>
</div>
<template #tip>
<div class="el-upload__tip">
{{ tip }}
</div>
</template>
</el-upload>
</template>
<script setup lang="jsx">
import { reactive, ref } from 'vue';
import { fileUp } from '../api';
const props = defineProps({
url: {
type: String,
default: ''
},
tip: {
type: String,
default: ''
}
})
const fileList = ref([])
const uploadRef = ref()
const localData = reactive({
})
const change = (file, files) => {
console.log(file, 'file');
}
const progress = (UploadProgressEvent, UploadFile, UploadFiles) => {
}
const remove = (file, files) => {}
const beforeRemove = (file, files) => {}
const uploadRequest = (UploadRequestOptions) => {
console.log(UploadRequestOptions, 'UploadRequestOptions');
// UploadRequestOptions.data = {}
const formData = new FormData()
formData.append('file', UploadRequestOptions.file)
// formData.append('params', UploadRequestOptions.data)
fileUp(url, formData)
}
</script>
<style lang="scss" scoped>
</style>

1
src/views/project-demand/summary/detail.vue
View File

@@ -48,7 +48,6 @@ const getInfo = async (state) => {
processStore.passList.value = data.passList;
nextTick(() => {
summaryProcessViewer.value = true
console.log('data.formPermMap["fileList"]',data.formPermMap["fileList"])
if (data.formPermMap["fileList"]) {
fileListShow.value = data.formPermMap["fileList"].perm
}

4
src/views/project-demand/summary/index.vue
View File

@@ -4,11 +4,7 @@
</template>
<script setup lang="jsx">
import {reactive, ref, shallowRef} from 'vue';
import fvSelect from '@/fvcomponents/fvSelect/index.vue'
import {useRouter} from 'vue-router';
const localData = reactive({})
const tableIns = ref()
const router = useRouter()

135
src/views/project-demand/summary/upload.vue
View File

@@ -1,135 +0,0 @@
<template>
<!-- <baseTitle title="标签名称"></baseTitle>-->
<!-- <el-form :model="formData" ref="tagForm" label-width="auto" :rules="rules">-->
<!-- <el-form-item label="标签名称" prop="tagName">-->
<!-- <el-input v-model="formData.tagName" placeholder="请输入标签名称" style="width: 300px"/>-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<baseTitle title="上传附件"></baseTitle>
<el-card style="width: 100%;margin: 15px 0">
<file-upload @getFile="getFile"/>
<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"/>
</template>
</fvTable>
</el-card>
<div class="oper-page-btn">
<el-button color="#DED0B2" @click="handleSubmit">提交</el-button>
</div>
</template>
<script setup lang="jsx">
import {ElNotification} from "element-plus";
import {useTagsView} from '@/stores/tagsview.js'
import {uploadCollectAttachment} from "./api";
const tagsViewStore = useTagsView()
const route = useRoute()
const router = useRouter()
const fileList = ref([])
const formData = ref({
tagName:''
})
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'
},
{
prop: 'oper',
label: '操作',
align: 'center',
currentRender: ({row, index}) => {
return (
<div>
<el-button type="primary" link onClick={() => handleDownload(row)}>下载</el-button>
</div>
)
}
}
]
})
const showTable = ref(true)
const name = ref(router.currentRoute.value.name)
const rules = reactive({
tagName: [{required: true, message: '请输入标签名称', trigger: 'blur'}],
})
const compositeParam = (item) => {
return {
fileId: item.id,
size: item.size,
originalFileName: item.originalFilename,
fileType: item.fileType,
url: item.url,
newFile: true,
tag:'需求上报',
}
}
const getFile = (val) => {
showTable.value = false
let fileObj = compositeParam(val)
fileList.value.push(fileObj)
nextTick(() => {
showTable.value = true
})
}
const getFileParam = (item) => {
return {
fileId: item.fileId,
tag:item.tag
}
}
const handleSubmit = async () => {
let files = []
fileList.value.forEach(item => {
files.push(getFileParam(item))
})
let params = {
mosrUserFileDtoList: files,
projectId: route.query.id,
}
console.log('params', params)
let res = await uploadCollectAttachment(params)
ElNotification({
title: '提示',
message: res.msg,
type: res.code === 1000 ? 'success' : 'error'
})
if (res.code === 1000) {
tagsViewStore.delVisitedViews(router.currentRoute.value.path)
await router.push({
name: 'Filing/attachment',
query:{
id: route.query.id
}
})
}
}
</script>
<style scoped>
:deep(.el-table--fit ){
height: 300px!important;
}
</style>

19
src/views/project-management/filing/attachment.vue
View File

@@ -132,27 +132,14 @@ const upload = () => {
})
} else {
router.push({
name: switchUpload(activeName.value),
name: 'Filing/upload',
query: {
id: route.query.id
id: route.query.id,
name: activeName.value
}
})
}
}
const switchUpload = (index) => {
switch (index) {
case '00':
return 'Requirement/upload';
case '10':
return 'Summary/upload';
case '20':
return 'Initiation/upload';
case '40':
return 'Implementation/upload';
case '50':
return 'Filing/upload';
}
}
</script>
<style scoped lang="scss">

214
src/views/project-management/filing/attachment45.vue
View File

@@ -1,214 +0,0 @@
<template>
<el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
<el-tab-pane label="需求征集" name="0">
<search-files-by-tag @search="searchRequirement" @upload="upload"
:otherFileList="otherFileList"/>
</el-tab-pane>
<el-tab-pane label="需求上报" name="1">
<search-files-by-tag @search="searchReport" @upload="upload"
:otherFileList="otherFileList"/>
</el-tab-pane>
<el-tab-pane label="项目立项" name="2">
<search-files-by-tag @search="searchInitiation" @upload="upload"
:otherFileList="otherFileList"/>
</el-tab-pane>
<el-tab-pane label="项目实施" name="3">
<search-files-by-tag type="3" @search="searchImplementation" @upload="upload" ref="implementation"
:otherFileList="otherFileList"/>
</el-tab-pane>
<el-tab-pane label="项目归档" name="4">
<search-files-by-tag @search="searchFiling" @upload="upload"
:otherFileList="otherFileList"/>
</el-tab-pane>
</el-tabs>
</template>
<script setup lang="jsx">
import {ElNotification} from "element-plus";
import {getImplementationAttachment} from "@/api/project-manage";
import {getRequirementAttachment} from "@/api/project-demand";
import {getCollectAttachment} from "@/views/project-demand/summary/api";
import {getFilingAttachment, getInitiationAttachment} from "@/api/project-manage";
const route = useRoute()
const router = useRouter()
const activeName = ref('4')
const attachment = ref({})
const showTable = ref(true)
const implementation = ref()
const otherFileList = ref([])
const handleClick = (tab) => {
let name = {}
switchSearch(name, tab.index)
}
const getParams = (param, type) => {
let targetId
let params
if (type === 1) {
targetId = route.query.requirementId
params = {
targetId: targetId,
...param
}
} else if (type === 2){
targetId = route.query.id
if(JSON.stringify(param) !== '{}'){
if (param.tag &&!param.name) {
implementation.value.tagsOption?.forEach(item => {
if (item.value === param.tag) {
param.tag = item.label
}
})
params = {
targetId: targetId,
tag:param.tag
}
}else if(!param.tag &&param.name){
params = {
targetId: targetId,
...param
}
} else if (!param.tag &&!param.name) {
params = {
targetId: targetId,
}
}
}else {
params = {
targetId: targetId
}
}
}else {
targetId = route.query.id
params = {
targetId: targetId,
...param
}
}
return params;
}
const searchRequirement = async (param) => {
await search(param)
}
const search = async (param, type) => {
const res = await getRequirementAttachment(getParams(param, type))
changeFileList(res)
}
const searchReport = async (param) => {
const res = await getCollectAttachment(getParams(param))
changeFileList(res)
}
const searchInitiation = async (param) => {
const res = await getInitiationAttachment(getParams(param))
changeFileList(res)
}
const searchImplementation = async (param) => {
const res = await getImplementationAttachment(getParams(param,2))
changeFileList(res)
}
const searchFiling = async (param) => {
const res = await getFilingAttachment(getParams(param))
changeFileList(res)
}
const changeFileList = (res) => {
showTable.value = false
if (res.code === 1000) {
otherFileList.value = res.data
nextTick(() => {
showTable.value = true
})
} else {
ElNotification({
title: '提示',
message: res.msg,
type: 'error'
})
}
}
const upload = () => {
if(activeName.value==='3'){
router.push({
name: 'Implementation/upload',
query: {
id: route.query.id,
type:'3'
}
})
}else {
router.push({
name: switchUpload(activeName.value),
query: {
id: route.query.id
}
})
}
}
const switchUpload=(index)=>{
switch (index) {
case '0':
return 'Requirement/upload';
case '1':
return 'Summary/upload';
case '2':
return 'Initiation/upload';
case '3':
return 'Implementation/upload';
case '4':
return 'Filing/upload';
}
}
const switchSearch = (name, index) => {
switch (index) {
case '0':
search(name, 1)
break
case '1':
searchReport(name)
break
case '2':
searchInitiation(name)
break
case '3':
searchImplementation(name)
break
case '4':
searchFiling(name)
break
}
}
onMounted(() => {
if (activeName.value === '4') {
let name = {
name: ''
}
searchFiling(name)
}
})
</script>
<style scoped lang="scss">
:deep(.el-tabs__header) {
margin: 15px 0 30px 0;
}
:deep(.el-tabs__nav-scroll) {
width: 100%;
display: flex;
.el-tabs__nav {
display: flex;
flex: 1;
.el-tabs__item {
flex: 1;
font-size: 16px;
}
.is-active {
color: black;
//background-color: #DED0B2;
}
}
}
</style>

94
src/views/project-management/filing/attachment56.vue
View File

@@ -1,94 +0,0 @@
<template>
<el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
<el-tab-pane label="需求征集" name="00">
<search-files-by-tag @search="searchRequirement" @upload="upload"
:otherFileList="otherFileList"/>
</el-tab-pane>
<el-tab-pane label="需求上报" name="10">
<search-files-by-tag @search="searchReport" @upload="upload"
:otherFileList="otherFileList"/>
</el-tab-pane>
<el-tab-pane label="项目立项" name="20">
<search-files-by-tag @search="searchInitiation" @upload="upload"
:otherFileList="otherFileList"/>
</el-tab-pane>
<el-tab-pane label="项目实施" name="40">
<search-files-by-tag type="3" @search="searchImplementation" @upload="upload" ref="implementation"
:otherFileList="otherFileList"/>
</el-tab-pane>
<el-tab-pane label="项目归档" name="50">
<search-files-by-tag @search="searchFiling" @upload="upload"
:otherFileList="otherFileList"/>
</el-tab-pane>
</el-tabs>
</template>
<script setup lang="jsx">
import {searchFileList} from "@/api/project-manage/attachment.js";
const route = useRoute()
const router = useRouter()
const activeName = ref('4')
const attachment = ref({})
const showTable = ref(true)
const implementation = ref()
const otherFileList = ref([])
const handleClick = (tab) => {
let name = {}
switchSearch(name, tab.index)
}
const switchSearch = (name, index) => {
switch (index) {
case '0':
search(name, 1)
break
case '1':
searchReport(name)
break
case '2':
searchInitiation(name)
break
case '3':
searchImplementation(name)
break
case '4':
searchFiling(name)
break
}
}
onMounted(() => {
if (activeName.value === '4') {
let name = {
name: ''
}
searchFiling(name)
}
})
</script>
<style scoped lang="scss">
:deep(.el-tabs__header) {
margin: 15px 0 30px 0;
}
:deep(.el-tabs__nav-scroll) {
width: 100%;
display: flex;
.el-tabs__nav {
display: flex;
flex: 1;
.el-tabs__item {
flex: 1;
font-size: 16px;
}
.is-active {
color: black;
//background-color: #DED0B2;
}
}
}
</style>

112
src/views/project-management/filing/detail.vue
View File

@@ -1,112 +0,0 @@
<template>
<steps :active="4" @setDetail="setDetail" @stepChange="stepChange">
<template #content>
<collection-detail
: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" :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" :fileListShow="fileListShow"/>
</template>
</steps>
<opinion v-if="commonForm.taskId" :formData="commonForm.formData" :taskId="commonForm.taskId"/>
</template>
<script setup lang="jsx">
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, ElNotification} from "element-plus";
const route = useRoute()
const showActive = ref()
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) => {
const loading = ElLoading.service({fullscreen: true})
try {
commonProvessViewer.value = false
loading.value = true
const {data, code, msg} = await getMapProjectStateInfo(route.query.projectId, state)
if (code === 1000) {
loading.value = false
} else {
ElNotification({
title: '提示',
message: msg,
type: 'error'
})
}
if (data === undefined) return;
commonForm.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(() => {
commonProvessViewer.value = true
if (data.formPermMap["fileList"]) {
fileListShow.value = data.formPermMap["fileList"].perm
}
})
loading.close()
} catch {
loading.close()
}
}
const setDetail = (active) => {
showActive.value = active
getAllInfo(active)
}
const stepChange = (data) => {
showActive.value = data.active
getAllInfo(data.active)
}
</script>
<style scoped lang="scss">
.detail-block {
padding-top: 15px;
:deep(.el-tabs__nav-scroll) {
width: 100%;
display: flex;
.el-tabs__nav {
display: flex;
flex: 1;
.el-tabs__item {
flex: 1;
font-size: 16px;
}
.is-active {
color: black;
background-color: #DED0B2;
}
}
}
}
</style>

33
src/views/project-management/filing/upload.vue
View File

@@ -1,10 +1,4 @@
<template>
<!-- <baseTitle title="标签名称"></baseTitle>-->
<!-- <el-form :model="formData" ref="tagForm" label-width="auto" :rules="rules">-->
<!-- <el-form-item label="标签名称" prop="tagName">-->
<!-- <el-input v-model="formData.tagName" placeholder="请输入标签名称" style="width: 300px"/>-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<baseTitle title="上传附件"></baseTitle>
<el-card style="width: 100%;margin: 15px 0">
<file-upload @getFile="getFile" />
@@ -23,7 +17,7 @@
<script setup lang="jsx">
import {ElNotification} from "element-plus";
import {useTagsView} from '@/stores/tagsview.js'
import {uploadFilingAttachment} from "@/api/project-manage";
import {uploadFileList} from "@/api/project-manage/attachment";
const tagsViewStore = useTagsView()
const route = useRoute()
@@ -76,6 +70,24 @@ const rules = reactive({
tagName: [{required: true, message: '请输入标签名称', trigger: 'blur'}],
})
const compositeParam = (item) => {
let tag=''
switch (route.query.name) {
case '00':
tag='需求征集'
break
case '10':
tag='需求上报'
break
case '20':
tag='项目立项'
break
case '40':
tag='项目实施'
break
case '50':
tag='项目归档'
break
}
return {
fileId: item.id,
size: item.size,
@@ -83,7 +95,7 @@ const compositeParam = (item) => {
fileType: item.fileType,
url: item.url,
newFile: true,
tag: '项目归档',
tag: tag,
}
}
const getFile = (val) => {
@@ -106,10 +118,11 @@ const handleSubmit = async () => {
files.push(getFileParam(item))
})
let params = {
mosrUserFileDtoList: files,
fileList: files,
targetState:'',
projectId: route.query.id,
}
let res = await uploadFilingAttachment(params)
let res = await uploadFileList(params)
ElNotification({
title: '提示',
message: res.msg,

55
src/views/project-management/implementation/attachment.vue
View File

@@ -12,7 +12,7 @@
</el-form-item>
<el-form-item>
<el-button @click="handleSearch" color="#DED0B2">搜索</el-button>
<el-button color="#DED0B2" @click="handleUpload">上传附件</el-button>
<el-button v-if="uploadState" color="#DED0B2" @click="handleUpload">上传附件</el-button>
</el-form-item>
</el-form>
<el-card style="width: 100%">
@@ -27,11 +27,13 @@
<script setup lang="jsx">
import {downloadFile} from "@/api/project-demand";
import {getTags,getImplementationAttachment} from "@/api/project-manage";
import {searchFileList} from "@/api/project-manage/attachment.js";
import {getTags} from "@/api/project-manage";
import {ElNotification} from "element-plus";
const route = useRoute()
const router = useRouter()
const uploadState = ref(true)
const attachment = reactive({
tag: ''
})
@@ -80,49 +82,45 @@ const showTable = ref(true)
const otherFileList = ref([])
const getTagsOption = () => {
if (!route.query.id) return
let params={
projectId: route.query.id
}
getTags(params).then(res => {
ElNotification({
title: '提示',
message: res.msg,
type: res.code === 1000 ? 'success' : 'error'
})
getTags(route.query.id).then(res => {
if (res.code === 1000) {
tagsOption.value = res.data
}else{
ElNotification({
title: '提示',
message: res.msg,
type: 'error'
})
}
})
}
const handleSearch = () => {
let params
let params = {
targetId: route.query.id,
targetState: "30"
}
if (attachment.tag) {
tagsOption.value.forEach(item => {
if (item.value === attachment.tag) {
attachment.tag = item.label
}
})
params = {
targetId: route.query.id,
tag: attachment.tag
}
} else {
params = {
targetId: route.query.id
}
params.tag = attachment.tag
}
getImplementationAttachment(params).then(res => {
ElNotification({
title: '提示',
message: res.msg,
type: res.code === 1000 ? 'success' : 'error'
})
searchFileList(params).then(res => {
showTable.value = false
if (res.code === 1000) {
otherFileList.value = res.data
otherFileList.value = res.data.fileList
uploadState.value = res.data.upload
nextTick(() => {
showTable.value = true
})
}else{
ElNotification({
title: '提示',
message: res.msg,
type: 'error'
})
}
})
}
@@ -143,8 +141,9 @@ const handleDownload = (row) => {
a.click()
})
}
getTagsOption()
handleSearch()
getTagsOption()
</script>
<style scoped>

47
src/views/project-management/implementation/upload.vue
View File

@@ -11,7 +11,7 @@
:value="item.value"
/>
</el-select>
<el-button type="primary" link @click="changeInput">{{showInput? '选择': '输入'}}</el-button>
<el-button type="primary" link @click="changeInput">{{ showInput ? '选择' : '输入' }}</el-button>
</el-form-item>
</el-form>
<baseTitle title="其他文件"></baseTitle>
@@ -30,9 +30,10 @@
</template>
<script setup lang="jsx">
import {uploadAttachment,getTags} from "@/api/project-manage";
import {getTags} from "@/api/project-manage";
import {ElNotification} from "element-plus";
import {useTagsView} from '@/stores/tagsview.js'
import {uploadFileList} from "@/api/project-manage/attachment";
const tagsViewStore = useTagsView()
const route = useRoute()
@@ -41,7 +42,7 @@ const fileList = ref([])
const showInput = ref(false)
const tagsOption = ref([])
const formData = ref({
tagName:''
tagName: ''
})
const tableConfig = reactive({
columns: [
@@ -87,16 +88,13 @@ const name = ref(router.currentRoute.value.name)
const rules = reactive({
tagName: [{required: true, message: '请输入标签名称', trigger: ['blur', 'change']}],
})
const changeInput=()=>{
showInput.value=!showInput.value;
formData.value.tagName='';
const changeInput = () => {
showInput.value = !showInput.value;
formData.value.tagName = '';
}
const getTagsOption = () => {
if (!route.query.id) return
let params={
projectId: route.query.id
}
getTags(params).then(res => {
getTags(route.query.id).then(res => {
ElNotification({
title: '提示',
message: res.msg,
@@ -134,26 +132,17 @@ const getFile = (val) => {
showTable.value = true
})
}
const getFileParam = (item) => {
return {
fileId: item.fileId
}
}
const handleSubmit = async (instance) => {
if (!instance) return
instance.validate(async (valid) => {
if (!valid) return
let files = []
fileList.value.forEach(item => {
files.push(getFileParam(item))
})
let params = {
fileList: files,
fileList: fileList.value,
projectId: route.query.id,
tag: formData.value.tagName
tag: formData.value.tagName,
targetState: "30"
}
console.log('params', params)
let res = await uploadAttachment(params)
let res = await uploadFileList(params)
ElNotification({
title: '提示',
message: res.msg,
@@ -161,17 +150,17 @@ const handleSubmit = async (instance) => {
})
if (res.code === 1000) {
tagsViewStore.delVisitedViews(router.currentRoute.value.path)
if(route.query.type==='40'){
if (route.query.type === '40') {
await router.push({
name: 'Filing/attachment',
query:{
query: {
id: route.query.id
}
})
}else {
} else {
await router.push({
name: 'Implementation/attachment',
query:{
query: {
id: route.query.id
}
})
@@ -183,7 +172,7 @@ getTagsOption()
</script>
<style scoped>
:deep(.el-table--fit ){
height: 300px!important;
:deep(.el-table--fit ) {
height: 300px !important;
}
</style>

123
src/views/project-management/initiation/detail.vue
View File

@@ -1,123 +0,0 @@
<template>
<steps :active="2" @setDetail="setDetail" @stepChange="stepChange">
<template #content>
<collection-detail
: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" :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" :fileListShow="fileListShow"/>
<ApprovalDetail type="archivist" v-show="showActive == '50'" :formData="commonForm.formData" :data="commonForm"
:processViewer="commonProvessViewer" :loading="loading" :fileListShow="fileListShow"/>
</template>
</steps>
<opinion v-if="commonForm.taskId" :formData="commonForm.formData" :taskId="commonForm.taskId"/>
</template>
<script setup lang="jsx">
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, ElNotification} from "element-plus";
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()
const showActive = ref()
const commonForm = ref({})
const commonProvessViewer = ref(true)
const getAllInfo = async (state) => {
const loading = ElLoading.service({fullscreen: true})
try {
commonProvessViewer.value = false
loading.value = true
const { data, code,msg } = await getMapProjectStateInfo(route.query.projectId, state)
if(code===1000){
loading.value = false
}else {
ElNotification({
title: '提示',
message: msg,
type: 'error'
})
}
if(data===undefined)return;
commonForm.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(() => {
commonProvessViewer.value = true
if (data.formPermMap["fileList"]) {
fileListShow.value = data.formPermMap["fileList"].perm
}
})
loading.close()
} catch {
loading.close()
}
}
const setDetail = (active) => {
showActive.value = active
getAllInfo(active)
}
const stepChange = (data) => {
showActive.value = data.active
getAllInfo(data.active)
}
</script>
<style scoped lang="scss">
.detail-block {
padding-top: 15px;
:deep(.el-tabs__nav-scroll) {
width: 100%;
display: flex;
.el-tabs__nav {
display: flex;
flex: 1;
.el-tabs__item {
flex: 1;
font-size: 16px;
}
.is-active {
color: black;
background-color: #DED0B2;
}
}
}
}
.approval-record {
padding-bottom: 30px;
.process {
position: relative;
}
}
</style>

133
src/views/project-management/initiation/upload.vue
View File

@@ -1,133 +0,0 @@
<template>
<!-- <baseTitle title="标签名称"></baseTitle>-->
<!-- <el-form :model="formData" ref="tagForm" label-width="auto" :rules="rules">-->
<!-- <el-form-item label="标签名称" prop="tagName">-->
<!-- <el-input v-model="formData.tagName" placeholder="请输入标签名称" style="width: 300px"/>-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<baseTitle title="上传附件"></baseTitle>
<el-card style="width: 100%;margin: 15px 0">
<file-upload @getFile="getFile"/>
<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"/>
</template>
</fvTable>
</el-card>
<div class="oper-page-btn">
<el-button color="#DED0B2" @click="handleSubmit">提交</el-button>
</div>
</template>
<script setup lang="jsx">
import {ElNotification} from "element-plus";
import {useTagsView} from '@/stores/tagsview.js'
import {uploadInitiationAttachment} from "@/api/project-manage";
const tagsViewStore = useTagsView()
const route = useRoute()
const router = useRouter()
const fileList = ref([])
const formData = ref({
tagName:''
})
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'
},
{
prop: 'oper',
label: '操作',
align: 'center',
currentRender: ({row, index}) => {
return (
<div>
<el-button type="primary" link onClick={() => handleDownload(row)}>下载</el-button>
</div>
)
}
}
]
})
const showTable = ref(true)
const name = ref(router.currentRoute.value.name)
const rules = reactive({
tagName: [{required: true, message: '请输入标签名称', trigger: 'blur'}],
})
const compositeParam = (item) => {
return {
fileId: item.id,
size: item.size,
originalFileName: item.originalFilename,
fileType: item.fileType,
url: item.url,
tag: '项目立项',
}
}
const getFile = (val) => {
showTable.value = false
let fileObj = compositeParam(val)
fileList.value.push(fileObj)
nextTick(() => {
showTable.value = true
})
}
const getFileParam = (item) => {
return {
fileId: item.fileId,
tag:item.tag
}
}
const handleSubmit = async () => {
let files = []
fileList.value.forEach(item => {
files.push(getFileParam(item))
})
let params = {
mosrUserFileDtoList: files,
projectId: route.query.id,
}
let res = await uploadInitiationAttachment(params)
ElNotification({
title: '提示',
message: res.msg,
type: res.code === 1000 ? 'success' : 'error'
})
if (res.code === 1000) {
tagsViewStore.delVisitedViews(router.currentRoute.value.path)
await router.push({
name: 'Filing/attachment',
query:{
id: route.query.id
}
})
}
}
</script>
<style scoped>
:deep(.el-table--fit ){
height: 300px!important;
}
</style>

10
src/views/system/user/index.vue
View File

@@ -131,7 +131,7 @@ const tableConfig = reactive({
<el-button type="danger" v-perm={auths.del} link onClick={()=>handleDel(row)}>删除</el-button> :
null
}
</div>
)
}
@@ -166,7 +166,7 @@ const search = (val) => {
const handleAdd = () => {
router.push({
path: '/system/useradd',
name: 'Useradd',
query: {
isAdd: 1
}
@@ -175,7 +175,7 @@ const handleAdd = () => {
const handleEdit = (row) => {
router.push({
path: '/system/useredit',
name: 'Useredit',
query: {
id: row.userId,
userType: row.userType
@@ -189,7 +189,7 @@ const handleDel = (row) => {
confirmButtonText: '确定',
cancelButtonText: '取消'
}).then(async res => {
// const { code } = await
// const { code } = await
}).catch(()=>{})
}
@@ -203,4 +203,4 @@ const headBtnClick = (key) => {
<style lang="scss" scoped>
</style>
</style>