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

common/http.api.js

@@ -54,7 +54,7 @@ const install = (Vue, vm) => {
       changeCheckMachineTool: (params = {}) =>
         vm.$u.get(
           config.adminPath +
-            `/mes/pro/protask/checkMachineTool/${params.taskWorkunitId}`
+            `/mes/pro/protask/getToolOnMachines/${params.taskWorkunitId}`
         ),
       //生产报工
       feedback: (params = {}) =>

pages/mes/prodReport/index.vue

@@ -799,7 +799,7 @@ export default {
           align: 'center'
         },
         {
-          name: 'quantityUnquanlify',
+          name: 'quantityUnqualify',
           label: '不合格数量',
           width: 80,
           align: 'center'