Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-pad into dev

common/http.api.js

@@ -58,7 +58,7 @@ const install = (Vue, vm) => {
       changeCheckMachineTool: (params = {}) =>
         vm.$u.get(
           config.adminPath +
-            `/mes/pro/protask/getToolOnMachines/${params.taskWorkunitId}`
+            `/mes/pro/protask/getToolInProcess/${params.taskWorkunitId}`
         ),
       //生产报工
       feedback: (params = {}) =>
@@ -286,7 +286,7 @@ const install = (Vue, vm) => {
       saveRegByValidCode: (params = {}) =>
         vm.$u.post('/account/saveRegByValidCode', params),
       getPrintTemplateList: (params = {}) =>
-        vm.$u.get(config.adminPath + '/ureportM/list' , params),
+        vm.$u.get(config.adminPath + '/ureportM/list', params),
       // APP公共服务
       upgradeCheck: () =>
         vm.$u.post('/app/upgrade/check', {