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

报表修饰后入库接口对接

This commit is contained in:
zzyuan 2025-01-23 16:42:23 +08:00
parent d9b83b8412
commit ab4e64d9a0
7 changed files with 68 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,7 +77,6 @@ export function getBackDetailsInputListApi(query) {
} }
// 维修报表查询 // 维修报表查询
export function getRepairListApi(query) { export function getRepairListApi(query) {
return request({ return request({
@ -102,3 +101,29 @@ export function getRepairDetailsListApi(query) {
params: query 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
})
}

2
src/views/material/report/backReport.vue
View File

@ -98,7 +98,7 @@
</el-form-item> </el-form-item>
</el-form> </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 label="序号" align="center" width="80" type="index" :index="indexContinuation(dialogQuery.pageNum, dialogQuery.pageSize)">
</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"/>

2
src/views/material/report/goodsEntryReport.vue
View File

@ -103,7 +103,7 @@
</el-form-item> </el-form-item>
</el-form> </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 label="序号" align="center" width="80" type="index" :index="indexContinuation(dialogQuery.pageNum, dialogQuery.pageSize)">
</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"/>

2
src/views/material/report/leaseOutReport.vue
View File

@ -102,7 +102,7 @@
</el-form-item> </el-form-item>
</el-form> </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 label="序号" align="center" width="80" type="index" :index="indexContinuation(dialogQuery.pageNum, dialogQuery.pageSize)">
</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"/>

4
src/views/material/report/repairReport.vue
View File

@ -102,7 +102,7 @@
</el-form-item> </el-form-item>
</el-form> </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 label="序号" align="center" width="80" type="index" :index="indexContinuation(dialogQuery.pageNum, dialogQuery.pageSize)">
</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"/>
@ -267,7 +267,7 @@
this.download( this.download(
'material/bm_report/exportRepairDetailsList', 'material/bm_report/exportRepairDetailsList',
{ ...this.dialogQuery}, { ...this.dialogQuery},
`维修报表_退料设备_${new Date().getTime()}.xlsx`, `维修报表_维修设备_${new Date().getTime()}.xlsx`,
) )
}, },

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

@ -87,7 +87,7 @@
</el-form-item> </el-form-item>
</el-form> </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 label="序号" align="center" width="80" type="index" :index="indexContinuation(dialogQuery.pageNum, dialogQuery.pageSize)">
</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"/>

62
src/views/material/report/testedInBoundReport.vue
View File

@ -34,16 +34,27 @@
<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="true"/>
<el-table-column label="规格型号" align="center" prop="" :show-overflow-tooltip="true"/> <el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true"/>
<el-table-column label="计量单位" align="center" prop="" :show-overflow-tooltip="true"/> <el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true"/>
<el-table-column label="维修合格数量" align="center" prop="" :show-overflow-tooltip="true"/> <el-table-column label="维修合格数量" align="center" prop="repairedNum" :show-overflow-tooltip="true">
<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.repairedNum }}
<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.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> </el-table>
<pagination <pagination
@ -87,18 +98,14 @@
</el-form-item> </el-form-item>
</el-form> </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 label="序号" align="center" width="80" type="index" :index="indexContinuation(dialogQuery.pageNum, dialogQuery.pageSize)">
</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="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="inputPersonName" :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="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 +119,7 @@
</template> </template>
<script> <script>
import { getPurChaseReportListApi,getPurChaseReportListNoPageApi,getPurChaseReportDetailsListApi } from "@/api/report/report"; import { getRepairInputListApi, getRepairInputListNoPageApi, getRepairInputDetailsListApi } from "@/api/report/report";
export default { export default {
name: "Report", name: "Report",
data() { data() {
@ -184,7 +191,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 getRepairInputListApi(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,13 +203,10 @@
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 getRepairInputListNoPageApi(param)
let obj = { let obj = {
purchaseNum: response.data.purchaseNum||0,//采购数量 repairedNum: response.data.repairedNum||0,//维修合格数量
passNum: response.data.passNum||0,//验收合格数量 inputNum: response.data.inputNum||0,//入库数量
inputNum: response.data.inputNum||0,//验收合格数量
purchasePrice: response.data.purchasePrice||0,//采购价格(含税)
purchasePriceNoTax: response.data.purchasePriceNoTax||0,//采购价格(不含税)
pendingInputNum: response.data.pendingInputNum||0,//待入库数量 pendingInputNum: response.data.pendingInputNum||0,//待入库数量
} }
this.tableList.unshift(obj) this.tableList.unshift(obj)
@ -223,9 +227,9 @@
}, },
handleExport() { handleExport() {
this.download( 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]}, {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() { getDialogDataList() {
getPurChaseReportDetailsListApi(this.dialogQuery).then((response) => { getRepairInputDetailsListApi(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,9 +260,9 @@
/** 弹框导出操作 */ /** 弹框导出操作 */
handleDialogExport() { handleDialogExport() {
this.download( this.download(
'material/bm_report/exportPurChaseReportDetailsList', 'material/bm_report/exportRepairInputDetailsList',
{ ...this.dialogQuery}, { ...this.dialogQuery},
`报表_新购入库采购设备_${new Date().getTime()}.xlsx`, `修饰入库报表_入库设备_${new Date().getTime()}.xlsx`,
) )
}, },