调整待办任务选择部门

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

@@ -21,6 +21,16 @@
                     ></el-cascader>
                 </el-form-item>
 
+                <el-form-item :label="'部门'" v-if="!user.timeType.projectWithDept">
+                    <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: true,expandTrigger: 'hover' }" :show-all-levels="false" clearable
+                        @change="getList()" size="mini"></el-cascader>
+
+                        <vueCascader :size="'mini'" :widthStr="'125'" :clearable="true" :subject="departmentList" :radios="true" :distinction="'1'" @vueCasader="vueCasader" v-if="user.userNameNeedTranslate == 1"></vueCascader>
+                    </div>
+                </el-form-item>
+
                 <el-form-item :label="$t('types')">
                     <div style="margin-left: 8px">
                         <el-select v-model="typeField" style="width:120px;" size="small" slot="prepend" :placeholder="$t('defaultText.pleaseChoose')" clearable @change="hiddens()">
@@ -39,16 +49,6 @@
                     </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()">
@@ -2003,7 +2003,7 @@ import { error } from 'dingtalk-jsapi';
                 });
             },
 
-            vueCasader() {
+            vueCasader(obj) {
                 if(obj.distinction == '1') {
                     if(obj.id != '') {
                         let arr = []