From 54e7b81f1ec121f5e38b32005c06b193d3163132 Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Thu, 6 Jun 2024 22:58:50 +0800 Subject: [PATCH 01/26] =?UTF-8?q?fix=20:=20=E4=BF=AE=E6=94=B9=E4=B8=93?= =?UTF-8?q?=E9=A1=B9=E8=B5=84=E9=87=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DetailComponent/SpecialFundDetail.vue | 5 +-- src/views/project-demand/summary/add.vue | 5 +++ src/views/special-fund/add.vue | 38 ++++++++++++++++++- 3 files changed, 43 insertions(+), 5 deletions(-) diff --git a/src/components/DetailComponent/SpecialFundDetail.vue b/src/components/DetailComponent/SpecialFundDetail.vue index 140f81f..8fa6135 100644 --- a/src/components/DetailComponent/SpecialFundDetail.vue +++ b/src/components/DetailComponent/SpecialFundDetail.vue @@ -50,7 +50,7 @@ -
+
- - +
diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue index eb08312..718b6ab 100644 --- a/src/views/project-demand/summary/add.vue +++ b/src/views/project-demand/summary/add.vue @@ -510,6 +510,11 @@ const getDetailInfo = async () => { type: res.code === 1000 ? 'success' : 'error' }) if (res.code === 1000) { + if(res.data.formData.specialFund===null&&res.data.formData.isSpecialFund===null){ + res.data.formData.isSpecialFund=false + }else if(res.data.formData.specialFund&&res.data.formData.isSpecialFund===null){ + res.data.formData.isSpecialFund=true + } formData.value = res.data.formData loading.value = false } diff --git a/src/views/special-fund/add.vue b/src/views/special-fund/add.vue index ed83649..437f901 100644 --- a/src/views/special-fund/add.vue +++ b/src/views/special-fund/add.vue @@ -35,11 +35,12 @@ diff --git a/src/views/expense-management/share/add.vue b/src/views/expense-management/share/add.vue index 955a20d..5e222c9 100644 --- a/src/views/expense-management/share/add.vue +++ b/src/views/expense-management/share/add.vue @@ -159,7 +159,7 @@ const rules = reactive({ const processStore = useProcessStore() const processInstanceData = ref() const processDiagramViewer = ref(false) -const loading = ref(true) +const loading = ref(false) const showTable = ref(true) const route = useRoute() const router = useRouter() @@ -365,7 +365,6 @@ const handleBack = () => { onMounted(async () => { await init() if (route.query.id) { - loading.value = true await getDetailInfo() } }) diff --git a/src/views/project-demand/requirement/add.vue b/src/views/project-demand/requirement/add.vue index e19d616..db0359f 100644 --- a/src/views/project-demand/requirement/add.vue +++ b/src/views/project-demand/requirement/add.vue @@ -39,8 +39,8 @@ - - + + { a.click() }) } +const getSpecialFundName = (val) => { + let label + specialFundOption.value.forEach(item => { + if (item.value == val) { + label = item.label + } + }) + return label +} const compositeParam = (item) => { let tag = '' if (!formData.value.collectType && routerName.value === 'Requirement/add') { @@ -284,7 +293,8 @@ const submitParam = (item) => { fileList: files, deploymentId: processInstanceData.value.deploymentId, isSpecialFund: item.isSpecialFund, - specialFund: item.specialFund + specialFundId: item.specialFundId, + specialFund: getSpecialFundName(item.specialFundId) } } const handleSubmit = async (instance) => { diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue index 2e05f5c..c38483c 100644 --- a/src/views/project-demand/summary/add.vue +++ b/src/views/project-demand/summary/add.vue @@ -9,17 +9,21 @@ - + 是 否 - - - {{ getSpecialFundName(formData.specialFund) }} - + + + {{ formData.specialFund }} + + + + + - + - + + + + - + - + @@ -277,7 +287,7 @@ const formData = ref({ const rules = reactive({ projectName: [{required: true, message: '请输入项目名称', trigger: 'blur'}], - specialFund: [{required: true, message: '请选择专项资金', trigger: 'blur'}], + specialFundId: [{required: true, message: '请选择专项资金', trigger: 'blur'}], startTime: [{required: true, message: '请选择开始时间', trigger: ['blur', 'change']}], endTime: [{required: true, message: '请选择结束时间', trigger: ['blur', 'change']}], rdSubject: [{required: true, message: '请选择研发主体', trigger: ['blur', 'change']}], @@ -313,19 +323,21 @@ const getIsFund = async () => { loading.value = false formData.value.isSpecialFund = res.data.isSpecialFund if (res.data.isSpecialFund) { - formData.value.specialFund = Number(res.data.specialFund) + res.data.specialFundId = getSpecialFundId(res.data.specialFund) + formData.value.specialFundId = res.data.specialFundId + formData.value.specialFund = res.data.specialFund } } }) } -const getSpecialFundName = (val) => { - let label +const getSpecialFundId = (val) => { + let value specialFundOption.value.forEach(item => { - if (item.value == val) { - label = item.label + if (item.label == val) { + value = item.value } }) - return label + return value } const compositeParam = (item, type) => { let tag = '' @@ -383,44 +395,15 @@ const handleSubmit = debounce(async (instance) => { otherFileList.value.forEach(item => { otherFiles.push(getFileParam(item)) }) - // let params = { - // "specialFund": "2", - // "projectName": "测试全流程功能-上报", - // "startTime": "2024-05-24 00:00:00", - // "endTime": "2024-05-29 00:00:00", - // "projectType": "3", - // "investmentType": "3", - // "businessSegment": "2", - // "technicalStandard": "2", - // "governmentDeclaration": 0, - // "inventionPatent": "3", - // "newPatent": "3", - // "economicEstimate": "3", - // "other": "3", - // "copyright": "3", - // "softwareCopyright": "3", - // "industryUniversityResearch": 0, - // "intellectualProperty": "00", - // "resultForm": "3", - // "projectImpact": "3", - // "rdSubject": "3", - // "serviceDescription": "3", - // "contentDescription": "3", - // "specialFundAmount": "3", - // deploymentId: deploymentId.value, - // "singleFile": singleFile, - // "fileList": otherFiles, - // "requirementId":route.query.id - // } 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, requirementId: route.query.id ? route.query.id : '-1' } - console.log('params', params) + console.log('params', params, formData.value) if (JSON.stringify(singleFile) === "{}") { attachment.value.validate() ElNotification({ @@ -432,18 +415,18 @@ const handleSubmit = debounce(async (instance) => { } else { attachment.value.clearValidate() } - let res = await requirementReported(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: 'Summary' - }) - } + // let res = await requirementReported(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: 'Summary' + // }) + // } }) }) const handleResubmit = debounce(() => { @@ -469,12 +452,14 @@ 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, requirementId: route.query.id ? route.query.id : '-1' } + + console.log('重新提交params', params, formData.value) if (JSON.stringify(singleFile) === "{}") { attachment.value.validate() ElNotification({ @@ -486,7 +471,6 @@ const handleResubmit = debounce(() => { } else { attachment.value.clearValidate() } - console.log('重新提交params', params) resubmitReported(params).then(res => { ElNotification({ title: '提示', @@ -503,6 +487,7 @@ const handleResubmit = debounce(() => { }) const getDetailInfo = async () => { + loading.value = true getDetail(route.query.projectId).then(res => { ElNotification({ title: '提示', @@ -510,26 +495,22 @@ const getDetailInfo = async () => { type: res.code === 1000 ? 'success' : 'error' }) if (res.code === 1000) { - // if(res.data.formData.specialFund===null&&res.data.formData.isSpecialFund===null){ - // res.data.formData.isSpecialFund=false - // }else if(res.data.formData.specialFund&&res.data.formData.isSpecialFund===null){ - // res.data.formData.isSpecialFund=true - // } formData.value = res.data.formData loading.value = false } }) } const init = async () => { + loading.value = true const resFund = await getFundOption() specialFundOption.value = resFund.data - await getIsFund() const res = await getSubCompOpt() companyOption.value = res.data getProcessInfo().then(res => { if (res.code === 1000) { let data = res.data deploymentId.value = data.deploymentId + loading.value = false processStore.setDesign(data) processStore.runningList.value = data.runningList; processStore.endList.value = data.endList; @@ -539,6 +520,7 @@ const init = async () => { nextTick(() => { processDiagramViewer.value = true }) + getIsFund() } else { ElNotification({ title: '提示', @@ -551,7 +533,6 @@ const init = async () => { onMounted(async () => { await init() if (route.query.projectId) { - loading.value = true await getDetailInfo() } }) diff --git a/src/views/special-fund/add.vue b/src/views/special-fund/add.vue index 437f901..49bba56 100644 --- a/src/views/special-fund/add.vue +++ b/src/views/special-fund/add.vue @@ -6,7 +6,7 @@ - + @@ -36,11 +36,11 @@ From 42fea1853d235e576ec15dd6f87f250af9fdea31 Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Fri, 7 Jun 2024 16:46:44 +0800 Subject: [PATCH 04/26] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=9C=80?= =?UTF-8?q?=E6=B1=82=E4=B8=8A=E6=8A=A5=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?/=E5=88=A0=E9=99=A4=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/AttachmentUpload.vue | 85 ++++++++++++------- .../DetailComponent/FileComponent.vue | 40 ++++----- src/views/project-demand/summary/add.vue | 70 ++++++--------- src/views/project-demand/summary/index.vue | 1 + 4 files changed, 98 insertions(+), 98 deletions(-) diff --git a/src/components/AttachmentUpload.vue b/src/components/AttachmentUpload.vue index aa5ed37..81ebf81 100644 --- a/src/components/AttachmentUpload.vue +++ b/src/components/AttachmentUpload.vue @@ -37,6 +37,32 @@ import FileUpload from '@/components/FileUpload.vue' import {deleteFile, downloadFile} from "@/api/project-demand"; import {ElMessage, ElMessageBox, ElNotification} from "element-plus"; +const props = defineProps({ + showFileList: { + type: Boolean, + default: false + }, + label: { + type: String, + default: '项目附件' + }, + showTable: { + type: Boolean, + default: true + }, + preview: { + type: Boolean, + default: false + }, + otherFileList: { + type: Array, + default: [] + }, + formData: { + type: Array, + default: [] + } +}) const emit = defineEmits(["getAttachment", "getOtherFile"]) const formData = ref({}) const tableConfig = reactive({ @@ -72,9 +98,9 @@ const tableConfig = reactive({ currentRender: ({row, index}) => { let btn = [] btn.push({label: '下载', func: () => handleDownload(row), type: 'primary'}) - if (row.newFile){ - btn.push({label: '删除', func: () => handleDelete(row), type: 'primary'}) - } + // if (row.newFile){ + // btn.push({label: '删除', func: () => handleDelete(row), type: 'primary'}) + // } return (
{ @@ -88,6 +114,12 @@ const tableConfig = reactive({ )) } + { + row.newFile||props.preview ? handleDelete(row)}/> + : '' + }
) } @@ -101,39 +133,13 @@ const applyForm = ref() const singleFile = ref() const isSingleFile = ref(false) const allFileList = ref([]) -const props = defineProps({ - showFileList: { - type: Boolean, - default: false - }, - label: { - type: String, - default: '项目附件' - }, - showTable: { - type: Boolean, - default: true - }, - preview: { - type: Boolean, - default: false - }, - otherFileList: { - type: Array, - default: [] - }, - formData: { - type: Array, - default: [] - } -}) watch(() => props.showTable, (newVal) => { props.showTable = newVal }, {deep: true}) watch(() => props.otherFileList, (newVal) => { console.log('newotherFileList', newVal) if (props.preview) { - if (props.formData.fileList.length===0) { + if (props.formData.fileList===null||props.formData.fileList.length===0) { allFileList.value = newVal } else { newVal?.forEach(item => { @@ -156,6 +162,21 @@ watch(() => props.formData.singleFile, (newVal) => { console.log('singleFile', newVal) singleFile.value = newVal }, {deep: true}) +watch(() => isSingleFile.value, (newVal) => { + isSingleFile.value = newVal +}, {deep: true}) +const handleDelete = (row) => { + deleteFile(row.fileId).then(res => { + ElNotification({ + title: '提示', + message: res.msg, + type: res.code === 1000 ? 'success' : 'error' + }) + if (res.code === 1000) { + allFileList.value.splice(allFileList.value.findIndex((item) => item.id === row.fileId), 1); + } + }); +} const getAttachment = (val) => { isSingleFile.value = true emit('getAttachment', val) @@ -172,6 +193,7 @@ const deleteAttachment = (val) => { type: 'success' }) isSingleFile.value = false + singleFile.value={} } }); } @@ -221,7 +243,8 @@ defineExpose({ return applyForm.value.clearValidate() }, allFileList, - singleFile + singleFile, + isSingleFile }) diff --git a/src/components/DetailComponent/FileComponent.vue b/src/components/DetailComponent/FileComponent.vue index 9ae988a..f4a1374 100644 --- a/src/components/DetailComponent/FileComponent.vue +++ b/src/components/DetailComponent/FileComponent.vue @@ -12,7 +12,7 @@ From 86ff3c2e94a459190e08243c4a48d14746d0a1ce Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Sat, 8 Jun 2024 00:04:33 +0800 Subject: [PATCH 09/26] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=99=84?= =?UTF-8?q?=E4=BB=B6=E6=A0=A1=E9=AA=8C=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/AttachmentUpload.vue | 6 ++--- .../DetailComponent/ApprovalDetail.vue | 8 +++++-- src/views/project-demand/summary/add.vue | 22 +++++++++---------- .../project-management/filing/conclusion.vue | 18 +++++++-------- .../implementation/check.vue | 19 ++++++++-------- .../project-management/initiation/apply.vue | 21 +++++++++--------- 6 files changed, 48 insertions(+), 46 deletions(-) diff --git a/src/components/AttachmentUpload.vue b/src/components/AttachmentUpload.vue index e8c8533..4a36418 100644 --- a/src/components/AttachmentUpload.vue +++ b/src/components/AttachmentUpload.vue @@ -193,12 +193,12 @@ const deleteAttachment = (val) => { type: 'success' }) isSingleFile.value = false - singleFile.value={} + singleFile.value=null } }); } const deleteSingleFile = (row, type) => { - ElMessageBox.confirm(`确认删除名称为${row.originalFileName}的表格吗?`, '系统提示', { + ElMessageBox.confirm(`确认删除名称为${row.originalFileName}的文件吗?`, '系统提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' @@ -212,7 +212,7 @@ const deleteSingleFile = (row, type) => { if (res.code === 1000) { isSingleFile.value=false if (type === 1) { - singleFile.value = {} + singleFile.value = null } else { props.otherFileList.splice(props.otherFileList.findIndex((item) => item.id === row.fileId), 1); } diff --git a/src/components/DetailComponent/ApprovalDetail.vue b/src/components/DetailComponent/ApprovalDetail.vue index d5c7bdc..8d1bb39 100644 --- a/src/components/DetailComponent/ApprovalDetail.vue +++ b/src/components/DetailComponent/ApprovalDetail.vue @@ -22,7 +22,7 @@
- +
@@ -67,6 +67,10 @@ const props = defineProps({ value: { type: String, default: '' + }, + idName: { + type: String, + default: '' } }) const form = ref() @@ -224,7 +228,7 @@ const handleDownload = (row) => { }) } watchEffect(() => { - Object.keys(props.formData).length && (form.value.setValues(props.formData)) + Object.keys(props.formData).length && (form.value?.setValues(props.formData)) }) watch(() => props.loading, (newVal) => { diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue index 1c2eeeb..f814d0b 100644 --- a/src/views/project-demand/summary/add.vue +++ b/src/views/project-demand/summary/add.vue @@ -16,8 +16,8 @@ - - + + {{ formData.specialFund }} @@ -433,14 +433,7 @@ const handleResubmit = debounce(() => { otherFiles.push(getFileParam(item)) }) } - let params = { - ...formData.value, - deploymentId: deploymentId.value, - fileList: otherFiles, - requirementId: route.query.id ? route.query.id : '-1' - } - console.log('重新提交params', params) - if (!attachment.value.isSingleFile || !formData.value.singleFile) { + if (attachment.value.singleFile==null) { attachment.value.validate() ElNotification({ title: '提示', @@ -448,9 +441,16 @@ const handleResubmit = debounce(() => { type: 'error' }) return; - } else { + } else{ attachment.value.clearValidate() } + let params = { + ...formData.value, + deploymentId: deploymentId.value, + fileList: otherFiles, + requirementId: route.query.id ? route.query.id : '-1' + } + console.log('重新提交params', params) resubmitReported(params).then(res => { ElNotification({ title: '提示', diff --git a/src/views/project-management/filing/conclusion.vue b/src/views/project-management/filing/conclusion.vue index ddf32f4..d779200 100644 --- a/src/views/project-management/filing/conclusion.vue +++ b/src/views/project-management/filing/conclusion.vue @@ -174,14 +174,7 @@ const handleResubmit = () => { otherFiles.push(getFileParam(item)) }) } - let params = { - deploymentId: deploymentId.value, - requirementId: route.query.id, - fileList: otherFiles, - singleFile: formData.value.singleFile, - projectId: route.query.projectId, - } - if (!attachment.value.isSingleFile || !formData.value.singleFile) { + if (attachment.value.singleFile==null) { attachment.value.validate() ElNotification({ title: '提示', @@ -189,9 +182,16 @@ const handleResubmit = () => { type: 'error' }) return; - } else { + } else{ attachment.value.clearValidate() } + let params = { + deploymentId: deploymentId.value, + requirementId: route.query.id, + fileList: otherFiles, + singleFile: attachment.value.singleFile, + projectId: route.query.projectId, + } console.log('重新提交params', params) resubmitConclusion(params).then(res => { ElNotification({ diff --git a/src/views/project-management/implementation/check.vue b/src/views/project-management/implementation/check.vue index b5f18fd..e219b9e 100644 --- a/src/views/project-management/implementation/check.vue +++ b/src/views/project-management/implementation/check.vue @@ -135,15 +135,7 @@ const handleResubmit = (instance) => { otherFiles.push(getFileParam(item)) }) } - - let params = { - deploymentId: deploymentId.value, - requirementId: route.query.id, - fileList: otherFiles, - singleFile: formData.value.singleFile, - projectId: route.query.projectId, - } - if (!attachment.value.isSingleFile || !formData.value.singleFile) { + if (attachment.value.singleFile==null) { attachment.value.validate() ElNotification({ title: '提示', @@ -151,9 +143,16 @@ const handleResubmit = (instance) => { type: 'error' }) return; - } else { + } else{ attachment.value.clearValidate() } + let params = { + deploymentId: deploymentId.value, + requirementId: route.query.id, + fileList: otherFiles, + singleFile: attachment.value.singleFile, + projectId: route.query.projectId, + } console.log('重新提交params', params) resubmitCheck(params).then(res => { ElNotification({ diff --git a/src/views/project-management/initiation/apply.vue b/src/views/project-management/initiation/apply.vue index 1465208..eceacdb 100644 --- a/src/views/project-management/initiation/apply.vue +++ b/src/views/project-management/initiation/apply.vue @@ -181,16 +181,7 @@ const handleResubmit = async () => { files.push(getFileParam(item)) }) } - - let params = { - deploymentId: deploymentId.value, - requirementId: route.query.id, - fileList: files, - singleFile: formData.value.singleFile, - projectId: route.query.projectId, - } - console.log('params', params, attachment.value.isSingleFile) - if (!attachment.value.isSingleFile || !formData.value.singleFile) { + if (attachment.value.singleFile==null) { attachment.value.validate() ElNotification({ title: '提示', @@ -198,9 +189,17 @@ const handleResubmit = async () => { type: 'error' }) return; - } else { + } else{ attachment.value.clearValidate() } + let params = { + deploymentId: deploymentId.value, + requirementId: route.query.id, + fileList: files, + singleFile: attachment.value.singleFile, + projectId: route.query.projectId, + } + console.log('params', params, attachment.value.isSingleFile) let res = await resubmitApply(params) ElNotification({ title: '提示', From 521e40cf3d04aca614cef4ed4f2cd860c38c3599 Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Sat, 8 Jun 2024 00:05:28 +0800 Subject: [PATCH 10/26] =?UTF-8?q?feat=20:=20=E9=A1=B9=E7=9B=AE=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E4=B8=AD=E7=AB=8B=E9=A1=B9/=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2demo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DetailComponent/ProjectApply.vue | 239 ++++++++++++++++++ .../implementation/detail.vue | 77 ++++-- 2 files changed, 291 insertions(+), 25 deletions(-) create mode 100644 src/components/DetailComponent/ProjectApply.vue diff --git a/src/components/DetailComponent/ProjectApply.vue b/src/components/DetailComponent/ProjectApply.vue new file mode 100644 index 0000000..8ae2735 --- /dev/null +++ b/src/components/DetailComponent/ProjectApply.vue @@ -0,0 +1,239 @@ + + + + + diff --git a/src/views/project-management/implementation/detail.vue b/src/views/project-management/implementation/detail.vue index 75f517f..0c63525 100644 --- a/src/views/project-management/implementation/detail.vue +++ b/src/views/project-management/implementation/detail.vue @@ -11,19 +11,32 @@ v-model:value="auditOpinion" /> - + - + :processViewer="commonProvessViewer" :loading="loading" :fileListShow="fileListShow" + v-model:value="auditOpinion"/> + + + + + + + + + - + From 9a862f8ccedd5fe277964680cf95f0659d5143ee Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Sat, 8 Jun 2024 11:43:39 +0800 Subject: [PATCH 11/26] =?UTF-8?q?feat=20:=20=E4=BF=AE=E5=A4=8D=E9=9C=80?= =?UTF-8?q?=E6=B1=82=E6=B1=87=E6=80=BB=E9=A1=B5=E9=9D=A2=E7=BB=86=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/project-demand/summary/add.vue | 2 +- src/views/project-demand/summary/index.vue | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue index f814d0b..5ae35cd 100644 --- a/src/views/project-demand/summary/add.vue +++ b/src/views/project-demand/summary/add.vue @@ -219,7 +219,7 @@ + v-if="route.query.id"> diff --git a/src/views/project-demand/summary/index.vue b/src/views/project-demand/summary/index.vue index db0a3fc..b3b055c 100644 --- a/src/views/project-demand/summary/index.vue +++ b/src/views/project-demand/summary/index.vue @@ -156,7 +156,6 @@ const tableConfig = reactive({ prop: 'oper', label: '操作', align: 'center', - fixed:'right', showOverflowTooltip: false, currentRender: ({row, index}) => { let btn = [] From 29b8bad394ad558c55065345f805d33d13cebb31 Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Sat, 8 Jun 2024 23:20:44 +0800 Subject: [PATCH 12/26] =?UTF-8?q?fix=20:=20=E6=A0=BC=E5=BC=8F=E5=8C=96?= =?UTF-8?q?=E9=87=91=E9=A2=9D=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/expense-management/ledger/index.vue | 13 ++++++++++++- src/views/project-management/filing/index.vue | 14 ++++++++++++-- .../implementation/index.vue | 14 ++++++++++++-- .../project-management/initiation/index.vue | 14 ++++++++++++-- src/views/special-fund/index.vue | 19 +++++++++++++++++-- 5 files changed, 65 insertions(+), 9 deletions(-) diff --git a/src/views/expense-management/ledger/index.vue b/src/views/expense-management/ledger/index.vue index e59138c..f4157cb 100644 --- a/src/views/expense-management/ledger/index.vue +++ b/src/views/expense-management/ledger/index.vue @@ -130,7 +130,10 @@ const tableConfig = reactive({ { prop: 'afterTax', label: '税后余额(元)', - align: 'center' + align: 'center', + currentRender:({row})=>{ + return {toThousands(row.afterTax)} + } } ], api: '/workflow/mosr/expense/ledger', @@ -140,6 +143,14 @@ const search = (val) => { tableConfig.params = {...val} tableIns.value.refresh() } +const toThousands=(num)=> { + if(num==undefined||num==null)return '--'; + const options = { + style: 'currency', + currency: 'CNY', + }; + return (num).toLocaleString('zh-CN', options) +} diff --git a/src/components/DetailComponent/SummaryDetail.vue b/src/components/DetailComponent/SummaryDetail.vue index 9673ff6..da790e8 100644 --- a/src/components/DetailComponent/SummaryDetail.vue +++ b/src/components/DetailComponent/SummaryDetail.vue @@ -8,7 +8,7 @@ - + {{localFormData.specialFund }} @@ -105,13 +105,13 @@ - {{ localFormData.economicEstimate }} + {{toThousands( localFormData.economicEstimate )}} - {{ localFormData.specialFundAmount }} + v-if="localFormData.isSpecialFund"> + {{ toThousands(localFormData.specialFundAmount) }} @@ -163,6 +163,7 @@ \ No newline at end of file diff --git a/src/views/project-management/implementation/phase.vue b/src/views/project-management/implementation/phase.vue index 0c43deb..8e05176 100644 --- a/src/views/project-management/implementation/phase.vue +++ b/src/views/project-management/implementation/phase.vue @@ -1,8 +1,14 @@