From e457e41313b55b02620513d0c5aa7bbe3592a07b Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Tue, 29 Mar 2022 11:33:45 +0800
Subject: [PATCH] =?UTF-8?q?produce=202022=E5=B9=B43=E6=9C=8829=E6=97=A5=20?=
 =?UTF-8?q?sxm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yieldReport/com_produce_report_normal.vue | 57 +++++++++++++++++++
 .../otherReport/fqc_produce_report_normal.vue |  2 +-
 .../otherReport/rework_inspect_report.vue     |  3 +-
 .../modules/yieldReport/produce_order.vue     |  6 +-
 4 files changed, 63 insertions(+), 5 deletions(-)

diff --git a/src/views/modules/yieldReport/com_produce_report_normal.vue b/src/views/modules/yieldReport/com_produce_report_normal.vue
index 588db76..8f5bcc8 100644
--- a/src/views/modules/yieldReport/com_produce_report_normal.vue
+++ b/src/views/modules/yieldReport/com_produce_report_normal.vue
@@ -293,6 +293,8 @@
                 height="260"
                 :data="sfdcDefectList"
                 border
+                show-summary
+                :summary-method="sfdcDefectListSummaries"
                 v-loading="dataListLoading"
                 style="width: 100%;">
 
@@ -319,7 +321,9 @@
                 height="260"
                 :data="sfdcRollList"
                 border
+                show-summary
                 v-loading="dataListLoading"
+                :summary-method="sfdcRollListSummaries"
                 style="width: 100%;">
                 <el-table-column
                   v-for="(item,index) in columnRollArray" :key="index"
@@ -2894,7 +2898,60 @@ export default {
     notOverFinishRoll,/*异常下级报工*/
   },
   methods: {
+    // 不良记录
+    sfdcDefectListSummaries(param){
+      const { columns, data } = param;
+      const sums = [];
+      columns.forEach((column, index) => {
+
+        if (index == 4){
+          const values = data.map(item => Number(item[column.property]));
+          if (!values.every(value => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr);
+              if (!isNaN(value)) {
+                return prev + curr;
+              } else {
+                return prev;
+              }
+            }, 0);
+            sums[index] ;
+          }
+          sums[index] = "合计:"+(sums[index]?sums[index]:0)
+        }
+
+      });
+      return sums;
+    },
+    // 机器下机卷
+    sfdcRollListSummaries(param){
+      const { columns, data } = param;
+      const sums = [];
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '下机卷总数：';
+          return;
+        }
+        if (index == 14){
+          let list = data.filter(item => item.virtualRollFlag!='Y' && item.rollType !='删除卷')
+          const values = list.map(item => Number(item[column.property]));
+          let sum = 0
+          if (!values.every(value => isNaN(value))) {
+            sum = values.reduce((prev, curr) => {
+              const value = Number(curr);
+              if (!isNaN(value)) {
+                return prev + curr;
+              } else {
+                return prev;
+              }
+            }, 0);
 
+          }
+          sums[0]+= sum?sum:0
+        }
+      });
+      return sums;
+    },
     // 删除卷
     switchRollReverse() {
       if (this.currentRollOps.rollNo === '暂无卷号') {
diff --git a/src/views/modules/yieldReport/otherReport/fqc_produce_report_normal.vue b/src/views/modules/yieldReport/otherReport/fqc_produce_report_normal.vue
index 3ad8cce..e78a877 100644
--- a/src/views/modules/yieldReport/otherReport/fqc_produce_report_normal.vue
+++ b/src/views/modules/yieldReport/otherReport/fqc_produce_report_normal.vue
@@ -2828,7 +2828,7 @@ export default {
             }, 0);
             sums[index] ;
           }
-          sums[index]+= sums[index]?sums[index]:0
+          sums[index] = "合计:"+(sums[index]?sums[index]:0)
         }
 
       });
diff --git a/src/views/modules/yieldReport/otherReport/rework_inspect_report.vue b/src/views/modules/yieldReport/otherReport/rework_inspect_report.vue
index 44b4eb4..2a8740c 100644
--- a/src/views/modules/yieldReport/otherReport/rework_inspect_report.vue
+++ b/src/views/modules/yieldReport/otherReport/rework_inspect_report.vue
@@ -2829,9 +2829,8 @@ export default {
             }, 0);
             sums[index] ;
           }
-          sums[index]+= sums[index]?sums[index]:0
+          sums[index] = "合计:"+(sums[index]?sums[index]:0)
         }
-
       });
       return sums;
     },
diff --git a/src/views/modules/yieldReport/produce_order.vue b/src/views/modules/yieldReport/produce_order.vue
index 83f1736..ef5db10 100644
--- a/src/views/modules/yieldReport/produce_order.vue
+++ b/src/views/modules/yieldReport/produce_order.vue
@@ -1097,8 +1097,10 @@ export default {
           this.menuButton.canceledAllPrdButton = false
           this.menuButton.createRecheckButton = false
           // 判断是否具有该页面权限
-
-          this.menuButton.prdButton = false
+          let menList = JSON.parse(sessionStorage.getItem('dynamicMenuRoutes') || '[]').filter(item => item.path == 'shopOrder-shopOrder/shopOrder')
+          if (menList.length>0){
+            this.menuButton.prdButton = false
+          }
           // 关闭按钮
           if (currentRow.closedFlag == 'N') {
             let data = {