diff --git a/src/api/lawEnforcement/index.js b/src/api/lawEnforcement/index.js index 5d2a4e92..b96da012 100644 --- a/src/api/lawEnforcement/index.js +++ b/src/api/lawEnforcement/index.js @@ -200,3 +200,28 @@ export function progressList(query) { params: query }) } + +// 查询用户个人信息 +export function getUserProfile() { + return request({ + url: '/system/user/profile/get', + method: 'get' + }) +} + +// 用户密码重置 +export function updateUserPwd(data) { + return request({ + url: '/system/user/profile/updatePwd', + method: 'post', + params: data + }) +} + +// 查询举报留言详细 +export function getCommunicate(id) { + return request({ + url: '/enforce/communicate/get/' + id, + method: 'get' + }) +} diff --git a/src/router/index.js b/src/router/index.js index 300210a7..f914167f 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1459,7 +1459,7 @@ export const constantRoutes = [ path: '/lawEnforcement', name: 'lawEnforcement', meta: { - title: '农业综合执法公众平台', + title: '农业综合行政执法公众平台', hidden: true, }, component: (resolve) => require(['@/views/lawEnforcement/index'], resolve) diff --git a/src/views/lawEnforcement/case/caseList.vue b/src/views/lawEnforcement/case/caseList.vue index 40a1d936..e295b107 100644 --- a/src/views/lawEnforcement/case/caseList.vue +++ b/src/views/lawEnforcement/case/caseList.vue @@ -4,8 +4,9 @@
@@ -13,46 +14,97 @@ 筛选
- -

筛选条件:企业 进行中 登记

 - + +

筛选条件：{{showType}} {{showCaseStatus}} {{showCaseProgress}}

 +
-

当事人类型

- -

全部

 -

个人/个体工商户

 -

企业

 - -

案件状态

- -

全部

 -

进行中

 -

结束

 -

中断

 - -

案件执法进度

- -

全部

 -

登记

 -

勘察

 -

立案

 - - -

取证

 -

处理

 -

裁决

 -

执行

 - - -

备案

 -

结案

 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- 重置 - 确定 + 重置 + 确定 { this.typeOptions = response.data; + for (var i = 0 ; i < response.data.length ; i++){ + this.typeColumns.push({text: response.data[i].dictLabel, value: response.data[i].dictValue}) + + } }); this.getDicts("case_status").then(response => { this.caseStatusOptions = response.data; + for (var i = 0 ; i < response.data.length ; i++){ + this.caseStatusColumns.push({text: response.data[i].dictLabel, value: response.data[i].dictValue}) + } }); this.getDicts("case_node").then(response => { this.caseProgressOptions = response.data; + for (var i = 0 ; i < response.data.length ; i++){ + this.caseProgressColumns.push({text: response.data[i].dictLabel, value: response.data[i].dictValue}) + } }); }, methods: { @@ -164,7 +236,50 @@ export default { goDetail(id){ console.log(id) window.location = 'news/newDetail?id='+id; - } + }, + onConfirmDsrlx(data){ + this.queryParams.type = data.value; + this.showType = data.text; + this.showDsrlx = false; + }, + onConfirmAjzt(data){ + this.queryParams.caseStatus = data.value; + this.showCaseStatus = data.text + this.showAjzt = false; + }, + onConfirmAjzfjd(data){ + this.queryParams.caseProgress = data.value; + this.showCaseProgress = data.text + this.showAjzfjd = false; + }, + resetQuery(){ + this.queryParams = { + // 分页 + pageNum: 1, + pageSize: 10, + // 查询排序 + orderByColumn: "id", + isAsc: "desc", + caseNum: null, + type: null, + caseStatus: null, + caseProgress: null, + }; + this.showType = ''; + this.showCaseStatus = ''; + this.showCaseProgress = ''; + this.showSxtj = false; + this.getList() + }, + /** 搜索按钮操作 */ + handleQuery() { + if(this.showType != '' || this.showCaseStatus != '' || this.showCaseProgress != ''){ + this.showSxtj = true; + } + this.caseList = []; + this.queryParams.pageNum = 1; + this.getList(); + }, }, }; @@ -181,9 +296,8 @@ export default { padding-bottom: 0.5rem; } .sheetContent{ - padding: 10PX 1% 1rem; + padding: 10PX 1% 0; margin-bottom: 0.5rem; - border-bottom: 1px solid #eeeeee; .sheetTitle{ font-size: 0.42rem; background-color: transparent; diff --git a/src/views/lawEnforcement/changePassword/index.vue b/src/views/lawEnforcement/changePassword/index.vue index be8ede60..755b749b 100644 --- a/src/views/lawEnforcement/changePassword/index.vue +++ b/src/views/lawEnforcement/changePassword/index.vue @@ -1,29 +1,51 @@ diff --git a/src/views/lawEnforcement/complaint/complaintList.vue b/src/views/lawEnforcement/complaint/complaintList.vue index 14fecd44..f3c80240 100644 --- a/src/views/lawEnforcement/complaint/complaintList.vue +++ b/src/views/lawEnforcement/complaint/complaintList.vue @@ -9,84 +9,52 @@ /> -
- - - - - - 类型： - 投诉 - - - 标题： - 事件标题时间标题时间标题 - - - 内容： - 发生事件内容发生事件内容发生事件内容发生事件内发生事件内容发生事件内容发生事件内容发生事件内容发发生事件内容件内容发生事件内容。 - - - - 回复 - -
-
- - - - - - 类型： - 投诉 - - - 标题： - 事件标题时间标题时间标题 - - - 内容： - 发生事件内容发生事件内容发生事件内容发生事件内发生事件内容发生事件内容发生事件内容发生事件内容发发生事件内容件内容发生事件内容。 - - - - 回复 - -
-
- - - - - - 类型： - 投诉 - - - 标题： - 事件标题时间标题时间标题 - - - 内容： - 发生事件内容发生事件内容发生事件内容发生事件内发生事件内容发生事件内容发生事件内容发生事件内容发发生事件内容件内容发生事件内容。 - - - - 回复 - -
+ +
+ + + + + + 类型： + {{item.communicateType}} + + + 标题： + {{item.title}} + + + 内容： + {{item.content}} + + + + + + + + 回复： + {{item.reply}} + + + 回复人： + {{item.replyName}} + + + + 回复 + +
+ 内容 @@ -98,18 +66,53 @@ @@ -138,6 +141,11 @@ export default { } /deep/.van-cell{ padding: 0; + padding-bottom: 10PX; + border-bottom: 1px solid #eee; +} +/deep/.van-cell::after{ + border: none; } /deep/.van-row{ margin-top: 15PX; diff --git a/src/views/lawEnforcement/complaint/indexComplaint.vue b/src/views/lawEnforcement/complaint/indexComplaint.vue index 35457099..8dcfbf56 100644 --- a/src/views/lawEnforcement/complaint/indexComplaint.vue +++ b/src/views/lawEnforcement/complaint/indexComplaint.vue @@ -56,7 +56,7 @@ @@ -60,6 +80,9 @@ export default { font-family: SourceHanSansCNBold; src: url("../../../assets/fonts/SourceHanSansCN-Bold.otf"); } +.app-container{ + padding: 2%; +} /deep/ .van-tabs__line{ background-color: #1D6FE9; } diff --git a/src/views/lawEnforcement/index.vue b/src/views/lawEnforcement/index.vue index eb2bb62f..90d1dddc 100644 --- a/src/views/lawEnforcement/index.vue +++ b/src/views/lawEnforcement/index.vue @@ -3,7 +3,7 @@ diff --git a/src/views/lawEnforcement/login.vue b/src/views/lawEnforcement/login.vue index 9e18e3f1..1ef50a19 100644 --- a/src/views/lawEnforcement/login.vue +++ b/src/views/lawEnforcement/login.vue @@ -2,7 +2,7 @@
-

农业综合执法公众平台

+

农业综合行政执法公众平台

@@ -13,46 +14,50 @@ 筛选
- -

筛选条件:企业 进行中 登记

 - + +

筛选条件：{{showProductType}} {{showCategory}}

 +
-

当事人类型

- -

全部

 -

个人/个体工商户

 -

企业

 - -

案件状态

- -

全部

 -

进行中

 -

结束

 -

中断

 - -

案件执法进度

- -

全部

 -

登记

 -

勘察

 -

立案

 - - -

取证

 -

处理

 -

裁决

 -

执行

 - - -

备案

 -

结案

 - + + + + + + + +
- 重置 - 确定 + 重置 + 确定 { + this.productTypeOptions = response.data; + for (var i = 0 ; i < response.data.length ; i++){ + this.productTypeColumns.push({text: response.data[i].dictLabel, value: response.data[i].dictValue}) + + } + }); + this.getDicts("category_type").then(response => { + this.categoryOptions = response.data; + for (var i = 0 ; i < response.data.length ; i++){ + this.categoryColumns.push({text: response.data[i].dictLabel, value: response.data[i].dictValue}) + } + }); this.getDeptId(); }, methods: { @@ -123,7 +161,6 @@ export default { }, getList(){ this.loading = true; - productList(this.queryParams).then(response => { this.newList = response.rows; if(this.newList.length >= response.total){ @@ -134,6 +171,46 @@ export default { this.loading = false; }); }, + onConfirmNypzl(data){ + this.queryParams.category = data.value; + this.showCategory = data.text; + this.showNypzl = false; + }, + onConfirmNyplx(data){ + this.queryParams.productType = data.value; + this.showProductType = data.text + this.showNyplx = false; + }, + resetQuery(){ + this.queryParams = { + // 分页 + pageNum: 1, + pageSize: 10, + deptId:100, + // 查询排序 + orderByColumn: "id", + isAsc: "desc", + productType: null, + recordCode: null, + productName: null, + category: null, + agent: null, + checkStatus:"1", + }, + this.showProductType = ''; + this.showCategory = ''; + this.showSxtj = false; + this.getDeptId() + }, + /** 搜索按钮操作 */ + handleQuery() { + if( this.showProductType != '' || this.showCategory != '' ){ + this.showSxtj = true; + } + this.caseList = []; + this.queryParams.pageNum = 1; + this.getList(); + }, }, }; diff --git a/src/views/lawEnforcement/user/index.vue b/src/views/lawEnforcement/user/index.vue index 9d8ad4af..869217df 100644 --- a/src/views/lawEnforcement/user/index.vue +++ b/src/views/lawEnforcement/user/index.vue @@ -2,13 +2,13 @@
- + -

农燊高科

-

农业农村局种子部门

+

{{ user.userName }}

+

{{ user.dept.deptName }} {{ postGroup }}

 @@ -54,23 +54,40 @@
@@ -104,12 +121,12 @@ export default { overflow: hidden; } .userName{ - font-size: 20PX; + font-size: 0.55rem; color: #FFFFFF; line-height: 0.85rem; } .userDept{ - font-size: 14PX; + font-size: 0.4rem; color: #FFFFFF; line-height: 0.85rem; }