bonus
/
bonus-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

报废报表-页面修改联调

This commit is contained in:
bb_pan 2025-03-20 18:06:19 +08:00
parent f6cd03c3da
commit 69a5603954
2 changed files with 55 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/api/report/report.js
View File

@ -126,4 +126,31 @@ export function getRepairInputDetailsListApi(query) {
method: 'get', method: 'get',
params: query params: query
}) })
}
// 报废报表-列表
export function getScrapListApi(query) {
return request({
url: '/material/bm_report/getScrapList',
method: 'get',
params: query
})
}
// 报废报表-总条数
export function getScrapListNoPageApi(query) {
return request({
url: '/material/bm_report/getScrapListNoPage',
method: 'get',
params: query
})
}
// 报废报表-弹窗查询
export function getScrapDetailsListApi(query) {
return request({
url: '/material/bm_report/getScrapDetailsList',
method: 'get',
params: query
})
} }

57
src/views/material/report/scrapReport.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px" @submit.native.prevent>
<el-form-item prop="dateRange"> <el-form-item prop="dateRange">
<el-date-picker <el-date-picker
v-model="dateRange" v-model="dateRange"
@ -34,16 +34,25 @@
<span v-else>{{ (queryParams.pageNum - 1) * 10 + scope.$index }}</span> <span v-else>{{ (queryParams.pageNum - 1) * 10 + scope.$index }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="物资名称" align="center" prop="" :show-overflow-tooltip="true"/> <el-table-column label="物资名称" align="center" prop="typeName" show-overflow-tooltip />
<el-table-column label="规格型号" align="center" prop="" :show-overflow-tooltip="true"/> <el-table-column label="规格型号" align="center" prop="typeModelName" show-overflow-tooltip />
<el-table-column label="计量单位" align="center" prop="" :show-overflow-tooltip="true"/> <el-table-column label="计量单位" align="center" prop="unitName" show-overflow-tooltip />
<el-table-column label="维修合格数量" align="center" prop="" :show-overflow-tooltip="true"/> <el-table-column label="报废数量" align="center" prop="scrapNum" show-overflow-tooltip >
<el-table-column label="入库数量" align="center" prop="" :show-overflow-tooltip="true"/> <template scope="scope">
<el-table-column label="维修提交时间" align="center" prop="" :show-overflow-tooltip="true"/> <!-- 当 manageType 为 '编码' 时，使用可点击的 span -->
<el-table-column label="入库时间" align="center" prop="" :show-overflow-tooltip="true"/> <span class="clickText" v-if="scope.row.manageType =='0'" @click="openRecords(scope.row)">
<el-table-column label="入库人员" align="center" prop="" :show-overflow-tooltip="true"/> {{ scope.row.scrapNum }}
<el-table-column label="待入库数量" align="center" prop="" :show-overflow-tooltip="true"/> </span>
<el-table-column label="入库单号" align="center" prop="" :show-overflow-tooltip="true"/> <!-- 否则，直接显示数字 -->
<span v-else>
{{ scope.row.scrapNum }}
</span>
</template>
</el-table-column>
<el-table-column label="报废时间" align="center" prop="scrapTime" show-overflow-tooltip />
<el-table-column label="报废人员" align="center" prop="scrapPersonName" show-overflow-tooltip />
<el-table-column label="报废类型" align="center" prop="scrapType" show-overflow-tooltip />
<el-table-column label="报废单号" align="center" prop="scrapCode" show-overflow-tooltip />
</el-table> </el-table>
<pagination <pagination
@ -92,13 +101,8 @@
</el-table-column> </el-table-column>
<el-table-column label="机具名称" align="center" prop="typeName" :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="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="buyPrice" :show-overflow-tooltip="true"/>
<el-table-column label="设备编码" align="center" prop="maCode" :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> </el-table>
<pagination <pagination
v-show="dialogTotal > 0" v-show="dialogTotal > 0"
@ -112,7 +116,7 @@
</template> </template>
<script> <script>
import { getPurChaseReportListApi,getPurChaseReportListNoPageApi,getPurChaseReportDetailsListApi } from "@/api/report/report"; import { getScrapListApi,getScrapListNoPageApi,getScrapDetailsListApi } from "@/api/report/report";
export default { export default {
name: "Report", name: "Report",
data() { data() {
@ -184,7 +188,7 @@
pageSize: this.queryParams.pageSize, pageSize: this.queryParams.pageSize,
pageNum: this.queryParams.pageNum pageNum: this.queryParams.pageNum
} }
const res = await getPurChaseReportListApi(params) const res = await getScrapListApi(params)
if(res.data.rows.length>0){ if(res.data.rows.length>0){
this.tableList = res.data.rows; this.tableList = res.data.rows;
}else{ }else{
@ -196,14 +200,9 @@
startTime: this.dateRange && this.dateRange[0], startTime: this.dateRange && this.dateRange[0],
endTime: this.dateRange && this.dateRange[1], endTime: this.dateRange && this.dateRange[1],
} }
const response = await getPurChaseReportListNoPageApi(param) const response = await getScrapListNoPageApi(param)
let obj = { let obj = {
purchaseNum: response.data.purchaseNum||0,//采购数量 scrapNum: response.data.scrapNum,
passNum: response.data.passNum||0,//验收合格数量
inputNum: response.data.inputNum||0,//验收合格数量
purchasePrice: response.data.purchasePrice||0,//采购价格(含税)
purchasePriceNoTax: response.data.purchasePriceNoTax||0,//采购价格(不含税)
pendingInputNum: response.data.pendingInputNum||0,//待入库数量
} }
this.tableList.unshift(obj) this.tableList.unshift(obj)
this.loading = false this.loading = false
@ -223,7 +222,7 @@
}, },
handleExport() { handleExport() {
this.download( this.download(
"/material/bm_report/exportPurChaseReportList", "/material/bm_report/exportScrapList",
{keyWord: this.queryParams.keyWord,startTime: this.dateRange && this.dateRange[0],endTime: this.dateRange && this.dateRange[1]}, {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 +237,7 @@
}, },
/** 查询弹框列表 */ /** 查询弹框列表 */
getDialogDataList() { getDialogDataList() {
getPurChaseReportDetailsListApi(this.dialogQuery).then((response) => { getScrapDetailsListApi(this.dialogQuery).then((response) => {
this.dialogList = response.data.rows this.dialogList = response.data.rows
this.dialogTotal = response.data.total this.dialogTotal = response.data.total
}) })
@ -256,7 +255,7 @@
/** 弹框导出操作 */ /** 弹框导出操作 */
handleDialogExport() { handleDialogExport() {
this.download( this.download(
'material/bm_report/exportPurChaseReportDetailsList', 'material/bm_report/exportScrapDetailsList',
{ ...this.dialogQuery}, { ...this.dialogQuery},
`报废报表_维修合格设备_${new Date().getTime()}.xlsx`, `报废报表_维修合格设备_${new Date().getTime()}.xlsx`,
) )