@@ -959,8 +959,8 @@
diff --git a/src/views/lawEnforcement/user/waitingProcessing.vue b/src/views/lawEnforcement/user/waitingProcessing.vue
index cdad256f..4fa849ab 100644
--- a/src/views/lawEnforcement/user/waitingProcessing.vue
+++ b/src/views/lawEnforcement/user/waitingProcessing.vue
@@ -59,12 +59,12 @@
:key="index"
:value="item.formData.createTime == null ? '' : item.endTime.substr(0,10)"
:to="{
- name:item.formData.activityBusinessType == '21' ? 'schemeDetail':'caseDetail',
- 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:'',
- }
- }"
+ name:item.formData.activityBusinessType == '21' ? 'schemeDetail':'caseDetail',
+ 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:'',
+ }
+ }"
>
{{selectDictLabel(activityBusinessTypeOptions,item.formData.activityBusinessType).substr(2,2)}}
@@ -175,21 +175,20 @@ export default {
url: "/activiti/process/taskList",
method: "get",
params: this.queryParamsTask,
- })
- .then((response) => {
- console.log(response)
- for (var i = 0; i < response.rows.length; i++) {
- this.taskList.push(response.rows[i]);
- }
- if(this.taskList.length >= response.total ){
- this.finished = true;
- return;
- }
- this.queryParamsTask.pageNum += 1 ;
- this.loading = false;
- })
- .then(() => {
- });
+ }).then((response) => {
+ console.log(response)
+ for (var i = 0; i < response.rows.length; i++) {
+ this.taskList.push(response.rows[i]);
+ }
+ if(this.taskList.length >= response.total ){
+ this.finished = true;
+ return;
+ }
+ this.queryParamsTask.pageNum += 1 ;
+ this.loading = false;
+ }).then(() => {
+
+ });
},
getTaskDoneList(){
this.doneLoading = true;
@@ -198,20 +197,20 @@ export default {
method: "get",
params: this.queryParams,
})
- .then((response) => {
- for (var i = 0; i < response.rows.length; i++) {
- this.taskDoneList.push(response.rows[i]);
- }
- console.log(this.taskDoneList.length >= response.total)
- if(this.taskDoneList.length >= response.total ){
- this.doneFinished = true;
- return;
- }
- this.queryParams.pageNum += 1 ;
- this.doneLoading = false;
- })
- .then(() => {
- });
+ .then((response) => {
+ for (var i = 0; i < response.rows.length; i++) {
+ this.taskDoneList.push(response.rows[i]);
+ }
+ console.log(this.taskDoneList.length >= response.total)
+ if(this.taskDoneList.length >= response.total ){
+ this.doneFinished = true;
+ return;
+ }
+ this.queryParams.pageNum += 1 ;
+ this.doneLoading = false;
+ })
+ .then(() => {
+ });
},
getListchange(type){
if(type == 'db'){
diff --git a/src/views/lawEnforcement/userNew/user_new.vue b/src/views/lawEnforcement/userNew/user_new.vue
index 8556c5da..617c0e37 100644
--- a/src/views/lawEnforcement/userNew/user_new.vue
+++ b/src/views/lawEnforcement/userNew/user_new.vue
@@ -106,7 +106,7 @@ export default {
console.log(response);
Cookies.remove("User-Token");
this.$router.push({
- path: '/lawEnforcement'
+ path: '/lawEnforcement/login'
})
});
},