Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/timesheet/src/views/task/list.vue

@@ -39,6 +39,16 @@
                     </div>
                 </el-form-item>
 
+                <el-form-item :label="'部门'">
+                    <div style="margin-left: 8px">
+                        <el-cascader v-if="user.userNameNeedTranslate != 1" v-model="screenDeptId" :placeholder="$t('defaultText.pleaseChoose')" style="width: 125px"
+                        :options="departmentList" :props="{ checkStrictly: false,expandTrigger: 'hover' }" :show-all-levels="false" clearable
+                        @change="getList()" size="mini"></el-cascader>
+
+                        <vueCascader :size="'mini'" :widthStr="'125'" :clearable="true" :subject="departmentList" :radios="false" :distinction="'1'" @vueCasader="vueCasader" v-if="user.userNameNeedTranslate == 1"></vueCascader>
+                    </div>
+                </el-form-item>
+
                 <el-form-item :label="'任务分组'">
                     <div style="margin-left: 8px">
                         <el-select v-model="screenTaskGroupingId" style="width:150px;" size="small" :disabled="!screenProjectId" slot="prepend" :placeholder="$t('defaultText.pleaseChoose')" clearable @change="hiddens()">
@@ -469,6 +479,9 @@ import { error } from 'dingtalk-jsapi';
 
     // 引入自定义组件
     import selectCat from "@/components/select.vue"
+    // 引入自定义级联组件
+    import vueCascader from "@/components/cascader.vue"
+    import cascaderOption from "@/components/cascaderOption.vue"
 
     import taskComponent from "@/components/taskComponent.vue"
 
@@ -492,7 +505,9 @@ import { error } from 'dingtalk-jsapi';
             // Earning,
             quillEditor, // 富文本
             selectCat,
-            taskComponent
+            taskComponent,
+            vueCascader,
+            cascaderOption
         },
         data() {
             return {
@@ -642,6 +657,7 @@ import { error } from 'dingtalk-jsapi';
                 screenPersonnelId: '',
                 allProjectList: [],
                 exportTaskLoading: false,
+                screenDeptId: [],
             };
         },
         methods: {
@@ -955,7 +971,7 @@ import { error } from 'dingtalk-jsapi';
 
             //获取项目列表
             getList() {
-                console.log('执行函数')
+                console.log('执行函数', this.screenDeptId)
                 this.listLoading = true;
                 let parameter = {
                     status: this.searchField,
@@ -967,6 +983,7 @@ import { error } from 'dingtalk-jsapi';
                     groupId: this.screenTaskGroupingId,
                     targetUserId: this.screenPersonnelId
                 }
+                console.log(parameter)
                 if(this.typeField != 'null' && this.typeField != null && this.typeField != '') {
                     parameter.type = this.typeField
                 }
@@ -983,6 +1000,9 @@ import { error } from 'dingtalk-jsapi';
                 } else {
                     parameter.deptId = ''
                 }
+                if(this.screenDeptId.length > 0) {
+                    parameter.deptId = this.screenDeptId[this.screenDeptId.length - 1]
+                }
                 this.http.post('/task/listByPage', parameter,
                 res => {
                     this.listLoading = false;
@@ -1981,6 +2001,19 @@ import { error } from 'dingtalk-jsapi';
                         type: "error"
                     });
                 });
+            },
+
+            vueCasader() {
+                if(obj.distinction == '1') {
+                    if(obj.id != '') {
+                        let arr = []
+                        arr.push(obj.id)
+                        this.screenDeptId = arr
+                    } else {
+                        this.screenDeptId = []
+                    }
+                    this.getList()
+                }
             }
         },
         created() {
@@ -1998,6 +2031,7 @@ import { error } from 'dingtalk-jsapi';
             if(this.user.timeType.projectWithDept) {
                 this.getDepartmentList()
             }
+            this.getDepartmentList()
             this.getAllProjectlist()
             // if(this.user.companyId == '428') {
             //     this.getSthForSb()