From a8776277d5008277455a78ee9e9b996abb912c1d Mon Sep 17 00:00:00 2001
From: guojuan <2715201989@qq.com>
Date: Wed, 17 Jul 2024 16:46:51 +0800
Subject: [PATCH] fix:优化项目库以及项目填报部分的导出以及刷新功能
---
frontend/front/src/api/projectSubmission.js | 2 +-
frontend/front/src/components/dataTemplate/TemplatePreview.vue | 2 +-
frontend/front/src/components/dialog/projectSubmissionDialog.vue | 7 ++++---
frontend/front/src/components/tableSlot/projectLibrary/exportLibraryRecord.vue | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
frontend/front/src/components/tableSlot/projectSubmission/exportRecord.vue | 24 +++++++++++++++++++++++-
5 files changed, 107 insertions(+), 6 deletions(-)
create mode 100644 frontend/front/src/components/tableSlot/projectLibrary/exportLibraryRecord.vue
diff --git a/frontend/front/src/api/projectSubmission.js b/frontend/front/src/api/projectSubmission.js
index d39ce51..b7f843d 100644
--- a/frontend/front/src/api/projectSubmission.js
+++ b/frontend/front/src/api/projectSubmission.js
@@ -4,7 +4,7 @@ const portal = window.context.portal
////后台管理预览VUE表单
export function exportRecordData(data) {
return request({
- url: `${context.form}/wProjectLibraryInventory/v1/down?fProjectNo=${data.fProjectNo}&fProjectName=${data.fProjectName}&fProjectCategory=${data.fProjectCategory}&fProjectState=${data.fProjectState}&createTime=${data.createTime}&fProjectNature=${data.fProjectNature}&fBusinessScenarios=${data.fBusinessScenarios}&fBusinessModel=${data.fBusinessModel}&fProjectRating=${data.fProjectRating}&updateTime=${data.updateTime}`,
+ url: `${context.form}/wProjectLibraryInventory/v1/down?fProjectNo=${data.fProjectNo}&fProjectName=${data.fProjectName}&fProjectCategory=${data.fProjectCategory}&fProjectState=${data.fProjectState}&createTime=${data.createTime}&fProjectNature=${data.fProjectNature}&fBusinessScenarios=${data.fBusinessScenarios}&fBusinessModel=${data.fBusinessModel}&fProjectRating=${data.fProjectRating}&updateTime=${data.updateTime}&exportType=${data.exportType}&idList=${data.idList}`,
method: 'get',
responseType: 'arraybuffer',
})
diff --git a/frontend/front/src/components/dataTemplate/TemplatePreview.vue b/frontend/front/src/components/dataTemplate/TemplatePreview.vue
index f8074d1..1fe1a7d 100644
--- a/frontend/front/src/components/dataTemplate/TemplatePreview.vue
+++ b/frontend/front/src/components/dataTemplate/TemplatePreview.vue
@@ -98,7 +98,7 @@
},
handleRefresh() {
console.log("this.$refs.httemplate",this.$refs.httemplate)
- this.$refs.httemplate.init()
+ this.$refs.httemplate.$refs.dataViewTemplate.search()
}
},
}
diff --git a/frontend/front/src/components/dialog/projectSubmissionDialog.vue b/frontend/front/src/components/dialog/projectSubmissionDialog.vue
index 96545a0..2a4fd43 100644
--- a/frontend/front/src/components/dialog/projectSubmissionDialog.vue
+++ b/frontend/front/src/components/dialog/projectSubmissionDialog.vue
@@ -88,13 +88,14 @@ export default {
await submitData(params).then((res)=>{
console.log('打印res',res);
if(res.code == 200){
- this.$emit('handleRefresh');
+ this.$message.success('操作成功!');
// this.$emit("RefreshTable");
+ }else{
+ this.$message.error('操作失败!');
}
- this.$emit("RefreshTable");
+ this.$emit('handleRefresh');
this.dialogForm.dialogVisible = false;
})
-
} else {
console.log('error submit!!');
return false;
diff --git a/frontend/front/src/components/tableSlot/projectLibrary/exportLibraryRecord.vue b/frontend/front/src/components/tableSlot/projectLibrary/exportLibraryRecord.vue
new file mode 100644
index 0000000..bb79c9b
--- /dev/null
+++ b/frontend/front/src/components/tableSlot/projectLibrary/exportLibraryRecord.vue
@@ -0,0 +1,78 @@
+
+
+ 导出
+
+
+
+
+
+
diff --git a/frontend/front/src/components/tableSlot/projectSubmission/exportRecord.vue b/frontend/front/src/components/tableSlot/projectSubmission/exportRecord.vue
index cd64525..ab3631f 100644
--- a/frontend/front/src/components/tableSlot/projectSubmission/exportRecord.vue
+++ b/frontend/front/src/components/tableSlot/projectSubmission/exportRecord.vue
@@ -12,6 +12,9 @@ export default {
searchForms:{
type:Object
},
+ selectRows:{
+ type:Array
+ }
},
data(){
return {
@@ -21,6 +24,23 @@ export default {
methods:{
handleExport(){
this.loading = true;
+ console.log('打印this.selectRows',this.selectRows,this.searchForms);
+ let isDataList = [];
+ if(this.selectRows.length>0){
+ isDataList = this.selectRows.map((item)=>item.id_);
+ this.searchForms.project_no = '';
+ this.searchForms.project_name = '';
+ this.searchForms.project_category = '';
+ this.searchForms.project_state = '';
+ this.searchForms.create_time = '';
+ this.searchForms.project_nature = '';
+ this.searchForms.business_scenarios = '';
+ this.searchForms.business_model = '';
+ this.searchForms.project_rating = '';
+ this.searchForms.update_time = '';
+ console.log('打印isDataList',isDataList);
+ }
+
let params ={
fProjectNo:this.searchForms.project_no?this.searchForms.project_no:'',
fProjectName:this.searchForms.project_name?this.searchForms.project_name:'',
@@ -31,7 +51,9 @@ export default {
fBusinessScenarios:this.searchForms.business_scenarios?this.searchForms.business_scenarios:'',
fBusinessModel:this.searchForms.business_model?this.searchForms.business_model:'',
fProjectRating:this.searchForms.project_rating?this.searchForms.project_rating:'',
- updateTime:this.searchForms.update_time?this.parseTime(this.searchForms.update_time,"{y}-{m}-{d}"):''
+ updateTime:this.searchForms.update_time?this.parseTime(this.searchForms.update_time,"{y}-{m}-{d}"):'',
+ idList:isDataList,
+ exportType:1
}
exportRecordData(params).then((res)=>{
console.log('打印res',res);
--
libgit2 0.21.2