Browse Source

renyuantianjia

liuhj 1 week ago
parent
commit
aeaeb7613a
2 changed files with 22 additions and 27 deletions
  1. 8 14
      src/components/expenseMobile.vue
  2. 14 13
      src/components/system/TaskList.vue

+ 8 - 14
src/components/expenseMobile.vue

@@ -28,20 +28,14 @@
             <div class="expenseMobile-top">
                 <div class="expenseMobile-title">{{this.portType!=2?'日常付款申请':''}}</div>
                 <div class="expenseMobile-search">
-                    <el-autocomplete
-                    popper-class="custom-autocomplete-dropdown"
-                    style="flex:19;"
-                    v-model="input"
-                    :fetch-suggestions="querySearchAsyncs"
-                    :trigger-on-focus="false"
-                    placeholder="请输入或选择"
-                    @select="handleSelects"
-                    >
+                    <el-autocomplete style="flex:19;" v-model="input"
+                        :fetch-suggestions="querySearchAsyncs" :trigger-on-focus="false" placeholder="请输入或选择"
+                        @select="handleSelects">
                         <template slot-scope="{ item }">
                             <div style="width: 300px">{{ item.instructions }}</div>
                         </template>
                     </el-autocomplete>
-                    <el-button style="flex:1;" @click.stop="searchbtn" type="primary"   icon="el-icon-search"></el-button>
+                    <el-button style="flex:1;" @click.stop="searchbtn" type="primary" icon="el-icon-search"></el-button>
                     <!-- <el-select popper-class="my-select" style="width:100%" v-model="input" clearable filterable remote :remote-method="DailyFeeKeywordSearch" :loading="selectLoadingrf" @change="searchbtn" placeholder="请选择">
                         <el-option
                         v-for="item in inputArrrf"
@@ -81,14 +75,14 @@
             <div class="expenseMobile-top">
                 <div class="expenseMobile-title">{{this.portType!=2?'费用审核':''}}</div>
                 <div class="expenseMobile-search">
-                    <el-autocomplete style="flex:19;" v-model="value"
-                        :fetch-suggestions="querySearchAsync" :trigger-on-focus="false" placeholder="请输入或选择团组"
-                        @select="handleSelect">
+                    <el-autocomplete style="flex:19;" v-model="value" :fetch-suggestions="querySearchAsync"
+                        :trigger-on-focus="false" placeholder="请输入或选择团组" @select="handleSelect">
                         <template slot-scope="{ item }">
                             <div>{{ item.teamName }}</div>
                         </template>
                     </el-autocomplete>
-                    <el-button type="primary" style="flex:1;" @click.stop="searchexamine" icon="el-icon-search"></el-button>
+                    <el-button type="primary" style="flex:1;" @click.stop="searchexamine"
+                        icon="el-icon-search"></el-button>
                     <!-- <el-select popper-class="my-select" style="width:100%" v-model="value" clearable filterable remote
                         :remote-method="GroupItemKeywordSearch" :loading="selectLoading" @change="searchexamine"
                         placeholder="请选择">

+ 14 - 13
src/components/system/TaskList.vue

@@ -36,6 +36,14 @@
                                 </el-option>
                             </el-select>
                         </el-form-item>
+                        <el-form-item label="人员名称" prop="name">
+                            <el-select @change="changecompletionstatus" size="medium" filterable
+                                v-model="taskUserId" placeholder="请选择">
+                                <el-option v-for="item in taskUserIdArr" :key="item.id" :label="item.name"
+                                    :value="item.id">
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
                         <!-- <el-form-item label="指派类型" prop="name">
                             <el-select @change="changeassignmenttype" size="medium" filterable v-model="assignmenttype" placeholder="请选择">
                                 <el-option
@@ -416,7 +424,6 @@ export default {
                     name:'指派给我'
                 },
             ],
-
             tableData: [],
             value: '',
             pagesize:10,
@@ -438,6 +445,8 @@ export default {
                 remark:'',
                 overTime:'',
             },
+            taskUserId:-1,
+            taskUserIdArr:[],
         }
     },
     methods: {
@@ -476,17 +485,6 @@ export default {
             }
             var url = "/api/PersonnelModule/PostTaskAllocationPage"
             var that = this
-            var data={
-                    portType:1,
-                    userId: that.userId,
-                    pageId: that.pageId,
-                    pageIndex: that.currentPage,
-                    pageSize: that.pagesize,
-                    type: that.assignmenttype,
-                    status: that.completionstatus,
-                    taskName: that.tasknames,
-                }
-                console.log(JSON.stringify(data))
             this.$axios({
                 method: 'post',
                 url: url,
@@ -502,6 +500,7 @@ export default {
                     type: that.assignmenttype,
                     status: that.completionstatus,
                     taskName: that.tasknames,
+                    taskUserId: that.taskUserId,
                 }
             }).then(function (res) {
                 console.log(res)
@@ -618,7 +617,9 @@ export default {
                 console.log(res)
                 if(res.data.code==200){
                     that.tasknamelist=res.data.data.taskNameInfos;
-                    that.PostTaskAllocationPage()
+                    that.taskUserIdArr=res.data.data.executeTaskUserInfos;
+                    that.taskUserIdArr.unshift({id:-1,name:'全部'});
+                    that.PostTaskAllocationPage();
                 }else{
                     that.$message.error(res.data.msg);
                 }