From 43e115a7de2c763c36d79e610a3abb1d833ea892 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 05 八月 2024 10:21:52 +0800
Subject: [PATCH] 修改发货报表

---
 north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue |   56 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 52 insertions(+), 4 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
index b14dbad..acc7fcd 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
@@ -4,11 +4,13 @@
 import request from "@/utils/request";
 import {ElMessage} from "element-plus";
 import {changeFilterEvent, filterChanged} from "@/hook"
+import domZIndex from 'dom-zindex'
 import {indexOf} from "xe-utils";
 import {addListener, toolbarButtonClickEvent} from "@/hook/mouseMove";
 import userInfo from "@/stores/userInfo"
 import { useI18n } from 'vue-i18n'
 import footSum from "@/hook/footSum"
+domZIndex.setCurrent(3000)
 //璇█鑾峰彇
 const { t } = useI18n()
 let brokenVisible = ref(false)
@@ -233,6 +235,13 @@
             visible: true,
             disabled: false
           },
+          {
+            code: 'SecondaryBreakage',
+            name: "娆＄牬鐩稿悓",
+            prefixIcon: 'vxe-icon-indicator',
+            visible: true,
+            disabled: false
+          },
         ]
       ]
     }
@@ -412,7 +421,6 @@
           //鏍规嵁琛ョ墖鐘舵�佸垽鏂槸鍚﹁兘淇敼
           request.post(`/reportingWork/getPatchCondition/${route.query.reportingWorkId}`).then(async (res) => {
             if (res.code == 200) {
-              console.log(res.data)
               if (res.data > 0) {
                 ElMessage.error("璇ユ姤宸ュ寘鍚凡琛ョ墖鏁版嵁锛屼笉鍙慨鏀�!")
                 return
@@ -494,6 +502,36 @@
                   item[result.cell] = ''
                 }
               })
+            }
+          }
+          break
+        }
+        case 'SecondaryBreakage' : {
+          let result = toolbarButtonClickEvent()
+          if (result.cell === "breakageQuantity"){
+            if (result) {
+              const dataList = xGrid.value.getTableData().visibleData
+              const seenOrders = {}
+              dataList.forEach((item, index) => {
+                const list = item.damageDetails
+                if (list!== null || list.length > 0){
+                  const { order_number, damageDetails, breakageQuantity } = item;
+                  // 濡傛灉 order_number 杩樻病鏈夊鐞嗚繃
+                  if (!seenOrders[order_number]) {
+                    // 璁板綍绗竴涓嚭鐜扮殑 damageDetails 鍜� breakageQuantity
+                    seenOrders[order_number] = {
+                      damageDetails,
+                      breakageQuantity
+                    };
+                  } else {
+                    // 灏嗗悗缁殑 damageDetails 鍜� breakageQuantity 鏇存柊涓虹涓�涓殑
+                    item.damageDetails = seenOrders[order_number].damageDetails;
+                    item.breakageQuantity = seenOrders[order_number].breakageQuantity;
+                  }
+                }
+
+              })
+              console.log(dataList)
             }
           }
           break
@@ -815,7 +853,9 @@
   const requestData = {
     title:titleUploadData.value,
     detail:xGrid.value.getTableData().fullData,
-    type:state//瀹℃牳鐘舵��
+    type:state,//瀹℃牳鐘舵��
+    userId:user.user.userId,
+    userName:user.user.userName,
   }
   gridOptions.toolbarConfig.buttons[0].disabled=true
   gridOptions.toolbarConfig.buttons[1].disabled=true
@@ -829,7 +869,6 @@
 }
 
 const saveReportingWorkRequest = (requestData) =>{
-  //request.post(`/reportingWork/saveReportingWorkLog`, requestData)
   request.post(`/reportingWork/saveReportingWork`,requestData).then(res =>{
     if (res.code == 200){
       ElMessage.success(t('reportingWorks.successfulJobApplication'))
@@ -1202,6 +1241,10 @@
   }
 
 }
+const changeRowClass =  ({ row, rowIndex, $rowIndex }) => {
+    return row?.rowClass
+
+}
 
 </script>
 
@@ -1371,8 +1414,9 @@
       <vxe-grid
           ref="xGrid"
           class="mytable-scrollbar"
+          :row-class-name="changeRowClass"
           max-height="100%"
-          height="400px"
+          height="100%"
           size="small"
           v-bind="gridOptions"
           v-on="gridEvents"
@@ -1575,4 +1619,8 @@
   color: #fff;
 }
 
+
+::v-deep(.latter) {
+  //display: none;
+}
 </style>
\ No newline at end of file

--
Gitblit v1.8.0