日常执法
-
案件分配
+ 待办事项
+
任务查看
@@ -229,6 +233,8 @@ export default { } /deep/ .van-grid-item__content{ background: transparent; + padding-left: 0; + padding-right: 0; p{ color: #333333; font-size: 14PX; diff --git a/src/views/lawEnforcement/task/taskHandle.vue b/src/views/lawEnforcement/task/taskHandle.vue index 9db11b86..4dddf0c2 100644 --- a/src/views/lawEnforcement/task/taskHandle.vue +++ b/src/views/lawEnforcement/task/taskHandle.vue @@ -6,7 +6,7 @@保存1
+提交1
+保存
提交
保存1
+提交1
+保存
提交
保存1
+提交1
+保存
提交
@@ -1619,6 +1696,10 @@ export default { showSurveyEndTime:false, showConclusion:false, + surveyDiglogStatus:false, + recordDiglogStatus:false, + evidenceDiglogStatus:false, + form:{}, caseProgress:0, caseActive:0, @@ -2075,7 +2156,7 @@ export default { next(vm => { console.log(from.path) console.log(to.path) - if (from.path === '/lawEnforcement/task'){ + if (from.path === '/lawEnforcement/task' || from.path === '/lawEnforcement/waitingProcessing'){ location.reload() } }) @@ -2083,56 +2164,90 @@ export default { 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: "操作成功" }); - setTimeout(function () { + this.preservation(); + var that = this; + setTimeout(function(){ + const data = { + taskId: that.surveyForm.taskId, + instanceId: that.surveyForm.instanceId, + variables: JSON.stringify({ + comment: that.comment, + pass: that.pass, + //"formData": this.row, + }), + }; + return request({ + url: "/activiti/process/complete", + method: "post", + params: data, + }).then((response) => { + if (response.code == 200 && response.msg == "操作成功") { + that.$notify({ type: 'success' , message: "操作成功" }); history.back(-1); - },1000) - } else { - this.$notify({ type: 'danger' , message: "操作失败" }); - } - }); + } else { + that.$notify({ type: 'danger' , message: "操作失败" }); + } + }); + },2000); }, /** 保存审批意见提交 */ 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: "操作成功" }); - setTimeout(function () { + this.submitEvidenceForm() + var that = this; + setTimeout(function(){ + const data = { + taskId: that.evidenceForm.taskId, + instanceId: that.evidenceForm.instanceId, + variables: JSON.stringify({ + comment: that.comment, + pass: that.pass, + //"formData": this.row, + }), + }; + return request({ + url: "/activiti/process/complete", + method: "post", + params: data, + }).then((response) => { + if (response.code == 200 && response.msg == "操作成功") { + that.$notify({ type: 'success' , message: "操作成功" }); history.back(-1); - },1000) - } else { - this.$notify({ type: 'danger' , message: "操作失败" }); - } - }); + } else { + that.$notify({ type: 'danger' , message: "操作失败" }); + } + }); + },2000); + }, + + /** 保存审批意见提交 */ + submitPutRecord() { + this.submitPutRecordForm() + var that = this; + setTimeout(function(){ + const data = { + taskId: that.putRecordForm.taskId, + instanceId: that.putRecordForm.instanceId, + variables: JSON.stringify({ + comment: that.comment, + pass: that.pass, + //"formData": this.row, + }), + }; + return request({ + url: "/activiti/process/complete", + method: "post", + params: data, + }).then((response) => { + if (response.code == 200 && response.msg == "操作成功") { + that.$notify({ type: 'success' , message: "操作成功" }); + history.back(-1); + } else { + that.$notify({ type: 'danger' , message: "操作失败" }); + } + }); + },2000); + }, /** 保存审批意见提交 */ @@ -2254,6 +2369,15 @@ export default { if(_this.surveyForm.isAvoid==null || _this.surveyForm.isAvoid==""){ _this.surveyForm.isAvoid = "N"; } + var taskName = responseSurvey.data.taskName; + console.log(taskName) + if (taskName == "调整申请") { + // 如果是调整申请 + this.surveyDiglogStatus = false; + } else { + // 设置表单按钮不可编辑 + this.surveyDiglogStatus = true; + } _this.instanceId = responseSurvey.data.instanceId; if (responseSurvey.data.tEnforceCaseHandlerList){ _this.tEnforceCaseHandlerList = responseSurvey.data.tEnforceCaseHandlerList; @@ -2265,7 +2389,8 @@ export default { relationType: "2" } enforceLockinCount(data).then(resEnforceLockin => { - _this.$set(_this.tEnforceCaseHandlerList[index],"num",resEnforceLockin.data) + console.log(resEnforceLockin) + _this.$set(_this.tEnforceCaseHandlerList[index],"num",resEnforceLockin.data.length) }); }); } @@ -2300,6 +2425,14 @@ export default { getputRecordByCaseId(_this.form.id).then(responsePutRecord => { getSamplingByCaseId(_this.form.id).then(responseSampling => { if(responsePutRecord.data != undefined){ + var taskName = responsePutRecord.data.taskName; + if (taskName == "调整申请") { + // 如果是调整申请 + this.recordDiglogStatus = false; + } else { + // 设置表单按钮不可编辑 + this.recordDiglogStatus = true; + } _this.tEnforcePutRecordHandlerList = responsePutRecord.data.tEnforceCaseHandlerList; if (responsePutRecord.data.tEnforceCaseHandlerList){ console.log(responsePutRecord.data.tEnforceCaseHandlerList) @@ -2311,7 +2444,7 @@ export default { relationType: "3" } enforceLockinCount(data).then(resEnforceLockin => { - _this.$set(_this.tEnforcePutRecordHandlerList[index],"num",resEnforceLockin.data) + _this.$set(_this.tEnforcePutRecordHandlerList[index],"num",resEnforceLockin.data.length) }); }); } @@ -2346,7 +2479,7 @@ export default { relationType: "3" } enforceLockinCount(data).then(resEnforceLockin => { - _this.$set(_this.tEnforcePutRecordHandlerList[index],"num",resEnforceLockin.data) + _this.$set(_this.tEnforcePutRecordHandlerList[index],"num",resEnforceLockin.data.length) }); }); @@ -2394,6 +2527,14 @@ export default { this.evidenceForm.caseId = this.form.id; getEvidenceByCaseId(this.form.id).then(responseEvidence => { getSamplingByCaseId(this.form.id).then(responseSampling => { + var taskName = responseEvidence.data.taskName; + if (taskName == "调整申请") { + // 如果是调整申请 + this.evidenceDiglogStatus = false; + } else { + // 设置表单按钮不可编辑 + this.evidenceDiglogStatus = true; + } for (var i = 0; i < responseSampling.data.tEnforceSamplingGoodsList.length; i++) { let goodsId = responseSampling.data.tEnforceSamplingGoodsList[i].id; let goodsName = responseSampling.data.tEnforceSamplingGoodsList[i].goodsName; @@ -2455,7 +2596,7 @@ export default { relationType: "4" } enforceLockinCount(data).then(resEnforceLockin => { - _this.$set(_this.tEnforceEvidenceHandlerList[index],"num",resEnforceLockin.data) + _this.$set(_this.tEnforceEvidenceHandlerList[index],"num",resEnforceLockin.data.length) }); }); @@ -2498,7 +2639,7 @@ export default { relationType: "4" } enforceLockinCount(data).then(resEnforceLockin => { - _this.$set(_this.tEnforceEvidenceHandlerList[index],"num",resEnforceLockin.data) + _this.$set(_this.tEnforceEvidenceHandlerList[index],"num",resEnforceLockin.data.length) }); }); @@ -3444,7 +3585,7 @@ export default { // 监听路由变化, 实现类似 小程序的 onShow 事件 if (to.path === '/lawEnforcement/taskHandle') { // do anything you want - console.log(this.tEnforceCaseHandlerList) + console.log(this.tEnforcePutRecordHandlerList) if (Cookies.get('enforcer')){ console.log(this.enforceType) JSON.parse(Cookies.get('enforcer')).map((res,index)=>{ diff --git a/src/views/lawEnforcement/user/waitingProcessing.vue b/src/views/lawEnforcement/user/waitingProcessing.vue index 810310ef..37856e25 100644 --- a/src/views/lawEnforcement/user/waitingProcessing.vue +++ b/src/views/lawEnforcement/user/waitingProcessing.vue @@ -1,12 +1,9 @@