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 |  215 +++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 182 insertions(+), 33 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 468ffe3..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
@@ -4,11 +4,15 @@
 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"
+import companyInfo from "@/stores/sd/companyInfo"
+domZIndex.setCurrent(3000)
+const company = companyInfo()
 //璇█鑾峰彇
 const { t } = useI18n()
 let brokenVisible = ref(false)
@@ -131,6 +135,7 @@
           titleUploadData.value.qualityInspector=user.user.userName
         }
 
+
         gridOptions.toolbarConfig.buttons.push(button)
       }
      // getQuantity()
@@ -202,12 +207,12 @@
     isChecked: true
   },
   editConfig: {
-    trigger: 'click',
+    trigger: 'dblclick',
     mode: 'row',
     showStatus: true
   },
   menuConfig: {
-    /*body: {
+    body: {
     //鍙抽敭鑿滃崟
       options: [
         [
@@ -232,9 +237,23 @@
             visible: true,
             disabled: false
           },
+          {
+            code: 'SecondaryBreakage',
+            name: "搴忓彿娆＄牬鐩稿悓",
+            prefixIcon: 'vxe-icon-indicator',
+            visible: true,
+            disabled: false
+          },
+          {
+            code: 'checkedBreakage',
+            name: "閫変腑娆＄牬鐩稿悓",
+            prefixIcon: 'vxe-icon-indicator',
+            visible: true,
+            disabled: false
+          },
         ]
       ]
-    }*/
+    }
   },
   //琛ㄥご鍙傛暟
   columns: [
@@ -408,13 +427,26 @@
           break
         }
         case 'update':  {
-          getQuantity()
-          const errMap = await $grid.validate(true)
-          if (errMap) {
-            ElMessage.error(t('basicData.msg.checkoutLose'))
-            return
-          }
-          saveReportingWork(0,'update')
+          //鏍规嵁琛ョ墖鐘舵�佸垽鏂槸鍚﹁兘淇敼
+          request.post(`/reportingWork/getPatchCondition/${route.query.reportingWorkId}`).then(async (res) => {
+            if (res.code == 200) {
+              if (res.data > 0) {
+                ElMessage.error("璇ユ姤宸ュ寘鍚凡琛ョ墖鏁版嵁锛屼笉鍙慨鏀�!")
+                return
+              } else {
+                getQuantity()
+                const errMap = await $grid.validate(true)
+                if (errMap) {
+                  ElMessage.error(t('basicData.msg.checkoutLose'))
+                  return
+                }
+                saveReportingWork(0, 'update')
+              }
+            } else {
+              ElMessage.warning(res.msg)
+            }
+          })
+
           break
         }
       }
@@ -483,6 +515,56 @@
           }
           break
         }
+        case 'SecondaryBreakage' : {
+          let result = toolbarButtonClickEvent()
+          if (result.cell === "breakageQuantity" || result.cell === "completedQuantity"){
+            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;
+                  }
+                }
+
+              })
+            }
+          }
+          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
+                  }
+
+                }
+              })
+            }
+          }
+          break
+        }
       }
     }
   },
@@ -519,6 +601,7 @@
     showStatus: true
   },//琛ㄥご鍙傛暟
   columns: [
+    {type: 'checkbox', fixed: "left", title: t('basicData.check'),width: 78},
     {type: 'seq',fixed:"left", title: t('basicData.Number'), width: 80 },
     // {
     //   field: 'order_number',
@@ -568,7 +651,7 @@
     },
     {
       field: 'responsiblePersonnel',
-      title: t('reportingWorks.responsiblePersonnel'),
+      title: '璐ｄ换淇℃伅',
       editRender: {name: 'input', attrs: {placeholder: ''}}
 
     },
@@ -634,9 +717,10 @@
           break
         }
         case 'removeRow':  {
-          let result = toolbarButtonClickEvent()
-          if(result){
-            $grid.remove(result.row)
+          const $grid = brokenGrid.value
+          const checkedList = $grid.getCheckboxRecords()
+          if(checkedList){
+            $grid.remove(checkedList)
           }
           break
         }
@@ -645,7 +729,7 @@
   }
 }
 const openedBrokenTable = () => {
-  addListener(brokenGrid.value,brokenGridOptions)
+  //addListener(brokenGrid.value,brokenGridOptions)
   let damage =ref(brokenRow.value.damageDetails)
   brokenGrid.value.reloadData(damage.value)
 }
@@ -687,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
+    }
+
   })
 
 
@@ -699,10 +787,21 @@
 
 
 //绗竴娆″姞杞芥暟鎹�
-
+let groupChangeProcess = ref(false)//鐢ㄤ簬鏈彮缁勬樉绀洪棶棰�
 request.post(`/reportingWork/selectProcess`).then((res) => {
   if (res.code == 200) {
-    titleSelectJson.value.processType = res.data.process;
+    titleSelectJson.value.processType = res.data.process
+    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
+    }
+
   } else {
     ElMessage.warning(res.msg)
   }
@@ -766,16 +865,15 @@
   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')}`)
       return false
     }
   }
-
 
   titleUploadData.value.creator = user.user.userName
   titleUploadData.value.creatorId = user.user.userId
@@ -784,15 +882,18 @@
     const b = (row.breakageQuantity !== undefined && row.breakageQuantity !== null && row.breakageQuantity !== '' && row.breakageQuantity*1!==0)
     return (a || b)
   })
-  if(requestDetailData.length === 0){
+  if(requestDetailData.length === 0 &&  (route.query.reportingWorkId===undefined)){
     ElMessage.warning(t('reportingWorks.atLeastOneFinishedAndWornEligible'))
     return false
   }
-
+  let status=company.qualityInsStatus
   const requestData = {
     title:titleUploadData.value,
     detail:xGrid.value.getTableData().fullData,
-    type:state//瀹℃牳鐘舵��
+    type:state,//瀹℃牳鐘舵��
+    userId:user.user.userId,
+    userName:user.user.userName,
+    qualityInsStatus:status
   }
   gridOptions.toolbarConfig.buttons[0].disabled=true
   gridOptions.toolbarConfig.buttons[1].disabled=true
@@ -821,7 +922,7 @@
       ElMessage.error(msg)
     }
   }).catch(err =>{
-    ElMessage.error(err.message)
+    ElMessage.error('鎻愪氦澶辫触锛岃鍒锋柊鍚庨噸璇�')
   }).finally(()=>{
 
     gridOptions.toolbarConfig.buttons[0].disabled=false
@@ -858,6 +959,7 @@
 })
 // 鏌ヨ璐ｄ换鐝粍
 const computedResponsibleTeam = computed((responsibleProcess) => {
+  titleSelectJson.value.historyTeams.push({basic_name: user.user.userName, process: titleUploadData.value.thisProcess, basic_type: 'teamsgroups', basic_category: 179, id: 555})
   return function (responsibleProcess){
     return titleSelectJson.value.historyTeams.filter((item) => {
       return item.process === responsibleProcess
@@ -898,9 +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
+    processId:processId,
+    thisProcess:titleUploadData.value.thisProcess,
+    technologyStr:technologyStr,
+    userName:user.user.userName
   }
   loadingFlag.value= true
   request.post("/reportingWork/reviewReportingWork",reportWork).then((res) =>{
@@ -960,9 +1073,10 @@
   //娴佺▼鍗″彿
   let processIdStr = result[1];
   //灞傚彿
-
   let technologyStr = result[2];
-  request.post(`/reportingWork/addSelectLastWork/${processIdStr}/${technologyStr}/${process}`).then((res) => {
+
+  let reportType= company.reportType
+  request.post(`/reportingWork/addSelectLastWork/${processIdStr}/${technologyStr}/${process}/${reportType}`).then((res) => {
     if (res.code == 200) {
       if(res.data.data==null){
         ElMessage.error(t('reportingWorks.noDataThisProcessCard'))
@@ -972,6 +1086,7 @@
       //琛ㄥご璧嬪��
       titleUploadData.value = res.data.data
       titleUploadData.value.processId = processId
+      titleUploadData.value.teamsGroupsName = user.user.userName
       //璁惧涓嬫媺妗�
       titleSelectJson.value.deviceType = res.data.device
       //鐝粍涓嬫媺妗�
@@ -1078,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
       }
     })
@@ -1114,7 +1230,7 @@
 }
 onMounted(() => {
   window.addEventListener('keypress', qrcodeScanner);
-  //addListener(xGrid.value, gridOptions)
+  addListener(xGrid.value, gridOptions)
 })
 
 // 鍦ㄧ粍浠跺嵏杞芥椂绉婚櫎閿洏浜嬩欢鐩戝惉
@@ -1155,6 +1271,9 @@
     if(codeArr.length!==0){
       titleUploadData.value.processId = codeArr.join('')
     }
+    if(user.user.address!==null || user.user.address!==''){
+      getWork()
+    }
 
     codeArr=[]
     lastTime = ''
@@ -1162,6 +1281,18 @@
     lastCode = ''
     nextCode = ''
   }
+
+}
+
+
+const cellClassName = ({ row, column }) => {
+  if (column.field === 'breakageQuantity') {
+      return 'col-red'
+  }
+
+}
+const changeRowClass =  ({ row, rowIndex, $rowIndex }) => {
+    return row?.rowClass
 
 }
 
@@ -1173,7 +1304,11 @@
       <el-input :disabled="inputDisabled" v-if="titleUploadData.reportingWorkId" v-model="titleUploadData.reportingWorkId" :placeholder="$t('reportingWorks.reportingWorkId')" style="width: 200px" />
       <el-input :disabled="inputDisabled" v-model="titleUploadData.processId" :placeholder="$t('processCard.processId')" style="width: 200px" @keyup.enter.native="getWork();getQuantity()"/>
       &nbsp;
-      <el-select :disabled="inputDisabled" v-model="titleUploadData.thisProcess" clearable :placeholder="$t('reportingWorks.selectProcess')" style="width: 120px"
+      <el-select :disabled="inputDisabled || groupChangeProcess"
+                 v-model="titleUploadData.thisProcess"
+                 clearable
+                 :placeholder="$t('reportingWorks.selectProcess')"
+                 style="width: 120px"
                  @change="getWork();getQuantity()">
         <el-option
             v-for="item in titleSelectJson['processType']"
@@ -1271,7 +1406,10 @@
           <el-text>{{$t('reportingWorks.teamsType')}}锛�</el-text>
         </el-col>
         <el-col :span="3">
-          <el-select  v-model="titleUploadData.teamsGroupsName" clearable :placeholder="$t('reportingWorks.selectTeam')">
+          <el-select :disabled="groupChangeProcess"
+                     v-model="titleUploadData.teamsGroupsName"
+                     clearable
+                     :placeholder="$t('reportingWorks.selectTeam')">
             <el-option
                 v-for="item in titleSelectJson['teamsType']"
                 :key="item.id"
@@ -1326,12 +1464,14 @@
       <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"
           @edit-closed="editClosedEvent"
+          :cell-class-name="cellClassName"
 
       >
 
@@ -1524,4 +1664,13 @@
   user-select: none;
 }
 
+::v-deep(.mytable-scrollbar .col-red) {
+  background-color: rgb(66,159,254);
+  color: #fff;
+}
+
+
+::v-deep(.latter) {
+  //display: none;
+}
 </style>
\ No newline at end of file

--
Gitblit v1.8.0