From 2adb2f6367b9987a3dfe0a2694e4da18958aa5be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com> Date: Fri, 3 Dec 2021 17:28:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/lawEnforcement/index.js | 44 +++ src/permission.js | 1 + src/router/index.js | 9 + src/views/lawEnforcement/case/caseDetail.vue | 318 +++++++++++++++--- src/views/lawEnforcement/case/caseList.vue | 5 +- .../complaint/complaintList.vue | 94 +++++- src/views/lawEnforcement/complaint/reply.vue | 30 +- src/views/lawEnforcement/index.vue | 71 ++-- .../programme/programmeApproval.vue | 213 ++++++------ .../programme/programmeDetail.vue | 116 +------ .../programme/programmeList.vue | 109 +++--- .../programme/programmeModify.vue | 172 +++++++--- .../lawEnforcement/scheme/schemeDetail.vue | 77 +++++ src/views/lawEnforcement/user/index.vue | 97 +++++- .../lawEnforcement/user/waitingProcessing.vue | 237 +++++++++++++ 15 files changed, 1182 insertions(+), 411 deletions(-) create mode 100644 src/views/lawEnforcement/user/waitingProcessing.vue diff --git a/src/api/lawEnforcement/index.js b/src/api/lawEnforcement/index.js index b96da012..3b9e7b2f 100644 --- a/src/api/lawEnforcement/index.js +++ b/src/api/lawEnforcement/index.js @@ -225,3 +225,47 @@ export function getCommunicate(id) { method: 'get' }) } + +// 修改举报留言 +export function updateCommunicate(data) { + return request({ + url: '/enforce/communicate/edit', + method: 'post', + data: data + }) +} + +// 查询方案管理列表 +export function listScheme(query) { + return request({ + url: '/enforce/scheme/list', + method: 'get', + params: query + }) +} + +// 查询方案管理详细 +export function getScheme(id) { + return request({ + url: '/enforce/scheme/get/' + id, + method: 'get' + }) +} + +// 修改方案管理 +export function updateScheme(data) { + return request({ + url: '/enforce/scheme/edit', + method: 'post', + data: data + }) +} + +// 待办事项列表 +export function processTaskList(query) { + return request({ + url: '/activiti/process/taskList', + method: 'get', + params: query + }) +} diff --git a/src/permission.js b/src/permission.js index 6b93c9b7..00af3b69 100644 --- a/src/permission.js +++ b/src/permission.js @@ -58,6 +58,7 @@ const whiteList = [ '/lawEnforcement/login', '/lawEnforcement/indexComplaint', '/lawEnforcement/schemeDetail', + '/lawEnforcement/waitingProcessing', ] router.beforeEach((to, from, next) => { diff --git a/src/router/index.js b/src/router/index.js index f914167f..42292ae9 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1635,6 +1635,15 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/lawEnforcement/scheme/schemeDetail'], resolve) }, + { + path: '/lawEnforcement/waitingProcessing', + name: 'waitingProcessing', + meta: { + title: '待办事项', + hidden: true, + }, + component: (resolve) => require(['@/views/lawEnforcement/user/waitingProcessing'], resolve) + }, ]; diff --git a/src/views/lawEnforcement/case/caseDetail.vue b/src/views/lawEnforcement/case/caseDetail.vue index 3cf6d138..8a3a74e8 100644 --- a/src/views/lawEnforcement/case/caseDetail.vue +++ b/src/views/lawEnforcement/case/caseDetail.vue @@ -7,13 +7,18 @@ left-arrow @click-left="onClickLeft" /> - + - +
@@ -76,11 +81,16 @@
- +
@@ -150,7 +160,7 @@ - + @@ -202,7 +212,7 @@
- + @@ -222,13 +232,39 @@ + +
+ + 审批
意见 + + + 同意 + 驳回 + + + + +
+
+ + + 提交 + + +
+
- +
@@ -391,11 +427,16 @@
- +
@@ -490,7 +531,7 @@
- + @@ -510,13 +551,39 @@ + +
+ + 审批
意见 + + + 同意 + 驳回 + + + + +
+
+ + + 提交 + + +
+
- +
@@ -623,7 +690,7 @@
- + @@ -643,13 +710,39 @@ + +
+ + 审批
意见 + + + 同意 + 驳回 + + + + +
+
+ + + 提交 + + +
+
- +
@@ -738,11 +831,16 @@
- +
@@ -801,11 +899,16 @@
- +
@@ -904,10 +1007,16 @@ export default { showPayeeType:false, showPicker:false, form:{}, + caseProgress:0, + caseActive:0, bankType:'', payeeType:'', value:'', + type:'', + + pass: "true", + comment: "同意", bankTypeOptions:[], payeeTypeOptions:[], @@ -1156,7 +1265,7 @@ export default { // 办理人员列表 tEnforceCaseHandlerList: [], tEnforcePutRecordHandlerList: [], - tEnforceSamplingGoodsList: [{}], + tEnforceSamplingGoodsList: [], tEnforceDetainHandlerList: [], tEnforceEvidenceHandlerList: [], tEnforceTreatHandlerList: [], @@ -1180,6 +1289,15 @@ export default { }; }, created() { + if (parseInt(this.$route.query.caseProgress)>7){ + this.caseProgress = 7; + this.caseActive = 7 ; + }else{ + this.caseProgress = parseInt(this.$route.query.caseProgress)-1; + this.caseActive = parseInt(this.$route.query.caseProgress)-1 ; + } + this.type = this.$route.query.type; + console.log(this.caseProgress) this.getDicts("case_source").then(response => { this.caseSourceOptions = response.data; }); @@ -1213,12 +1331,82 @@ export default { this.schemeOptions = response.data; this.getInformation(); }); + // treeselect().then((response) => { // this.deptOptions = response.data; // }); }, methods: { + /** 保存审批意见提交 */ + submitCase() { + const data = { + taskId: this.surveyForm.taskId, + instanceId: this.surveyForm.instanceId, + variables: JSON.stringify({ + comment: this.comment, + pass: this.pass, + //"formData": this.row, + }), + }; + return request({ + url: "/activiti/process/complete", + method: "post", + params: data, + }).then((response) => { + if (response.code == 200 && response.msg == "操作成功") { + this.$notify({ type: 'success' , message: "操作成功" }); + } else { + this.$notify({ type: 'danger' , message: "操作失败" }); + } + }); + }, + /** 保存审批意见提交 */ + submitEvidence() { + const data = { + taskId: this.evidenceForm.taskId, + instanceId: this.evidenceForm.instanceId, + variables: JSON.stringify({ + comment: this.comment, + pass: this.pass, + //"formData": this.row, + }), + }; + return request({ + url: "/activiti/process/complete", + method: "post", + params: data, + }).then((response) => { + if (response.code == 200 && response.msg == "操作成功") { + this.$notify({ type: 'success' , message: "操作成功" }); + } else { + this.$notify({ type: 'danger' , message: "操作失败" }); + } + }); + }, + /** 保存审批意见提交 */ + submitTreat() { + const data = { + taskId: this.treatForm.taskId, + instanceId: this.treatForm.instanceId, + variables: JSON.stringify({ + comment: this.comment, + pass: this.pass, + //"formData": this.row, + }), + }; + return request({ + url: "/activiti/process/complete", + method: "post", + params: data, + }).then((response) => { + if (response.code == 200 && response.msg == "操作成功") { + this.$notify({ type: 'success' , message: "操作成功" }); + } else { + this.$notify({ type: 'danger' , message: "操作失败" }); + } + }); + }, getInformation(){ getCase(this.$route.query.id).then(response => { response.data.caseSource = this.selectDictLabel(this.caseSourceOptions, response.data.caseSource); @@ -1228,13 +1416,37 @@ export default { response.data.nation = this.selectDictLabel(this.nationOptions, response.data.nation); // response.data.deptId = this.selectDictDeptId(this.deptOptions, response.data.deptId); this.form = response.data; - this.caseSurvey(); - this.getEvidenceCase(); - this.getTreat(); - this.getDecision(); - this.getExecuteCase(); - this.getEndingForm(); - this.progressSpeed(); + + console.log(this.caseActive) + if(this.caseActive >= 1){//勘察 + console.log("勘察") + this.caseSurvey(); + } + if(this.caseActive >= 2){// 立案 + console.log("立案") + this.getFileCase(); + } + if(this.caseActive >= 3){//取证 + console.log("取证") + this.getEvidenceCase(); + } + if(this.caseActive >= 4){ // 处理 + console.log("处理") + this.getTreat(); + } + if(this.caseActive >= 5){// 裁决 + console.log("裁决") + this.getDecision(); + } + if(this.caseActive >= 6){// 执行 + console.log("执行") + this.getExecuteCase(); + } + if(this.caseActive >= 7){// 结案 + console.log("结案") + this.getEndingForm(); + } + }); }, //勘察表单查询 @@ -1244,6 +1456,7 @@ export default { if (this.form.id != null && this.form.id != "") { this.surveyForm.caseId = this.form.id; getSurveyByCaseId(this.form.id).then(responseSurvey => { + console.log(responseSurvey) if (responseSurvey.data != undefined) { _this.surveyForm = responseSurvey.data; _this.instanceId = responseSurvey.data.instanceId; @@ -1255,7 +1468,7 @@ export default { _this.surveyForm.schemeId = this.form.schemeId; // 查询审批历史记录 _this.getHistoryList(_this.surveyForm,''); - _this.getFileCase(); + }); } }, @@ -1604,6 +1817,35 @@ export default { .app-container { padding: 0; } +.examine_box{ + background-color: #1D6FE9!important; + padding: 0.18rem!important; + padding-left: 0!important; + border-radius: 0.15rem!important; + margin-top: 0.3rem!important; +} +.examine_box .van-col:first-child{ + color: #FFF!important; + font-size: 0.45rem!important; + text-align: center!important; +} +.examine_box .van-col:last-child{ + background-color: #FFF!important; + border-radius: 0.15rem!important; + overflow: hidden!important; + .van-radio-group--horizontal{ + padding: 0.2rem 0; + border-bottom: 1px solid #eee; + } +} +/deep/.van-radio--horizontal{ + margin-left: 20px; + margin-right: 0; +} +.submitButtonActive{ + width: 100%; + margin: 0 auto; +} .van-uploader { padding: 15PX; } diff --git a/src/views/lawEnforcement/case/caseList.vue b/src/views/lawEnforcement/case/caseList.vue index e295b107..a7f4fe8d 100644 --- a/src/views/lawEnforcement/case/caseList.vue +++ b/src/views/lawEnforcement/case/caseList.vue @@ -114,7 +114,7 @@ @load="getList" > - + @@ -123,7 +123,7 @@ @@ -207,7 +207,6 @@ export default { listCase(this.queryParams).then(response => { for (var i = 0; i < response.rows.length; i++) { response.rows[i].caseStatus = this.selectDictLabel(this.caseStatusOptions, response.rows[i].caseStatus); - response.rows[i].caseProgress = this.selectDictLabel(this.caseProgressOptions, response.rows[i].caseProgress); this.caseList.push(response.rows[i]) } if(this.caseList.length >= response.total){ diff --git a/src/views/lawEnforcement/complaint/complaintList.vue b/src/views/lawEnforcement/complaint/complaintList.vue index f3c80240..60220c78 100644 --- a/src/views/lawEnforcement/complaint/complaintList.vue +++ b/src/views/lawEnforcement/complaint/complaintList.vue @@ -57,10 +57,100 @@ - 内容 + +
+ + + + + + 类型： + {{item.communicateType}} + + + 标题： + {{item.title}} + + + 内容： + {{item.content}} + + + + + + + + 回复： + {{item.reply}} + + + 回复人： + {{item.replyName}} + + + + 回复 + +
+ - 内容 + +
+ + + + + + 类型： + {{item.communicateType}} + + + 标题： + {{item.title}} + + + 内容： + {{item.content}} + + + + + + + + 回复： + {{item.reply}} + + + 回复人： + {{item.replyName}} + + + + 回复 + +
+
diff --git a/src/views/lawEnforcement/complaint/reply.vue b/src/views/lawEnforcement/complaint/reply.vue index 2ed97cc0..d642fa45 100644 --- a/src/views/lawEnforcement/complaint/reply.vue +++ b/src/views/lawEnforcement/complaint/reply.vue @@ -7,11 +7,12 @@ left-arrow right-text="发布" @click-left="onClickLeft" + @click-right="submitForm" />
类型： - {{form.communicateType}} + {{form.communicateTypeShow}} 标题： @@ -30,7 +31,7 @@ type="textarea" placeholder="请输入留言" show-word-limit - style="border-top: 1px solid #eeeeee;padding-top: 10PX" + style="border-top: 1px solid #eeeeee;border-bottom: 1px solid #eeeeee;padding-top: 10PX" /> @@ -38,7 +39,7 @@
@@ -105,6 +124,9 @@ export default { } /deep/.van-row{ margin-top: 15PX; + &:first-child{ + margin-top: 0; + } .van-col{ font-size: 0.4rem; } diff --git a/src/views/lawEnforcement/index.vue b/src/views/lawEnforcement/index.vue index 90d1dddc..42fc6165 100644 --- a/src/views/lawEnforcement/index.vue +++ b/src/views/lawEnforcement/index.vue @@ -35,35 +35,7 @@ - - - - - - - - - - - - - - - - @@ -89,6 +61,7 @@ diff --git a/src/views/lawEnforcement/programme/programmeApproval.vue b/src/views/lawEnforcement/programme/programmeApproval.vue index 79d037da..55323d81 100644 --- a/src/views/lawEnforcement/programme/programmeApproval.vue +++ b/src/views/lawEnforcement/programme/programmeApproval.vue @@ -7,85 +7,32 @@ left-arrow @click-left="onClickLeft" /> -
- +
+ -

1

-
+

{{index+1}}

+
+

-

+

- + - - - - - -

2

-
-

-

-

-
- - - - - - - - - - -

3

-
-

-

-

-
- - - - - - - - - - -

4

-
-

-

-
- - - - - @@ -95,6 +42,7 @@ @@ -210,11 +207,19 @@ export default { } .van-cell__title{ color: #666666; + p{ + width: 100%; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 1; + word-break: break-all; + overflow: hidden; + } } /deep/ .van-nav-bar--fixed{ } /deep/.van-cell__title{ - flex: 0.6; + flex: 0.7; } /deep/.van-cell__title span{ font-family: Arial; @@ -222,7 +227,7 @@ export default { font-weight: normal; } /deep/.van-cell__value{ - flex: 0.4; + flex: 0.3; } /deep/ .van-nav-bar__title{ display: flex; diff --git a/src/views/lawEnforcement/programme/programmeModify.vue b/src/views/lawEnforcement/programme/programmeModify.vue index 6cafd896..46250acf 100644 --- a/src/views/lawEnforcement/programme/programmeModify.vue +++ b/src/views/lawEnforcement/programme/programmeModify.vue @@ -16,18 +16,18 @@ - + - - - - - - + + + + + +
@@ -80,28 +80,40 @@
+ 序号 - 执行人员 - 执法证号 + 执行人员 + 执法证号 - - 1 - 张薇 - 456444666123A0FW - - - - 2 - 张薇 - 456444666123A0FW + + + + + + + + +
+ + 保存 +
@@ -179,15 +216,31 @@ } .peopleList{ padding-right: 3%; + margin-top: 3%; .van-row{ margin-bottom: 10PX; .van-col{ text-align: center; font-size: 14PX; + padding: 0 5PX; + &:first-child{ + padding: 0.266667rem 0.426667rem; + .van-field{ + border: none; + } + } + .van-field{ + border: 1px solid #eee; + /deep/ .van-field__control{ + text-align: center; + } + } } &:first-child{ .van-col{ color: #1D6FE9; + line-height: 0.64rem; + padding: 0; } } } @@ -242,4 +295,13 @@ right: 0; border-radius: 50%; } + .loginOut{ + width: 88%; + margin: 10PX 6%; + border-radius: 8Px; + box-shadow: 0PX 5PX 5PX #cccccc; + border: none; + background-color: #1D6FE9; + color: #FFF; + } diff --git a/src/views/lawEnforcement/scheme/schemeDetail.vue b/src/views/lawEnforcement/scheme/schemeDetail.vue index 6c777a62..25ef2c3d 100644 --- a/src/views/lawEnforcement/scheme/schemeDetail.vue +++ b/src/views/lawEnforcement/scheme/schemeDetail.vue @@ -87,6 +87,27 @@
+ +
+ + 审批
意见 + + + 同意 + 驳回 + + + + +
+
+ + + 提交 + + +
+
@@ -133,6 +181,35 @@ export default { .app-container { padding: 0; } +.examine_box{ + background-color: #1D6FE9!important; + padding: 0.18rem!important; + padding-left: 0!important; + border-radius: 0.15rem!important; + margin-top: 0.3rem!important; +} +.examine_box .van-col:first-child{ + color: #FFF!important; + font-size: 0.45rem!important; + text-align: center!important; +} +.examine_box .van-col:last-child{ + background-color: #FFF!important; + border-radius: 0.15rem!important; + overflow: hidden!important; + .van-radio-group--horizontal{ + padding: 0.2rem 0; + border-bottom: 1px solid #eee; + } +} +/deep/.van-radio--horizontal{ + margin-left: 20px; + margin-right: 0; +} +.submitButtonActive{ + width: 100%; + margin: 0 auto; +} .van-uploader { padding: 15PX; } diff --git a/src/views/lawEnforcement/user/index.vue b/src/views/lawEnforcement/user/index.vue index 869217df..5f989020 100644 --- a/src/views/lawEnforcement/user/index.vue +++ b/src/views/lawEnforcement/user/index.vue @@ -3,18 +3,41 @@
- - - - -

{{ user.userName }}

-

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

- - - + +

{{user.nickName}}{{roleGroup}}

+ +

{{user.dept.deptName}}

+

{{postGroup}}
+ + + + + + + + + + @@ -121,12 +178,13 @@ export default { overflow: hidden; } .userName{ - font-size: 0.55rem; + font-size: 0.8rem; color: #FFFFFF; line-height: 0.85rem; } .userDept{ font-size: 0.4rem; + text-align: right; color: #FFFFFF; line-height: 0.85rem; } @@ -176,4 +234,19 @@ export default { box-shadow: 0PX 5PX 5PX #cccccc; border: none; } +.db{ + .van-cell__title{ + color: #666666; + flex: 0.7; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 1; + word-break: break-all; + overflow: hidden; + } + .van-cell__value{ + flex: 0.3; + } +} + diff --git a/src/views/lawEnforcement/user/waitingProcessing.vue b/src/views/lawEnforcement/user/waitingProcessing.vue new file mode 100644 index 00000000..bbd209a4 --- /dev/null +++ b/src/views/lawEnforcement/user/waitingProcessing.vue @@ -0,0 +1,237 @@ + + + +