yinq
/
aucma-mes-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update - 灌注记录报表

Browse Source
master
yinq 8 months ago
parent e84aca216c
commit eb79d59c71
2 changed files with 266 additions and 152 deletions
Show Stats Download Patch File Download Diff File

44
src/api/report/perfusionRecord.js
Unescape Escape View File

@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询灌注记录列表
export function listPerfusionRecord(query) {
return request({
url: '/report/perfusionRecord/list',
method: 'get',
params: query
})
}
// 查询灌注记录详细
export function getPerfusionRecord(objId) {
return request({
url: '/report/perfusionRecord/' + objId,
method: 'get'
})
}
// 新增灌注记录
export function addPerfusionRecord(data) {
return request({
url: '/report/perfusionRecord',
method: 'post',
data: data
})
}
// 修改灌注记录
export function updatePerfusionRecord(data) {
return request({
url: '/report/perfusionRecord',
method: 'put',
data: data
})
}
// 删除灌注记录
export function delPerfusionRecord(objId) {
return request({
url: '/report/perfusionRecord/' + objId,
method: 'delete'
})
}

374
src/views/report/pourRecordReport/index.vue
Unescape Escape View File

@ -1,61 +1,35 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="产线" prop="PRODUCT_LINE_NAME">
<el-select v-model="queryParams.WORK_CENTER_CODE" placeholder="请选择产线">
<el-option
v-for="item in productLineList"
:key="item.workCenterCode"
:label="item.workCenterName"
:value="item.workCenterCode"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="产品编码" prop="MATERIAL_CODE">
<el-input
v-model="queryParams.MATERIAL_CODE"
placeholder="请输入产品编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="产品名称" prop="MATERIAL_NAME">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="箱体码" prop="perfusionBoxcode">
<el-input
v-model="queryParams.MATERIAL_NAME"
placeholder="请输入产品名称"
v-model="queryParams.perfusionBoxcode"
placeholder="请输入箱体码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="SAP订单编号" prop="ORDER_CODE">
<el-input
v-model="queryParams.ORDER_CODE"
placeholder="请输入SAP计划编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="工位">
<el-select v-model="queryParams.stationCode" placeholder="请选择工位">
<el-option
v-for="item in findStationList"
:key="item.productLineCode"
:label="item.productLineName"
:value="item.productLineCode"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="起止时间">
<el-form-item label="灌注时间">
<el-date-picker
v-model="daterangeBeginTime"
v-model="daterangeCreatedTime"
style="width: 340px"
value-format="yyyy-MM-dd"
value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange"
range-separator="-"
start-placeholder="开始时间"
end-placeholder="结束时间"
></el-date-picker>
</el-form-item>
<el-form-item label="灌注结果" prop="perfusionResult">
<el-select v-model="queryParams.perfusionResult" placeholder="请选择灌注结果" clearable>
<el-option
v-for="dict in dict.type.perfusion_result"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</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>
@ -63,70 +37,110 @@
</el-form>
<el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="warning"-->
<!-- plain-->
<!-- icon="el-icon-download"-->
<!-- size="mini"-->
<!-- @click="handleExport"-->
<!-- >导出-->
<!-- </el-button>-->
<!-- </el-col>-->
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['report:perfusionRecord:add']"
>新增
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['report:perfusionRecord:edit']"
>修改
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['report:perfusionRecord:remove']"
>删除
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['report:perfusionRecord:export']"
>导出
</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="reportList" @selection-change="handleSelectionChange">
<el-table v-loading="loading" :data="perfusionRecordList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="主键标识" align="center" prop="objId" v-if="columns[0].visible"/>
<el-table-column label="箱体码" align="center" prop="PERFUSION_BOXCODE" v-if="columns[1].visible"/>
<el-table-column label="左侧冷媒型号" align="center" prop="PERFUSION_REFRIGERANTTYPELEFT" v-if="columns[2].visible"/>
<el-table-column label="右侧侧冷媒型号" align="center" prop="PERFUSION_REFRIGERANTTYPERIGHT" v-if="columns[3].visible"/>
<el-table-column label="设置灌注量" align="center" prop="PERFUSION_SETVOLUME" v-if="columns[4].visible"/>
<el-table-column label="实际灌注量" align="center" prop="PERFUSION_ACTUALVOLUME" v-if="columns[5].visible"/>
<el-table-column label="灌注压力_R" align="center" prop="PERFUSION_R" v-if="columns[6].visible"/>
<el-table-column label="灌注压力_L" align="center" prop="PERFUSION_L" v-if="columns[7].visible"/>
<el-table-column label="灌注时长" align="center" prop="PERFUSION_DURATION" v-if="columns[7].visible"/>
<el-table-column label="系统" align="center" prop="PERFUSION_SYSTEM" v-if="columns[7].visible"/>
<el-table-column label="灌注结果" align="center" prop="PERFUSION_RESULT" v-if="columns[7].visible"/>
<el-table-column label="记录时间" align="center" prop="CREATED_TIME" v-if="columns[7].visible">
<el-table-column label="主键" align="center" prop="objId" v-if="columns[0].visible"/>
<el-table-column label="箱体码" align="center" prop="perfusionBoxcode" v-if="columns[1].visible" width="120"/>
<el-table-column label="左侧冷媒型号" align="center" prop="perfusionRefrigeranttypeleft" v-if="columns[2].visible"/>
<el-table-column label="右侧侧冷媒型号" align="center" prop="perfusionRefrigeranttyperight" v-if="columns[3].visible"/>
<el-table-column label="设置灌注量" align="center" prop="perfusionSetvolume" v-if="columns[4].visible" width="100"/>
<el-table-column label="实际灌注量" align="center" prop="perfusionActualvolume" v-if="columns[5].visible" width="100"/>
<el-table-column label="灌注压力_R" align="center" prop="perfusionR" v-if="columns[6].visible" width="100"/>
<el-table-column label="灌注压力_L" align="center" prop="perfusionL" v-if="columns[7].visible" width="100"/>
<el-table-column label="灌注时长" align="center" prop="perfusionDuration" v-if="columns[8].visible"/>
<el-table-column label="系统" align="center" prop="perfusionSystem" v-if="columns[9].visible"/>
<el-table-column label="创建人" align="center" prop="createdBy" v-if="columns[10].visible"/>
<el-table-column label="灌注时间" align="center" prop="createdTime" width="180" v-if="columns[11].visible">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.BEGIN_DATE, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
<span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-search"-->
<!-- @click="handleOrderDetails(scope.row)"-->
<!-- v-hasPermi="['report:pointDnb:edit']"-->
<!-- >检验详情</el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="更新人" align="center" prop="updatedBy" v-if="columns[12].visible"/>
<el-table-column label="更新时间" align="center" prop="updatedTime" width="180" v-if="columns[13].visible">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="灌注结果" align="center" prop="perfusionResult" v-if="columns[14].visible" width="120">
<template slot-scope="scope">
<dict-tag :options="dict.type.perfusion_result" :value="scope.row.perfusionResult"/>
</template>
</el-table-column>
<el-table-column label="产量" align="center" prop="yield" v-if="columns[15].visible"/>
<el-table-column label="灌注完成状态字" align="center" prop="finishStatus" v-if="columns[16].visible" width="120"/>
</el-table>
<!-- <pagination-->
<!-- v-show="total>0"-->
<!-- :total="total"-->
<!-- :page.sync="queryParams.pageNum"-->
<!-- :limit.sync="queryParams.pageSize"-->
<!-- @pagination="getList"-->
<!-- />-->
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
</div>
</template>
<script>
import {
pourRecordReportList
} from '@/api/report/reportAPI'
import { findProductLineList } from '@//api/base/productLine'
listPerfusionRecord,
getPerfusionRecord
} from '@/api/report/perfusionRecord'
import { parseTime } from '@//utils/ruoyi'
export default {
name: 'ReportInfo',
dicts: ['is_flag'],
name: 'PerfusionRecord',
dicts: ['perfusion_result'],
data() {
return {
// 遮罩层
@ -141,73 +155,78 @@ export default {
showSearch: true,
// 总条数
total: 0,
// 报表表格数据
reportList: [],
// 灌注记录表格数据
perfusionRecordList: [],
// 弹出层标题
title: '',
// 是否显示弹出层
open: false,
// 更新时间时间范围
daterangeBeginTime: [],
// 灌注完成状态字时间范围
daterangeCreatedTime: [],
// 查询参数
queryParams: {
// pageNum: 1,
// pageSize: 10,
beginBeginTime: null,
endBeginTime: null,
WORK_CENTER_CODE: null,
PRODUCT_LINE_NAME: null,
ORDER_CODE: null,
MATERIAL_CODE: null,
MATERIAL_NAME: null,
BEGIN_DATE: null
pageNum: 1,
pageSize: 10,
perfusionBoxcode: null,
perfusionRefrigeranttypeleft: null,
perfusionRefrigeranttyperight: null,
perfusionSetvolume: null,
perfusionActualvolume: null,
perfusionR: null,
perfusionL: null,
perfusionDuration: null,
perfusionSystem: null,
createdBy: null,
createdTime: null,
updatedBy: null,
updatedTime: null,
perfusionResult: null,
yield: null,
finishStatus: null
},
// 表单参数
form: {},
// 表单校验
rules: {},
columns: [
{ key: 0, label: `主键标识`, visible: false },
{ key: 1, label: `工位`, visible: true },
{ key: 2, label: `订单编号`, visible: true },
{ key: 3, label: `物料编码`, visible: true },
{ key: 4, label: `物料名称`, visible: true },
{ key: 5, label: `产品编码`, visible: true },
{ key: 6, label: `产品型号`, visible: true },
{ key: 7, label: `数量`, visible: true },
],
// 产线选项
productLineList: [],
// 工位选项
findStationList: []
{ key: 0, label: `主键`, visible: false },
{ key: 1, label: `箱体码`, visible: true },
{ key: 2, label: `左侧冷媒型号`, visible: false },
{ key: 3, label: `右侧侧冷媒型号`, visible: false },
{ key: 4, label: `设置灌注量`, visible: true },
{ key: 5, label: `实际灌注量`, visible: true },
{ key: 6, label: `灌注压力_R`, visible: true },
{ key: 7, label: `灌注压力_L`, visible: true },
{ key: 8, label: `灌注时长`, visible: true },
{ key: 9, label: `系统`, visible: true },
{ key: 10, label: `创建人`, visible: false },
{ key: 11, label: `灌注时间`, visible: true },
{ key: 12, label: `更新人`, visible: false },
{ key: 13, label: `更新时间`, visible: true },
{ key: 14, label: `灌注结果`, visible: true },
{ key: 15, label: `产量`, visible: true },
{ key: 16, label: `灌注完成状态字`, visible: false }
]
}
},
created() {
findProductLineList({ productLineType: 1 }).then(response => {
this.productLineList = response.data
})
findProductLineList({productLineType: 2}).then(response => {
this.findStationList = response.data;
});
const nowDate = parseTime(new Date(), '{y}-{m}-{d}')
this.daterangeBeginTime[0] = nowDate
this.daterangeBeginTime[1] = nowDate
this.daterangeCreatedTime[0] = nowDate + ' 00:00:00'
this.daterangeCreatedTime[1] = nowDate + ' 23:59:59'
this.getList()
},
methods: {
/** 查询工单信息列表 */
/** 查询灌注记录列表 */
getList() {
this.loading = true
if (null != this.daterangeBeginTime && '' != this.daterangeBeginTime) {
this.queryParams.beginBeginTime = this.daterangeBeginTime[0]
this.queryParams.endBeginTime = this.daterangeBeginTime[1]
} else {
this.queryParams.beginBeginTime = null
this.queryParams.endBeginTime = null
this.queryParams.params = {}
if (null != this.daterangeCreatedTime && '' != this.daterangeCreatedTime) {
this.queryParams.params['beginCreatedTime'] = this.daterangeCreatedTime[0]
this.queryParams.params['endCreatedTime'] = this.daterangeCreatedTime[1]
}
pourRecordReportList(this.queryParams).then(response => {
this.reportList = response.data
this.total = response.total;
listPerfusionRecord(this.queryParams).then(response => {
this.perfusionRecordList = response.rows
this.total = response.total
this.loading = false
})
},
@ -218,46 +237,97 @@ export default {
},
// 表单重置
reset() {
this.daterangeBeginTime = []
this.form = {
WORK_CENTER_CODE: null,
PRODUCT_LINE_NAME: null,
ORDER_CODE: null,
MATERIAL_CODE: null,
MATERIAL_NAME: null,
BEGIN_DATE: null
objId: null,
perfusionBoxcode: null,
perfusionRefrigeranttypeleft: null,
perfusionRefrigeranttyperight: null,
perfusionSetvolume: null,
perfusionActualvolume: null,
perfusionR: null,
perfusionL: null,
perfusionDuration: null,
perfusionSystem: null,
createdBy: null,
createdTime: null,
updatedBy: null,
updatedTime: null,
perfusionResult: null,
yield: null,
finishStatus: null
}
this.resetForm('form')
},
/** 搜索按钮操作 */
handleQuery() {
// this.queryParams.pageNum = 1;
this.queryParams.pageNum = 1
this.getList()
},
/** 重置按钮操作 */
resetQuery() {
this.daterangeCreatedTime = []
this.resetForm('queryForm')
this.handleQuery()
},
/** 查看明细 */
handleOrderDetails(row) {
this.$tab.openPage("SAP订单信息","/order/orderInfo" , {ORDER_CODE: row.ORDER_CODE});
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.objId)
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset()
this.open = true
this.title = '添加灌注记录'
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset()
const objId = row.objId || this.ids
getPerfusionRecord(objId).then(response => {
this.form = response.data
this.open = true
this.title = '修改灌注记录'
})
},
/** 提交按钮 */
submitForm() {
this.$refs['form'].validate(valid => {
if (valid) {
if (this.form.objId != null) {
updatePerfusionRecord(this.form).then(response => {
this.$modal.msgSuccess('修改成功')
this.open = false
this.getList()
})
} else {
addPerfusionRecord(this.form).then(response => {
this.$modal.msgSuccess('新增成功')
this.open = false
this.getList()
})
}
}
})
},
/** 删除按钮操作 */
handleDelete(row) {
const objIds = row.objId || this.ids
this.$modal.confirm('是否确认删除灌注记录编号为"' + objIds + '"的数据项？').then(function() {
return delPerfusionRecord(objIds)
}).then(() => {
this.getList()
this.$modal.msgSuccess('删除成功')
}).catch(() => {
})
},
/** 导出按钮操作 */
handleExport() {
this.download('/report/productionReport/export', {
this.download('report/perfusionRecord/export', {
...this.queryParams
}, `report_${new Date().getTime()}.xlsx`)
}, `perfusionRecord_${new Date().getTime()}.xlsx`)
}
}
}
</script>

Write Preview
Loading…
Cancel
Save