diff --git a/src/api/expense-manage/index.js b/src/api/expense-manage/index.js index 1d2575e..e8cd5e1 100644 --- a/src/api/expense-manage/index.js +++ b/src/api/expense-manage/index.js @@ -38,15 +38,7 @@ export const getProjectOption = () => { method: "get" }); }; -export const getAllocationCollect = (allocationId) => { - return request({ - url: '/workflow/mosr/cost/allocation/collect', - method: "post", - params:{ - allocationId:allocationId - } - }); -}; + export const editAllocation = (data) => { return request({ url: '/workflow/mosr/cost/allocation/edit', diff --git a/src/components/DetailComponent/SummaryDetail.vue b/src/components/DetailComponent/SummaryDetail.vue index 0e3c422..0b1f73f 100644 --- a/src/components/DetailComponent/SummaryDetail.vue +++ b/src/components/DetailComponent/SummaryDetail.vue @@ -110,7 +110,7 @@ + v-if="localFormData.specialFundAmount"> {{ localFormData.specialFundAmount }} diff --git a/src/fvcomponents/fvTable/index.vue b/src/fvcomponents/fvTable/index.vue index 2ca8d2f..a75c5ca 100644 --- a/src/fvcomponents/fvTable/index.vue +++ b/src/fvcomponents/fvTable/index.vue @@ -203,10 +203,15 @@ const getList = async () => { localData.loading = true try { const {code, data, msg} = await requestList(api, queryParmas) - if (code === 1000) { - localData.list = data.rows - localData.total = data.total + if(data.rows){ + localData.list = data.rows + }else { + localData.list = data + } + if(data.total){ + localData.total = data.total + } localData.loading = false } else { ElNotification({ diff --git a/src/views/expense-management/share/detail.vue b/src/views/expense-management/share/detail.vue index ef40118..5e8d98a 100644 --- a/src/views/expense-management/share/detail.vue +++ b/src/views/expense-management/share/detail.vue @@ -18,7 +18,7 @@ - + @@ -52,7 +52,7 @@ import OperationRender from '@/views/workflow/common/OperationRender.vue' import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue' import {ElNotification} from "element-plus"; import {useProcessStore} from '@/stores/processStore.js'; -import {getAllocationDetail,getAllocationCollect} from "@/api/expense-manage"; +import {getAllocationDetail} from "@/api/expense-manage"; const processStore = useProcessStore() const route = useRoute() @@ -62,7 +62,6 @@ const auditOpinion = ref('') const shareProcessViewer = ref(true) const showTable = ref(true) const loading = ref(false) -const collectList = ref([]) const activeName = ref('first') const tableConfig = reactive({ columns: [ @@ -112,7 +111,11 @@ const tableConfig = reactive({ label: '摘要', align: 'center' } - ] + ], + api:'/workflow/mosr/cost/allocation/collect', + params:{ + allocationId:route.query.id + } }) const getDetail = async () => { const id = route.query.id @@ -139,30 +142,9 @@ const getDetail = async () => { } } -const getDetailCollect = async () => { - loading.value = true - showTable.value = false - const {code, data, msg} = await getAllocationCollect(route.query.id) - if (code === 1000) { - collectList.value = data - nextTick(() => { - loading.value = false - showTable.value = true - }) - }else { - ElNotification({ - title: '提示', - message: msg, - type: 'error' - }) - } -} const handleClick = (tab) => { - console.log('tab',tab.index) if (tab.index==0) { getDetail() - }else { - getDetailCollect() } } getDetail() diff --git a/src/views/project-demand/requirement/add.vue b/src/views/project-demand/requirement/add.vue index ec8532d..e19d616 100644 --- a/src/views/project-demand/requirement/add.vue +++ b/src/views/project-demand/requirement/add.vue @@ -2,33 +2,33 @@
- - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -53,8 +53,13 @@ - + - - -
提交 重新提交 + 返回
@@ -91,7 +94,7 @@ import { } from "@/api/project-demand/index.js"; import FileUpload from "@/components/FileUpload.vue"; import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue'; -import {ElMessage, ElMessageBox, ElNotification} from "element-plus"; +import {ElMessageBox, ElNotification} from "element-plus"; import {useRoute, useRouter} from 'vue-router' import {getSubCompOpt} from '@/api/user/user.js' import {useTagsView} from '@/stores/tagsview.js' @@ -110,7 +113,7 @@ const formData = ref({ deadline: '', collectExplain: '', fileList: [], - isSpecialFund:false + isSpecialFund: false }) const showTinymce = ref(true) const routerName = ref(router.currentRoute.value.name) @@ -172,10 +175,12 @@ const tableConfig = reactive({ return (
handleDownload(row)}>下载 + handleDelete(row)}/>
) } - // handleDelete(row)}>删除 } ] }) @@ -183,7 +188,7 @@ const tableConfig = reactive({ const checkFormPrem = (formKey) => { if (formPermMap.value.hasOwnProperty(formKey)) { let formItem = formPermMap.value[formKey]; - return formItem.perm === 'EDIT' + return formItem.perm === 'EDIT' } else { return true; } @@ -203,9 +208,10 @@ const compositeParam = (item) => { let tag = '' if (!formData.value.collectType && routerName.value === 'Requirement/add') { tag = '需求征集' - }else if(!formData.value.collectType &&routerName.value === 'Requirement/edit'){ + } else if (!formData.value.collectType && routerName.value === 'Requirement/edit') { tag = '需求征集' - }if (formData.value.collectType) { + } + if (formData.value.collectType) { tag = formData.value.collectType } return { @@ -250,7 +256,7 @@ const init = async () => { nextTick(() => { processDiagramViewer.value = true }) - }else { + } else { ElNotification({ title: '提示', message: res.msg, @@ -277,15 +283,15 @@ const submitParam = (item) => { requirementName: item.requirementName, fileList: files, deploymentId: processInstanceData.value.deploymentId, - isSpecialFund:item.isSpecialFund, - specialFund:item.specialFund + isSpecialFund: item.isSpecialFund, + specialFund: item.specialFund } } const handleSubmit = async (instance) => { if (!instance) return instance.validate(async (valid) => { if (!valid) return - const {msg,code} = await addRequirement(submitParam(formData.value)) + const {msg, code} = await addRequirement(submitParam(formData.value)) ElNotification({ title: '提示', message: msg, @@ -338,28 +344,16 @@ const handleBack = () => { history.back() } const handleDelete = (row) => { - ElMessageBox.confirm(`确认删除名称为${row.originalFileName}的表格吗?`, '系统提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning' - }).then(() => { - deleteFile(row.fileId).then(res => { - ElNotification({ - title: '提示', - message: res.msg, - type: res.code === 1000 ? 'success' : 'error' - }) - if (res.code === 1000) { - formData.value.fileList.splice(formData.value.fileList.findIndex((item) => item.id === row.fileId), 1); - } - }); - }).catch(() => { + deleteFile(row.fileId).then(res => { ElNotification({ title: '提示', - message: '用户取消删除! ', - type: 'warning' + message: res.msg, + type: res.code === 1000 ? 'success' : 'error' }) - }) + if (res.code === 1000) { + formData.value.fileList.splice(formData.value.fileList.findIndex((item) => item.id === row.fileId), 1); + } + }); } onMounted(async () => { @@ -376,9 +370,11 @@ onMounted(async () => { :deep(.el-empty__description) { margin-top: 0; } -:deep(.el-table--fit ){ - height: 300px!important; + +:deep(.el-table--fit ) { + height: 300px !important; } + .add-block { //display: flex; //justify-content: space-between; diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue index b1cfc7c..eb08312 100644 --- a/src/views/project-demand/summary/add.vue +++ b/src/views/project-demand/summary/add.vue @@ -8,25 +8,25 @@ - - + + 是 否 - + - - - - + {{ getSpecialFundName(formData.specialFund) }} + + + @@ -180,37 +180,37 @@ - + - + - + - + - + - + - + @@ -229,16 +229,12 @@ @getAttachment="getAttachment" @getOtherFile="getOtherFile" :showFileList="true" :formData="formData" :preview="name === 'Summary/edit'"/> -
- - -
- + 发布 重新发布
@@ -274,6 +270,7 @@ const showTable = ref(true) const otherFileList = ref([]) const file = ref({}) const formData = ref({ + isSpecialFund: false, industryUniversityResearch: '0', governmentDeclaration: '0', }) @@ -417,7 +414,7 @@ const handleSubmit = debounce(async (instance) => { // } let params = { ...formData.value, - isSpecialFund: formData.value.isSpecialFund? formData.value.isSpecialFund : false, + isSpecialFund: formData.value.isSpecialFund ? formData.value.isSpecialFund : false, deploymentId: deploymentId.value, fileList: otherFiles, singleFile: singleFile, @@ -472,7 +469,7 @@ const handleResubmit = debounce(() => { //todo requirementId let params = { ...formData.value, - isSpecialFund: formData.value.isSpecialFund? formData.value.isSpecialFund : false, + isSpecialFund: formData.value.isSpecialFund ? formData.value.isSpecialFund : false, deploymentId: deploymentId.value, fileList: otherFiles, singleFile: singleFile, @@ -560,5 +557,13 @@ const staging = async () => { .detail-block { overflow: hidden; padding-bottom: 30px; + + :deep(.el-input-number) { + width: 100%; + + .el-input__inner { + text-align: left; + } + } } diff --git a/src/views/workflow/process/common/UserPicker.vue b/src/views/workflow/process/common/UserPicker.vue index faf145a..d9acfee 100644 --- a/src/views/workflow/process/common/UserPicker.vue +++ b/src/views/workflow/process/common/UserPicker.vue @@ -1,69 +1,67 @@ @@ -109,14 +107,11 @@ const defaultProps = { value: "value", label: "name", children: "children", - // isLeaf:(data, node) => - // { - // console.log('data, node',data, node) - // if (node.level === 2) { - // return true - // } - // } - + isLeaf: (data) => { + if (data.type === 0) { + return true + } + } }; const emit = defineEmits(); @@ -200,7 +195,6 @@ const showUserPicker = () => { getList(); }; const handleChange = (item, data) => { - console.log('item', item, data) selectItem = item; if (isSearch.value && item.type !== 0) { filterText.value = "" @@ -283,116 +277,109 @@ defineExpose({