Merge branch 'material-ui' of http://192.168.0.75:3000/bonus/bonus-ui into material-ui
This commit is contained in:
commit
b1cb4189aa
|
|
@ -1,17 +1,25 @@
|
||||||
<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" @submit.native.prevent>
|
<el-form
|
||||||
<el-form-item prop="dateRange">
|
:model="queryParams"
|
||||||
|
ref="queryForm"
|
||||||
|
size="small"
|
||||||
|
:inline="true"
|
||||||
|
v-show="showSearch"
|
||||||
|
label-width="68px"
|
||||||
|
@submit.native.prevent
|
||||||
|
>
|
||||||
|
<el-form-item prop="dateRange">
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="dateRange"
|
v-model="dateRange"
|
||||||
type="daterange"
|
type="daterange"
|
||||||
value-format="yyyy-MM-dd"
|
value-format="yyyy-MM-dd"
|
||||||
range-separator="至"
|
range-separator="至"
|
||||||
start-placeholder="开始日期"
|
start-placeholder="开始日期"
|
||||||
end-placeholder="结束日期">
|
end-placeholder="结束日期"
|
||||||
</el-date-picker>
|
></el-date-picker>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item prop="keyWord">
|
<el-form-item prop="keyWord">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="queryParams.keyWord"
|
v-model="queryParams.keyWord"
|
||||||
placeholder="请输入关键词"
|
placeholder="请输入关键词"
|
||||||
|
|
@ -19,7 +27,7 @@
|
||||||
@keyup.enter.native="handleQuery"
|
@keyup.enter.native="handleQuery"
|
||||||
maxlength="20"
|
maxlength="20"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
|
<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-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
||||||
|
|
@ -27,36 +35,36 @@
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
|
|
||||||
<el-table v-loading="loading" :data="tableList" ref="multipleTable" border :span-method="objectSpanMethod">
|
<el-table v-loading="loading" :data="tableList" ref="multipleTable" border :span-method="objectSpanMethod">
|
||||||
<el-table-column label="序号" align="center" width="80" type="index">
|
<el-table-column label="序号" align="center" width="80" type="index">
|
||||||
<template scope="scope">
|
<template slot-scope="scope">
|
||||||
<span v-if="scope.$index==0">合计：</span>
|
<span v-if="scope.$index == 0">合计：</span>
|
||||||
<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="typeName" show-overflow-tooltip />
|
<el-table-column label="物资名称" align="center" prop="typeName" show-overflow-tooltip />
|
||||||
<el-table-column label="规格型号" align="center" prop="typeModelName" show-overflow-tooltip />
|
<el-table-column label="规格型号" align="center" prop="typeModelName" show-overflow-tooltip />
|
||||||
<el-table-column label="计量单位" align="center" prop="unitName" show-overflow-tooltip />
|
<el-table-column label="计量单位" align="center" prop="unitName" show-overflow-tooltip />
|
||||||
<el-table-column label="报废数量" align="center" prop="scrapNum" show-overflow-tooltip >
|
<el-table-column label="报废数量" align="center" prop="scrapNum" show-overflow-tooltip>
|
||||||
<template scope="scope">
|
<template slot-scope="scope">
|
||||||
<!-- 当 manageType 为 '编码' 时，使用可点击的 span -->
|
<!-- 当 manageType 为 '编码' 时，使用可点击的 span -->
|
||||||
<span class="clickText" v-if="scope.row.manageType =='0'" @click="openRecords(scope.row)">
|
<span class="clickText" v-if="scope.row.manageType == '0'" @click="openRecords(scope.row)">
|
||||||
{{ scope.row.scrapNum }}
|
{{ scope.row.scrapNum }}
|
||||||
</span>
|
</span>
|
||||||
<!-- 否则，直接显示数字 -->
|
<!-- 否则，直接显示数字 -->
|
||||||
<span v-else>
|
<span v-else>
|
||||||
{{ scope.row.scrapNum }}
|
{{ scope.row.scrapNum }}
|
||||||
</span>
|
</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="报废时间" align="center" prop="scrapTime" show-overflow-tooltip />
|
<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="scrapPersonName" show-overflow-tooltip />
|
||||||
<el-table-column label="报废类型" align="center" prop="scrapType" 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-column label="报废单号" align="center" prop="scrapCode" show-overflow-tooltip />
|
||||||
</el-table>
|
</el-table>
|
||||||
|
|
||||||
<pagination
|
<pagination
|
||||||
v-show="total>0"
|
v-show="total > 0"
|
||||||
:total="total"
|
:total="total"
|
||||||
:page.sync="queryParams.pageNum"
|
:page.sync="queryParams.pageNum"
|
||||||
:limit.sync="queryParams.pageSize"
|
:limit.sync="queryParams.pageSize"
|
||||||
|
|
@ -70,39 +78,38 @@
|
||||||
<el-input
|
<el-input
|
||||||
v-model="dialogQuery.keyWord"
|
v-model="dialogQuery.keyWord"
|
||||||
placeholder="请输入关键字"
|
placeholder="请输入关键字"
|
||||||
clearable :maxlength="30"
|
clearable
|
||||||
style="width: 240px"/>
|
:maxlength="30"
|
||||||
|
style="width: 240px"
|
||||||
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button type="primary"
|
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleDialogQuery">
|
||||||
icon="el-icon-search" size="mini"
|
查询
|
||||||
@click="handleDialogQuery"
|
</el-button>
|
||||||
>查询</el-button>
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button
|
<el-button icon="el-icon-refresh" size="mini" @click="resetDialogQuery">重置</el-button>
|
||||||
icon="el-icon-refresh"
|
</el-form-item>
|
||||||
size="mini"
|
|
||||||
@click="resetDialogQuery"
|
|
||||||
>重置</el-button>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button
|
<el-button type="warning" icon="el-icon-download" size="mini" @click="handleDialogExport">
|
||||||
type="warning"
|
导出
|
||||||
icon="el-icon-download"
|
</el-button>
|
||||||
size="mini"
|
|
||||||
@click="handleDialogExport"
|
|
||||||
>导出</el-button>
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
|
|
||||||
<el-table v-loading="loading" :data="dialogList" height="500px">
|
<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
|
||||||
</el-table-column>
|
label="序号"
|
||||||
<el-table-column label="机具名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
|
align="center"
|
||||||
<el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true"/>
|
width="80"
|
||||||
<el-table-column label="购置价（元）" align="center" prop="buyPrice" :show-overflow-tooltip="true"/>
|
type="index"
|
||||||
<el-table-column label="设备编码" align="center" prop="maCode" :show-overflow-tooltip="true"/>
|
: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="typeModelName" :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>
|
</el-table>
|
||||||
<pagination
|
<pagination
|
||||||
v-show="dialogTotal > 0"
|
v-show="dialogTotal > 0"
|
||||||
|
|
@ -110,59 +117,59 @@
|
||||||
:page.sync="dialogQuery.pageNum"
|
:page.sync="dialogQuery.pageNum"
|
||||||
:limit.sync="dialogQuery.pageSize"
|
:limit.sync="dialogQuery.pageSize"
|
||||||
@pagination="getDialogDataList"
|
@pagination="getDialogDataList"
|
||||||
/>
|
/>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { getScrapListApi,getScrapListNoPageApi,getScrapDetailsListApi } from "@/api/report/report";
|
import { getScrapListApi, getScrapListNoPageApi, getScrapDetailsListApi } from '@/api/report/report'
|
||||||
export default {
|
export default {
|
||||||
name: "Report",
|
name: 'Report',
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
// 遮罩层
|
// 遮罩层
|
||||||
loading: false,
|
loading: false,
|
||||||
// 非单个禁用
|
// 非单个禁用
|
||||||
single: true,
|
single: true,
|
||||||
// 非多个禁用
|
// 非多个禁用
|
||||||
multiple: true,
|
multiple: true,
|
||||||
// 显示搜索条件
|
// 显示搜索条件
|
||||||
showSearch: true,
|
showSearch: true,
|
||||||
showHouse: false,
|
showHouse: false,
|
||||||
dateRange:[],
|
dateRange: [],
|
||||||
ids:[],
|
ids: [],
|
||||||
// 查询参数
|
// 查询参数
|
||||||
queryParams: {
|
queryParams: {
|
||||||
pageNum: 1,
|
pageNum: 1,
|
||||||
pageSize: 10,
|
pageSize: 10,
|
||||||
keyWord:undefined,
|
keyWord: undefined
|
||||||
},
|
},
|
||||||
// 总条数
|
// 总条数
|
||||||
total: 0,
|
total: 0,
|
||||||
//表格数据
|
//表格数据
|
||||||
tableList: [],
|
tableList: [],
|
||||||
// 弹出层标题
|
// 弹出层标题
|
||||||
title: "",
|
title: '',
|
||||||
//弹窗
|
//弹窗
|
||||||
openRecord: false,
|
openRecord: false,
|
||||||
dialogList: [], //在库编码设备列表
|
dialogList: [], //在库编码设备列表
|
||||||
dialogQuery: {
|
dialogQuery: {
|
||||||
pageNum: 1,
|
pageNum: 1,
|
||||||
pageSize: 10,
|
pageSize: 10,
|
||||||
keyWord: undefined,
|
keyWord: undefined
|
||||||
},
|
},
|
||||||
dialogTotal: 0,
|
dialogTotal: 0
|
||||||
};
|
}
|
||||||
},
|
},
|
||||||
created() {
|
created() {
|
||||||
this.getList();
|
this.getList()
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
// 合并单元格 rowIndex=行数 columnIndex=列数
|
// 合并单元格 rowIndex=行数 columnIndex=列数
|
||||||
// 这里是合并table的除表头外的第一行的第二列 + 除表头外的第二行的第二列
|
// 这里是合并table的除表头外的第一行的第二列 + 除表头外的第二行的第二列
|
||||||
// 注意列数和行数从 0 开始
|
// 注意列数和行数从 0 开始
|
||||||
objectSpanMethod ({ row, column, rowIndex, columnIndex }) {
|
objectSpanMethod({ row, column, rowIndex, columnIndex }) {
|
||||||
if (rowIndex === 0 && columnIndex == 0) {
|
if (rowIndex === 0 && columnIndex == 0) {
|
||||||
let rowspan = 1
|
let rowspan = 1
|
||||||
let colspan = 4
|
let colspan = 4
|
||||||
|
|
@ -173,71 +180,74 @@
|
||||||
// 否则如果是 第二行 的 第二列 那么隐藏原有第二行 的 第二列的数据使他隐藏
|
// 否则如果是 第二行 的 第二列 那么隐藏原有第二行 的 第二列的数据使他隐藏
|
||||||
else if (rowIndex === 0 && columnIndex < 4) {
|
else if (rowIndex === 0 && columnIndex < 4) {
|
||||||
return {
|
return {
|
||||||
rowspan: 0,
|
rowspan: 0,
|
||||||
colspan: 0
|
colspan: 0
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
/** 查询列表 */
|
/** 查询列表 */
|
||||||
async getList() {
|
async getList() {
|
||||||
this.loading = true
|
this.loading = true
|
||||||
const params = {
|
const params = {
|
||||||
keyWord: this.queryParams.keyWord,
|
keyWord: this.queryParams.keyWord,
|
||||||
startTime: this.dateRange && this.dateRange[0],
|
startTime: this.dateRange && this.dateRange[0],
|
||||||
endTime: this.dateRange && this.dateRange[1],
|
endTime: this.dateRange && this.dateRange[1],
|
||||||
pageSize: this.queryParams.pageSize,
|
pageSize: this.queryParams.pageSize,
|
||||||
pageNum: this.queryParams.pageNum
|
pageNum: this.queryParams.pageNum
|
||||||
}
|
}
|
||||||
const res = await getScrapListApi(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 {
|
||||||
this.tableList=[]
|
this.tableList = []
|
||||||
}
|
}
|
||||||
this.total = res.data.total;
|
this.total = res.data.total
|
||||||
let param = {
|
let param = {
|
||||||
keyWord: this.queryParams.keyWord,
|
keyWord: this.queryParams.keyWord,
|
||||||
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 getScrapListNoPageApi(param)
|
const response = await getScrapListNoPageApi(param)
|
||||||
let obj = {
|
let obj = {
|
||||||
scrapNum: response.data.scrapNum,
|
scrapNum: response.data.scrapNum
|
||||||
}
|
}
|
||||||
this.tableList.unshift(obj)
|
this.tableList.unshift(obj)
|
||||||
this.loading = false
|
this.loading = false
|
||||||
|
|
||||||
},
|
},
|
||||||
/** 重置按钮操作 */
|
/** 重置按钮操作 */
|
||||||
resetQuery() {
|
resetQuery() {
|
||||||
this.resetForm("queryForm");
|
this.resetForm('queryForm')
|
||||||
this.dateRange=[]
|
this.dateRange = []
|
||||||
this.queryParams.keyWord=null;
|
this.queryParams.keyWord = null
|
||||||
this.handleQuery();
|
this.handleQuery()
|
||||||
},
|
},
|
||||||
/** 搜索按钮操作 */
|
/** 搜索按钮操作 */
|
||||||
handleQuery() {
|
handleQuery() {
|
||||||
this.queryParams.pageNum = 1;
|
this.queryParams.pageNum = 1
|
||||||
this.getList();
|
this.getList()
|
||||||
},
|
},
|
||||||
handleExport() {
|
handleExport() {
|
||||||
this.download(
|
this.download(
|
||||||
"/material/bm_report/exportScrapList",
|
'/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`
|
||||||
);
|
)
|
||||||
},
|
},
|
||||||
//查看弹框数据
|
//查看弹框数据
|
||||||
openRecords(row) {
|
openRecords(row) {
|
||||||
this.openRecord = true
|
this.openRecord = true
|
||||||
this.dialogQuery.keyWord = ""
|
this.dialogQuery.keyWord = ''
|
||||||
this.dialogQuery.taskId = row.taskId;
|
this.dialogQuery.taskId = row.taskId
|
||||||
this.dialogQuery.typeId = row.typeId;
|
this.dialogQuery.typeId = row.typeId
|
||||||
this.getDialogDataList()
|
this.getDialogDataList()
|
||||||
},
|
},
|
||||||
/** 查询弹框列表 */
|
/** 查询弹框列表 */
|
||||||
getDialogDataList() {
|
getDialogDataList() {
|
||||||
getScrapDetailsListApi(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
|
||||||
})
|
})
|
||||||
|
|
@ -248,54 +258,53 @@
|
||||||
this.getDialogDataList()
|
this.getDialogDataList()
|
||||||
},
|
},
|
||||||
/** 弹框重置操作 */
|
/** 弹框重置操作 */
|
||||||
resetDialogQuery(){
|
resetDialogQuery() {
|
||||||
this.dialogQuery.keyWord = "";
|
this.dialogQuery.keyWord = ''
|
||||||
this.handleDialogQuery()
|
this.handleDialogQuery()
|
||||||
},
|
},
|
||||||
/** 弹框导出操作 */
|
/** 弹框导出操作 */
|
||||||
handleDialogExport() {
|
handleDialogExport() {
|
||||||
this.download(
|
this.download(
|
||||||
'material/bm_report/exportScrapDetailsList',
|
'material/bm_report/exportScrapDetailsList',
|
||||||
{ ...this.dialogQuery},
|
{ ...this.dialogQuery },
|
||||||
`报废报表_维修合格设备_${new Date().getTime()}.xlsx`,
|
`报废报表_维修合格设备_${new Date().getTime()}.xlsx`
|
||||||
)
|
)
|
||||||
},
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
.image-type {
|
.image-type {
|
||||||
/* 旋转图片 */
|
/* 旋转图片 */
|
||||||
transform: rotate(-90deg);
|
transform: rotate(-90deg);
|
||||||
/* 确保旋转后的图片不会超出容器 */
|
/* 确保旋转后的图片不会超出容器 */
|
||||||
max-width: 100%;
|
max-width: 100%;
|
||||||
/* 保持图片的宽高比 */
|
/* 保持图片的宽高比 */
|
||||||
width: 40px;
|
width: 40px;
|
||||||
height: 80px;
|
height: 80px;
|
||||||
}
|
}
|
||||||
.sign-type{
|
.sign-type {
|
||||||
width: 80px;
|
width: 80px;
|
||||||
height: 40px;
|
height: 40px;
|
||||||
}
|
}
|
||||||
.uploadImg {
|
.uploadImg {
|
||||||
padding-top: 20px;
|
padding-top: 20px;
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
}
|
}
|
||||||
.deviceCode {
|
.deviceCode {
|
||||||
margin-top: 10px;
|
margin-top: 10px;
|
||||||
padding-bottom: 20px;
|
padding-bottom: 20px;
|
||||||
font-size: 18px;
|
font-size: 18px;
|
||||||
}
|
}
|
||||||
::v-deep.el-table .fixed-width .el-button--mini {
|
::v-deep.el-table .fixed-width .el-button--mini {
|
||||||
width: 60px !important;
|
width: 60px !important;
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
}
|
}
|
||||||
.clickText {
|
.clickText {
|
||||||
color: #02a7f0;
|
color: #02a7f0;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue