From 95bbcba612ce5009e1b5bb4f25cc9e942793bbd8 Mon Sep 17 00:00:00 2001
From: zhaodengke <beyondk2000@gmail.com>
Date: Fri, 13 Oct 2023 09:05:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/agentcenter/accounting_task.js |  9 +++++++++
 src/views/processed/processed.vue      |  3 +++
 src/views/taskAllocation/todo.vue      | 25 ++++++++++++++++++-------
 3 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/src/api/agentcenter/accounting_task.js b/src/api/agentcenter/accounting_task.js
index 63e73a4..2d128a5 100644
--- a/src/api/agentcenter/accounting_task.js
+++ b/src/api/agentcenter/accounting_task.js
@@ -17,3 +17,12 @@ export function accountingProcessedTaskList(params) {
     params: params,
   })
 }
+
+// 完成任务
+export function finishTask(data) {
+  return request({
+    url: '/accounting/task/finish',
+    method: 'post',
+    data: data,
+  })
+}
diff --git a/src/views/processed/processed.vue b/src/views/processed/processed.vue
index 27f4a3c..a58297e 100644
--- a/src/views/processed/processed.vue
+++ b/src/views/processed/processed.vue
@@ -124,7 +124,10 @@ export default {
       cityTree({rootId: ENV.UserDeptId()}).then((resp) => {
         this.deptOptions = resp.data;
         if(this.deptOptions.length)
+        {
           this.parms.countyCode = this.deptOptions[0].orgCode;
+          this.getTaskList();
+        }
       });
     },
     chooseCity(cmd) {
diff --git a/src/views/taskAllocation/todo.vue b/src/views/taskAllocation/todo.vue
index 59cc69b..25943d5 100644
--- a/src/views/taskAllocation/todo.vue
+++ b/src/views/taskAllocation/todo.vue
@@ -23,8 +23,7 @@
             <span class="sanjiao-right"></span>
             <p>{{townName}}</p>
           </div>
-          <div class="select_address">
-          </div>
+<!--          <div class="select_address"></div>-->
         </div>
         <el-dropdown-menu slot="dropdown" style="width: 16vw;text-align: center;">
           <el-dropdown-item v-for="(item,index) in townList">
@@ -57,7 +56,7 @@
           <el-table-column prop="endAt" label="截止日期" sortable />
           <el-table-column label="操作">
             <template slot-scope="scope">
-              <el-button type="primary" size="mini" icon="el-icon-edit"></el-button>
+              <el-button type="primary" size="mini" icon="el-icon-edit" @click="finishTask(scope.row)"></el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -74,7 +73,7 @@
 <script>
 import {cityTree} from "@/api/misc/misc_dept";
 import {ENV} from "@/utils/env";
-import {accountingTodoTaskList} from "@/api/agentcenter/accounting_task";
+import {accountingTodoTaskList, finishTask} from "@/api/agentcenter/accounting_task";
 import {date, date_format} from "@/utils/date";
 import RightYearMonthSelector from "@/components/framework/RightYearMonthSelector.vue";
 
@@ -102,19 +101,23 @@ export default {
       cityTree({rootId: ENV.UserDeptId()}).then((resp) => {
         this.deptOptions = resp.data;
         if(this.deptOptions.length)
+        {
           this.parms.countyCode = this.deptOptions[0].orgCode;
+          this.getTaskList();
+        }
       });
     },
     chooseCity(cmd) {
       this.parms.countyCode = cmd;
       this.parms.townCode = null;
+      this.getTaskList();
     },
     chooseTown(cmd) {
       this.parms.townCode = cmd;
       this.getTaskList();
     },
     getTaskList() {
-      if(!this.parms.townCode || !this.parms.orderYear || !this.parms.orderMonth)
+      if(!this.parms.countyCode || !this.parms.orderYear || !this.parms.orderMonth)
         return;
       accountingTodoTaskList(this.parms).then((resp) => {
         this.list = resp.rows;
@@ -127,6 +130,14 @@ export default {
     dateFormatter(row, column, cellValue, index) {
       return cellValue ? date(cellValue, 'yyyy-MM-dd HH:mm:ss', 'yyyy-MM-dd') : '';
     },
+    finishTask(row) {
+      finishTask({
+        taskId: row.id,
+      }).then((resp) => {
+        this.$message.success('完成成功');
+        this.getTaskList();
+      });
+    },
   },
   mounted(){
 
@@ -222,8 +233,8 @@ export default {
       align-items: center;
       & .select_address:nth-child(1){
         margin-right: 0vw;
-        border-top-right-radius: initial;
-        border-bottom-right-radius: initial;
+       /* border-top-right-radius: initial;
+        border-bottom-right-radius: initial;*/
       }
       & .select_address:nth-child(2){
         margin-right: 0vw;