fix: 完成报工统计分析表完成修改

src/api/mes/proTable/statistAnaly.js

@@ -21,47 +21,47 @@ export function getListByProcess(query) {
 
 // 生产报工记录:统计方式用户
 export function getListByUser(query) {
-    return request({
-      url: '/report/pro/feedback/getListByUser',
-      method: "get",
-      params: query
-    });
-  }
-  // 生产报工记录:统计方式车间
+  return request({
+    url: '/report/pro/feedback/getListByUser',
+    method: "get",
+    params: query
+  });
+}
+// 生产报工记录:统计方式车间
 export function getListByWorkshop(query) {
-    return request({
-      url: '/report/pro/feedback/getListByWorkshop',
-      method: "get",
-      params: query
-    });
-  }
+  return request({
+    url: '/report/pro/feedback/getListByWorkshop',
+    method: "get",
+    params: query
+  });
+}
 
 // 生产报工记录:统计方式工单
 export function getListByWorkOrder(query) {
-    return request({
-      url: '/report/pro/feedback/getListByWorkOrder',
-      method: "get",
-      params: query
-    });
-  }
+  return request({
+    url: '/report/pro/feedback/getListByWorkOrder',
+    method: "get",
+    params: query
+  });
+}
 
-  // 生产报工记录:统计方式工作中心
+// 生产报工记录:统计方式工作中心
 export function getListByWorkstation(query) {
-    return request({
-      url: '/report/pro/feedback/getListByWorkstation',
-      method: "get",
-      params: query
-    });
-  }
+  return request({
+    url: '/report/pro/feedback/getListByWorkstation',
+    method: "get",
+    params: query
+  });
+}
 
-    // 生产报工记录:统计方式工作单元
+// 生产报工记录:统计方式工作单元
 export function getListByWorkunit(query) {
-    return request({
-      url: '/report/pro/feedback/getListByWorkunit',
-      method: "get",
-      params: query
-    });
-  }
+  return request({
+    url: '/report/pro/feedback/getListByWorkunit',
+    method: "get",
+    params: query
+  });
+}
 
 // 生产报工记录:统计方式不合格原因
 export function getListByDefect(query) {
@@ -70,4 +70,40 @@ export function getListByDefect(query) {
     method: "get",
     params: query
   });
-}
\ No newline at end of file
+}
+
+// 生产报工报表:计划达成率统计表
+export function getAchievementRateApi(query) {
+  return request({
+    url: '/report/pro/feedback/getAchievementRate',
+    method: "get",
+    params: query
+  });
+}
+
+// 生产报工报表:效率统计表
+export function getEfficiencyRateApi(query) {
+  return request({
+    url: '/report/pro/feedback/getEfficiencyRate',
+    method: "get",
+    params: query
+  });
+}
+
+// 生产报工报表:产品不良分析统计表
+export function getFeedDefRateApi(query) {
+  return request({
+    url: '/report/pro/feedback/getFeedDefRate',
+    method: "get",
+    params: query
+  });
+}
+
+// 生产报工报表:生产力统计表
+export function getProductivityRateApi(query) {
+  return request({
+    url: '/report/pro/feedback/getProductivityRate',
+    method: "get",
+    params: query
+  });
+}

src/views/mes/proTable/knifeMoldUsage/index.vue

@@ -36,7 +36,7 @@
         </el-row>
         <el-table v-loading="loading" :max-height="tableHeight" :data="tbodys">
           <el-table-column :label="item.label" align="center" :prop="item.value" :width="item.width"
-            v-for="(item, index) in theaders" :key="index">
+            :min-width="item.minWidth" v-for="(item, index) in theaders" :key="index">
             <template slot-scope="scope">
               <span v-if="item.value == 'operationType'">{{ operationTypeData[scope.row[item.value]] }}</span>
               <span v-else>{{ scope.row[item.value] }}</span>
@@ -60,8 +60,8 @@
           </el-col> -->
         </el-row>
         <el-table v-loading="loading" :max-height="tableHeight" :data="tbodys1">
-          <el-table-column :label="item.label" align="center" :prop="item.value" :width="item.width" v-for="(item, index) in theaders1"
-            :key="index">
+          <el-table-column :label="item.label" align="center" :prop="item.value" :width="item.width"
+            :min-width="item.minWidth" v-for="(item, index) in theaders1" :key="index">
             <template slot-scope="scope">
               <span v-if="item.value == 'warning10' || item.value == 'warning30'">{{ scope.row[item.value] ? '是' : '否'
                 }}</span>
@@ -189,23 +189,23 @@ export default {
       let api = getListApi
       if (Number(this.tabIndex) === 0) {
         this.theaders = [
-          { label: '物料编码', value: 'sapItemCode', width: '200px' },
-          { label: '刀模SN', value: 'toolCode', width: '150px' },
+          { label: '物料编码', value: 'sapItemCode', minWidth: '200px' },
+          { label: '刀模SN', value: 'toolCode', minWidth: '120px' },
           { label: '履历状态', value: 'operationType', width: '120px' },
           { label: '关联单据类型', value: 'orderType', width: '120px' },
           { label: '增减寿命值（次）', value: 'quantityDifference', width: '140px' },
           { label: '剩余次数', value: 'lifeTime', width: '80px' },
           { label: '所在位置', value: 'location', width: '100px' },
           { label: '操作人', value: 'createBy', width: '120px' },
-          { label: '操作时间', value: 'createTime', width: '160px' },
+          { label: '操作时间', value: 'createTime', width: '180px' },
         ]
       }
       if (Number(this.tabIndex) === 1) {
         if (this.statisisType === '物料维保预警统计') {
           api = getMaterialMaintenanceListApi
           this.theaders1 = [
-            { label: '物料编码', value: 'sapItemCode', width: '200px' },
-            { label: '物料名称', value: 'itemName', width: '200px' },
+            { label: '物料编码', value: 'sapItemCode', minWidth: '200px' },
+            { label: '物料名称', value: 'itemName', minWidth: '200px' },
             { label: 'SN数量', value: 'sum', width: '100px' },
             { label: '寿命低于30%数量', value: 'warning30Sum', width: '140px' },
             { label: '寿命低于30%占比', value: 'warning30Proportion', width: '140px' },
@@ -234,7 +234,7 @@ export default {
           api = getSnMaintenanceListApi
         } else if (this.statisisType === 'SN生命周期统计') {
           this.theaders1 = [
-            { label: '刀模SN', value: 'toolCode', width: '150px' },
+            { label: '刀模SN', value: 'toolCode' },
             { label: '创建时间', value: 'createTime', width: '140px' },
             { label: '初始寿命', value: 'initialLifeTime', width: '120px' },
             { label: '累计使用次数', value: 'countSum', width: '140px' },