diff --git a/src/api/sunVillage_info/fixedAssets.js b/src/api/sunVillage_info/fixedAssets.js index 488d4273..0bff76d4 100644 --- a/src/api/sunVillage_info/fixedAssets.js +++ b/src/api/sunVillage_info/fixedAssets.js @@ -254,6 +254,15 @@ export function treeselectByUser(query) { params: query }) } + +// 查询部门下拉树结构 +export function treeselect() { + return request({ + url: '/depositm/dept/treeselect', + method: 'get' + }) +} + //获取账套列表 export function listByDeptId(query) { return request({ @@ -833,6 +842,16 @@ export function attachmentUpload(data) { }) } +// 附件上传 +export function publicUpload(data) { + return request({ + url: '/villageAffairs/public/upload', + method: 'post', + header: { "Content-Type": 'application/x-www-form-urlencoded' }, + data: data + }) +} + // 投诉建议列表 export function adviceList(query) { return request({ @@ -841,3 +860,20 @@ export function adviceList(query) { params: query }) } + +// 新增投诉建议 +export function addAdvice(data) { + return request({ + url: '/villageAffairs/public/addAdvice', + method: 'post', + data: data + }) +} + +// 投诉建议详情 +export function getAdvice(id) { + return request({ + url: '/villageAffairs/public/getAdvice/'+id, + method: 'get', + }) +} diff --git a/src/assets/images/sunVillage_info/complaint_add_icon_03.png b/src/assets/images/sunVillage_info/complaint_add_icon_03.png new file mode 100644 index 00000000..a5adad6b Binary files /dev/null and b/src/assets/images/sunVillage_info/complaint_add_icon_03.png differ diff --git a/src/assets/images/sunVillage_info/complaint_add_icon_04.png b/src/assets/images/sunVillage_info/complaint_add_icon_04.png new file mode 100644 index 00000000..7f327c17 Binary files /dev/null and b/src/assets/images/sunVillage_info/complaint_add_icon_04.png differ diff --git a/src/assets/images/sunVillage_info/complaint_add_icon_05.png b/src/assets/images/sunVillage_info/complaint_add_icon_05.png new file mode 100644 index 00000000..9eb286e2 Binary files /dev/null and b/src/assets/images/sunVillage_info/complaint_add_icon_05.png differ diff --git a/src/permission.js b/src/permission.js index 0e79cded..e2628cac 100644 --- a/src/permission.js +++ b/src/permission.js @@ -140,6 +140,7 @@ const whiteList = [ '/sunVillage_info/list_vote_form', //详情页 '/sunVillage_info/list_complaint', //详情页 '/sunVillage_info/list_complaint_add', //详情页 + '/sunVillage_info/list_complaint_detail', //详情页 '/sunVillage_info/homeApplication/applicationList', //列表页面 '/sunVillage_info/proposerLite', '/sunVillage_info/paidExit/paidExitList', //列表页面 diff --git a/src/router/index.js b/src/router/index.js index ad4403c8..7813929a 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -3849,6 +3849,15 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/sunVillage_info/list_complaint_add'], resolve) }, + { ////阳光村务（新）-- 合同信息 + path: '/sunVillage_info/list_complaint_detail', + name: 'sunVillageInfoListComplaintDetail', + meta: { + title: '投诉建议', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/list_complaint_detail'], resolve) + }, { ////阳光村务（新）-- 合同网签 path: '/sunVillage_info/list_signature', name: 'sunVillageInfoListSignature', diff --git a/src/views/sunVillage_info/index_code.vue b/src/views/sunVillage_info/index_code.vue index bb1d2835..3e985d2c 100644 --- a/src/views/sunVillage_info/index_code.vue +++ b/src/views/sunVillage_info/index_code.vue @@ -100,23 +100,25 @@ }, created() { - if(this.$route.query.bookId) - { - bookInfo(this.$route.query.bookId).then((res) => { - if (res.code == 200) { - Cookies.set("bookName", res.data.bookName, { - expires: 30, - }); - Cookies.set("deptName", res.data.deptName, { - expires: 30, - }); - this.deptName = res.data.deptName; - this.bookName = res.data.bookName; - } - }); - Cookies.set("bookId", this.$route.query.bookId, { - expires: 30, - }); + if(this.$route.query.bookId){ + bookInfo(this.$route.query.bookId).then((res) => { + if (res.code == 200) { + let seconds = 3600; + + let expires = new Date(new Date() * 1 + seconds * 1000); + Cookies.set("bookName", res.data.bookName, { + expires: expires, + }); + Cookies.set("deptName", res.data.deptName, { + expires: expires, + }); + this.deptName = res.data.deptName; + this.bookName = res.data.bookName; + } + }); + Cookies.set("bookId", this.$route.query.bookId, { + expires: 30, + }); } Cookies.set("deptId", this.$route.query.deptId, { expires: 30, diff --git a/src/views/sunVillage_info/list_complaint.vue b/src/views/sunVillage_info/list_complaint.vue index 66e4ae30..ae543f39 100644 --- a/src/views/sunVillage_info/list_complaint.vue +++ b/src/views/sunVillage_info/list_complaint.vue @@ -17,23 +17,29 @@ + - + + + + + @@ -43,6 +49,7 @@ import { adviceList , delPoll , publicPoll } from "@/api/sunVillage_info/fixedAssets"; import Cookies from "js-cookie"; import request from '@/utils/request' + import {Dialog} from "vant"; export default { name: "certificateList", data() { @@ -56,15 +63,23 @@ }; }, created() { - if (Cookies.get('user')){ - this.queryParams.userId = JSON.parse(Cookies.get('user')).id + if (!Cookies.get('user')){ + Dialog.confirm({ + title: '系统提示', + message: '登录状态已过期，请重新登录', + confirmButtonText: '重新登录', + cancelButtonText: '取消' + }).then(() => { + this.$router.push({path:'/sunVillage_info/login_code'}) + }) } }, methods: { getList(){ var _this = this; let queryParams = { - advicePhone:JSON.parse(Cookies.get('user')).phone + advicePhone:JSON.parse(Cookies.get('user')).phone, + translate_dict:1, } adviceList(queryParams).then(response => { _this.listLength = response.total; @@ -82,7 +97,7 @@ }); }, goAdd(){ - this.$router.push('/sunVillage_info/list_complaint_add') + this.$router.push({path:'/sunVillage_info/list_complaint_add', query: {type: 'code'}}) }, goDetail(id){ this.$router.push({path:'/sunVillage_info/list_vote_detail',query: {id:id}}) @@ -126,6 +141,9 @@ } }, + + + } @@ -192,5 +210,36 @@ flex: 1; } } + + .tit{ + color: #333333; + font-size: .45rem; + } + .time{ + color: #aaaaaa; + font-size: .35rem; + } + .dept{ + color: #3977e7; + font-size: .35rem; + display: flex; + align-items: center; + } + + .state1{ + background: #e4f8f4; + border: 1px solid #c5efe7; + color: #2ec6a9; + padding: 0 3vw; + border-radius: 5vw; + } + + .state2{ + background: #fedfe3; + border: 1px solid #fcb9c2; + color: #f60325; + padding: 0 3vw; + border-radius: 5vw; + } } diff --git a/src/views/sunVillage_info/list_complaint_add.vue b/src/views/sunVillage_info/list_complaint_add.vue index 27d09697..7ef57164 100644 --- a/src/views/sunVillage_info/list_complaint_add.vue +++ b/src/views/sunVillage_info/list_complaint_add.vue @@ -1,6 +1,6 @@