From 2f894921e5cf74910805f08a5e3180b68ac09e18 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 23 四月 2024 15:50:32 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/a1536384743/erp_-override

---
 north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue |   44 +++++++++++++++++++++++++++-----------------
 1 files changed, 27 insertions(+), 17 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 2e31b63..5bc23e0 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
@@ -20,7 +20,7 @@
 const titleUploadData = ref({
   reportingWorkId: null,
   //娴佺▼鍗″彿
-  processId: '',
+  processId: null,
   //閿�鍞崟鍙�
   orderId: '',
   reviewedState:0,
@@ -105,6 +105,7 @@
 
         gridOptions.toolbarConfig.buttons.push(button)
       }
+      getQuantity()
       inputDisabled.value = true
     })
   }
@@ -784,17 +785,18 @@
 const getWork = () => {
 
   let processId = titleUploadData.value.processId
-  // if (processId.indexOf("/") < 0) {
-  //
-  //   ElMessage.warning("璇疯緭鍏ユ纭牸寮忔祦绋嬪崱")
-  //   return
-  // }
-  // let indexOfChar = processId.indexOf("/")
-  // let leftString = processId.slice(0, indexOfChar)
-  // if (leftString.length != 13) {
-  //   ElMessage.warning("璇疯緭鍏ユ纭綅鏁扮殑娴佺▼鍗�")
-  //   return
-  // }
+  let parts = processId.split('/');
+
+  if (processId.indexOf("/") < 0 ||parts[1].trim() == '') {
+    ElMessage.warning("璇疯緭鍏ユ纭牸寮忔祦绋嬪崱")
+    return
+  }
+  let indexOfChar = processId.indexOf("/")
+  let leftString = processId.slice(0, indexOfChar)
+  if (leftString.length != 14) {
+    ElMessage.warning("璇疯緭鍏ユ纭綅鏁扮殑娴佺▼鍗�")
+    return
+  }
 //宸ュ簭
   let process = titleUploadData.value.thisProcess
   if (process == "" || process == null) {
@@ -817,10 +819,11 @@
 
   request.post(`/reportingWork/addSelectLastWork/${processIdStr}/${technologyStr}/${process}`).then((res) => {
     if (res.code == 200) {
-      if(res.data.data===null){
+      if(res.data.data==null){
         ElMessage.error("鏈煡璇㈠埌姝ゆ祦绋嬪崱鏁版嵁")
         return
       }
+
       //琛ㄥご璧嬪��
       titleUploadData.value = res.data.data
       titleUploadData.value.processId = processId
@@ -917,6 +920,8 @@
   }
 }
 const  getQuantity = () => {
+  titleUploadData.value.thisCompletedQuantity = 0
+  titleUploadData.value.thisWornQuantity = 0
   const arr = xGrid.value.getTableData().fullData
   const returnArr =  arr.filter((obj, index, self) =>
       self.findIndex((t) => t.order_number === obj.order_number) === index
@@ -935,16 +940,21 @@
   titleUploadData.value.thisWornQuantity = sumBreak
 }
 
+const changeTable=()=>{
+  const $grid = xGrid.value
+  this.$grid.commitProxy('data', yourData)
+}
+
 </script>
 
 <template>
   <div style="height: 100%;width: 100%">
     <div id="head" style="height: 5%;width: 100%;margin-bottom: 5px">
       <el-input :disabled="inputDisabled" v-if="titleUploadData.reportingWorkId" v-model="titleUploadData.reportingWorkId" placeholder="鎶ュ伐缂栧彿" style="width: 200px" />
-      <el-input :disabled="inputDisabled" v-model="titleUploadData.processId" placeholder="娴佺▼鍗″彿" style="width: 200px" @keyup.enter.native="getWork"/>
+      <el-input :disabled="inputDisabled" v-model="titleUploadData.processId" placeholder="娴佺▼鍗″彿" style="width: 200px" @keyup.enter.native="getWork();getQuantity()"/>
       &nbsp;
       <el-select :disabled="inputDisabled" v-model="titleUploadData.thisProcess" clearable placeholder="璇烽�夋嫨宸ュ簭" style="width: 120px"
-                 @change="getWork">
+                 @change="getWork();getQuantity()">
         <el-option
             v-for="item in titleSelectJson['processType']"
             :key="item.id"
@@ -998,7 +1008,7 @@
           <el-text>{{$t('reportingWorks.deviceType')}}锛�</el-text>
         </el-col>
         <el-col :span="3">
-          <el-select v-model="titleUploadData.deviceName" clearable :placeholder="$t('reportingWorks.pleaseDevice')">
+          <el-select @change="getQuantity" v-model="titleUploadData.deviceName" clearable :placeholder="$t('reportingWorks.pleaseDevice')">
             <el-option
                 v-for="item in titleSelectJson['deviceType']"
                 :key="item.id"
@@ -1040,7 +1050,7 @@
           <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  v-model="titleUploadData.teamsGroupsName" clearable :placeholder="$t('reportingWorks.selectTeam')">
             <el-option
                 v-for="item in titleSelectJson['teamsType']"
                 :key="item.id"

--
Gitblit v1.8.0