From a6b22651454652042dc70a87b88d0b8fe8ea635d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com>
Date: Thu, 3 Nov 2022 17:34:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=9C=E4=B8=9A=E6=89=A7=E6=B3=95=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../task/taskHandleProcessing.vue             | 12 ++--
 .../lawEnforcement/user/waitingProcessing.vue | 69 +++++++++----------
 src/views/lawEnforcement/userNew/user_new.vue |  2 +-
 3 files changed, 41 insertions(+), 42 deletions(-)

diff --git a/src/views/lawEnforcement/task/taskHandleProcessing.vue b/src/views/lawEnforcement/task/taskHandleProcessing.vue
index 400e8a58..b2b75109 100644
--- a/src/views/lawEnforcement/task/taskHandleProcessing.vue
+++ b/src/views/lawEnforcement/task/taskHandleProcessing.vue
@@ -425,8 +425,8 @@
 <!--          <div class="clear"></div>-->
 <!--        </div>-->
         <div class="submit_box" v-if="caseActive == 1 && type == 'waiting'">
-          <p class="submitButton" @click="preservation('submit')">保存1</p>
-          <p class="submitButton" @click="submitCase">提交1</p>
+          <p class="submitButton" @click="preservation('submit')">保存</p>
+          <p class="submitButton" @click="submitCase">提交</p>
         </div>
         <div class="submit_box" v-if=" type != 'waiting' || ( caseProgress == 1 && ( surveyForm.instanceId=='' || surveyForm.instanceId==null || surveyForm.instanceId==undefined ))">
           <p class="submitButton" @click="preservation('submit')">保存</p>
@@ -759,8 +759,8 @@
 <!--        </div>-->
 
         <div class="submit_box" v-if="caseActive == 2 && type == 'waiting'">
-          <p class="submitButton" @click="submitPutRecordForm('submit')">保存1</p>
-          <p class="submitButton" @click="submitPutRecord">提交1</p>
+          <p class="submitButton" @click="submitPutRecordForm('submit')">保存</p>
+          <p class="submitButton" @click="submitPutRecord">提交</p>
         </div>
 
         <div class="submit_box" v-if=" type != 'waiting' || (caseProgress == 2 && ( putRecordForm.instanceId=='' || putRecordForm.instanceId==null || putRecordForm.instanceId==undefined ))">
@@ -959,8 +959,8 @@
 <!--        </div>-->
 
         <div class="submit_box" v-if="caseActive == 3 && type == 'waiting'">
-          <p class="submitButton" @click="submitEvidenceForm('submit')">保存1</p>
-          <p class="submitButton" @click="submitEvidence">提交1</p>
+          <p class="submitButton" @click="submitEvidenceForm('submit')">保存</p>
+          <p class="submitButton" @click="submitEvidence">提交</p>
         </div>
 
         <div class="submit_box" v-if="caseProgress == 3 && ( evidenceForm.instanceId=='' || evidenceForm.instanceId==null || evidenceForm.instanceId==undefined )">
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:'',
+                }
+              }"
             >
               <template #title>
                 <span class="tap">{{selectDictLabel(activityBusinessTypeOptions,item.formData.activityBusinessType).substr(2,2)}}</span>
@@ -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'
         })
       });
     },