任务

components/select/admin_user_batch.vue

@@ -4,7 +4,7 @@
       <el-option
         v-for="item in options"
         :key="item.uid"
-        :label="item.uid"
+        :label="item.real_name"
         :value="item.uid">
       </el-option>
     </el-select>
@@ -19,16 +19,28 @@
         options: []
       }
     },
+    props: {
+      change:{
+        type: Function,
+      },
+      value:{
+
+      }
+    },
     mounted() {
       this.select_val = this.type;
       this.getCateGory()
     },
     methods: {
       handleChange(value) {
-        this.$emit('input',value+"")
+        this.$emit('input',value);
+        if(typeof(this.change)=="function")
+        {
+          this.change(value);
+        }
       },
       async getCateGory() {
-        const res = await post('/api/pub/list/admin/admin_user/list')
+        const res = await this.$post('/uapi/pub/list/admin/admin_user/list')
         this.options = res.data
       }
     }

pages/main/index/add/task_info.vue

@@ -40,6 +40,11 @@
         <admin_user :change="set_enforcer_uid"  v-model="info.enforcer_uid" style="width: 150px"/>
       </div>
 
+      <div class="date" style="margin-top: 20px;display: flex;line-height: 40px;font-size: 12px;justify-content: space-between">
+        <span>通知用户：</span>
+        <admin_user_batch :change="set_followers_uid"  v-model="info.followers" style="width: 250px;display: flex;justify-content: right"/>
+      </div>
+
       <el-divider>基础信息</el-divider>
       <div class="date" style="display: flex;height: 40px;line-height: 40px;font-size: 12px;justify-content: space-between">
         <span>开始时间：</span>
@@ -187,6 +192,7 @@ import task_log from "./task_log";
 import Clipboard from 'clipboard';
 import Tinymce from '@/components/Tinymce'
 import admin_user from '@/components/select/admin_user'
+import admin_user_batch from '@/components/select/admin_user_batch'
 
 import request from "@/utils/request";
 export default {
@@ -196,7 +202,7 @@ export default {
       default: 0
     }
   },
-  components: {task_log,Tinymce,admin_user},
+  components: {task_log,Tinymce,admin_user,admin_user_batch},
   data() {
     return {
       loading: false,
@@ -242,7 +248,11 @@ export default {
     },
     async set_enforcer_uid(uid)
     {
-      this.request_api('/uapi/pub/info/admin/task/set_enforcer_uid',{enforcer_uid:uid,task_id:this.id});
+      this.request_api('/uapi/pub/bool/admin/task/set_enforcer_uid',{enforcer_uid:uid,task_id:this.id});
+    },
+    async set_followers_uid(uid)
+    {
+      this.request_api('/uapi/pub/bool/admin/task_user/set_followers_uid',{followers_uid:uid,task_id:this.id});
     },
     async offer_drawer(project_id,offer_id)
     {

pages/main/index/index.vue

@@ -69,7 +69,7 @@
     <div style="display: flex;width: 100%;margin-top: 30px">
       <el-card style="flex: 1;" class="box-card">
         <div slot="header" class="clearfix">
-          <span>我发起的任务</span>
+          <span>我关注的任务</span>
         </div>
         <el-table
           :data="my_to"
@@ -77,13 +77,14 @@
           <el-table-column prop="id" label="任务编号" width="120"></el-table-column>
           <el-table-column prop="uid"  label="任务标题">
             <template slot-scope="scope">
-              <span style="cursor: pointer" @click="info_(scope.row.id)"  class="lblue point">{{ scope.row.name }}</span>
+              <span style="cursor: pointer" @click="info_(scope.row,1)"  class="lblue point">{{ scope.row.name }}</span>
               <el-tag
                 size="mini"
                 :type="scope.row.status_type"
                 effect="dark">
                 {{ scope.row.status_text }}
               </el-tag>
+              <span v-if="scope.row.last_num>0" style="color: red;font-weight: bold;margin-left: 10px">+{{ scope.row.last_num }}</span>
             </template>
           </el-table-column>
           <el-table-column prop="etime" label="截止时间" width="120"></el-table-column>
@@ -117,13 +118,14 @@
           <el-table-column prop="id" label="任务编号" width="120"></el-table-column>
           <el-table-column prop="uid"  label="任务标题">
             <template slot-scope="scope">
-              <span style="cursor: pointer" @click="info_(scope.row.id)"  class="lblue point">{{ scope.row.name }}</span>
+              <span style="cursor: pointer" @click="info_(scope.row,2)"  class="lblue point">{{ scope.row.name }}</span>
               <el-tag
                 size="mini"
                 :type="scope.row.status_type"
                 effect="dark">
                 {{ scope.row.status_text }}
               </el-tag>
+              <span v-if="scope.row.last_num>0" style="color: red;font-weight: bold;margin-left: 10px">+{{ scope.row.last_num }}</span>
             </template>
           </el-table-column>
           <el-table-column prop="etime" label="截止时间" width="120"></el-table-column>
@@ -207,8 +209,16 @@
           this.tj_data=res.data;
         }
       },
-      info_(id){
-        this.task_id=id;
+      info_(row,type){
+        if(type==1)
+        {
+          this.my_to[row.key]["last_num"]="0";
+        }
+        if(type==2)
+        {
+          this.to_my[row.key]["last_num"]="0";
+        }
+        this.task_id=row.id;
         this.open_info_drawer();
       },
       drawer_close(){

pages/main/index/task.vue

@@ -122,6 +122,7 @@
           total:0,
           type:"",
           status:"1",
+          data_type:"all",
         },
         items: [
           { type: '', label: '待处理',val:'1'},