diff --git a/src/api/sunVillage_info/fixedAssets.js b/src/api/sunVillage_info/fixedAssets.js index a70fd12b..2d7d15eb 100644 --- a/src/api/sunVillage_info/fixedAssets.js +++ b/src/api/sunVillage_info/fixedAssets.js @@ -55,6 +55,15 @@ export function commonAttach(data) { data: data }) } +//上传全局方法附件 +export function commonUpload(data) { + return request({ + url: '/common/upload', + method: 'post', + header: { "Content-Type": 'application/x-www-form-urlencoded' }, + data: data + }) +} //查询已上传附件 export const attachmentList = (data) => { return request({ @@ -184,3 +193,72 @@ export function changeBook(query) { params: query }) } +// 财务公开新增 +export function openAdd(data) { + return request({ + url: '/open/open/add', + method: 'post', + data: data + }) +} +// 财务公开修改 +export function openEdit(data) { + return request({ + url: '/open/open/edit', + method: 'post', + data: data + }) +} +// 零工公开新增 +export function tempWorkerOpenAdd(data) { + return request({ + url: '/subcontract/tempWorkerOpen/add', + method: 'post', + data: data + }) +} +// 财务公开修改 +export function tempWorkerOpenEdit(data) { + return request({ + url: '/subcontract/tempWorkerOpen/edit', + method: 'post', + data: data + }) +} +// 重大事项新增 +export function majorEventOpenAdd(data) { + return request({ + url: '/subcontract/majorEventOpen/add', + method: 'post', + data: data + }) +} +// 重大事项修改 +export function majorEventOpenEdit(data) { + return request({ + url: '/subcontract/majorEventOpen/edit', + method: 'post', + data: data + }) +} +// 财务公开删除 +export function openRemove(id) { + return request({ + url: '/open/open/remove/' + id, + method: 'get' + }) +} +// 零工公开删除 +export function tempWorkerOpenRemove(id) { + return request({ + url: '/subcontract/tempWorkerOpen/remove/' + id, + method: 'get' + }) +} +// 零工公开删除 +export function majorEventOpenRemove(id) { + return request({ + url: '/subcontract/majorEventOpen/remove/' + id, + method: 'get' + }) +} diff --git a/src/router/index.js b/src/router/index.js index 9d19e458..7822d4c8 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -2967,10 +2967,82 @@ export const constantRoutes = [ path: '/sunVillage_info/list_finance_add', name: 'sunVillageInfoListFinanceAdd', meta: { - title: '新增重大事项', + title: '新增财务公开', hidden: true, }, component: (resolve) => require(['@/views/sunVillage_info/list_finance_add'], resolve) + }, + { ////阳光村务(新)-- 合同信息 + path: '/sunVillage_info/list_finance_detail', + name: 'sunVillageInfoListFinanceDetail', + meta: { + title: '查看财务公开', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/list_finance_detail'], resolve) + }, + { ////阳光村务(新)-- 合同信息 + path: '/sunVillage_info/list_tourists_add', + name: 'sunVillageInfoListTouristsAdd', + meta: { + title: '新增零工公开', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/list_tourists_add'], resolve) + }, + { ////阳光村务(新)-- 合同信息 + path: '/sunVillage_info/list_finance_edit', + name: 'sunVillageInfoListFinanceEdit', + meta: { + title: '修改财务公开', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/list_finance_edit'], resolve) + }, + { ////阳光村务(新)-- 合同信息 + path: '/sunVillage_info/list_tourists_edit', + name: 'sunVillageInfoListTouristsEdit', + meta: { + title: '修改零工公开', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/list_tourists_edit'], resolve) + }, + { ////阳光村务(新)-- 合同信息 + path: '/sunVillage_info/list_tourists_detail', + name: 'sunVillageInfoListTouristsDetail', + meta: { + title: '查看零工公开', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/list_tourists_detail'], resolve) + }, + { ////阳光村务(新)-- 合同信息 + path: '/sunVillage_info/list_issues_add', + name: 'sunVillageInfoListIssuesAdd', + meta: { + title: '新增重大事项', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/list_issues_add'], resolve) + }, + { ////阳光村务(新)-- 合同信息 + path: '/sunVillage_info/list_issues_detail', + name: 'sunVillageInfoListIssuesDetail', + meta: { + title: '查看重大事项', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/list_issues_detail'], resolve) + }, + { ////阳光村务(新)-- 合同信息 + path: '/sunVillage_info/list_issues_edit', + name: 'sunVillageInfoListIssuesEdit', + meta: { + title: '修改重大事项', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/list_issues_edit'], resolve) } ]; diff --git a/src/utils/request.js b/src/utils/request.js index cbda2b8d..593730ee 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -89,6 +89,8 @@ service.interceptors.response.use(res => { window.location.href = '/zjdLogin'; } else if (window.location.href.indexOf('yinnong') != -1) { window.location.href = '/yinnongLogin'; + } else if (window.location.href.indexOf('/sunVillage_info/') != -1) { + window.location.href = '/sunVillage_info/login'; } else if (window.location.href.indexOf('/sunVillage') != -1) { window.location.href = '/sunVillage/login'; } else if (window.location.href.indexOf('/homestead/') != -1) { diff --git a/src/views/sunVillage_info/fixedAssets.vue b/src/views/sunVillage_info/fixedAssets.vue index 62f2cd6e..566cc681 100644 --- a/src/views/sunVillage_info/fixedAssets.vue +++ b/src/views/sunVillage_info/fixedAssets.vue @@ -126,6 +126,7 @@ }, afterRead(file) { // 此时可以自行将文件上传至服务器 + console.log(file) this.uploadFiles1.push(file.file); let params1 = new FormData(); params1.append("tableId", this.projectId); diff --git a/src/views/sunVillage_info/list_finance.vue b/src/views/sunVillage_info/list_finance.vue index 59833ad4..09ac7ca5 100644 --- a/src/views/sunVillage_info/list_finance.vue +++ b/src/views/sunVillage_info/list_finance.vue @@ -25,8 +25,8 @@ @load="getList" > -
-
+
+

{{item.openName}}

@@ -39,10 +39,10 @@
-
+
-
+
- + + + diff --git a/src/views/sunVillage_info/list_finance_edit.vue b/src/views/sunVillage_info/list_finance_edit.vue new file mode 100644 index 00000000..2837b4f1 --- /dev/null +++ b/src/views/sunVillage_info/list_finance_edit.vue @@ -0,0 +1,336 @@ + + + + + diff --git a/src/views/sunVillage_info/list_issues.vue b/src/views/sunVillage_info/list_issues.vue index c8b5eb7c..f67b4ecd 100644 --- a/src/views/sunVillage_info/list_issues.vue +++ b/src/views/sunVillage_info/list_issues.vue @@ -25,8 +25,8 @@ @load="getList" > -
-
+
+

{{item.openName}}

@@ -39,10 +39,10 @@
-
+
-
+
+ + +
+ + + + +
+
+ + +

{{item.name}}

+
+
+ + + +
+ + + + + + + + +
+ +
+ + 保存 + +
+ +
+ + + + + diff --git a/src/views/sunVillage_info/list_issues_detail.vue b/src/views/sunVillage_info/list_issues_detail.vue new file mode 100644 index 00000000..3d3a3d9a --- /dev/null +++ b/src/views/sunVillage_info/list_issues_detail.vue @@ -0,0 +1,257 @@ + + + + + diff --git a/src/views/sunVillage_info/list_issues_edit.vue b/src/views/sunVillage_info/list_issues_edit.vue new file mode 100644 index 00000000..963ff058 --- /dev/null +++ b/src/views/sunVillage_info/list_issues_edit.vue @@ -0,0 +1,342 @@ + + + + + diff --git a/src/views/sunVillage_info/list_tourists.vue b/src/views/sunVillage_info/list_tourists.vue index 8a7704b1..e1eb27f2 100644 --- a/src/views/sunVillage_info/list_tourists.vue +++ b/src/views/sunVillage_info/list_tourists.vue @@ -25,8 +25,8 @@ @load="getList" > -
-
+
+

{{item.openName}}

@@ -39,10 +39,10 @@
-
+
-
+
+ + +
+ + + + +
+
+ + +

{{item.name}}

+
+
+ + + +
+ + + + +
+ +
+ + 保存 + +
+ +
+ + + + + diff --git a/src/views/sunVillage_info/list_tourists_detail.vue b/src/views/sunVillage_info/list_tourists_detail.vue new file mode 100644 index 00000000..03e9fe39 --- /dev/null +++ b/src/views/sunVillage_info/list_tourists_detail.vue @@ -0,0 +1,251 @@ + + + + + diff --git a/src/views/sunVillage_info/list_tourists_edit.vue b/src/views/sunVillage_info/list_tourists_edit.vue new file mode 100644 index 00000000..7facdb76 --- /dev/null +++ b/src/views/sunVillage_info/list_tourists_edit.vue @@ -0,0 +1,336 @@ + + + + +