组织架构全部人员添加批量导入

fhKeeper/formulahousekeeper/timesheet/src/views/team/index.vue

@@ -44,11 +44,18 @@
                     <el-form-item style="float:right;">
                         <el-link type="primary" :underline="false" @click="openInsertDialog(null)">添加人员</el-link>
                     </el-form-item>
-                    <el-form-item style="float:right;" v-if="depData != null && depData.id != -1 && depData.id != 0">
+                    <!-- 原来的 -->
+                    <!-- <el-form-item style="float:right;" v-if="depData != null && depData.id != -1 && depData.id != 0">
+                        <el-upload ref="upload" action="#" :limit="1" :http-request="importUser" :show-file-list="false">
+                            <el-link type="primary" :underline="false">批量导入</el-link>
+                        </el-upload>
+                    </el-form-item> -->
+                    <el-form-item style="float:right;">
                         <el-upload ref="upload" action="#" :limit="1" :http-request="importUser" :show-file-list="false">
                             <el-link type="primary" :underline="false">批量导入</el-link>
                         </el-upload>
                     </el-form-item>
+
                     <el-form-item style="float:right;">
                         <el-link type="primary" :underline="false" href="./upload/人员导入模板.xlsx" download="人员导入模板.xlsx">模板下载</el-link>
                     </el-form-item>
@@ -638,7 +645,9 @@
                     this.listLoading = true;
                     let formData = new FormData();
                     formData.append("file", item.file);
-                    formData.append("departmentId", this.depData.id);
+                    if(this.depData.label != '全部人员') {
+                        formData.append("departmentId", this.depData.id);
+                    }
                     this.http.uploadFile( this.port.manage.import, formData,
                     res => {
                         this.$refs.upload.clearFiles();