From 0bafaa0445dcdbbbc0908c4c3d37341a50650154 Mon Sep 17 00:00:00 2001
From: shilixia <2309368887@qq.com>
Date: Tue, 12 Oct 2021 11:31:13 +0800
Subject: [PATCH] richengjiandu

---
 client/.env.development                       |  4 +-
 client/src/views/supervision/mytask.vue       | 39 ++++++++++++++++++-
 client/src/views/supervision/mytaskrecord.vue | 16 +-------
 3 files changed, 41 insertions(+), 18 deletions(-)

diff --git a/client/.env.development b/client/.env.development
index c5200d4..aacde3e 100644
--- a/client/.env.development
+++ b/client/.env.development
@@ -3,8 +3,8 @@ ENV = 'development'
 
 # base api
 #VUE_APP_BASE_API = 'http://10.0.11.127:8000/api'
-VUE_APP_BASE_API = 'http://127.0.0.1:8000/api'
-#VUE_APP_BASE_API = 'https://testsearch.ctc.ac.cn/api'
+#VUE_APP_BASE_API = 'http://127.0.0.1:8000/api'
+VUE_APP_BASE_API = 'https://testsearch.ctc.ac.cn/api'
                      
 #VUE_APP_BASE_API = 'http://47.95.0.242:9101/api'
 
diff --git a/client/src/views/supervision/mytask.vue b/client/src/views/supervision/mytask.vue
index df4c439..60ff3b1 100644
--- a/client/src/views/supervision/mytask.vue
+++ b/client/src/views/supervision/mytask.vue
@@ -4,6 +4,21 @@
       <div slot="header" class="clearfix">
         <span>我的报送任务</span>
       </div>
+       <div>
+      <el-select
+        v-model="listQuery.dept"
+        placeholder="报送部门"
+       
+        @change="handleFilter"
+      >
+        <el-option
+          v-for="item in orgData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        />
+      </el-select>
+    </div>
       <el-table
         v-loading="listLoading"
         :data="taskList"
@@ -37,6 +52,9 @@
         <el-table-column label="报送率">
           <template slot-scope="scope">{{ scope.row.up_rate }}%</template>
         </el-table-column>
+        <el-table-column label="报送部门">
+          <template slot-scope="scope">{{ scope.row.dept_.name }}</template>
+        </el-table-column>
         <el-table-column label="确认率">
           <template slot-scope="scope">{{ scope.row.confirm_rate }}%</template>
         </el-table-column>
@@ -64,6 +82,7 @@
 import {
   getmytasklist,
 } from "@/api/task";
+import { getOrgList, getSubOrgList } from "@/api/org";
 import checkPermission from "@/utils/permission";
 import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
 import mytaskrecord from "@/views/supervision/mytaskrecord";
@@ -77,13 +96,15 @@ export default {
         page_size: 20,
       },
       listLoading: true,
-      query:null
+      query:null,
+      orgData: [],
     };
   },
   computed: {},
   watch: {},
   created() {
     this.getList();
+    this.getOrgList();
   },
   methods: {
     checkPermission,
@@ -95,12 +116,28 @@ export default {
         }
         this.listLoading = false;
       });
+    },
+     getOrgList() {
+      if (this.checkPermission(["record_confirm"])) {
+        getOrgList({ can_supervision: true }).then((res) => {
+          this.orgData = res.data;
+        });
+      } else {
+        getSubOrgList().then((res) => {
+          this.orgData = res.data;
+        });
+      }
     },
     clickRow(obj){
       this.query = {
         dept:obj.dept,
         task:obj.task
       }
+    },
+     handleFilter() {
+      this.listQuery.page = 1;
+
+      this.getList();
     },
     handleDo(val){
       this.getList()
diff --git a/client/src/views/supervision/mytaskrecord.vue b/client/src/views/supervision/mytaskrecord.vue
index edce980..3869bb5 100644
--- a/client/src/views/supervision/mytaskrecord.vue
+++ b/client/src/views/supervision/mytaskrecord.vue
@@ -1,20 +1,6 @@
 <template>
   <div>
-    <div>
-      <el-select
-        v-model="listQuery.belong_dept"
-        placeholder="报送部门"
-        clearable
-        @change="handleFilter"
-      >
-        <el-option
-          v-for="item in orgData"
-          :key="item.id"
-          :label="item.name"
-          :value="item.id"
-        />
-      </el-select>
-    </div>
+    
     <el-table
       style="margin-top: 6px"
       v-loading="listLoading"