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

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

@@ -524,7 +524,8 @@ export default {
                     })
                     // this.options = arr
                     console.log('将要赋值')
-                    this.$set(this, 'options', arr)
+                    var newArr = arr.length > 0 ? arr : res.data.records
+                    this.$set(this, 'options', newArr)
                     this.cursor = res.data.nextCursor
                 } else {
                     this.$message({

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

@@ -1138,7 +1138,7 @@
 
                     <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" :subject="departmentList" :radios="true" :distinction="'1'" @vueCasader="vueCasader" v-if="user.userNameNeedTranslate == 1" :selectNameChuan="$t('other.allDepartments')"></vueCascader>
+                    <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>
 
                 </el-form-item>
                 <el-form-item prop="projectId" :label="$t('time.dateRange')">
@@ -7753,7 +7753,7 @@
             },
             vueCasader(obj) {
                 // console.log(obj, '看看值')
-                if(obj.distinction == 1) {
+                if(obj.distinction == 1 && obj.item) {
                     let arr = []
                     arr.push(obj.item.id)
                     this.exportParam.departmentId = arr