From d43507f7f00478aebd37645e84ee9b1ec6a6ba70 Mon Sep 17 00:00:00 2001
From: jjLv <1981429112@qq.com>
Date: Mon, 25 Nov 2024 10:46:48 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/repair/repair.js                      |  4 +--
 src/api/repair/testedInBound.js               | 31 +++++++++++++++++++
 .../repair/repairManage/component/edit.vue    |  5 ++-
 .../repair/repairManage/component/home.vue    |  6 ++--
 .../repair/repairManage/component/view.vue    |  9 +++---
 .../material/repair/testedInBound/index.vue   | 31 +++++++++----------
 6 files changed, 59 insertions(+), 27 deletions(-)
 create mode 100644 src/api/repair/testedInBound.js

diff --git a/src/api/repair/repair.js b/src/api/repair/repair.js
index 3782efe1..ef98adfc 100644
--- a/src/api/repair/repair.js
+++ b/src/api/repair/repair.js
@@ -84,9 +84,9 @@ export function auditPass(data) {
 }
 
 //获取维修任务单信息
-export function getRepairInfo(taskId) {
+export function getRepairDocumentInfo(taskId) {
   return request({
-    url: '/material/repair/getRepairTicketInfo/?taskId=' + taskId,
+    url: '/material/repair/getRepairDocumentInfo/?taskId=' + taskId,
     method: 'get',
   })
 }
\ No newline at end of file
diff --git a/src/api/repair/testedInBound.js b/src/api/repair/testedInBound.js
new file mode 100644
index 00000000..f989f7cc
--- /dev/null
+++ b/src/api/repair/testedInBound.js
@@ -0,0 +1,31 @@
+import request from '@/utils/request'
+
+// 查询修试后入库的列表
+export function getListTested(query) {
+  return request({
+    url: '/material/repair/getRepairedList',
+    method: 'get',
+    params: query
+  })
+}
+// // 查询修试审核详细列表
+// export function getAuditInfo(query) {
+//   return request({
+//     url: '/material/repair_audit_details/getRepairAuditList',
+//     method: 'get',
+//     params: query
+//   })
+// }
+
+// //修试审核二级-通过，驳回
+// export function auditPass(data) {
+//   return request({
+//     url: '/material/repair_audit_details',
+//     method: 'put',
+//     data: data,
+//   })
+// }
+
+
+
+
diff --git a/src/views/material/repair/repairManage/component/edit.vue b/src/views/material/repair/repairManage/component/edit.vue
index d98389c4..1b7958ec 100644
--- a/src/views/material/repair/repairManage/component/edit.vue
+++ b/src/views/material/repair/repairManage/component/edit.vue
@@ -224,18 +224,21 @@
             <el-button
               size="mini"
               type="warning"
+              v-if="scope.row.status=='0'"
               @click="openInnerDialog(scope.row)"
               >内部维修</el-button
             >
             <el-button
               size="mini"
               type="warning"
+              v-if="scope.row.status=='0'"
               @click="openBackDialog(scope.row)"
               >返场维修</el-button
             >
             <el-button
               size="mini"
               type="danger"
+              v-if="scope.row.status=='0'"
               @click="openScrapDialog(scope.row)"
               >待报废</el-button
             >
@@ -1366,7 +1369,7 @@ export default {
         this.partTableList = [];
         this.typeTemp = row.type;
         this.typeNameTemp = row.typeName;
-        this.disrepairNumTemp = row.repairNum - row.repairedNum;
+        this.disrepairNumTemp = row.typeRepairNum - row.typeRepairedNum;
         this.repairRowData = row;
         this.repairDeviceList = [];
         const params = {};
diff --git a/src/views/material/repair/repairManage/component/home.vue b/src/views/material/repair/repairManage/component/home.vue
index 03ac1667..60d21e82 100644
--- a/src/views/material/repair/repairManage/component/home.vue
+++ b/src/views/material/repair/repairManage/component/home.vue
@@ -428,7 +428,7 @@ import {
     getRepaiDocumentInfo,
     rejectRepair,
     sendList,
-    getRepairInfo,
+    getRepairDocumentInfo,
 } from '@/api/repair/repair.js' 
 
  import { getInfo, h } from '@/api/login'
@@ -592,9 +592,9 @@ export default {
         },
         //查看维修任务单
        async handlePrint(row) {
-            const res = await getRepairInfo(row.taskId);
+            const res = await getRepairDocumentInfo(row.taskId);
             this.repairTicketlLevelOne = res.data.repairTaskInfo;
-            this.repairTicketDevice = res.data.repairDeviceArray;
+            this.repairTicketDevice = res.data.repairDeviceSummaryList;
             //维修设备列表计算
             if(this.repairTicketDevice.length>0){
               let num1 = 0;  //报废数量
diff --git a/src/views/material/repair/repairManage/component/view.vue b/src/views/material/repair/repairManage/component/view.vue
index 2d38060a..5bc0197f 100644
--- a/src/views/material/repair/repairManage/component/view.vue
+++ b/src/views/material/repair/repairManage/component/view.vue
@@ -77,13 +77,13 @@
       <el-table-column
         label="退料数量"
         align="center"
-        prop="repairNum"
+        prop="typeRepairNum"
         show-overflow-tooltip
       ></el-table-column>
       <el-table-column
         label="已修数量"
         align="center"
-        prop="repairedNum"
+        prop="typeRepairedNum"
         show-overflow-tooltip
       ></el-table-column>
       <el-table-column
@@ -91,7 +91,8 @@
         align="center"
         prop="disrepairNum"
         show-overflow-tooltip
-      ></el-table-column>
+      >
+      </el-table-column>
       <el-table-column label="管理模式" align="center" prop="manageType">
         <template slot-scope="scope">
           <!-- 0编码1数量 -->
@@ -173,7 +174,7 @@ export default {
       const res = await getAppRepairMaTypeList(param);
       this.equipmentList = res.data;
       this.equipmentList.forEach((e) => {
-        e.disrepairNum = Number(e.repairNum) - Number(e.repairedNum);
+        e.disrepairNum = Number(e.typeRepairNum) - Number(e.typeRepairedNum);
       });
     },
     },
diff --git a/src/views/material/repair/testedInBound/index.vue b/src/views/material/repair/testedInBound/index.vue
index 665446bd..7aefc830 100644
--- a/src/views/material/repair/testedInBound/index.vue
+++ b/src/views/material/repair/testedInBound/index.vue
@@ -241,12 +241,9 @@
   
   <script>
 import {
-  getListHouse,
-  getHouseDetail,
-  editHouse,
-  addHouse,
-  delHouse,
-} from "@/api/ma/whHouse";
+  getListTested,
+
+} from "@/api/repair/testedInBound";
 import { downloadFile } from "@/utils/download";
 export default {
   name: "testedInBound",
@@ -314,17 +311,17 @@ export default {
     /** 查询修试入库列表 */
     getList() {
       this.loading = true;
-      // getListTested(this.queryParams).then((response) => {
-      //   this.testedList = response.rows;
-      //   this.total = response.total;
-      //   this.loading = false;
-      // });
-      this.testedList = [
-        {'repairNum':'X20241121001','taskStatus':0},
-        {'repairNum':'X20241121002','taskStatus':1}
-      ]
-      this.total = 2;
-      this.loading = false;
+      getListTested(this.queryParams).then((response) => {
+        this.testedList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+      // this.testedList = [
+      //   {'repairNum':'X20241121001','taskStatus':0},
+      //   {'repairNum':'X20241121002','taskStatus':1}
+      // ]
+      // this.total = 2;
+      // this.loading = false;
     },
 
     /** 搜索按钮操作 */