From 10a26b9b670efef0a2adba675c794c539846aa3c Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 06 九月 2024 10:18:10 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

---
 north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue |   66 ++++++++++++++++++++++++++++----
 1 files changed, 57 insertions(+), 9 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 d9e4da6..0a3edbe 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
@@ -239,7 +239,14 @@
           },
           {
             code: 'SecondaryBreakage',
-            name: "娆＄牬鐩稿悓",
+            name: "搴忓彿娆＄牬鐩稿悓",
+            prefixIcon: 'vxe-icon-indicator',
+            visible: true,
+            disabled: false
+          },
+          {
+            code: 'checkedBreakage',
+            name: "閫変腑娆＄牬鐩稿悓",
             prefixIcon: 'vxe-icon-indicator',
             visible: true,
             disabled: false
@@ -510,7 +517,7 @@
         }
         case 'SecondaryBreakage' : {
           let result = toolbarButtonClickEvent()
-          if (result.cell === "breakageQuantity"){
+          if (result.cell === "breakageQuantity" || result.cell === "completedQuantity"){
             if (result) {
               const dataList = xGrid.value.getTableData().visibleData
               const seenOrders = {}
@@ -532,6 +539,27 @@
                   }
                 }
 
+              })
+            }
+          }
+          break
+        }
+        case 'checkedBreakage' : {
+          let result = toolbarButtonClickEvent()
+          if (result.cell === "breakageQuantity" || result.cell === "completedQuantity"){
+            if (result) {
+              const dataList = xGrid.value.getTableData().visibleData
+              const val = dataList[result.start].damageDetails
+              const quantity = dataList[result.start].breakageQuantity
+              dataList.forEach((item, index) => {
+                if (index >= result.start && index <= result.end) {
+                  item.damageDetails = val
+                  item.breakageQuantity =  quantity
+                  if (index!=result.start){
+                    item.completedQuantity = item.completedQuantity - quantity
+                  }
+
+                }
               })
             }
           }
@@ -743,8 +771,12 @@
     return row.order_number === brokenRow.value.order_number
   })
   const maxQuantity =  Math.max(...equalByOrderNum.map(item =>item.breakageQuantity || 0))
+  let process = titleUploadData.value.thisProcess
   equalByOrderNum.forEach((row) =>{
-    row.completedQuantity= brokenRow.value.quantity*1-maxQuantity
+    if (process=='澶硅兌' || process=='涓┖' || process=='鍖呰' ||process=='鎵撹兌鍜岀矘妗�'){
+      row.completedQuantity= brokenRow.value.quantity*1-maxQuantity
+    }
+
   })
 
 
@@ -762,7 +794,11 @@
     if(user.user.address!==null && user.user.address!==''){
       titleUploadData.value.thisProcess = user.user.address
       titleUploadData.value.teamsGroupsName = user.user.userName
+      console.log(user.user.address)
       groupChangeProcess.value = true
+      if (user.user.address==='鎶�鏈儴澶氭洸' || user.user.address==='澶硅兌'){
+        groupChangeProcess.value = false
+      }
       gridOptions.toolbarConfig.buttons[1].visible=false
     }
 
@@ -829,9 +865,9 @@
   const notFinishList = xGrid.value.getTableData().fullData.filter(item =>{
     return item.saveFlag === 0
   })
-
+  let process = titleUploadData.value.thisProcess
   for(let item of uniqueByOrderNum){
-    if(!checkSameNumForId(notFinishList,item.order_number )){
+    if(!checkSameNumForId(notFinishList,item.order_number ) && (process=='澶硅兌' || process=='涓┖' || process=='鍖呰' ||process=='鎵撹兌鍜岀矘妗�')){
       ElMessage.error(`${t('reportingWorks.pleaseCheckTheOrderNumber1')}':'
       ${item.order_number}
        ${t('reportingWorks.pleaseCheckTheOrderNumber1')}`)
@@ -850,13 +886,14 @@
     ElMessage.warning(t('reportingWorks.atLeastOneFinishedAndWornEligible'))
     return false
   }
-
+  let status=company.qualityInsStatus
   const requestData = {
     title:titleUploadData.value,
     detail:xGrid.value.getTableData().fullData,
     type:state,//瀹℃牳鐘舵��
     userId:user.user.userId,
     userName:user.user.userName,
+    qualityInsStatus:status
   }
   gridOptions.toolbarConfig.buttons[0].disabled=true
   gridOptions.toolbarConfig.buttons[1].disabled=true
@@ -885,7 +922,7 @@
       ElMessage.error(msg)
     }
   }).catch(err =>{
-    ElMessage.error(err.message)
+    ElMessage.error('鎻愪氦澶辫触锛岃鍒锋柊鍚庨噸璇�')
   }).finally(()=>{
 
     gridOptions.toolbarConfig.buttons[0].disabled=false
@@ -963,10 +1000,20 @@
     ElMessage.warning(t('reportingWorks.firstProcessNotReview'))
     return
   }
+  //鍖归厤鈥�/鈥濆墠鍚庡瓧绗︿覆
+  const regex =  /([^\/]+)\/([^\/]+)/;
+  //鏌ユ壘鍖归厤鐨勫瓧绗︿覆
+  const result = processId.match(regex);
+  //娴佺▼鍗″彿
+  let processIdStr = result[1];
+  //灞傚彿
+  let technologyStr = result[2];
   const reportWork = {
     process: titleUploadData.value.previousProcess,
     processId:processId,
-    thisProcess:titleUploadData.value.thisProcess
+    thisProcess:titleUploadData.value.thisProcess,
+    technologyStr:technologyStr,
+    userName:user.user.userName
   }
   loadingFlag.value= true
   request.post("/reportingWork/reviewReportingWork",reportWork).then((res) =>{
@@ -1146,9 +1193,10 @@
 }
 
 const editClosedEvent = ({ row, column }) => {
+  let process = titleUploadData.value.thisProcess
   if (column.property==='completedQuantity') {
     xGrid.value.getTableData().fullData.forEach((item, index) =>{
-      if(item.order_number===row.order_number){
+      if(item.order_number===row.order_number && (process=='澶硅兌' || process=='涓┖' || process=='鍖呰' ||process=='鎵撹兌鍜岀矘妗�')){
         item.completedQuantity=row.completedQuantity
       }
     })

--
Gitblit v1.8.0