From ab4e64d9a09368cd8ff33cc206916d49ad29ab13 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Thu, 23 Jan 2025 16:42:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E4=BF=AE=E9=A5=B0=E5=90=8E?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/report/report.js                      | 27 +++++++-
 src/views/material/report/backReport.vue      |  2 +-
 .../material/report/goodsEntryReport.vue      |  2 +-
 src/views/material/report/leaseOutReport.vue  |  2 +-
 src/views/material/report/repairReport.vue    |  4 +-
 src/views/material/report/scrapReport.vue     |  2 +-
 .../material/report/testedInBoundReport.vue   | 68 ++++++++++---------
 7 files changed, 68 insertions(+), 39 deletions(-)

diff --git a/src/api/report/report.js b/src/api/report/report.js
index d81f039e..59d51436 100644
--- a/src/api/report/report.js
+++ b/src/api/report/report.js
@@ -77,7 +77,6 @@ export function getBackDetailsInputListApi(query) {
 }
 
 
-
 // 维修报表查询
 export function getRepairListApi(query) {
   return request({
@@ -101,4 +100,30 @@ export function getRepairDetailsListApi(query) {
       method: 'get',
       params: query
     })
+}
+
+
+// 修饰入库报表查询
+export function getRepairInputListApi(query) {
+  return request({
+    url: '/material/bm_report/getRepairInputList',
+    method: 'get',
+    params: query
+  })
+}
+// 修饰入库报表查询-无分页
+export function getRepairInputListNoPageApi(query) {
+  return request({
+    url: '/material/bm_report/getRepairInputListNoPage',
+    method: 'get',
+    params: query
+  })
+}
+// 修饰入库报表-弹窗查询
+export function getRepairInputDetailsListApi(query) {
+    return request({
+      url: '/material/bm_report/getRepairInputDetailsList',
+      method: 'get',
+      params: query
+    })
 }
\ No newline at end of file
diff --git a/src/views/material/report/backReport.vue b/src/views/material/report/backReport.vue
index a260bf9e..355ea212 100644
--- a/src/views/material/report/backReport.vue
+++ b/src/views/material/report/backReport.vue
@@ -98,7 +98,7 @@
                 </el-form-item>
             </el-form>
 
-            <el-table v-loading="loading" :data="dialogList">
+            <el-table v-loading="loading" :data="dialogList" height="500px">
                 <el-table-column label="序号" align="center" width="80" type="index" :index="indexContinuation(dialogQuery.pageNum, dialogQuery.pageSize)">
                 </el-table-column>
                 <el-table-column label="机具名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
diff --git a/src/views/material/report/goodsEntryReport.vue b/src/views/material/report/goodsEntryReport.vue
index 2dd8a24b..ead17042 100644
--- a/src/views/material/report/goodsEntryReport.vue
+++ b/src/views/material/report/goodsEntryReport.vue
@@ -103,7 +103,7 @@
                 </el-form-item>
             </el-form>
 
-            <el-table v-loading="loading" :data="dialogList">
+            <el-table v-loading="loading" :data="dialogList" height="500px">
                 <el-table-column label="序号" align="center" width="80" type="index" :index="indexContinuation(dialogQuery.pageNum, dialogQuery.pageSize)">
                 </el-table-column>
                 <el-table-column label="机具名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
diff --git a/src/views/material/report/leaseOutReport.vue b/src/views/material/report/leaseOutReport.vue
index 7c4adcc6..6ebb1ec5 100644
--- a/src/views/material/report/leaseOutReport.vue
+++ b/src/views/material/report/leaseOutReport.vue
@@ -102,7 +102,7 @@
                 </el-form-item>
             </el-form>
 
-            <el-table v-loading="loading" :data="dialogList">
+            <el-table v-loading="loading" :data="dialogList" height="500px">
                 <el-table-column label="序号" align="center" width="80" type="index" :index="indexContinuation(dialogQuery.pageNum, dialogQuery.pageSize)">
                 </el-table-column>
                 <el-table-column label="机具名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
diff --git a/src/views/material/report/repairReport.vue b/src/views/material/report/repairReport.vue
index ede84d38..68ea6e1e 100644
--- a/src/views/material/report/repairReport.vue
+++ b/src/views/material/report/repairReport.vue
@@ -102,7 +102,7 @@
                 </el-form-item>
             </el-form>
 
-            <el-table v-loading="loading" :data="dialogList">
+            <el-table v-loading="loading" :data="dialogList" height="500px">
                 <el-table-column label="序号" align="center" width="80" type="index" :index="indexContinuation(dialogQuery.pageNum, dialogQuery.pageSize)">
                 </el-table-column>
                 <el-table-column label="机具名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
@@ -267,7 +267,7 @@
             this.download(
                 'material/bm_report/exportRepairDetailsList',
                 { ...this.dialogQuery},
-                `维修报表_退料设备_${new Date().getTime()}.xlsx`,
+                `维修报表_维修设备_${new Date().getTime()}.xlsx`,
             )
         },
 
diff --git a/src/views/material/report/scrapReport.vue b/src/views/material/report/scrapReport.vue
index e09b9ea2..f1f5b877 100644
--- a/src/views/material/report/scrapReport.vue
+++ b/src/views/material/report/scrapReport.vue
@@ -87,7 +87,7 @@
                 </el-form-item>
             </el-form>
 
-            <el-table v-loading="loading" :data="dialogList">
+            <el-table v-loading="loading" :data="dialogList" height="500px">
                 <el-table-column label="序号" align="center" width="80" type="index" :index="indexContinuation(dialogQuery.pageNum, dialogQuery.pageSize)">
                 </el-table-column>
                 <el-table-column label="机具名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
diff --git a/src/views/material/report/testedInBoundReport.vue b/src/views/material/report/testedInBoundReport.vue
index 22449080..b2b24cbd 100644
--- a/src/views/material/report/testedInBoundReport.vue
+++ b/src/views/material/report/testedInBoundReport.vue
@@ -34,16 +34,27 @@
                     <span v-else>{{ (queryParams.pageNum - 1) * 10 + scope.$index }}</span>
                 </template> 
             </el-table-column> 
-            <el-table-column label="物资名称" align="center" prop="" :show-overflow-tooltip="true"/>
-            <el-table-column label="规格型号" align="center" prop="" :show-overflow-tooltip="true"/>
-            <el-table-column label="计量单位" align="center" prop="" :show-overflow-tooltip="true"/>
-            <el-table-column label="维修合格数量" align="center" prop="" :show-overflow-tooltip="true"/>
-            <el-table-column label="入库数量" align="center" prop="" :show-overflow-tooltip="true"/>
-            <el-table-column label="维修提交时间" align="center" prop="" :show-overflow-tooltip="true"/>
-            <el-table-column label="入库时间" align="center" prop="" :show-overflow-tooltip="true"/>
-            <el-table-column label="入库人员" align="center" prop="" :show-overflow-tooltip="true"/>
-            <el-table-column label="待入库数量" align="center" prop="" :show-overflow-tooltip="true"/>
-            <el-table-column label="入库单号" align="center" prop="" :show-overflow-tooltip="true"/> 
+            <el-table-column label="物资名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
+            <el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true"/>
+            <el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true"/>
+            <el-table-column label="维修合格数量" align="center" prop="repairedNum" :show-overflow-tooltip="true">
+                <template scope="scope">
+                    <!-- 当 manageType 为 '编码' 时，使用可点击的 span -->
+                    <span class="clickText" v-if="scope.row.manageType=='0'" @click="openRecords(scope.row)">
+                        {{ scope.row.repairedNum }}
+                    </span>
+                    <!-- 否则，直接显示数字 -->
+                    <span v-else>
+                        {{ scope.row.repairedNum }}
+                    </span>
+                </template> 
+            </el-table-column>
+            <el-table-column label="入库数量" align="center" prop="inputNum" :show-overflow-tooltip="true"/>
+            <el-table-column label="维修提交时间" align="center" prop="repairTime" :show-overflow-tooltip="true"/>
+            <el-table-column label="入库时间" align="center" prop="inputTime" :show-overflow-tooltip="true"/>
+            <el-table-column label="入库人员" align="center" prop="inputPersonName" :show-overflow-tooltip="true"/>
+            <el-table-column label="待入库数量" align="center" prop="pendingInputNum" :show-overflow-tooltip="true"/>
+            <el-table-column label="入库单号" align="center" prop="code" :show-overflow-tooltip="true"/> 
         </el-table>
 
         <pagination
@@ -87,18 +98,14 @@
                 </el-form-item>
             </el-form>
 
-            <el-table v-loading="loading" :data="dialogList">
+            <el-table v-loading="loading" :data="dialogList" height="500px">
                 <el-table-column label="序号" align="center" width="80" type="index" :index="indexContinuation(dialogQuery.pageNum, dialogQuery.pageSize)">
                 </el-table-column>
                 <el-table-column label="机具名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
-                <el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true"/>
-                <el-table-column label="入库数量" align="center" prop="storeNum" :show-overflow-tooltip="true"/>
-                <el-table-column label="原值（元）" align="center" prop="buyPrice" :show-overflow-tooltip="true"/>
-                <el-table-column label="设备编码" align="center" prop="maCode" :show-overflow-tooltip="true"/>
-                <el-table-column label="库管员" align="center" prop="maKeeper" :show-overflow-tooltip="true"/>
-                <el-table-column label="操作人" align="center" prop="inputUser" :show-overflow-tooltip="true"/>
-                <el-table-column label="入库时间" align="center" prop="inputTime" :show-overflow-tooltip="true"/>
-                <el-table-column label="入库方式" align="center" prop="inputType" :show-overflow-tooltip="true"/>
+                <el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true"/> 
+                <el-table-column label="设备编码" align="center" prop="maCode" :show-overflow-tooltip="true"/> 
+                <el-table-column label="入库人员" align="center" prop="inputPersonName" :show-overflow-tooltip="true"/>
+                <el-table-column label="入库时间" align="center" prop="inputTime" :show-overflow-tooltip="true"/> 
             </el-table>
             <pagination
                 v-show="dialogTotal > 0"
@@ -112,7 +119,7 @@
 </template>
 
 <script>
-    import { getPurChaseReportListApi,getPurChaseReportListNoPageApi,getPurChaseReportDetailsListApi } from "@/api/report/report"; 
+    import { getRepairInputListApi, getRepairInputListNoPageApi, getRepairInputDetailsListApi } from "@/api/report/report"; 
     export default {
     name: "Report", 
     data() {
@@ -184,7 +191,7 @@
                 pageSize: this.queryParams.pageSize,
                 pageNum: this.queryParams.pageNum
             }
-            const res = await getPurChaseReportListApi(params)
+            const res = await getRepairInputListApi(params)
             if(res.data.rows.length>0){
                 this.tableList = res.data.rows; 
             }else{
@@ -196,13 +203,10 @@
                 startTime: this.dateRange && this.dateRange[0],
                 endTime: this.dateRange && this.dateRange[1],
             }
-            const response = await getPurChaseReportListNoPageApi(param)
+            const response = await getRepairInputListNoPageApi(param)
                 let obj = {
-                    purchaseNum: response.data.purchaseNum||0,//采购数量
-                    passNum: response.data.passNum||0,//验收合格数量
-                    inputNum: response.data.inputNum||0,//验收合格数量
-                    purchasePrice: response.data.purchasePrice||0,//采购价格(含税)
-                    purchasePriceNoTax: response.data.purchasePriceNoTax||0,//采购价格(不含税)
+                    repairedNum: response.data.repairedNum||0,//维修合格数量
+                    inputNum: response.data.inputNum||0,//入库数量
                     pendingInputNum: response.data.pendingInputNum||0,//待入库数量
                 }
                 this.tableList.unshift(obj)
@@ -223,9 +227,9 @@
         },
         handleExport() {
             this.download(
-                "/material/bm_report/exportPurChaseReportList",
+                "/material/bm_report/exportRepairInputList",
                 {keyWord: this.queryParams.keyWord,startTime: this.dateRange && this.dateRange[0],endTime: this.dateRange && this.dateRange[1]},
-                `新购入库报表_${new Date().getTime()}.xlsx`
+                `修饰入库报表_${new Date().getTime()}.xlsx`
             );
         },
         //查看弹框数据
@@ -238,7 +242,7 @@
         },
         /** 查询弹框列表 */
         getDialogDataList() {
-            getPurChaseReportDetailsListApi(this.dialogQuery).then((response) => {
+            getRepairInputDetailsListApi(this.dialogQuery).then((response) => {
                 this.dialogList = response.data.rows
                 this.dialogTotal = response.data.total
             })
@@ -256,9 +260,9 @@
         /** 弹框导出操作 */
         handleDialogExport() {
             this.download(
-                'material/bm_report/exportPurChaseReportDetailsList',
+                'material/bm_report/exportRepairInputDetailsList',
                 { ...this.dialogQuery},
-                `报表_新购入库采购设备_${new Date().getTime()}.xlsx`,
+                `修饰入库报表_入库设备_${new Date().getTime()}.xlsx`,
             )
         },