修饰数量
This commit is contained in:
parent
433f26c4d0
commit
88c986d3ee
|
|
@ -1,6 +1,6 @@
|
|||
<template>
|
||||
<div class="app-container" id="">
|
||||
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
|
||||
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
|
||||
<el-form-item label="关键字" prop="keyWord">
|
||||
<el-input
|
||||
v-model="queryParams.keyWord"
|
||||
|
|
@ -8,7 +8,7 @@
|
|||
clearable :maxlength="20"
|
||||
style="width: 240px"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-form-item>
|
||||
<el-form-item label="物资名称" prop="typeName">
|
||||
<el-input
|
||||
v-model="queryParams.typeName"
|
||||
|
|
@ -21,10 +21,10 @@
|
|||
<el-input
|
||||
v-model="queryParams.typeModelName"
|
||||
placeholder="请输入规格型号"
|
||||
clearable :maxlength="20"
|
||||
style="width: 240px"
|
||||
clearable :maxlength="20"
|
||||
style="width: 240px"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button
|
||||
type="primary"
|
||||
|
|
@ -52,15 +52,15 @@
|
|||
> -->
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||
<el-table v-loading="loading" :data="tableList" :span-method="objectSpanMethod">
|
||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||
<el-table v-loading="loading" :data="tableList" :span-method="objectSpanMethod">
|
||||
<!-- houseName type typeName typeModelName unitName storeNum manageType usNum repairNum inputNum repairInputNum allNum-->
|
||||
<el-table-column label="序号" align="center" width="80" type="index">
|
||||
<template scope="scope">
|
||||
<span v-if="scope.$index==0">合计：</span>
|
||||
<span v-else>{{ (queryParams.pageNum - 1) * 10 + scope.$index }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table-column>
|
||||
<el-table-column label="仓库信息" align="center" prop="whHouseName" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="施工类型" align="center" prop="constructionType" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="物资类型" align="center" prop="materialType" :show-overflow-tooltip="true"/>
|
||||
|
|
@ -124,20 +124,20 @@
|
|||
</span> -->
|
||||
<!-- <span class="clickText" @click="openTestedRecords(scope.row)">{{ scope.row.repairInputNum }}</span> -->
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="总保有量" align="center" prop="allNum" :show-overflow-tooltip="true">
|
||||
</el-table-column>
|
||||
</el-table-column>
|
||||
<el-table-column label="总保有量" align="center" prop="allNum" :show-overflow-tooltip="true">
|
||||
</el-table-column>
|
||||
<el-table-column label="总保有量资产（万元）" align="center" prop="totalPrice" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="成新率" align="center" prop="" :show-overflow-tooltip="true">
|
||||
<el-table-column label="五年以内" align="center" prop="fiveReplacementRate" :show-overflow-tooltip="true"></el-table-column>
|
||||
<el-table-column label="五年以内" align="center" prop="fiveReplacementRate" :show-overflow-tooltip="true"></el-table-column>
|
||||
<el-table-column label="五年至十年" align="center" prop="tenReplacementRate" :show-overflow-tooltip="true"></el-table-column>
|
||||
<el-table-column label="十年以上" align="center" prop="tenPlusReplacementRate" :show-overflow-tooltip="true"></el-table-column>
|
||||
</el-table-column>
|
||||
|
||||
|
||||
|
||||
<el-table-column label="管理模式" align="center" prop="manageType" :show-overflow-tooltip="true"/>
|
||||
</el-table>
|
||||
<el-table-column label="管理模式" align="center" prop="manageType" :show-overflow-tooltip="true"/>
|
||||
</el-table>
|
||||
<pagination
|
||||
v-show="total > 0"
|
||||
:total="total"
|
||||
|
|
@ -145,11 +145,11 @@
|
|||
:limit.sync="queryParams.pageSize"
|
||||
:page-sizes="[5, 10, 15, 20, 30]"
|
||||
@pagination="getList"
|
||||
/>
|
||||
/>
|
||||
|
||||
<!-- 在库编码设备弹窗-->
|
||||
<el-dialog :title="title" :visible.sync="openRecord" width="1200px" append-to-body>
|
||||
<el-form :model="dialogQuery" ref="dialogQuery" size="small" :inline="true" label-width="80px">
|
||||
<el-form :model="dialogQuery" ref="dialogQuery" size="small" :inline="true" label-width="80px">
|
||||
<el-form-item label="关键字" prop="keyWord">
|
||||
<el-input
|
||||
v-model="dialogQuery.keyWord"
|
||||
|
|
@ -164,7 +164,7 @@
|
|||
>查询</el-button>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button
|
||||
<el-button
|
||||
icon="el-icon-download"
|
||||
size="mini"
|
||||
@click="handleDialogStoreExport"
|
||||
|
|
@ -184,7 +184,7 @@
|
|||
<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
|
||||
v-show="dialogTotal > 0"
|
||||
:total="dialogTotal"
|
||||
|
|
@ -195,7 +195,7 @@
|
|||
</el-dialog>
|
||||
<!-- 在用编码设备弹窗-->
|
||||
<el-dialog :title="title" :visible.sync="openUseRecord" width="1200px" append-to-body>
|
||||
<el-form :model="dialogUseQuery" ref="dialogUseQuery" size="small" :inline="true" label-width="80px">
|
||||
<el-form :model="dialogUseQuery" ref="dialogUseQuery" size="small" :inline="true" label-width="80px">
|
||||
<el-form-item label="关键字" prop="keyWord">
|
||||
<el-input
|
||||
v-model="dialogUseQuery.keyWord"
|
||||
|
|
@ -213,7 +213,7 @@
|
|||
>查询</el-button>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button
|
||||
<el-button
|
||||
icon="el-icon-download"
|
||||
size="mini"
|
||||
@click="handleDialogUserExport"
|
||||
|
|
@ -228,8 +228,8 @@
|
|||
<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="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="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="creator" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="出库时间" align="center" prop="outTime" :show-overflow-tooltip="true"/>
|
||||
|
|
@ -252,7 +252,7 @@
|
|||
</el-dialog>
|
||||
<!-- 在修编码设备弹窗-->
|
||||
<el-dialog :title="title" :visible.sync="openRepairRecord" width="1200px" append-to-body>
|
||||
<el-form :model="dialogRepairQuery" ref="dialogRepairQuery" size="small" :inline="true" label-width="80px">
|
||||
<el-form :model="dialogRepairQuery" ref="dialogRepairQuery" size="small" :inline="true" label-width="80px">
|
||||
<el-form-item label="关键字" prop="keyWord">
|
||||
<el-input
|
||||
v-model="dialogRepairQuery.keyWord"
|
||||
|
|
@ -270,7 +270,7 @@
|
|||
>查询</el-button>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button
|
||||
<el-button
|
||||
icon="el-icon-download"
|
||||
size="mini"
|
||||
@click="handleDialogRepairExport"
|
||||
|
|
@ -285,8 +285,8 @@
|
|||
<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="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="buyPrice" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="设备编码" align="center" prop="maCode" :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"/>
|
||||
|
|
@ -295,7 +295,7 @@
|
|||
<span class="clickText" @click="jumpRepair(scope.row.repairCode)">
|
||||
{{ scope.row.repairCode }}
|
||||
</span>
|
||||
</template>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
|
|
@ -309,7 +309,7 @@
|
|||
</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">
|
||||
<el-form :model="dialogPurchaseQuery" ref="dialogPurchaseQuery" size="small" :inline="true" label-width="80px">
|
||||
<el-form-item label="关键字" prop="keyWord">
|
||||
<el-input
|
||||
v-model="dialogPurchaseQuery.keyWord"
|
||||
|
|
@ -327,7 +327,7 @@
|
|||
>查询</el-button>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button
|
||||
<el-button
|
||||
icon="el-icon-download"
|
||||
size="mini"
|
||||
@click="handleDialogPurchaseExport"
|
||||
|
|
@ -341,9 +341,9 @@
|
|||
</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="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="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="maKeeper" :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"/>
|
||||
|
|
@ -352,7 +352,7 @@
|
|||
<span class="clickText" @click="jumpInput(scope.row.code)">
|
||||
{{ scope.row.code }}
|
||||
</span>
|
||||
</template>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
|
|
@ -363,10 +363,10 @@
|
|||
:limit.sync="dialogPurchaseQuery.pageSize"
|
||||
@pagination="getPurchaseRecords"
|
||||
/>
|
||||
</el-dialog>
|
||||
</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 :model="dialogTestedQuery" ref="dialogTestedQuery" size="small" :inline="true" label-width="80px">
|
||||
<el-form-item label="关键字" prop="keyWord">
|
||||
<el-input
|
||||
v-model="dialogTestedQuery.keyWord"
|
||||
|
|
@ -384,7 +384,7 @@
|
|||
>查询</el-button>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button
|
||||
<el-button
|
||||
icon="el-icon-download"
|
||||
size="mini"
|
||||
@click="handleDialogTestedExport"
|
||||
|
|
@ -398,9 +398,9 @@
|
|||
</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="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="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="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"/>
|
||||
|
|
@ -409,7 +409,7 @@
|
|||
<span class="clickText" @click="jumpRepairInput(scope.row.inputCode)">
|
||||
{{ scope.row.inputCode }}
|
||||
</span>
|
||||
</template>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
|
|
@ -420,8 +420,8 @@
|
|||
:limit.sync="dialogTestedQuery.pageSize"
|
||||
@pagination="getTestedRecords"
|
||||
/>
|
||||
</el-dialog>
|
||||
|
||||
</el-dialog>
|
||||
|
||||
</div>
|
||||
</template>
|
||||
|
||||
|
|
@ -458,13 +458,13 @@ export default {
|
|||
// 总条数
|
||||
total: 0,
|
||||
// 主表格数据
|
||||
tableList: [],
|
||||
tableList: [],
|
||||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 10,
|
||||
keyWord: null,
|
||||
typeName: null, //物资名称
|
||||
typeName: null, //物资名称
|
||||
typeModelName: null //规格型号
|
||||
},
|
||||
|
||||
|
|
@ -474,7 +474,7 @@ export default {
|
|||
dialogQuery: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
keyWord: undefined,
|
||||
keyWord: undefined,
|
||||
},
|
||||
dialogTotal: 0,
|
||||
//在用弹窗
|
||||
|
|
@ -482,8 +482,8 @@ export default {
|
|||
dialogUseQuery: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
keyWord: undefined,
|
||||
},
|
||||
keyWord: undefined,
|
||||
},
|
||||
useRecordList: [], //在用设备列表
|
||||
dialogUserTotal: 0,
|
||||
//在修弹窗
|
||||
|
|
@ -491,8 +491,8 @@ export default {
|
|||
dialogRepairQuery: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
keyWord: undefined,
|
||||
},
|
||||
keyWord: undefined,
|
||||
},
|
||||
repairRecordList: [], //在修设备列表
|
||||
dialogRepairTotal: 0,
|
||||
|
||||
|
|
@ -501,8 +501,8 @@ export default {
|
|||
dialogPurchaseQuery: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
keyWord: undefined,
|
||||
},
|
||||
keyWord: undefined,
|
||||
},
|
||||
purchaseRecordList: [], //新购待入库设备列表
|
||||
dialogPurchaseTotal: 0,
|
||||
|
||||
|
|
@ -511,11 +511,11 @@ export default {
|
|||
dialogTestedQuery: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
keyWord: undefined,
|
||||
},
|
||||
keyWord: undefined,
|
||||
},
|
||||
testedRecordList: [], //修试待入库设备列表
|
||||
dialogTestedTotal: 0,
|
||||
|
||||
|
||||
}
|
||||
},
|
||||
created() {
|
||||
|
|
@ -523,18 +523,18 @@ export default {
|
|||
},
|
||||
methods: {
|
||||
// 获取列表
|
||||
async getList() {
|
||||
async getList() {
|
||||
this.loading = true
|
||||
const params = {
|
||||
const params = {
|
||||
keyWord: this.queryParams.keyWord,
|
||||
typeName: this.queryParams.typeName,
|
||||
typeModelName: this.queryParams.typeModelName,
|
||||
typeModelName: this.queryParams.typeModelName,
|
||||
pageSize: this.queryParams.pageSize,
|
||||
pageNum: this.queryParams.pageNum
|
||||
}
|
||||
const res = await getRetainedEquipmentListApi(params)
|
||||
if(res.data.rows.length>0){
|
||||
this.tableList = res.data.rows;
|
||||
this.tableList = res.data.rows;
|
||||
}else{
|
||||
this.tableList=[]
|
||||
}
|
||||
|
|
@ -543,7 +543,7 @@ export default {
|
|||
let param = {
|
||||
keyWord: this.queryParams.keyWord,
|
||||
typeName: this.queryParams.typeName,
|
||||
typeModelName: this.queryParams.typeModelName,
|
||||
typeModelName: this.queryParams.typeModelName,
|
||||
}
|
||||
const response = await getRetainedEquipmentListNoPageApi(param)
|
||||
let obj = {
|
||||
|
|
@ -556,7 +556,7 @@ export default {
|
|||
allNum: response.data.allNum||0,
|
||||
totalPrice: response.data.totalPrice||0,
|
||||
fiveReplacementRate: response.data.fiveReplacementRate||0,
|
||||
tenReplacementRate: response.data.tenReplacementRate||0,
|
||||
tenReplacementRate: response.data.tenReplacementRate||0,
|
||||
tenPlusReplacementRate: response.data.tenPlusReplacementRate||0,
|
||||
manageType:response.data.manageType||"",
|
||||
}
|
||||
|
|
@ -571,10 +571,10 @@ export default {
|
|||
return "合计"
|
||||
}else{
|
||||
return number
|
||||
}
|
||||
}
|
||||
},
|
||||
// 合并单元格 rowIndex=行数 columnIndex=列数
|
||||
// 这里是合并table的除表头外的第一行的第二列 + 除表头外的第二行的第二列
|
||||
// 合并单元格 rowIndex=行数 columnIndex=列数
|
||||
// 这里是合并table的除表头外的第一行的第二列 + 除表头外的第二行的第二列
|
||||
// 注意列数和行数从 0 开始
|
||||
objectSpanMethod ({ row, column, rowIndex, columnIndex }) {
|
||||
if (rowIndex === 0 && columnIndex == 0) {
|
||||
|
|
@ -587,8 +587,8 @@ export default {
|
|||
// 否则如果是 第二行 的 第二列 那么隐藏原有第二行 的 第二列的数据使他隐藏
|
||||
else if (rowIndex === 0 && columnIndex < 7) {
|
||||
return {
|
||||
rowspan: 0,
|
||||
colspan: 0
|
||||
rowspan: 0,
|
||||
colspan: 0
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
@ -596,12 +596,12 @@ export default {
|
|||
handleQuery() {
|
||||
this.queryParams.pageNum = 1
|
||||
this.getList()
|
||||
},
|
||||
},
|
||||
/** 重置按钮操作 */
|
||||
resetQuery() {
|
||||
resetQuery() {
|
||||
this.resetForm('queryForm')
|
||||
this.handleQuery()
|
||||
},
|
||||
},
|
||||
/** 导出按钮操作 */
|
||||
handleExport() {
|
||||
this.download(
|
||||
|
|
@ -613,7 +613,7 @@ export default {
|
|||
)
|
||||
},
|
||||
//跳转领料
|
||||
jumpLease(code){
|
||||
jumpLease(code){
|
||||
this.$router.push({ path: "/lease/outBound", query: {'code':code} });
|
||||
},
|
||||
//跳转维修
|
||||
|
|
@ -626,7 +626,7 @@ export default {
|
|||
},
|
||||
// 跳转修试后入库
|
||||
jumpRepairInput(code){
|
||||
this.$router.push({ path: "/repair/testedInBound", query: {'code':code} });
|
||||
this.$router.push({ path: "/repair/testedInBound", query: {'code':code} });
|
||||
},
|
||||
// ------------------
|
||||
//查看在库编码数据
|
||||
|
|
@ -635,7 +635,7 @@ export default {
|
|||
this.dialogQuery.keyWord = ""
|
||||
this.dialogQuery.typeId = row.typeId;
|
||||
this.getStoreCodeList()
|
||||
},
|
||||
},
|
||||
/** 查询在库编码列表 */
|
||||
getStoreCodeList() {
|
||||
getStorageInfoListApi(this.dialogQuery).then((response) => {
|
||||
|
|
@ -674,7 +674,7 @@ export default {
|
|||
handleDialogUseQuery() {
|
||||
this.dialogUseQuery.pageNum = 1
|
||||
this.getUserRecords()
|
||||
},
|
||||
},
|
||||
handleDialogUserExport() {
|
||||
this.download(
|
||||
'material/complex_query/exportUserRecordList',
|
||||
|
|
|
|||
Loading…
Reference in New Issue