diff --git a/src/views/lawEnforcement/case/caseDetail.vue b/src/views/lawEnforcement/case/caseDetail.vue
index 6a30ff4a..9a50719a 100644
--- a/src/views/lawEnforcement/case/caseDetail.vue
+++ b/src/views/lawEnforcement/case/caseDetail.vue
@@ -134,6 +134,7 @@
勘察
+
@@ -439,6 +440,7 @@
立案
+
@@ -2066,7 +2068,7 @@ export default {
relationType: "2"
}
enforceLockinCount(data).then(resEnforceLockin => {
- _this.$set(_this.tEnforceCaseHandlerList[index],"num",resEnforceLockin.data)
+ _this.$set(_this.tEnforceCaseHandlerList[index],"num",resEnforceLockin.data.length)
});
});
}
@@ -2133,7 +2135,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)
});
});
@@ -2151,7 +2153,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)
});
});
}
@@ -2262,7 +2264,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)
});
});
@@ -2305,7 +2307,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)
});
});
diff --git a/src/views/lawEnforcement/caseAllocation/caseEnforceList.vue b/src/views/lawEnforcement/caseAllocation/caseEnforceList.vue
index 7b896e86..3d26a3cc 100644
--- a/src/views/lawEnforcement/caseAllocation/caseEnforceList.vue
+++ b/src/views/lawEnforcement/caseAllocation/caseEnforceList.vue
@@ -152,9 +152,7 @@
setTimeout(function () {
updateSurvey(that.surveyForm).then(response => {
that.$notify({ type: 'success', message: '保存成功' });
- setTimeout(function(){
- history.back(-1);
- },2000)
+ history.back(-1);
});
},2000)
}else{
@@ -174,9 +172,7 @@
setTimeout(function () {
addSurvey(that.surveyForm).then(response => {
that.$notify({ type: 'success', message: '保存成功' });
- setTimeout(function(){
- history.back(-1);
- },2000)
+ history.back(-1);
});
},2000)
}
diff --git a/src/views/lawEnforcement/task/taskHandle.vue b/src/views/lawEnforcement/task/taskHandle.vue
index 78f19c8c..e6dc32be 100644
--- a/src/views/lawEnforcement/task/taskHandle.vue
+++ b/src/views/lawEnforcement/task/taskHandle.vue
@@ -125,6 +125,7 @@
勘察
+
@@ -150,7 +151,7 @@
- 执法人员
+ 执法人员{{caseActive}}
@@ -167,11 +168,11 @@
-
+
-

+
@@ -453,6 +454,7 @@
立案
+
@@ -2369,15 +2371,6 @@ 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;
@@ -2425,14 +2418,6 @@ 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)
@@ -2527,14 +2512,6 @@ 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;
@@ -2580,12 +2557,9 @@ export default {
// responseSampling.data.tEnforceSamplingGoodsList[i].attachementList = [];
// }
}
-
-
-
+ console.log(responseEvidence.data)
if (responseEvidence.data != undefined) {
responseEvidence.data.attachementList = [];
-
_this.tEnforceEvidenceHandlerList = responseEvidence.data.tEnforceCaseHandlerList;
if (responseEvidence.data.tEnforceCaseHandlerList){
responseEvidence.data.tEnforceCaseHandlerList.map((responseEnforce,index)=>{
@@ -2601,7 +2575,7 @@ export default {
});
}
- responseEvidence.data.conclusion = this.selectDictLabel(this.conclusionOptions,responseEvidence.data.conclusion)
+ this.conclusion = this.selectDictLabel(this.conclusionOptions,responseEvidence.data.conclusion)
_this.evidenceForm = responseEvidence.data;
@@ -2619,8 +2593,6 @@ export default {
}
}else{
_this.evidenceForm.attachement = [];
-
-
// 取证表单没有保存之前,办理人员默认获取上一节点立案的办理人员列表
const queryEnforcerParams = {
relationType: "3",
@@ -3425,13 +3397,11 @@ export default {
if (typeof this.evidenceForm.attachement != 'string'){
this.evidenceForm.attachement = this.evidenceForm.attachement.join(',');
}
-
- this.evidenceForm.detectResults.forEach(res=>{
- if (typeof res.attachement != 'string'){
- res.attachement = res.attachement.join(',');
- }
- })
-
+ this.evidenceForm.detectResults.forEach(res=>{
+ if (typeof res.attachement != 'string'){
+ res.attachement = res.attachement.join(',');
+ }
+ })
if (this.evidenceForm.id != null) {
this.surveyDiglogStatus = true;
updateEvidence(this.evidenceForm).then(response => {
diff --git a/src/views/lawEnforcement/task/taskHandleProcessing.vue b/src/views/lawEnforcement/task/taskHandleProcessing.vue
index b2b75109..15dd1a2b 100644
--- a/src/views/lawEnforcement/task/taskHandleProcessing.vue
+++ b/src/views/lawEnforcement/task/taskHandleProcessing.vue
@@ -125,6 +125,7 @@
勘察
+
@@ -453,6 +454,7 @@
立案
+
diff --git a/src/views/lawEnforcement/user/waitingProcessing.vue b/src/views/lawEnforcement/user/waitingProcessing.vue
index 4fa849ab..1880b7c7 100644
--- a/src/views/lawEnforcement/user/waitingProcessing.vue
+++ b/src/views/lawEnforcement/user/waitingProcessing.vue
@@ -27,7 +27,7 @@
name:item.formData.activityBusinessType == '21' ? 'schemeDetail':'lawEnforcementTaskHandleProcessing',
query:{
id:item.formData.activityBusinessType == '21' ? item.formData.id:item.formData.caseId,
- caseProgress:item.formData.activityBusinessType == '21' ? '': item.formData.activityBusinessType == '22' ? 2:item.formData.activityBusinessType == '24' ? 4:item.formData.activityBusinessType == '25' ? 5:'',
+ caseProgress:item.formData.activityBusinessType == '21' ? '': item.formData.activityBusinessType == '22' ? 2:item.formData.activityBusinessType == '25' ? 3:item.formData.activityBusinessType == '24' ? 4:'',
type:'waiting'
}
}"