Merge remote-tracking branch 'origin/master'

src/api/school-center/userManager/newUser.js

+import {postAction,downFilePost} from '@/api/manage'
+const prefix = '/manager/ciop';
+
+// 楼长KPI管理
+let excelOut = (params) => downFilePost(prefix + "/studentDwkVerify/excelOut" , params);
+let list = (params) => postAction(prefix + "/studentDwkVerify/list" , params);
+let update = (params) => postAction(prefix + "/studentDwkVerify/update" , params);
+let queryById = (params) => postAction(prefix + "/studentDwkVerify/queryById" , params);
+export {
+    excelOut,
+    list,
+    update,
+    queryById
+}

src/views/school-center/louZhang/zjlSalary.vue

@@ -107,7 +107,7 @@
     import STable from '@/components/table';
     import ImportBtn from "../../../components/sysmanage/ImportBtn";
     import {
-        zjlSalaryList, zjlSalaryDelete, excelOut, downloadMoBan,createSalary
+        zjlSalaryList, zjlSalaryDelete, uploadExcel, downloadMoBan,createSalary
     } from "../../../api/school-center/louZhang/zjlSalaryManagerAPI"
     import {cloneObject, exportFile} from '@/utils/util';
     import Vue from 'vue';
@@ -256,7 +256,7 @@
                 let nowdate = moment().format("YYYY-MM-DD");
                 //导出
                 exportFile(
-                    excelOut(Object.assign(params, obj)),
+                    uploadExcel(Object.assign(params, obj)),
                     "总经理薪酬管理信息" + nowdate + ".xlsx",
                 );