diff --git a/src/components/home/HomeApplyUploadCompTc.vue b/src/components/home/HomeApplyUploadCompTc.vue index db08bd56..95e574bd 100644 --- a/src/components/home/HomeApplyUploadCompTc.vue +++ b/src/components/home/HomeApplyUploadCompTc.vue @@ -85,7 +85,7 @@ export default { file.response = resp; console.log(resp); file.fileList = item.fileList; - this.onFileListChanged("ADD", resp.id); + this.onFileListChanged("ADD", resp); this.setFileStatus(file, 'done', '文件上传成功'); this.$emit('onUploadSuccess', file); } @@ -147,15 +147,15 @@ export default { return UfileList; } }, - onFileListChanged(type, id) { + onFileListChanged(type, data) { if(this.proposerId != -1) return; if(type === "ADD") { - this.newAttachments.push(id); + this.newAttachments.push(data); } else if(type === "REMOVE") { - let index = this.newAttachments.indexOf(id); + let index = this.newAttachments.indexOf(data.id); if(index !== -1) this.newAttachments.splice(index, 1); } diff --git a/src/permission.js b/src/permission.js index 53292217..76d65c0b 100644 --- a/src/permission.js +++ b/src/permission.js @@ -112,10 +112,12 @@ const whiteList = [ '/sunVillage_info/homeApplication/applicationNewList', //列表页面 '/sunVillage_info/proposerLite', '/sunVillage_info/proposerLiteNew', + '/sunVillage_info/paidExitAddNew', '/sunVillage_info/paidExit/paidExitList', //列表页面 '/sunVillage_info/paidExit/paidExitNewList', //宅基地退出列表页面(新) '/sunVillage_info/paidExitAdd', '/sunVillage_info/paidExitModify', + '/sunVillage_info/paidExitModifyNew', '/sunVillage_info/paidExitDetail', '/sunVillage_info/paidExitDetailNew', '/sunVillage_info/arbitrationList', diff --git a/src/router/index.js b/src/router/index.js index d49e1a8a..1ef30e7f 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -4102,13 +4102,22 @@ export const constantRoutes = [ component: (resolve) => require(['@/views/sunVillage_info/paidExit/paidExitAdd'], resolve) }, { - path: '/sunVillage_info/paidExitModify', - name: 'sunVillageInfoPaidExitModify', + path: '/sunVillage_info/paidExitAddNew', + name: 'sunVillageInfoPaidExitAddNew', meta: { - title: '有偿退出修改', + title: '有偿退出新增(新)', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/paidExit/paidExitAddNew'], resolve) + }, + { + path: '/sunVillage_info/paidExitModifyNew', + name: 'sunVillageInfoPaidExitModifyNew', + meta: { + title: '有偿退出修改(新)', hidden: true, }, - component: (resolve) => require(['@/views/sunVillage_info/paidExit/paidExitModify'], resolve) + component: (resolve) => require(['@/views/sunVillage_info/paidExit/paidExitModifyNew'], resolve) }, { path: '/sunVillage_info/paidExitDetail', diff --git a/src/views/sunVillage_info/paidExit/paidExitAddNew.vue b/src/views/sunVillage_info/paidExit/paidExitAddNew.vue new file mode 100644 index 00000000..00670cbc --- /dev/null +++ b/src/views/sunVillage_info/paidExit/paidExitAddNew.vue @@ -0,0 +1,749 @@ + + + + + diff --git a/src/views/sunVillage_info/paidExit/paidExitModifyNew.vue b/src/views/sunVillage_info/paidExit/paidExitModifyNew.vue new file mode 100644 index 00000000..65abd837 --- /dev/null +++ b/src/views/sunVillage_info/paidExit/paidExitModifyNew.vue @@ -0,0 +1,657 @@ + + + + + diff --git a/src/views/sunVillage_info/paidExit/paidExitNewList.vue b/src/views/sunVillage_info/paidExit/paidExitNewList.vue index 0ca0a262..cc188bed 100644 --- a/src/views/sunVillage_info/paidExit/paidExitNewList.vue +++ b/src/views/sunVillage_info/paidExit/paidExitNewList.vue @@ -39,7 +39,7 @@