Merge remote-tracking branch 'origin/dev_New' into dev_New

yaowanxin

18 小时以前 bbd880d66e993f80670259882f2feca1b150d1ae

 src/views/reportAnalysis/dataDashboard/index.vue

@@ -253,7 +253,7 @@
   getProgressStatistics,
     getWorkInProcessTurnover
} from "@/api/viewIndex.js";
import {staffOnJobListPage} from "@/api/personnelManagement/employeeRecord.js";
import {staffOnJobListPage} from "@/api/personnelManagement/staffOnJob.js";
import {listCustomer} from "@/api/basicData/customerFile.js";
import {listSupplier} from "@/api/basicData/supplierManageFile.js";
import {getLedgerPage} from "@/api/equipmentManagement/ledger.js";