提交代码

fhKeeper/formulahousekeeper/timesheet/src/components/vueMultipleDept.vue

@@ -58,7 +58,7 @@ export default {
             children: 'children',
             label: 'label'
         },
-        selectType: { // 默认0 人员搜索  1部门搜索
+        selectType: { // 0 人员/部门, 1 人员搜索  2部门搜索
             type: String,
             default: () => '0'
         },

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -1179,7 +1179,7 @@
                 <el-form-item prop="departmentId" :label="$t('other.selectdepartment')" v-if="permissions.reportsCompany">
                     <!-- <el-cascader v-if="user.userNameNeedTranslate != 1" v-model="exportParam.departmentId" :placeholder="$t('other.allDepartments')" :options="departmentList" :props="{ checkStrictly: true, value: 'id' }" clearable style="width: 350px;"></el-cascader>
                     <vueCascader :size="'medium'" :widthStr="'350'" :clearable="true" :subjectId="exportParam.departmentId" :subject="option" :radios="true" :distinction="'1'" @vueCasader="vueCasader" v-if="user.userNameNeedTranslate == 1" :selectNameChuan="$t('other.allDepartments')"></vueCascader> -->
-                    <vueMultipleDept v-model="exportParam.departmentId" :selectType="'1'"></vueMultipleDept>
+                    <vueMultipleDept v-model="exportParam.departmentId" :selectType="'0'"></vueMultipleDept>
                 </el-form-item>
                 <el-form-item prop="projectId" :label="$t('time.dateRange')">
                     <el-date-picker