diff --git a/config/dev.env.js b/config/dev.env.js index 181662fd..10bc2e4b 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -5,5 +5,5 @@ const prodEnv = require('./prod.env') module.exports = merge(prodEnv, { NODE_ENV: '"development"', VUE_APP_BASE_API: '"/api"', - VUE_APP_BASE_ROUTING_URL:'"http://192.168.31.26:8080"' + VUE_APP_BASE_ROUTING_URL:'"http://116.255.135.38:73"' }) diff --git a/config/prod.env.js b/config/prod.env.js index c8c5c57a..465dba33 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -2,5 +2,5 @@ module.exports = { NODE_ENV: '"production"', VUE_APP_BASE_API: '"/api"', - VUE_APP_BASE_ROUTING_URL:'"http://192.168.31.26:8080"' + VUE_APP_BASE_ROUTING_URL:'"http://116.255.135.38:73"' } diff --git a/src/api/lawEnforcement/index.js b/src/api/lawEnforcement/index.js index 81b5b282..ccdded56 100644 --- a/src/api/lawEnforcement/index.js +++ b/src/api/lawEnforcement/index.js @@ -278,3 +278,11 @@ export function listModelCustom(data) { params: data }) } + +// 查询农业执法-案件-备案信息详细 +export function getOnrecordByCaseId(caseId) { + return request({ + url: '/enforce/onrecord/getOnrecordByCaseId/' + caseId, + method: 'get' + }) +} diff --git a/src/views/lawEnforcement/case/caseDetail.vue b/src/views/lawEnforcement/case/caseDetail.vue index f84a51a0..2fbb20ed 100644 --- a/src/views/lawEnforcement/case/caseDetail.vue +++ b/src/views/lawEnforcement/case/caseDetail.vue @@ -7,7 +7,7 @@ left-arrow @click-left="onClickLeft" /> - + - + + - + - + +

审批流程

@@ -255,7 +257,7 @@ - + - +
- @@ -385,7 +386,9 @@ - + + +
@@ -423,11 +426,12 @@ 案件文档 - + +
- + - + +

审批流程

@@ -574,7 +581,7 @@ - + - +
@@ -675,7 +682,8 @@ 案件文档 - + +

审批流程

@@ -733,7 +741,7 @@ - + - + + - + - + + - - + + +
+ + + + + +
+ +
+ + + +
+ + + 交办单位 + + +
+
+ + +
+
+ + + 移送信息 + + + + +
+
+ 办理人员 +
+ + 序号 + 执行人员 + 执法证号 + + + + {{index+1}} + {{item.enforcerName}} + {{item.enforcerNum}} + +
+ 处罚整改 + + + + + + + + + + + + + + + 案件信息 + + +
+
+ + +
+
+ + +
+
+ + +
+
+ +
+ + + + + +
+ + + +
- + +
@@ -993,6 +1121,7 @@ import { getExecuteByCaseId , getEndingByCaseId , progressList , + getOnrecordByCaseId } from "@/api/lawEnforcement/index"; import law from "@/components/common/law_footer"; import request from "@/utils/request"; @@ -1014,12 +1143,18 @@ export default { payeeType:'', value:'', type:'', + progressLength:0, pass: "true", comment: "同意", bankTypeOptions:[], payeeTypeOptions:[], + attachementOption:[], + savePlaceOptions:[], + qualityStatusOptions:[], + samplingSceneOptions:[], + conclusionOptions:[], minDate: new Date(2020, 0, 1), maxDate: new Date(2025, 10, 1), currentDate: new Date(2021, 0, 17), @@ -1099,6 +1234,7 @@ export default { caseName: "", schemeId: "", }, + //勘察表单参数 samplingForm:{ id: null, caseId: null, @@ -1235,7 +1371,7 @@ export default { caseName: "", schemeId: "", }, - // 表单参数 + // 结案表单参数 endingForm: { id: null, caseId: null, @@ -1262,6 +1398,40 @@ export default { caseName: "", schemeId: "", }, + // 备案表单参数 + onrecordForm: { + id: null, + caseId: null, + surveyResult: null, + recordType: null, + punishStartTime: null, + rectifyTime: null, + breakFact: null, + punishmentBase: null, + punishContent: null, + correctDays: null, + punishAddress: null, + peopleGov: null, + reviewGov: null, + peopleCourt: null, + spotExecute: "0", + executModes: null, + refusalCorrect: null, + unillegal: null, + assignReason: null, + assignDept: null, + regionName: null, + caseStatus: "0", + transferPolice: null, + transferCopy: null, + contacts: null, + phone: null, + attachement: null, + createBy: null, + createTime: null, + updateBy: null, + updateTime: null + }, // 办理人员列表 tEnforceCaseHandlerList: [], tEnforcePutRecordHandlerList: [], @@ -1271,6 +1441,7 @@ export default { tEnforceTreatHandlerList: [], tEnforceDecisionHandlerList: [], tEnforceExecuteHandlerList: [], + tEnforceOnrecordHandlerList: [], getDecisionByCaseId: [], historyList: [], evidencHistoryList: [], @@ -1281,6 +1452,11 @@ export default { executeEnforcers: [], endingEnforcers: [], treatEnforcers: [], + surveyOption: [], + samplingOption: [], + putRecordOption: [], + documentTypeOptions: [], + agingStatusOptions: [], // 案件执法进度 1:登记 2:勘察 3:立案 4:取证 5:处理 6:裁决 7:执行 8:备案 9:结案字典 caseProgressOptions: [], @@ -1288,14 +1464,17 @@ export default { active: 1, // 当前节点 }; }, + 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.caseProgress = parseInt(this.$route.query.caseProgress)-1; + this.caseActive = parseInt(this.$route.query.caseProgress)-1 ; + // 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 => { @@ -1313,15 +1492,33 @@ export default { this.getDicts("case_status").then(response => { this.caseStatusOptions = response.data; }); - this.getDicts("case_node").then(response => { - this.caseProgressOptions = response.data; - }); + // this.getDicts("case_node").then(response => { + // this.caseProgressOptions = response.data; + // }); this.getDicts("enforce_category").then(response => { this.enforceCategoryOptions = response.data; }); this.getDicts("approve_type").then(response => { this.surveyResultOptions = response.data; }); + this.getDicts("goods_location").then(response => { + this.savePlaceOptions = response.data; + }); + this.getDicts("sampling_person_type").then(response => { + this.samplingSceneOptions = response.data; + }); + this.getDicts("quality_type").then(response => { + this.qualityStatusOptions = response.data; + }); + this.getDicts("conclusion_type").then(response => { + this.conclusionOptions = response.data; + }); + this.getDicts("cert_type").then(response => { + this.documentTypeOptions = response.data; + }); + this.getDicts("aging_status").then(response => { + this.agingStatusOptions = response.data; + }); // 关联方案下拉框 var schemeQueryParam = { applyStatus: "1" @@ -1409,44 +1606,60 @@ export default { }, getInformation(){ getCase(this.$route.query.id).then(response => { + console.log(response) response.data.caseSource = this.selectDictLabel(this.caseSourceOptions, response.data.caseSource); response.data.schemeId = this.selectDictScheme(this.schemeOptions, response.data.schemeId); response.data.typeLable = this.selectDictLabel(this.typeOptions, response.data.type); response.data.sex = this.selectDictLabel(this.sexOptions, response.data.sex); response.data.nation = this.selectDictLabel(this.nationOptions, response.data.nation); - // response.data.deptId = this.selectDictDeptId(this.deptOptions, response.data.deptId); - this.form = response.data; - - 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(); + if (response.data.attachement){ + var attachement = response.data.attachement.split( "," ); + attachement.forEach(res=>{ + this.attachementOption.push({ + url:res + }); + }) } + // response.data.deptId = this.selectDictDeptId(this.deptOptions, response.data.deptId); + this.form = response.data; + this.progressSpeed() + // if (this.caseActive == 7){//判断是否为备案 + // + // }else{ + // 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.getOnrecord(); + // } + // if( this.caseActive >= 8 ){//结案 + // console.log("结案") + // this.getEndingForm(); + // } + // } }); }, //勘察表单查询 @@ -1462,13 +1675,20 @@ export default { _this.instanceId = responseSurvey.data.instanceId; _this.tEnforceCaseHandlerList = responseSurvey.data.tEnforceCaseHandlerList; } + if (responseSurvey.data.attachement){ + var attachement = responseSurvey.data.attachement.split( "," ); + attachement.forEach(response=>{ + this.surveyOption.push({ + url:response + }); + }) + } _this.surveyForm.gender = this.selectDictLabel(this.sexOptions, _this.surveyForm.gender); _this.surveyForm.surveyResult = this.selectDictLabel(this.surveyResultOptions, _this.surveyForm.surveyResult); _this.surveyForm.caseName = this.form.caseName; _this.surveyForm.schemeId = this.form.schemeId; // 查询审批历史记录 _this.getHistoryList(_this.surveyForm,''); - }); } }, @@ -1488,6 +1708,27 @@ export default { if(responseSampling.data != undefined) { _this.samplingForm = responseSampling.data; _this.tEnforceSamplingGoodsList = responseSampling.data.tEnforceSamplingGoodsList; + + for (var i = 0 ; i < responseSampling.data.tEnforceSamplingGoodsList.length ; i++){ + if (responseSampling.data.tEnforceSamplingGoodsList[i].attachement){ + responseSampling.data.tEnforceSamplingGoodsList[i].attachementList = []; + var Sampling = responseSampling.data.tEnforceSamplingGoodsList[i].attachement.split( "," ); + Sampling.forEach(response=>{ + responseSampling.data.tEnforceSamplingGoodsList[i].attachementList.push({ + url:process.env.VUE_APP_BASE_ROUTING_URL + process.env.VUE_APP_BASE_API + response, + }); + }) + } + } + console.log(responseSampling.data.tEnforceSamplingGoodsList) + } + if (responsePutRecord.data.attachement){ + var attachement = responsePutRecord.data.attachement.split( "," ); + attachement.forEach(response=>{ + this.samplingOption.push({ + url:process.env.VUE_APP_BASE_ROUTING_URL + process.env.VUE_APP_BASE_API + response, + }); + }) } _this.putRecordForm.caseName = this.form.caseName; _this.putRecordForm.schemeId = this.form.schemeId; @@ -1507,9 +1748,12 @@ export default { let goodsId = responseSampling.data.tEnforceSamplingGoodsList[i].id; let goodsName = responseSampling.data.tEnforceSamplingGoodsList[i].goodsName; getReportByGoodsId(goodsId).then(responseReport => { + console.log(responseReport) if (responseReport.data != undefined) { responseReport.data.goodsId = goodsId; responseReport.data.goodsName = goodsName; + responseReport.data.attachementList = []; + _this.detectResults.push(responseReport.data); } else { var goodsObj = { @@ -1521,9 +1765,35 @@ export default { }); } if (responseEvidence.data != undefined) { + responseEvidence.data.attachementList = []; + + responseEvidence.data.conclusion = this.selectDictLabel(this.conclusionOptions,responseEvidence.data.conclusion) + _this.evidenceForm = responseEvidence.data; _this.tEnforceEvidenceHandlerList = responseEvidence.data.tEnforceCaseHandlerList; + console.log(responseEvidence.data) + if (responseEvidence.data.attachement){ + var Evidence = responseEvidence.data.attachement.split( "," ); + Evidence.forEach(response=>{ + responseEvidence.data.attachementList.push({ + url:process.env.VUE_APP_BASE_ROUTING_URL + process.env.VUE_APP_BASE_API + response, + }); + }) + } } + setTimeout(function () { + for (var i = 0 ; i < responseSampling.data.tEnforceSamplingGoodsList.length ; i++){ + console.log(_this.detectResults[0]) + if (responseSampling.data.tEnforceSamplingGoodsList[i].attachement){ + var Sampling = responseSampling.data.tEnforceSamplingGoodsList[i].attachement.split( "," ); + Sampling.forEach(response=>{ + _this.detectResults[i].attachementList.push({ + url:process.env.VUE_APP_BASE_ROUTING_URL + process.env.VUE_APP_BASE_API + response, + }); + }) + } + } + },1000) _this.evidenceForm.caseName = this.form.caseName; _this.evidenceForm.schemeId = this.form.schemeId; // 查询审批历史记录 @@ -1533,7 +1803,7 @@ export default { } }, - //查询取证表单数据 + //查询处理表单数据 getTreat(){ // 执行人员列表查询 getEnforcerList().then(response => { @@ -1553,9 +1823,22 @@ export default { if (this.form.id != null && this.form.id != "") { this.treatForm.caseId = this.form.id; getTreatByCaseId(this.form.id).then(responseTreat => { + console.log(responseTreat) if (responseTreat.data != undefined) { + responseTreat.data.attachementList = []; + responseTreat.data.documentType = this.selectDictLabel(this.documentTypeOptions,responseTreat.data.documentType) + responseTreat.data.agentDocumentType = this.selectDictLabel(this.documentTypeOptions,responseTreat.data.agentDocumentType) _this.treatForm = responseTreat.data; _this.tEnforceTreatHandlerList = responseTreat.data.tEnforceCaseHandlerList; + + if (responseTreat.data.attachement){ + var Treat = responseTreat.data.attachement.split( "," ); + Treat.forEach(response=>{ + responseTreat.data.attachementList.push({ + url:process.env.VUE_APP_BASE_ROUTING_URL + process.env.VUE_APP_BASE_API + response, + }); + }) + } } _this.treatForm.caseName = this.form.caseName; _this.treatForm.schemeId = this.form.schemeId; @@ -1566,6 +1849,7 @@ export default { } }, + //查询裁决表单数据 getDecision(){ // 执行人员列表查询 getEnforcerList().then(response => { @@ -1580,14 +1864,25 @@ export default { this.decisionEnforcers.push(res); } }); - // 查询立案表单数据 + // 查询裁决表单数据 var _this = this; if (this.form.id != null && this.form.id != "") { this.decisionForm.caseId = this.form.id; getDecisionByCaseId(this.form.id).then(responseDecision => { if (responseDecision.data != undefined) { + console.log(responseDecision) + responseDecision.data.attachementList = []; _this.decisionForm = responseDecision.data; _this.tEnforceDecisionHandlerList = responseDecision.data.tEnforceCaseHandlerList; + + if (responseDecision.data.attachement){ + var Treat = responseDecision.data.attachement.split( "," ); + Treat.forEach(response=>{ + responseDecision.data.attachementList.push({ + url:process.env.VUE_APP_BASE_ROUTING_URL + process.env.VUE_APP_BASE_API + response, + }); + }) + } } _this.decisionForm.caseName = this.form.caseName; _this.decisionForm.schemeId = this.form.schemeId; @@ -1595,6 +1890,7 @@ export default { } }, + //查询执行表单数据 getExecuteCase(){ // 执行人员列表查询 getEnforcerList().then(response => { @@ -1610,14 +1906,24 @@ export default { } }); - // 查询表单数据 + // 查询执行表单数据 var _this = this; if (this.form.id != null && this.form.id != "") { this.executeForm.caseId = this.form.id; getExecuteByCaseId(this.form.id).then(responseExecute => { if (responseExecute.data != undefined) { + responseExecute.data.attachementList = []; _this.executeForm = responseExecute.data; _this.tEnforceExecuteHandlerList = responseExecute.data.tEnforceCaseHandlerList; + + if (responseExecute.data.attachement){ + var Execute = responseExecute.data.attachement.split( "," ); + Execute.forEach(response=>{ + responseExecute.data.attachementList.push({ + url:process.env.VUE_APP_BASE_ROUTING_URL + process.env.VUE_APP_BASE_API + response, + }); + }) + } } _this.executeForm.caseName = this.form.caseName; _this.executeForm.schemeId = this.form.schemeId; @@ -1625,6 +1931,24 @@ export default { } }, + getOnrecord(){ + // 查询备案表单数据 + if (this.form.id != null && this.form.id != "") { + this.onrecordForm.caseId = this.form.id; + getCase(this.form.id).then(response => { + getOnrecordByCaseId(this.form.id).then(responseOnrecord => { + if (responseOnrecord.data != undefined) { + this.onrecordForm = responseOnrecord.data; + this.tEnforceOnrecordHandlerList = responseOnrecord.data.tEnforceCaseHandlerList; + } + this.onrecordForm.caseName = this.form.caseName; + this.onrecordForm.schemeId = this.form.schemeId; + }); + }); + } + }, + + //查询结案表单数据 getEndingForm(){ // 执行人员列表查询 getEnforcerList().then(response => { @@ -1645,7 +1969,18 @@ export default { this.endingForm.caseId = this.form.id; getEndingByCaseId(this.form.id).then(responseEnding => { if (responseEnding.data != undefined) { + responseEnding.data.attachementList = []; + responseEnding.data.agingStatus = this.selectDictLabel(this.agingStatusOptions,responseEnding.data.agingStatus) _this.endingForm = responseEnding.data; + + if (responseEnding.data.attachement){ + var Execute = responseEnding.data.attachement.split( "," ); + Execute.forEach(response=>{ + responseEnding.data.attachementList.push({ + url:process.env.VUE_APP_BASE_ROUTING_URL + process.env.VUE_APP_BASE_API + response, + }); + }) + } } _this.endingForm.caseName = this.form.caseName; _this.endingForm.schemeId = this.form.schemeId; @@ -1655,25 +1990,15 @@ export default { progressSpeed(){ console.log(this.form) - if(this.form.caseProgress != undefined && this.form !="add"){ - this.active = this.form.caseProgress; - this.successActive = this.form.caseProgress -1; - - if((this.form.caseStatus == "2" || this.form.caseStatus == "3") && - (this.form.caseProgress=="8" || this.form.caseProgress=="9")){ - this.successActive = this.form.caseProgress; - } - } else{ - this.form.caseProgress = undefined; - } - if((this.form.caseStatus == "2" || this.form.caseStatus == "3") && (this.form.caseProgress=="8" || this.form.caseProgress=="9")){ + console.log("a") // 已结束备案或者结案阶段的案件,查询显示已保存案件的历史流程节点 var progressParam = { "caseId": this.form.id }; progressList(progressParam).then(response => { + console.log(response) for (var i = 0; i < response.data.length; i++) { var obj={ dictLabel:response.data[i].caseProgressName, @@ -1683,6 +2008,7 @@ export default { } }); } else if(this.form.caseProgress=="8" && this.form.caseStatus == "1"){ + console.log("b") // 进行中的案件到达备案阶段显示历史节点和备案节点 var progressParam = { "caseId": this.form.id @@ -1702,9 +2028,11 @@ export default { this.caseProgressOptions.push(onrecordObj); }); } else{ + console.log("c") // 非备案或者结案阶段的案件,显示所有节点判断状态 this.getDicts("case_node").then(response => { - if (this.form.caseProgress == "9") { // 结案状态 + console.log(this.form.caseProgress) + if (this.form.caseProgress == "8") { // 结案状态 for (var i = 0; i < response.data.length; i++) { if (response.data[i].dictValue != "8") { // 如果是结案,步骤条不显示备案 this.caseProgressOptions.push(response.data[i]); @@ -1713,9 +2041,46 @@ export default { } else{ this.caseProgressOptions = response.data; } - }); } + + var that = this ; + setTimeout(function () { + that.progressLength = that.caseProgressOptions.length; + + if( that.caseProgressOptions.length >= 3 && that.caseActive >= 1 ){//勘察 + console.log("勘察") + that.caseSurvey(); + } + if( that.caseProgressOptions.length >= 4 && that.caseActive >= 2 ){//立案 + console.log("立案") + that.getFileCase(); + } + if( that.caseProgressOptions.length >= 5 && that.caseActive >= 3 ){//取证 + console.log("取证") + that.getEvidenceCase(); + } + if( that.caseProgressOptions.length >= 6 && that.caseActive >= 4 ){//处理 + console.log("处理") + that.getTreat(); + } + if( that.caseProgressOptions.length >= 7 && that.caseActive >= 5 ){//裁决 + console.log("裁决") + that.getDecision(); + } + if( that.caseProgressOptions.length >= 8 && that.caseActive >= 6 ){//执行 + console.log("执行") + that.getExecuteCase(); + } + if( that.caseActive == 8 ){//执行 + console.log("结案") + that.getEndingForm(); + } + if (that.caseActive == 7){//判断是否为备案 + console.log("备案") + that.getOnrecord(); + } + },1000) console.log(this.caseProgressOptions) }, @@ -1842,6 +2207,10 @@ export default { border-bottom: 1px solid #eee; } } +/deep/.van-tabs .van-tabs__nav{ + border: none; + height: auto; +} /deep/.van-radio--horizontal{ margin-left: 20px; margin-right: 0; diff --git a/src/views/lawEnforcement/case/caseList.vue b/src/views/lawEnforcement/case/caseList.vue index a7f4fe8d..c155db58 100644 --- a/src/views/lawEnforcement/case/caseList.vue +++ b/src/views/lawEnforcement/case/caseList.vue @@ -119,7 +119,7 @@ - + @@ -218,9 +218,8 @@ export default { this.loading = false; }); }, - goDetail(id){ - console.log(id) - window.location = 'news/newDetail?id='+id; + goWork(id){ + window.location = '/lawEnforcement/workDetail?id='+id; }, }, }; diff --git a/src/views/lawEnforcement/login.vue b/src/views/lawEnforcement/login.vue index 1ef50a19..91575373 100644 --- a/src/views/lawEnforcement/login.vue +++ b/src/views/lawEnforcement/login.vue @@ -279,7 +279,7 @@ this.$store .dispatch("Login", this.formData) .then(() => { - this.$router.push({ path: "/onlineHome/workbench" }).catch(() => {}); + this.$router.push({ path: "/lawEnforcement" }).catch(() => {}); }) .catch((error) => { console.log(error) diff --git a/src/views/lawEnforcement/user/waitingProcessing.vue b/src/views/lawEnforcement/user/waitingProcessing.vue index e4c16036..54d24bfe 100644 --- a/src/views/lawEnforcement/user/waitingProcessing.vue +++ b/src/views/lawEnforcement/user/waitingProcessing.vue @@ -74,6 +74,7 @@ export default { taskId: null, taskName: null, systemType: 26, + orderByColumn: "A.ID_", activityBusinessType:'', isAsc:'' },