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

问题修复

This commit is contained in:
hongchao 2025-10-24 17:05:06 +08:00
parent 92350abb43
commit 996a20e6fe
14 changed files with 543 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/api/stquery/deviceFixQuery.js
View File

@ -37,6 +37,14 @@ export function getProData(params = {}){
})
}
// 查询维修损坏记录列表
export function repairFixRecord(query) {
return request({
url: '/material/repairRecord/getRepairFixRecordList',
method: 'get',
params: query
})
}

2
src/views/claimAndreturn/return/receive/component/addReturn1.vue
View File

@ -268,7 +268,7 @@
</el-upload>
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="160px">
<el-table-column label="操作" align="center" width="160px" v-if="!isView">
<template slot-scope="scope" v-if="scope.row.roleId !== 1">
<el-button
size="mini"

14
src/views/cost/csotSettlement/component/finishAndDetails.vue
View File

@ -315,6 +315,13 @@ export default {
isFlag = true
throw new Error()
}
if (e.isMaxEndTime && e.isMaxEndTime == 1) {
this.$message.error(
'结算清单存在标红终止日期数据，请先完成对应确认结算！',
)
isFlag = true
throw new Error()
}
})
}
@ -327,6 +334,13 @@ export default {
isFlag = true
throw new Error()
}
if (e.isMaxEndTime && e.isMaxEndTime == 1) {
this.$message.error(
'结算清单存在标红终止日期数据，请先完成对应确认结算！',
)
isFlag = true
throw new Error()
}
})
}
} catch {}

9
src/views/cost/csotSettlement/component/finishTable.vue
View File

@ -73,6 +73,11 @@
:header-cell-class-name="setClassName"
@selection-change="handleSelectionChange"
>
<el-table-column
type="index"
width="55"
align="center"
/>
<el-table-column
type="selection"
v-if="isRepair && currRowInfo.isSlt == 0"
@ -141,7 +146,9 @@
<el-tag size="mini" type="warning">待报废</el-tag>
</template>
<template v-else>
{{ scope.row[t.t_prop] }}
<span :style="{ color: t.t_prop === 'endTime' && scope.row.isMaxEndTime === 1 ? 'red' : '' }">
{{ scope.row[t.t_prop] }}
</span>
</template>
</template>
</el-table-column>

47
src/views/stquery/backRecord.vue
View File

@ -23,7 +23,7 @@
<el-select
v-model="queryParams.unitId"
clearable
@change="GetProData"
@change="getProList"
style="width: 240px"
placeholder="请选择"
>
@ -39,7 +39,7 @@
<el-select
v-model="queryParams.proId"
clearable
@change="GetUnitData"
@change="getUnitList"
style="width: 240px"
placeholder="请选择"
>
@ -81,6 +81,21 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="资产属性" prop="propId">
<el-select
v-model="queryParams.propId"
filterable
placeholder="请选择资产属性"
style="width: 240px"
>
<el-option
v-for="keeper in propList"
:key="keeper.propId"
:label="keeper.propName"
:value="keeper.propId"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="关键字" prop="keyWord">
<el-input
v-model="queryParams.keyWord"
@ -159,6 +174,13 @@
prop="typeModelName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="资产属性"
align="center"
prop="propName"
:show-overflow-tooltip="true"
width="100px"
/>
<el-table-column
label="退料单号"
align="center"
@ -195,13 +217,13 @@
label="制单日期"
align="center"
prop="createTime"
:show-overflow-tooltip="true"
width="100px"
/>
<el-table-column
label="回库日期"
align="center"
prop="backTime"
:show-overflow-tooltip="true"
width="100px"
/>
<el-table-column
label="退料单位"
@ -235,7 +257,7 @@ import {
getUnitData,
getProData,
} from '@/api/stquery/backRecord'
import { getProLists } from '@/api/base/base'
export default {
name: 'BackRecord',
dicts: ['sys_normal_disable'],
@ -270,19 +292,28 @@ export default {
proId: null, //工程id
typeName: '',
typeModelName: '',
propId: '',
keyWord: '',
types: 1, // 1申请列表 2审核列表
},
unitList: [], //来往单位集合
proList: [], //工程集合
propList: null,
}
},
created() {
this.getList()
this.getUnitList()
this.getProList()
this.getPropData()
},
methods: {
/** 查询资产属性下拉 */
getPropData() {
getProLists().then((response) => {
this.propList = response.rows
})
},
// 获取 申请列表
async getList() {
this.loading = true
@ -294,6 +325,7 @@ export default {
agreementCode: this.queryParams.agreementCode,
typeName: this.queryParams.typeName,
typeModelName: this.queryParams.typeModelName,
propId: this.queryParams.propId,
startTime: this.queryParams.time && this.queryParams.time[0],
endTime: this.queryParams.time && this.queryParams.time[1],
pageSize: this.queryParams.pageSize,
@ -344,8 +376,13 @@ export default {
/** 重置按钮操作 */
resetQuery() {
this.queryParams.time = []
this.queryParams.unitId = ''
this.queryParams.proId = ''
this.resetForm('queryForm')
this.getUnitList()
this.getProList()
this.handleQuery()
this.getPropData()
},
/** 导出按钮操作 */

36
src/views/stquery/deviceFixQuery.vue
View File

@ -8,6 +8,21 @@
v-show="showSearch"
label-width="80px"
>
<el-form-item label="资产属性" prop="propId">
<el-select
v-model="queryParams.propId"
filterable
placeholder="请选择资产属性"
style="width: 240px"
>
<el-option
v-for="keeper in propList"
:key="keeper.propId"
:label="keeper.propName"
:value="keeper.propId"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="关键字" prop="keyWord">
<el-input
v-model="queryParams.keyWord"
@ -76,6 +91,13 @@
/>
<el-table-column label="机具名称" align="center" prop="typeName" show-overflow-tooltip width="150px"/>
<el-table-column label="规格型号" align="center" prop="type" show-overflow-tooltip width="150px"/>
<el-table-column
label="资产属性"
align="center"
prop="propName"
:show-overflow-tooltip="true"
width="100px"
/>
<el-table-column label="机具编号" align="center" prop="maCode" show-overflow-tooltip width="120px"/>
<el-table-column label="维修总数" align="center" prop="repairNum" show-overflow-tooltip />
<el-table-column label="维修合格数量" align="center" prop="repairedNum" show-overflow-tooltip />
@ -114,7 +136,7 @@ import {
getUnitData,
getProData,
} from '@/api/stquery/deviceFixQuery'
import { getProLists } from '@/api/base/base'
export default {
name: 'DeviceFixQuery',
dicts: ['sys_normal_disable'],
@ -143,7 +165,7 @@ export default {
dictName: undefined,
dictType: undefined,
status: undefined,
propId: '',
time: null, //申请时间
@ -151,14 +173,22 @@ export default {
},
unitList: [], //来往单位集合
proList: [], //工程集合
propList: null,
}
},
created() {
this.getList()
this.getUnitList()
this.getProList()
this.getPropData()
},
methods: {
/** 查询资产属性下拉 */
getPropData() {
getProLists().then((response) => {
this.propList = response.rows
})
},
// 获取 申请列表
async getList() {
this.loading = true
@ -168,6 +198,7 @@ export default {
agreementCode: this.queryParams.agreementCode,
typeName: this.queryParams.typeName,
typeModelName: this.queryParams.typeModelName,
propId: this.queryParams.propId,
startTime: this.queryParams.time && this.queryParams.time[0],
endTime: this.queryParams.time && this.queryParams.time[1],
pageSize: this.queryParams.pageSize,
@ -221,6 +252,7 @@ export default {
this.queryParams.unitId = ''
this.queryParams.proId = ''
this.resetForm('queryForm')
this.getPropData()
this.handleQuery()
},

224
src/views/stquery/deviceFixRate.vue Normal file
View File

@ -0,0 +1,224 @@
<template>
<div class="app-container" >
<el-form
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="80px"
>
<el-form-item label="资产属性" prop="propId">
<el-select
v-model="queryParams.propId"
filterable
placeholder="请选择资产属性"
style="width: 240px"
>
<el-option
v-for="keeper in propList"
:key="keeper.propId"
:label="keeper.propName"
:value="keeper.propId"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="机具名称" prop="typeName">
<el-input
v-model="queryParams.typeName"
placeholder="请输入机具名称"
clearable
:maxlength="20"
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="规格型号" prop="typeModelName">
<el-input
v-model="queryParams.typeModelName"
placeholder="请输入规格型号"
clearable
:maxlength="20"
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="机具编号" prop="maCode">
<el-input
v-model="queryParams.maCode"
placeholder="请输入机具编号"
clearable
:maxlength="20"
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>查询</el-button
>
<el-button
icon="el-icon-refresh"
size="mini"
@click="resetQuery"
>重置</el-button
>
</el-form-item>
</el-form>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出</el-button
>
</el-col>
<right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
<el-table v-loading="loading" :data="tableList" border>
<el-table-column
align="center"
label="序号"
type="index"
:index="
indexContinuation(queryParams.pageNum, queryParams.pageSize)
"
/>
<el-table-column label="机具名称" align="center" prop="typeName" show-overflow-tooltip width="150px"/>
<el-table-column label="规格型号" align="center" prop="typeModelName" show-overflow-tooltip width="150px"/>
<el-table-column label="资产属性" align="center" prop="propName" :show-overflow-tooltip="true" width="100px"/>
<el-table-column label="机具编号" align="center" prop="maCode" show-overflow-tooltip width="120px"/>
<el-table-column label="维修次数" align="center" prop="repairNum" show-overflow-tooltip />
<el-table-column label="退料次数" align="center" prop="backNum" show-overflow-tooltip />
<el-table-column label="维修费用" align="center" prop="cost" show-overflow-tooltip >
<template slot-scope="scope">
{{ scope.row.cost.toFixed(2) }}
</template>
</el-table-column>
<el-table-column label="维修损坏比例" align="center" prop="damageRate" show-overflow-tooltip />
</el-table>
<pagination
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
:page-sizes="[5, 10, 15, 20, 30]"
@pagination="getList"
/>
</div>
</template>
<script>
import {
repairFixRecord,
} from '@/api/stquery/deviceFixQuery'
import { getProLists } from '@/api/base/base'
export default {
name: 'DeviceFixRate',
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
tableList: [],
// 日期范围
dateRange: [],
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
typeName: '',
typeModelName: '',
maCode: '',
status: undefined,
propId: '',
},
propList: null,
}
},
created() {
this.getList()
this.getPropData()
},
methods: {
/** 查询资产属性下拉 */
getPropData() {
getProLists().then((response) => {
this.propList = response.rows
})
},
// 获取 申请列表
async getList() {
this.loading = true
const params = {
typeName: this.queryParams.typeName,
typeModelName: this.queryParams.typeModelName,
propId: this.queryParams.propId,
maCode: this.queryParams.maCode,
pageSize: this.queryParams.pageSize,
pageNum: this.queryParams.pageNum,
}
const res = await repairFixRecord(params)
this.loading = false
this.tableList = res.data.rows
this.total = res.data.total
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1
this.getList()
},
/** 重置按钮操作 */
resetQuery() {
this.queryParams.time = []
this.queryParams.unitId = ''
this.queryParams.proId = ''
this.resetForm('queryForm')
this.getPropData()
this.handleQuery()
},
/** 导出按钮操作 */
handleExport() {
this.download(
'material/repairRecord/exportFixRecord',
{
...this.queryParams,
},
`综合查询_维修损坏记录_${new Date().getTime()}.xlsx`,
)
},
},
}
</script>
<style lang="scss" scoped>
::v-deep.el-table .fixed-width .el-button--mini {
width: 60px !important;
margin-bottom: 10px;
}
</style>

35
src/views/stquery/deviceInStoreQuery.vue
View File

@ -40,6 +40,21 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="资产属性" prop="propId">
<el-select
v-model="queryParams.propId"
filterable
placeholder="请选择资产属性"
style="width: 240px"
>
<el-option
v-for="keeper in propList"
:key="keeper.propId"
:label="keeper.propName"
:value="keeper.propId"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="关键字" prop="keyWord">
<el-input
v-model="queryParams.keyWord"
@ -136,6 +151,13 @@
prop="unit"
:show-overflow-tooltip="true"
/>
<el-table-column
label="资产属性"
align="center"
prop="propName"
:show-overflow-tooltip="true"
width="100px"
/>
<el-table-column
label="入库数量"
align="center"
@ -180,7 +202,7 @@ import {
getUnitData,
getProData,
} from '@/api/stquery/deviceInStoreQuery'
import { getProLists } from '@/api/base/base'
export default {
name: 'DeviceInStoreQuery',
dicts: ['sys_normal_disable'],
@ -215,18 +237,27 @@ export default {
proId: null, //工程id
typeName: '', //机具名称
typeModelName: '', //规格型号
propId: '',
types: 1, // 1申请列表 2审核列表
},
unitList: [], //来往单位集合
proList: [], //工程集合
propList: [], //资产属性集合
}
},
created() {
this.getList()
this.getUnitList()
this.getProList()
this.getPropData()
},
methods: {
/** 查询资产属性下拉 */
getPropData() {
getProLists().then((response) => {
this.propList = response.rows
})
},
// 获取 申请列表
async getList() {
this.loading = true
@ -238,6 +269,7 @@ export default {
agreementCode: this.queryParams.agreementCode,
typeName: this.queryParams.typeName,
typeModelName: this.queryParams.typeModelName,
propId: this.queryParams.propId,
startTime: this.queryParams.time && this.queryParams.time[0],
endTime: this.queryParams.time && this.queryParams.time[1],
pageSize: this.queryParams.pageSize,
@ -290,6 +322,7 @@ export default {
resetQuery() {
this.queryParams.time = []
this.resetForm('queryForm')
this.getPropData()
this.handleQuery()
},

36
src/views/stquery/deviceScrapQuery.vue
View File

@ -40,6 +40,21 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="资产属性" prop="propId">
<el-select
v-model="queryParams.propId"
filterable
placeholder="请选择资产属性"
style="width: 240px"
>
<el-option
v-for="keeper in propList"
:key="keeper.propId"
:label="keeper.propName"
:value="keeper.propId"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="关键字" prop="keyWord">
<el-input
v-model="queryParams.keyWord"
@ -132,6 +147,13 @@
prop="unit"
:show-overflow-tooltip="true"
/>
<el-table-column
label="资产属性"
align="center"
prop="propName"
:show-overflow-tooltip="true"
width="100px"
/>
<el-table-column
label="设备编号"
align="center"
@ -183,7 +205,7 @@ import {
getUnitData,
getProData,
} from '@/api/stquery/deviceScrapQuery'
import { getProLists } from '@/api/base/base'
export default {
name: 'DeviceScrapQuery',
dicts: ['sys_normal_disable'],
@ -212,19 +234,27 @@ export default {
dictName: undefined,
dictType: undefined,
status: undefined,
propId: undefined,
time: null, //申请时间
types: 1, // 1申请列表 2审核列表
},
unitList: [], //来往单位集合
proList: [], //工程集合
propList: null,
}
},
created() {
this.getList()
this.getPropData()
},
methods: {
/** 查询资产属性下拉 */
getPropData() {
getProLists().then((response) => {
this.propList = response.rows
})
},
// 获取 申请列表
async getList() {
this.loading = true
@ -236,6 +266,7 @@ export default {
agreementCode: this.queryParams.agreementCode,
typeName: this.queryParams.typeName,
typeModelName: this.queryParams.typeModelName,
propId: this.queryParams.propId,
startTime: this.queryParams.time && this.queryParams.time[0],
endTime: this.queryParams.time && this.queryParams.time[1],
pageSize: this.queryParams.pageSize,
@ -270,6 +301,7 @@ export default {
resetQuery() {
this.queryParams.time = []
this.resetForm('queryForm')
this.getPropData()
this.handleQuery()
},

36
src/views/stquery/deviceStatusRecord.vue
View File

@ -68,6 +68,21 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="资产属性" prop="propId">
<el-select
v-model="queryParams.propId"
filterable
placeholder="请选择资产属性"
style="width: 240px"
>
<el-option
v-for="keeper in propList"
:key="keeper.propId"
:label="keeper.propName"
:value="keeper.propId"
></el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="关键字" prop="keyWord">
<el-input
v-model="queryParams.keyWord"
@ -155,6 +170,12 @@
prop="unit"
:show-overflow-tooltip="true"
/>
<el-table-column
label="资产属性"
align="center"
prop="propName"
width="100px"
/>
<el-table-column
label="在库数量"
align="center"
@ -236,7 +257,7 @@ import {
getUnitData,
getProData,
} from '@/api/stquery/deviceStatusRecord'
import { getProLists } from '@/api/base/base'
export default {
name: 'DeviceStatusRecord',
dicts: ['sys_normal_disable'],
@ -270,19 +291,28 @@ export default {
time: null, //申请时间
unitId: null, //来往单位id
proId: null, //工程id
propId: null, //资产属性id
types: 1, // 1申请列表 2审核列表
},
unitList: [], //来往单位集合
proList: [], //工程集合
//资产类型数据
propList: null,
}
},
created() {
this.getList()
this.getPropData()
/* this.getUnitList();
this.getProList(); */
},
methods: {
/** 查询资产属性下拉 */
getPropData() {
getProLists().then((response) => {
this.propList = response.rows
})
},
// 获取 申请列表
async getList() {
this.loading = true
@ -294,6 +324,7 @@ export default {
agreementCode:this.queryParams.agreementCode, */
typeName: this.queryParams.typeName,
typeModelName: this.queryParams.typeModelName,
propId: this.queryParams.propId,
/* startTime:this.queryParams.time && this.queryParams.time[0],
endTime:this.queryParams.time && this.queryParams.time[1], */
pageSize: this.queryParams.pageSize,
@ -346,6 +377,7 @@ export default {
resetQuery() {
this.queryParams.time = []
this.resetForm('queryForm')
this.getPropData()
this.handleQuery()
},

45
src/views/stquery/leaseRecord.vue
View File

@ -23,7 +23,7 @@
<el-select
v-model="queryParams.unitId"
clearable
@change="GetProData"
@change="getProList"
style="width: 240px"
placeholder="请选择"
>
@ -39,7 +39,7 @@
<el-select
v-model="queryParams.proId"
clearable
@change="GetUnitData"
@change="getUnitList"
style="width: 240px"
placeholder="请选择"
>
@ -71,6 +71,21 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="资产属性" prop="propId">
<el-select
v-model="queryParams.propId"
filterable
placeholder="请选择资产属性"
style="width: 240px"
>
<el-option
v-for="keeper in propList"
:key="keeper.propId"
:label="keeper.propName"
:value="keeper.propId"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="关键字" prop="keyWord">
<el-input
v-model="queryParams.keyWord"
@ -169,6 +184,13 @@
:show-overflow-tooltip="true"
width="50px"
/>
<el-table-column
label="资产属性"
align="center"
prop="propName"
:show-overflow-tooltip="true"
width="100px"
/>
<el-table-column
label="领料数量"
align="center"
@ -186,13 +208,13 @@
label="申请日期"
align="center"
prop="leaseTime"
:show-overflow-tooltip="true"
width="100px"
/>
<el-table-column
label="出库日期"
align="center"
prop="createTime"
:show-overflow-tooltip="true"
width="100px"
/>
<el-table-column
label="领料单位"
@ -227,6 +249,7 @@ import {
getUnitData,
getProData,
} from '@/api/stquery/stquery'
import { getProLists } from '@/api/base/base'
export default {
name: 'LeaseRecord',
@ -263,19 +286,29 @@ export default {
typeName: '',
typeModelName: '',
keyWord: '',
propId: '',
types: 1, // 1申请列表 2审核列表
},
unitList: [], //来往单位集合
proList: [], //工程集合
//资产类型数据
propList: null,
}
},
created() {
this.getList()
this.getUnitList()
this.getProList()
this.getPropData()
},
methods: {
/** 查询资产属性下拉 */
getPropData() {
getProLists().then((response) => {
this.propList = response.rows
})
},
// 获取 申请列表
async getList() {
this.loading = true
@ -286,6 +319,7 @@ export default {
keyWord: this.queryParams.keyWord,
typeName: this.queryParams.typeName,
typeModelName: this.queryParams.typeModelName,
propId: this.queryParams.propId,
startTime: this.queryParams.time && this.queryParams.time[0],
endTime: this.queryParams.time && this.queryParams.time[1],
pageSize: this.queryParams.pageSize,
@ -341,6 +375,7 @@ export default {
this.resetForm('queryForm')
this.getUnitList()
this.getProList()
this.getPropData()
this.handleQuery()
},

26
src/views/stquery/outboundPreview/components/outbound-form.vue
View File

@ -67,6 +67,21 @@
@change="onOutTimeChange"
/>
</el-form-item>
<el-form-item label="资产属性" prop="propId">
<el-select
v-model="queryParamsForm.propId"
filterable
placeholder="请选择资产属性"
style="width: 240px"
>
<el-option
v-for="keeper in propList"
:key="keeper.propId"
:label="keeper.propName"
:value="keeper.propId"
></el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button
size="mini"
@ -107,6 +122,7 @@
<script>
import OutboundOrder from './outbound-order'
import { getProData, getUnitData } from '@/api/stquery/deviceScrapQuery'
import { getProLists } from '@/api/base/base'
export default {
components: {
OutboundOrder,
@ -124,14 +140,23 @@ export default {
keyWord: '',
startTime: '',
endTime: '',
propId:''
},
propList:[]
}
},
created() {
this.getUnitList()
this.getProList()
this.getPropData()
},
methods: {
/** 查询资产属性下拉 */
getPropData() {
getProLists().then((response) => {
this.propList = response.rows
})
},
async getUnitList() {
const { data: res } = await getUnitData()
this.unitList = res
@ -155,6 +180,7 @@ export default {
this.queryParamsForm.endTime = ''
this.queryParamsForm.startTime = ''
this.$refs.queryParamsFormRef.resetFields()
this.getPropData()
this.$emit('handleQuery', this.queryParamsForm, 'reset')
},
handleExport() {

9
src/views/stquery/outboundPreview/components/outbound-table.vue
View File

@ -38,10 +38,17 @@
/>
<el-table-column
align="center"
prop="unitId"
prop="unit"
label="计量单位"
show-overflow-tooltip
/>
<el-table-column
label="资产属性"
align="center"
prop="propName"
:show-overflow-tooltip="true"
width="100px"
/>
<el-table-column
align="center"
prop="maCode"

38
src/views/stquery/projUsingRecord.vue
View File

@ -82,6 +82,21 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="资产属性" prop="propId">
<el-select
v-model="queryParams.propId"
filterable
placeholder="请选择资产属性"
style="width: 240px"
>
<el-option
v-for="keeper in propList"
:key="keeper.propId"
:label="keeper.propName"
:value="keeper.propId"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="关键字" prop="keyWord">
<el-input
v-model="queryParams.keyWord"
@ -194,6 +209,13 @@
prop="unit"
:show-overflow-tooltip="true"
/>
<el-table-column
label="资产属性"
align="center"
prop="propName"
:show-overflow-tooltip="true"
width="100px"
/>
<el-table-column label="租赁数量" align="center" prop="outNum" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span class="clickText" v-if="scope.row.manageType == 0" @click="outNumDialog(scope.row)">
@ -287,7 +309,7 @@ import {
usingRecord,
getRecordListApi
} from '@/api/stquery/projUsingRecord'
import { getProLists } from '@/api/base/base'
export default {
name: 'ProjUsingRecord',
dicts: ['sys_normal_disable'],
@ -320,7 +342,7 @@ export default {
time: null, //申请时间
unitId: null, //来往单位id
proId: null, //工程id
propId: '',
types: 1, // 1申请列表 2审核列表
useFlag: 0,
},
@ -341,14 +363,24 @@ export default {
numType: undefined, // 0租赁 1归还
},
dialogTotal: 0,
//资产类型数据
propList: null,
}
},
created() {
this.getList()
this.getUnitList()
this.getProList()
this.getPropData()
},
methods: {
/** 查询资产属性下拉 */
getPropData() {
getProLists().then((response) => {
this.propList = response.rows
})
},
// 获取 申请列表
async getList() {
this.loading = true
@ -360,6 +392,7 @@ export default {
// agreementCode:this.queryParams.agreementCode,
typeName: this.queryParams.typeName,
typeModelName: this.queryParams.typeModelName,
propId: this.queryParams.propId,
startTime: this.queryParams.time && this.queryParams.time[0],
endTime: this.queryParams.time && this.queryParams.time[1],
pageSize: this.queryParams.pageSize,
@ -417,6 +450,7 @@ export default {
this.isUseChecked = false
this.queryParams.useFlag = 0
this.resetForm('queryForm')
this.getPropData()
this.handleQuery()
},