diff --git a/src/views/modules/base/smartExcel/cpts/excel-summary.vue b/src/views/modules/base/smartExcel/cpts/excel-summary.vue index 24a8266f1..fde8c4140 100644 --- a/src/views/modules/base/smartExcel/cpts/excel-summary.vue +++ b/src/views/modules/base/smartExcel/cpts/excel-summary.vue @@ -6,21 +6,21 @@

汇总文件

返回 -
+
周期更新表

提报的文件

-
+
{{ item.taskTitle }}周期更新表
-
（{{ getStateDescription(item.state) }}）
+
（{{ getStateDescription(item.taskState) }}）
- +
@@ -35,14 +35,15 @@ export default { list: [ ], workbookId:'', - sheetTotal:false + sheetTotal:false, + infoObj:{}, + mergeObj:null//用于传递subworkbookId与workbookId }; }, created() { }, async mounted(){ - console.log(this.summaryDetal,"dsalkjdlfks"); this.getTableList() }, methods: { @@ -79,12 +80,22 @@ export default { handleClickBack() { this.$emit('close') }, - handleClickShowView(val,total){ + handleClickShowView(val){ + const { id, taskId, taskTitle, taskPeriod, taskType, taskIntroduction,subWorkBookId,workBookId } = val; this.$store.state.sidebarFold = true; this.showView = true; - this.sheetTotal = total || false - this.workbookId = val + this.sheetTotal = false + this.workbookId = val.taskId; + this.infoObj = { id, taskId, taskTitle, taskPeriod, taskType, taskIntroduction}; + this.mergeObj = {subWorkBookId,workBookId } }, + handleClickShowViewAll(val){ + this.$store.state.sidebarFold = true; + this.showView = true; + this.sheetTotal = true + this.workbookId = val + + } }, components: { excelView }, computed: { diff --git a/src/views/modules/base/smartExcel/cpts/excel-template-confirmation.vue b/src/views/modules/base/smartExcel/cpts/excel-template-confirmation.vue index 2478db5c5..c4a82e3b4 100644 --- a/src/views/modules/base/smartExcel/cpts/excel-template-confirmation.vue +++ b/src/views/modules/base/smartExcel/cpts/excel-template-confirmation.vue @@ -70,8 +70,8 @@ export default { } }, mounted() { - console.log(this.fileUrl, 'fileUrl==='); - this.urlToFile('http://localhost:9001/epmet-work-pc/test1.xlsx',this.fileName) + console.log(this.fileUrl, 'fileUrl===');//测试用'http://localhost:9001/epmet-work-pc/test1.xlsx' + this.urlToFile(this.fileUrl,this.fileName) }, props: { diff --git a/src/views/modules/base/smartExcel/cpts/excel-view.vue b/src/views/modules/base/smartExcel/cpts/excel-view.vue index e3d52e0ae..461752afe 100644 --- a/src/views/modules/base/smartExcel/cpts/excel-view.vue +++ b/src/views/modules/base/smartExcel/cpts/excel-view.vue @@ -24,9 +24,10 @@ 智能填表
- 驳回重提 - 审核存档 - 保存 + + 驳回重提 + 审核存档 + 保存
@@ -51,26 +52,7 @@ export default { data() { return { showUploadData: false, - menuList: [ - // { - // name: '2024年11月第三周（已提交）', - // workbookId:'1876569275607785473' - // }, - // { - // name: '2024年11月第三周（已提交）', - // workbookId:'1876571135966158850' - // }, - // { - // name: '2024年11月第三周（已提交）', - // workbookId:'1879063358107648002' - // }, - // { - // name: '2024年11月第三周（已提交）' - // }, - // { - // name: '2024年11月第三周（已提交）' - // } - ], + menuList: [], menuActive: 0, socket: null, currentTable: null, @@ -89,6 +71,14 @@ export default { sheetTotal: { type: Boolean, default: false + }, + infoObj:{ + type:Object, + default:()=>{} + }, + mergeObj:{ + type:Object, + default:()=>{} } }, computed: { @@ -203,46 +193,6 @@ export default { }, updataSheet(list) { - let arr = [ - // { - // 1: '张三1', - // 2: '证件类型1', - // 3: '1234', - // 4: '456', - // 5: '国籍', - // 6: '性别', - // 7: '出生日期', - // 8: '所属社区', - // 9: '所属网格', - // 10: '所属小区', - // 11: '楼栋名称', - // 12: '单元号', - // 13: '门牌号', - // 14: '人房关系', - // 15: '人户状况', - // 16: '与户主关系', - // 17: '民族' - // }, - // { - // 1: '张三12', - // 2: '证件类型12', - // 3: '12342', - // 4: '4562', - // 5: '国籍2', - // 6: '性别2', - // 7: '出生日期2', - // 8: '所属社区2', - // 9: '所属网格2', - // 10: '所属小区2', - // 11: '楼栋名称2', - // 12: '单元号2', - // 13: '门牌号2', - // 14: '人房关系2', - // 15: '人户状况2', - // 16: '与户主关系2', - // 17: '民族' - // } - ] list.forEach((item, index) => { luckysheet.insertRow(this.currentTable[0].data.length, 1) for (let k in item) { @@ -250,6 +200,35 @@ export default { } }) }, + // 驳回重提，审核存档，保存统一用这一个事件来处理 + async handleClickCurrencyEvent(val){ + const url = '/actual/base/communityOneTablePeriodPublish/update' + let parm = { + ...this.infoObj + } + parm.taskState = val; + if(val === 'archived'){ + this.workbookMerge() + } + const {data,code,msg} = await requestPost(url,parm) + if(code === 0){ + this.$message.success('操作成功') + }else{ + console.log(msg); + } + }, + async workbookMerge(){ + const url = '/actual/base/luckySheet/workbook/merge' + let parm = { + sourceWorkbookId:this.mergeObj.subWorkBookId, + targetWorkbookId:this.mergeObj.workBookId + } + const {data,code,msg} = await requestPost(url,parm) + if(code === 0){ + console.log('合并成功'); + } + }, + }, components: { excelUploadData diff --git a/src/views/modules/base/smartExcel/cpts/filling-info.vue b/src/views/modules/base/smartExcel/cpts/filling-info.vue index fe22bb2b3..ba71e141b 100644 --- a/src/views/modules/base/smartExcel/cpts/filling-info.vue +++ b/src/views/modules/base/smartExcel/cpts/filling-info.vue @@ -65,7 +65,7 @@ （点击以下表格开始提报任务）
-
{{formData.taskTitle}}
@@ -90,7 +90,7 @@
- +
{ - this.formData=res.data + this.formData=res.data; + const { id, taskId, taskTitle, taskPeriod, taskType, taskIntroduction } = this.formData; + this.infoObj = {id, taskId, taskTitle, taskPeriod, taskType, taskIntroduction} }); }, close() {