From 4b488b49c198d911d5ead7ea25a28081375d674f Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Wed, 12 Feb 2025 10:35:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E5=B7=A5=E8=BF=94=E4=BF=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/production/generateReport.js          |  3 +
 src/views/modules/production/reworkRecord.vue | 59 ++++++++++++++++++-
 2 files changed, 60 insertions(+), 2 deletions(-)

diff --git a/src/api/production/generateReport.js b/src/api/production/generateReport.js
index 75bc1f3..63dc4d6 100644
--- a/src/api/production/generateReport.js
+++ b/src/api/production/generateReport.js
@@ -79,3 +79,6 @@ export const searchOutboundLabelScanList = data=>createAPI('/outbound/label/list
 
 
 export const getTCPPackagePrintDataList = data =>createAPI('/board/getTCPPackagePrintDataList','post',data)
+
+export const removeRework = (data) => createAPI(`/dailyPlan/removeRework`,'post',data)
+export const cancelRework = (data) => createAPI(`/dailyPlan/cancelRework`,'post',data)
diff --git a/src/views/modules/production/reworkRecord.vue b/src/views/modules/production/reworkRecord.vue
index 7a0b4a8..b191fd1 100644
--- a/src/views/modules/production/reworkRecord.vue
+++ b/src/views/modules/production/reworkRecord.vue
@@ -1,6 +1,13 @@
 <script>
 import chooseList from '../common/Chooselist.vue'
-import {selectRework,startRework,saveRework,getRework} from '../../../api/production/generateReport'
+import {
+  selectRework,
+  startRework,
+  saveRework,
+  getRework,
+  removeRework,
+  cancelRework
+} from '../../../api/production/generateReport'
 import dayjs from 'dayjs'
 import decimal, {Decimal} from 'decimal.js'
 export default {
@@ -22,6 +29,7 @@ export default {
         resourceId:undefined,
         shiftNo:"",
         type:"",
+        reworkStatus:"",
       },
       tagNo:undefined,
       type:undefined,
@@ -257,6 +265,42 @@ export default {
           this.$refs.seqNoR.focus()
         })
       }
+    },
+    removeReportWork(row){
+      this.$confirm('是否删除该返工信息？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(()=>{
+        let params = {
+          reworkNo: row.reworkNo,
+        }
+        removeRework(params).then(({data})=>{
+          if (data && data.code === 0){
+            this.$message.success(data.msg)
+            this.selectRework()
+          }else {
+            this.$message.warning(data.msg)
+          }
+        }).catch((error)=>{
+          this.$message.error(error)
+        })
+      })
+    },
+    cancelReportWork(row){
+      let params = {
+        reworkNo: row.reworkNo,
+      }
+      cancelRework(params).then(({data})=>{
+        if (data && data.code === 0){
+          this.$message.success(data.msg)
+          this.selectRework()
+        }else {
+          this.$message.warning(data.msg)
+        }
+      }).catch((error)=>{
+        this.$message.error(error)
+      })
     }
   },
   watch:{
@@ -578,6 +622,15 @@ export default {
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="4">
+          <el-form-item label="返修状态" prop="reworkStatus">
+            <el-select v-model="searchData.reworkStatus">
+              <el-option value="" label="全部"></el-option>
+              <el-option value="已结束" label="已结束"></el-option>
+              <el-option value="返工中" label="返工中"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
         <el-col :span="4">
           <el-form-item label=" ">
             <el-button type="primary" @click="selectRework">查 询</el-button>
@@ -598,10 +651,12 @@ export default {
     <el-table-column
       header-align="center"
       align="center"
-      width="80"
+      width="100"
       label="操作">
       <template slot-scope="scope" class="foo_container">
         <a style="cursor: pointer;" v-if="scope.row.reworkStatus === '返工中'" @click="clickReportWork(scope.row)">报工</a>
+        <a style="cursor: pointer;" v-if="scope.row.reworkStatus === '已结束'" @click="cancelReportWork(scope.row)">取消</a>
+        <a style="cursor: pointer;" @click="removeReportWork(scope.row)">删除</a>
         <a style="cursor: pointer;" @click="clickReportWork(scope.row,0)">详情</a>
       </template>
     </el-table-column>