综合查询接口对接

This commit is contained in:
zzyuan 2024-12-25 18:02:54 +08:00
parent 0525ecd3a6
commit d58d6ff3ca
8 changed files with 254 additions and 66 deletions

View File

@ -63,7 +63,46 @@ export function getOutRecordListApi(query) {
}
// 在库详情查询
export function getStorageInfoListApi(query) {
return request({
url: '/material/complex_query/getStorageInfoList',
method: 'get',
params: query
})
}
// 在用详情查询
export function getUserRecordListApi(query) {
return request({
url: '/material/complex_query/getUserRecordList',
method: 'get',
params: query
})
}
// 在修详情查询
export function getRepairRecordListApi(query) {
return request({
url: '/material/complex_query/getRepairRecordList',
method: 'get',
params: query
})
}
// 新购待入库详情查询
export function getPurchaseRecordListApi(query) {
return request({
url: '/material/complex_query/getPurchaseRecordList',
method: 'get',
params: query
})
}
// 修饰待入库详情查询
export function getRepairInputListApi(query) {
return request({
url: '/material/complex_query/getRepairInputList',
method: 'get',
params: query
})
}

View File

@ -949,6 +949,9 @@ export default {
};
},
created() {
if(this.$route.query.code){
this.queryParams.keyWord=this.$route.query.code
}
this.getList();
},

View File

@ -375,6 +375,9 @@ export default {
}
},
created() {
if(this.$route.query.code){
this.queryParams.keyWord=this.$route.query.code
}
this.getList()
},
methods: {

View File

@ -512,6 +512,9 @@ export default {
}
},
created() {
if(this.$route.query.code){
this.queryParams.keyWord=this.$route.query.code
}
this.getList();
// this.initSelectData()
// this.InitIGetInfo()

View File

@ -186,6 +186,9 @@ export default {
};
},
created() {
if(this.$route.query.code){
this.queryParams.keyWord=this.$route.query.code
}
this.getList();
},
components: {},

View File

@ -91,7 +91,12 @@
<el-table-column label="计量单位" align="center" prop="unit" :show-overflow-tooltip="true"/>
<el-table-column label="入库人员" align="center" prop="inputUser" :show-overflow-tooltip="true"></el-table-column>
<el-table-column label="入库时间" align="center" prop="inputTime" :show-overflow-tooltip="true"></el-table-column>
<el-table-column label="入库单号" align="center" prop="inputCode" :show-overflow-tooltip="true"></el-table-column>
<el-table-column label="入库单号" align="center" prop="inputCode" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span class="clickText" v-if="scope.row.inputType=='新购入库'" @click="jumpInput(scope.row.inputCode)">{{ scope.row.inputCode }}</span>
<span class="clickText" v-if="scope.row.inputType=='修试后入库'" @click="jumpRepairInput(scope.row.inputCode)">{{ scope.row.inputCode }}</span>
</template>
</el-table-column>
<el-table-column label="入库类型" align="center" prop="inputType" :show-overflow-tooltip="true"></el-table-column>
<el-table-column label="入库方式" align="center" prop="inputStyle" :show-overflow-tooltip="true"/>
</el-table>
@ -200,6 +205,14 @@ export default {
`综合查询_入库记录_${new Date().getTime()}.xlsx`,
)
},
//
jumpInput(code){
this.$router.push({ path: "/purchase/goodsEntry", query: {'code':code} });
},
//
jumpRepairInput(code){
this.$router.push({ path: "/repair/testedInBound", query: {'code':code} });
},
},
}

View File

@ -117,7 +117,13 @@
<el-table-column label="出库数量" align="center" prop="outNum" :show-overflow-tooltip="true"></el-table-column>
<el-table-column label="出库人员" align="center" prop="outUser" :show-overflow-tooltip="true"></el-table-column>
<el-table-column label="出库时间" align="center" prop="outTime" :show-overflow-tooltip="true"></el-table-column>
<el-table-column label="领料单号" align="center" prop="leaseCode" :show-overflow-tooltip="true"></el-table-column>
<el-table-column label="领料单号" align="center" prop="leaseCode" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span class="clickText" @click="jumpLease(scope.row.leaseCode)">
{{ scope.row.leaseCode }}
</span>
</template>
</el-table-column>
<el-table-column label="出库方式" align="center" prop="outStyle" :show-overflow-tooltip="true"/>
</el-table>
<pagination
@ -222,7 +228,10 @@ export default {
}
this.GetUnitData()
},
//
jumpLease(code){
this.$router.push({ path: "/lease/outBound", query: {'code':code} });
},
//
async getList() {
this.loading = true

View File

@ -70,58 +70,58 @@
<el-table-column label="在库数量" align="center" prop="storeNum" :show-overflow-tooltip="true">
<template slot-scope="scope">
<!-- manageType '编码' 使用可点击的 span -->
<span v-if="scope.row.manageType === '编码'" class="clickText" @click="openRecords(scope.row)">
</span>
<!-- 否则直接显示数字 -->
<span v-else>
<span class="clickText" @click="openRecords(scope.row)">
{{ scope.row.storeNum }}
</span>
<!-- 否则直接显示数字 -->
<!-- <span v-else>
{{ scope.row.storeNum }}
</span> -->
</template>
</el-table-column>
<el-table-column label="在用数量" align="center" prop="usNum" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.manageType === '编码'" class="clickText" @click="openUserRecords(scope.row)">
<span class="clickText" @click="openUserRecords(scope.row)">
{{ scope.row.usNum }}
</span>
<!-- 否则直接显示数字 -->
<span v-else>
<!-- <span v-else>
{{ scope.row.usNum }}
</span>
</span> -->
</template>
</el-table-column>
<el-table-column label="在修数量" align="center" prop="repairNum" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.manageType === '编码'" class="clickText" @click="openRepairRecords(scope.row)">
<span class="clickText" @click="openRepairRecords(scope.row)">
{{ scope.row.repairNum }}
</span>
<!-- 否则直接显示数字 -->
<span v-else>
<!-- <span v-else>
{{ scope.row.repairNum }}
</span>
</span> -->
</template>
</el-table-column>
<el-table-column label="新购待入库" align="center" prop="inputNum" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.manageType === '编码'" class="clickText" @click="openPurchaseRecords(scope.row)">
<span class="clickText" @click="openPurchaseRecords(scope.row)">
{{ scope.row.inputNum }}
</span>
<!-- 否则直接显示数字 -->
<span v-else>
<!-- <span v-else>
{{ scope.row.inputNum }}
</span>
</span> -->
<!-- <span class="clickText" @click="openPurchaseRecords(scope.row)">{{ scope.row.inputNum }}</span> -->
</template>
</el-table-column>
<el-table-column label="修试后待入库" align="center" prop="repairInputNum" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.manageType === '编码'" class="clickText" @click="openTestedRecords(scope.row)">
<span class="clickText" @click="openTestedRecords(scope.row)">
{{ scope.row.repairInputNum }}
</span>
<!-- 否则直接显示数字 -->
<span v-else>
<!-- <span v-else>
{{ scope.row.repairInputNum }}
</span>
</span> -->
<!-- <span class="clickText" @click="openTestedRecords(scope.row)">{{ scope.row.repairInputNum }}</span> -->
</template>
</el-table-column>
@ -163,19 +163,27 @@
@click="handleDialogQuery"
>查询</el-button>
</el-form-item>
<el-form-item>
<el-button
icon="el-icon-download"
size="mini"
@click="handleDialogStoreExport"
>导出</el-button>
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="dialogList">
<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="modelName" :show-overflow-tooltip="true"/>
<el-table-column label="原值(元)" align="center" prop="modelName" :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="maCode" :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>
<pagination
v-show="dialogTotal > 0"
@ -204,6 +212,13 @@
@click="handleDialogUseQuery"
>查询</el-button>
</el-form-item>
<el-form-item>
<el-button
icon="el-icon-download"
size="mini"
@click="handleDialogUserExport"
>导出</el-button>
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="useRecordList">
@ -211,13 +226,20 @@
:index="indexContinuation(dialogUseQuery.pageNum, dialogUseQuery.pageSize)">
</el-table-column>
<el-table-column label="机具名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
<el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true"/>
<el-table-column label="原值(元)" align="center" prop="modelName" :show-overflow-tooltip="true"/>
<el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true"/>
<el-table-column label="在用数量" align="center" prop="usNum" :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="" :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="maKeeper" :show-overflow-tooltip="true"/>
<el-table-column label="操作人" align="center" prop="creator" :show-overflow-tooltip="true"/>
<el-table-column label="出库时间" align="center" prop="outTime" :show-overflow-tooltip="true"/>
<el-table-column label="领料单号" align="center" prop="code" width="180" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span class="clickText" @click="jumpLease(scope.row.code)">
{{ scope.row.code }}
</span>
</template>
</el-table-column>
</el-table>
<pagination
@ -247,6 +269,13 @@
@click="handleDialogRepairQuery"
>查询</el-button>
</el-form-item>
<el-form-item>
<el-button
icon="el-icon-download"
size="mini"
@click="handleDialogRepairExport"
>导出</el-button>
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="repairRecordList">
@ -254,13 +283,20 @@
:index="indexContinuation(dialogRepairQuery.pageNum, dialogRepairQuery.pageSize)">
</el-table-column>
<el-table-column label="机具名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
<el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true"/>
<el-table-column label="原值(元)" align="center" prop="modelName" :show-overflow-tooltip="true"/>
<el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true"/>
<el-table-column label="在修数量" align="center" prop="repairNum" :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="" :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="repairer" :show-overflow-tooltip="true"/>
<el-table-column label="操作人" align="center" prop="creator" :show-overflow-tooltip="true"/>
<el-table-column label="退料时间" align="center" prop="leaseTime" :show-overflow-tooltip="true"/>
<el-table-column label="维修单号" align="center" prop="repairCode" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span class="clickText" @click="jumpRepair(scope.row.repairCode)">
{{ scope.row.repairCode }}
</span>
</template>
</el-table-column>
</el-table>
<pagination
@ -271,7 +307,6 @@
@pagination="getRepairRecords"
/>
</el-dialog>
<!-- 新购待入库设备弹窗-->
<el-dialog :title="title" :visible.sync="openPurchaseRecord" width="1200px" append-to-body>
<el-form :model="dialogPurchaseQuery" ref="dialogPurchaseQuery" size="small" :inline="true" label-width="80px">
@ -291,6 +326,13 @@
@click="handleDialogPurchaseQuery"
>查询</el-button>
</el-form-item>
<el-form-item>
<el-button
icon="el-icon-download"
size="mini"
@click="handleDialogPurchaseExport"
>导出</el-button>
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="purchaseRecordList">
@ -298,13 +340,20 @@
:index="indexContinuation(dialogPurchaseQuery.pageNum, dialogPurchaseQuery.pageSize)">
</el-table-column>
<el-table-column label="机具名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
<el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true"/>
<el-table-column label="原值(元)" align="center" prop="modelName" :show-overflow-tooltip="true"/>
<el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true"/>
<el-table-column label="新购待入库" align="center" prop="inputNum" :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="" :show-overflow-tooltip="true"/>
<el-table-column label="库管员" align="center" prop="maKeeper" :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="checkTime" :show-overflow-tooltip="true"/>
<el-table-column label="新购待入库单号" align="center" prop="code" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span class="clickText" @click="jumpInput(scope.row.code)">
{{ scope.row.code }}
</span>
</template>
</el-table-column>
</el-table>
<pagination
@ -315,7 +364,7 @@
@pagination="getPurchaseRecords"
/>
</el-dialog>
<!-- 新购待入库设备弹窗-->
<!-- 修试后待入库设备弹窗-->
<el-dialog :title="title" :visible.sync="openTestedRecord" width="1200px" append-to-body>
<el-form :model="dialogTestedQuery" ref="dialogTestedQuery" size="small" :inline="true" label-width="80px">
<el-form-item label="关键字" prop="keyWord">
@ -334,6 +383,13 @@
@click="handleDialogTestedQuery"
>查询</el-button>
</el-form-item>
<el-form-item>
<el-button
icon="el-icon-download"
size="mini"
@click="handleDialogTestedExport"
>导出</el-button>
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="testedRecordList">
@ -341,13 +397,20 @@
:index="indexContinuation(dialogTestedQuery.pageNum, dialogTestedQuery.pageSize)">
</el-table-column>
<el-table-column label="机具名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
<el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true"/>
<el-table-column label="原值(元)" align="center" prop="modelName" :show-overflow-tooltip="true"/>
<el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true"/>
<el-table-column label="修试待入库" align="center" prop="repairInputNum" :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="" :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="maKeeper" :show-overflow-tooltip="true"/>
<el-table-column label="维修员" align="center" prop="repairer" :show-overflow-tooltip="true"/>
<el-table-column label="修试提交时间" align="center" prop="repairInputTime" :show-overflow-tooltip="true"/>
<el-table-column label="修试待入库单号" align="center" prop="inputCode" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span class="clickText" @click="jumpRepairInput(scope.row.inputCode)">
{{ scope.row.inputCode }}
</span>
</template>
</el-table-column>
</el-table>
<pagination
@ -372,7 +435,8 @@
// } from '@/api/stquery/deviceStatusRecord'
// import {getRecords} from "@/api/claimAndRefund/secondStore";
import {
getRetainedEquipmentListApi, getRetainedEquipmentListNoPageApi
getRetainedEquipmentListApi, getRetainedEquipmentListNoPageApi,getStorageInfoListApi,getUserRecordListApi,getRepairRecordListApi,
getPurchaseRecordListApi,getRepairInputListApi
} from '@/api/stquery/stquery';
export default {
name: '',
@ -548,16 +612,33 @@ export default {
`综合查询_保有设备总量_${new Date().getTime()}.xlsx`,
)
},
//
jumpLease(code){
this.$router.push({ path: "/lease/outBound", query: {'code':code} });
},
//
jumpRepair(code){
this.$router.push({ path: "/repair/repairManage", query: {'code':code} });
},
//
jumpInput(code){
this.$router.push({ path: "/purchase/goodsEntry", query: {'code':code} });
},
//
jumpRepairInput(code){
this.$router.push({ path: "/repair/testedInBound", query: {'code':code} });
},
// ------------------
//
openRecords(row) {
this.openRecord = true
this.dialogQuery.keyWord = ""
this.dialogQuery.typeId = row.typeId;
this.getStoreCodeList()
},
/** 查询在库编码列表 */
getStoreCodeList() {
getUseMaCode(this.dialogQuery).then((response) => {
getStorageInfoListApi(this.dialogQuery).then((response) => {
this.dialogList = response.data.rows
this.dialogTotal = response.data.total
})
@ -567,17 +648,24 @@ export default {
this.queryParams.pageNum = 1
this.getStoreCodeList()
},
handleDialogStoreExport() {
this.download(
'material/complex_query/exportStorageInfoList',
{ ...this.dialogTestedQuery},
`综合查询_在库设备_${new Date().getTime()}.xlsx`,
)
},
// ------------------
//
openUserRecords(row) {
this.openUseRecord = true
// this.dialogUseQuery.typeId= row.typeId
this.dialogUseQuery.typeId= row.typeId
this.dialogUseQuery.keyWord = "";
this.getUserRecords()
},
/** 查询在用设备列表 */
getUserRecords() {
getUserRecords(this.dialogUseQuery).then((response) => {
getUserRecordListApi(this.dialogUseQuery).then((response) => {
this.useRecordList = response.data.rows
this.dialogUserTotal = response.data.total
})
@ -587,18 +675,25 @@ export default {
this.dialogUseQuery.pageNum = 1
this.getUserRecords()
},
handleDialogUserExport() {
this.download(
'material/complex_query/exportUserRecordList',
{ ...this.dialogTestedQuery},
`综合查询_在用设备_${new Date().getTime()}.xlsx`,
)
},
// ------------------
//
openRepairRecords(row) {
this.openRepairRecord = true
// this.dialogUseQuery.typeId= row.typeId
this.dialogRepairQuery.typeId= row.typeId
this.dialogRepairQuery.pageNum = 1;
this.dialogRepairQuery.keyWord = "";
this.getRepairRecords()
},
/** 查询在修设备列表 */
getRepairRecords() {
getRepairRecordApi(this.dialogRepairQuery).then((response) => {
getRepairRecordListApi(this.dialogRepairQuery).then((response) => {
this.repairRecordList = response.data.rows
this.dialogRepairTotal = response.data.total
})
@ -608,18 +703,25 @@ export default {
this.dialogRepairQuery.pageNum = 1
this.getRepairRecords()
},
handleDialogRepairExport() {
this.download(
'material/complex_query/exportRepairRecordList',
{ ...this.dialogTestedQuery},
`综合查询_在修设备_${new Date().getTime()}.xlsx`,
)
},
// ------------------
//
openPurchaseRecords(row) {
this.openPurchaseRecord = true
// this.dialogUseQuery.typeId= row.typeId
this.dialogPurchaseQuery.typeId= row.typeId
this.dialogPurchaseQuery.pageNum = 1;
this.dialogPurchaseQuery.keyWord = "";
this.getPurchaseRecords()
},
/** 查询新购入库设备列表 */
getPurchaseRecords() {
getPurchaseRecordApi(this.dialogPurchaseQuery).then((response) => {
getPurchaseRecordListApi(this.dialogPurchaseQuery).then((response) => {
this.purchaseRecordList = response.data.rows
this.dialogPurchaseTotal = response.data.total
})
@ -629,18 +731,25 @@ export default {
this.dialogPurchaseQuery.pageNum = 1
this.getPurchaseRecords()
},
handleDialogPurchaseExport() {
this.download(
'material/complex_query/exportPurchaseRecordList',
{ ...this.dialogTestedQuery},
`综合查询_新购入库设备_${new Date().getTime()}.xlsx`,
)
},
// ------------------
//
openTestedRecords(row) {
this.openTestedRecord = true
// this.dialogUseQuery.typeId= row.typeId
this.dialogTestedQuery.typeId= row.typeId
this.dialogTestedQuery.pageNum = 1;
this.dialogTestedQuery.keyWord = "";
this.getTestedRecords()
},
/** 查询修试入库设备列表 */
getTestedRecords() {
getTestedRecordApi(this.dialogTestedQuery).then((response) => {
getRepairInputListApi(this.dialogTestedQuery).then((response) => {
this.testedRecordList = response.data.rows
this.dialogTestedTotal = response.data.total
})
@ -650,7 +759,13 @@ export default {
this.dialogTestedQuery.pageNum = 1
this.getTestedRecords()
},
handleDialogTestedExport() {
this.download(
'material/complex_query/exportRepairInputList',
{ ...this.dialogTestedQuery},
`综合查询_修试后入库设备_${new Date().getTime()}.xlsx`,
)
},
},
}
</script>