department

pages/basicData/department/api.js

 import Api from '@/plugins/request'
 export default {
-    getpaged(params){
-    return Api.get(`${systemUrl}/Department/GetDepartmentsWithOrganizations`,params);
-    },
-    get(params){
-    return Api.get(`${systemUrl}/Department/get`,params);
-    },
-    create(params){
-    return Api.post(`${systemUrl}/Department/Create`,params);
-    },
-    update(params){
-    return Api.post(`${systemUrl}/Department/DepartUpdate`,params);
-    },
-    //删除：
-    delete(params) {
-        return Api.post(`${systemUrl}/Department/DepartDelete`,params);
-    },
+  getpaged(params) {
+    return Api.get(`${systemUrl}/Department/GetDepartmentsWithOrganizations`, params);
+  },
+  get(params) {
+    return Api.get(`${systemUrl}/Department/get`, params);
+  },
+  create(params) {
+    return Api.post(`${systemUrl}/Department/Create`, params);
+  },
+  update(params) {
+    return Api.post(`${systemUrl}/Department/DepartUpdate`, params);
+  },
+  //删除：
+  delete(params) {
+    return Api.post(`${systemUrl}/Department/DepartDelete`, params);
+  },
+  //批量导入部门，有上下级关系
+  departImport(params) {
+    return Api.post(`${systemUrl}/departmentimport/import`, params);
+  },
+
 }
\ No newline at end of file

pages/basicData/department/index.vue

@@ -2,7 +2,7 @@
 <div id="department">
     <div class="tr">
         <Button type="primary" @click="add()" class="mb10">新增部门</Button>
-        <Button>导入</Button>
+        <Button @click="openModalIm">导入</Button>
         <Button @click="export2Excel">导出</Button>
         <RadioGroup v-model="img" type="button" size="small">
             <Radio :label="1">
@@ -27,6 +27,7 @@
     <Modal v-model="editModal" title="编辑" width="800" footer-hide>
         <Edit :row="rowData" @on-close="cancel" @on-ok="addOk" />
     </Modal>
+    <ImportExcel ref="importExcel" @on-get-data="getData" :modalTitle="temTitle" :columns="columns" :open="ModalIm" @on-cancel="ModalImCancel" @on-ok="ok" />
 </div>
 </template>
 
@@ -163,6 +164,8 @@ export default {
             treeList: [],
             citys: citys(),
             cityDatas: [], //省市县在一起
+            ModalIm: false,
+            temTitle: "部门管理",
         };
     },
     async fetch({
@@ -289,6 +292,11 @@ export default {
             let departList = this.$u.clone(this.treeList)
             return this.$u.getDepartAllName(departList, val)
         },
+
+        ok() {
+            this.init();
+            this.modal = false;
+        },
         //导出excel
         export2Excel() {
             //当前显示数据
@@ -348,7 +356,43 @@ export default {
             );
         },
         //导入excel
+        //批量导入start
+        //导入功能
+        openModalIm() {
+            this.ModalIm = true
+        },
+        ModalImCancel() {
+            this.ModalIm = false
+        },
+        getData(val) {
+            let url = `${systemUrl}/departmentimport/import`;
+            this.$refs.importExcel.deelData(url, this.columns, this.formatMethod(val))
+        },
+        //根据页面二次处理数据
+        formatMethod(val) {
+            let tempData = this.$u.clone(val);
+            let tempList = [];
+            tempData.forEach((ele) => {
+                let obj = {
+                    parentTitle: ele.parentTitle ? ele.parentTitle : '',
+                    name: ele.name ? ele.name : '', //部门名称
+                    parent_Id: ele.parent_Id ? ele.parent_Id : 0, //上级部门 [id]
+                    code: ele.code ? ele.code : '', //部门编号
+                    location: ele.location ? ele.location : '', //省市县
+                    isProduction: 1, //是否生产班组：1是，0否
+                    property: ele.property ? ele.property : '' //属性
+                };
+                if (ele.name && ele.name != '') {
+                    obj.ico = false
+                } else {
+                    obj.ico = true
+                }
+                tempList.push(obj);
 
+            });
+            return tempList
+        },
+        //批量导入end
     }
 };
 </script>

pages/basicData/user/api.js

@@ -54,7 +54,7 @@ export default {
         return Api.post(`${systemUrl}/user/accountreset`, params);
     },
      //批量导入用户
-     accountreset(params) {
+     userImport(params) {
         return Api.post(`${systemUrl}/userimportservice/import`, params);
     },
     

pages/basicData/user/index.vue

@@ -874,7 +874,7 @@ export default {
             let parms = {
                 list: tempList,
             };
-            Api.accountreset(parms).then((res) => {
+            Api.userImport(parms).then((res) => {
                 if (res.success) {
                     this.$Message.success("批量导入成功！");
                     this.$refs.grid.load();