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

Merge remote-tracking branch 'origin/master'

Browse Source
master
夜笙歌 11 months ago
parent ddc83ecaa5 28a51fa954
commit 30743a1c32
4 changed files with 275 additions and 186 deletions
Show Stats Download Patch File Download Diff File

9
src/api/report/reportAPI.js
Unescape Escape View File

@ -54,6 +54,15 @@ export function qualityDefectsStatisticalAnalysisList(query) {
}) })
} }
// 质量缺陷统计分析明细
export function qualityDefectsDetailList(query) {
return request({
url: '/report/qualityReport/qualityDefectsDetailList',
method: 'get',
params: query
})
}
// 少错件报表 // 少错件报表
export function fewerMistakesReportList(query) { export function fewerMistakesReportList(query) {
return request({ return request({

8
src/views/base/orderInfo/index.vue
Unescape Escape View File

@ -19,6 +19,14 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="物料编号" prop="materialCode">
<el-input
v-model="queryParams.materialCode"
placeholder="请输入物料编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="工单类型" prop="orderType"> <el-form-item label="工单类型" prop="orderType">
<el-select v-model="queryParams.orderType" placeholder="请选择工单类型" clearable> <el-select v-model="queryParams.orderType" placeholder="请选择工单类型" clearable>
<el-option <el-option

272
src/views/production/planInfo/index.vue
Unescape Escape View File

@ -54,16 +54,16 @@
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5">--> <!-- <el-col :span="1.5">-->
<!-- <el-button--> <!-- <el-button-->
<!-- type="primary"--> <!-- type="primary"-->
<!-- plain--> <!-- plain-->
<!-- icon="el-icon-plus"--> <!-- icon="el-icon-plus"-->
<!-- size="mini"--> <!-- size="mini"-->
<!-- @click="handleAdd"--> <!-- @click="handleAdd"-->
<!-- v-hasPermi="['production:planInfo:add']"--> <!-- v-hasPermi="['production:planInfo:add']"-->
<!-- >新增</el-button>--> <!-- >新增</el-button>-->
<!-- </el-col>--> <!-- </el-col>-->
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="success" type="success"
@ -73,7 +73,8 @@
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['production:planInfo:edit']" v-hasPermi="['production:planInfo:edit']"
>修改</el-button> >修改
</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@ -84,7 +85,8 @@
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['production:planInfo:remove']" v-hasPermi="['production:planInfo:remove']"
>删除</el-button> >删除
</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@ -94,47 +96,50 @@
size="mini" size="mini"
@click="handleExport" @click="handleExport"
v-hasPermi="['production:planInfo:export']" v-hasPermi="['production:planInfo:export']"
>导出</el-button> >导出
</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="planInfoList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="planInfoList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <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="objId" v-if="columns[0].visible"/>
<el-table-column label="SAP计划编号" align="center" prop="orderCode" width="100" v-if="columns[2].visible"/> <el-table-column label="产线编号" align="center" prop="productLineCode" width="100" v-if="columns[1].visible"/>
<el-table-column label="销售订单编号" align="center" prop="saleOrderCode" width="100" v-if="columns[3].visible"/> <el-table-column label="产线名称" align="center" prop="productLineName" width="100" v-if="columns[2].visible"/>
<el-table-column label="销售订单行号" align="center" prop="saleorderLinenumber" width="100" v-if="columns[4].visible"/> <el-table-column label="SAP计划编号" align="center" prop="orderCode" width="100" v-if="columns[3].visible"/>
<el-table-column label="MES工单编号" align="center" prop="planCode" width="110" v-if="columns[1].visible"/> <el-table-column label="销售订单编号" align="center" prop="saleOrderCode" width="100" v-if="columns[4].visible"/>
<el-table-column label="销售订单行号" align="center" prop="saleorderLinenumber" width="100" v-if="columns[5].visible"/>
<el-table-column label="物料编号" align="center" prop="materialCode" width="100" v-if="columns[5].visible"/> <el-table-column label="MES工单编号" align="center" prop="planCode" width="110" v-if="columns[6].visible"/>
<el-table-column label="物料名称" align="center" prop="materialName" width="200" v-if="columns[6].visible"/> <el-table-column label="物料编号" align="center" prop="materialCode" width="100" v-if="columns[7].visible"/>
<el-table-column label="计划工位" align="center" prop="productLineName" width="100" v-if="columns[7].visible"/> <el-table-column label="物料名称" align="center" prop="materialName" width="200" v-if="columns[8].visible"/>
<el-table-column label="计划数量" align="center" prop="planAmount" v-if="columns[8].visible"/> <el-table-column label="计划工位编号" align="center" prop="stationCode" width="100" v-if="columns[9].visible"/>
<el-table-column label="完成数量" align="center" prop="completeAmount" v-if="columns[9].visible"/> <el-table-column label="计划工位名称" align="center" prop="stationName" width="100" v-if="columns[10].visible"/>
<el-table-column label="实际开始时间" align="center" prop="beginTime" width="100" v-if="columns[10].visible"> <el-table-column label="计划数量" align="center" prop="planAmount" v-if="columns[11].visible"/>
<el-table-column label="完成数量" align="center" prop="completeAmount" v-if="columns[12].visible"/>
<el-table-column label="实际开始时间" align="center" prop="beginTime" width="100" v-if="columns[13].visible">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.beginTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> <span>{{ parseTime(scope.row.beginTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="实际完成时间" align="center" prop="endTime" width="100" v-if="columns[11].visible"> <el-table-column label="实际完成时间" align="center" prop="endTime" width="100" v-if="columns[14].visible">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="是否标识" align="center" prop="isFlag" v-if="columns[12].visible"> <el-table-column label="是否标识" align="center" prop="isFlag" v-if="columns[15].visible">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/> <dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="创建人" align="center" prop="createdBy" v-if="columns[13].visible"/> <el-table-column label="创建人" align="center" prop="createdBy" v-if="columns[16].visible"/>
<el-table-column label="创建时间" align="center" prop="createdTime" width="180" v-if="columns[14].visible"> <el-table-column label="创建时间" align="center" prop="createdTime" width="180" v-if="columns[17].visible">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> <span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="更新人" align="center" prop="updatedBy" v-if="columns[15].visible"/> <el-table-column label="更新人" align="center" prop="updatedBy" v-if="columns[18].visible"/>
<el-table-column label="更新时间" align="center" prop="updatedTime" width="180" v-if="columns[16].visible"> <el-table-column label="更新时间" align="center" prop="updatedTime" width="180" v-if="columns[19].visible">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> <span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template> </template>
@ -147,14 +152,15 @@
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['production:planInfo:edit']" v-hasPermi="['production:planInfo:edit']"
>修改计划</el-button> >修改计划
<!-- <el-button--> </el-button>
<!-- size="mini"--> <!-- <el-button-->
<!-- type="text"--> <!-- size="mini"-->
<!-- icon="el-icon-delete"--> <!-- type="text"-->
<!-- @click="handleDelete(scope.row)"--> <!-- icon="el-icon-delete"-->
<!-- v-hasPermi="['production:planInfo:remove']"--> <!-- @click="handleDelete(scope.row)"-->
<!-- >删除</el-button>--> <!-- v-hasPermi="['production:planInfo:remove']"-->
<!-- >删除</el-button>-->
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -170,11 +176,21 @@
<!-- 添加或修改生产计划对话框 --> <!-- 添加或修改生产计划对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="产线">
<el-select v-model="form.productLineCode" placeholder="请选择产线" :disabled="true">
<el-option
v-for="item in productLineList"
:key="item.productLineCode"
:label="item.productLineName"
:value="item.productLineCode"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="SAP计划编号" prop="orderCode"> <el-form-item label="SAP计划编号" prop="orderCode">
<el-input v-model="form.orderCode" :disabled="true"/> <el-input v-model="form.orderCode" :disabled="true"/>
</el-form-item> </el-form-item>
<el-form-item label="工单编号" prop="planCode"> <el-form-item label="工单编号" prop="planCode">
<el-input v-model="form.planCode" :disabled="true"/> <el-input v-model="form.planCode" :disabled="true"/>
</el-form-item> </el-form-item>
<el-form-item label="销售订单编号" prop="saleOrderCode"> <el-form-item label="销售订单编号" prop="saleOrderCode">
<el-input v-model="form.saleOrderCode" placeholder="请输入销售订单编号" :disabled="true"/> <el-input v-model="form.saleOrderCode" placeholder="请输入销售订单编号" :disabled="true"/>
@ -188,8 +204,9 @@
<el-form-item label="物料名称" prop="materialName"> <el-form-item label="物料名称" prop="materialName">
<el-input v-model="form.materialName" placeholder="请输入物料名称" :disabled="true"/> <el-input v-model="form.materialName" placeholder="请输入物料名称" :disabled="true"/>
</el-form-item> </el-form-item>
<el-form-item label="计划工位"> <el-form-item label="计划工位">
<el-select v-model="form.productLineCode" placeholder="请选择产线工位"> <el-select v-model="form.stationCode" placeholder="请选择计划工位" :disabled="true">
<el-option <el-option
v-for="item in productLineList" v-for="item in productLineList"
:key="item.productLineCode" :key="item.productLineCode"
@ -199,25 +216,27 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="计划数量" prop="planAmount"> <el-form-item label="计划数量" prop="planAmount">
<el-input v-model="form.planAmount" placeholder="请输入计划数量" /> <el-input v-model="form.planAmount" placeholder="请输入计划数量"/>
</el-form-item> </el-form-item>
<el-form-item label="完成数量" prop="completeAmount"> <el-form-item label="完成数量" prop="completeAmount">
<el-input v-model="form.completeAmount" placeholder="请输入完成数量" /> <el-input v-model="form.completeAmount" placeholder="请输入完成数量"/>
</el-form-item> </el-form-item>
<el-form-item label="实际开始时间" prop="beginTime"> <el-form-item label="实际开始时间" prop="beginTime">
<el-date-picker clearable <el-date-picker clearable
v-model="form.beginTime" v-model="form.beginTime"
type="datetime" type="datetime"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择实际开始时间"> placeholder="请选择实际开始时间"
>
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="实际完成时间" prop="endTime"> <el-form-item label="实际完成时间" prop="endTime">
<el-date-picker clearable <el-date-picker clearable
v-model="form.endTime" v-model="form.endTime"
type="datetime" type="datetime"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择实际完成时间"> placeholder="请选择实际完成时间"
>
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -230,11 +249,11 @@
</template> </template>
<script> <script>
import { listPlanInfo, getPlanInfo, delPlanInfo, addPlanInfo, updatePlanInfo } from "@/api/production/planInfo"; import { listPlanInfo, getPlanInfo, delPlanInfo, addPlanInfo, updatePlanInfo } from '@/api/production/planInfo'
import { findProductLineList } from '@//api/base/productLine' import { findProductLineList } from '@//api/base/productLine'
export default { export default {
name: "PlanInfo", name: 'PlanInfo',
dicts: ['is_flag'], dicts: ['is_flag'],
data() { data() {
return { return {
@ -253,7 +272,7 @@ export default {
// 生产计划表格数据 // 生产计划表格数据
planInfoList: [], planInfoList: [],
// 弹出层标题 // 弹出层标题
title: "", title: '',
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
// 更新时间时间范围 // 更新时间时间范围
@ -284,60 +303,62 @@ export default {
// 表单参数 // 表单参数
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {},
},
columns: [ columns: [
{ key: 0, label: `主键标识`, visible: false }, { key: 0, label: `主键标识`, visible: false },
{ key: 1, label: `计划编号`, visible: true }, { key: 1, label: `产线编号`, visible: false },
{ key: 2, label: `工单编号`, visible: true }, { key: 2, label: `产线名称`, visible: true },
{ key: 3, label: `销售订单编号`, visible: true }, { key: 3, label: `SAP计划编号`, visible: true },
{ key: 4, label: `销售订单行号`, visible: true }, { key: 4, label: `销售订单编号`, visible: false },
{ key: 5, label: `物料编号`, visible: true }, { key: 5, label: `销售订单行号`, visible: false },
{ key: 6, label: `物料名称`, visible: true }, { key: 6, label: `MES工单编号`, visible: true },
{ key: 7, label: `计划工位`, visible: true }, { key: 7, label: `物料编号`, visible: true },
{ key: 8, label: `计划数量`, visible: true }, { key: 8, label: `物料名称`, visible: true },
{ key: 9, label: `完成数量`, visible: true }, { key: 9, label: `计划工位编号`, visible: false },
{ key: 10, label: `实际开始时间`, visible: true }, { key: 10, label: `计划工位名称`, visible: true },
{ key: 11, label: `实际完成时间`, visible: true }, { key: 11, label: `计划数量`, visible: true },
{ key: 12, label: `是否标识`, visible: false }, { key: 12, label: `完成数量`, visible: false },
{ key: 13, label: `创建人`, visible: false }, { key: 13, label: `实际开始时间`, visible: true },
{ key: 14, label: `创建时间`, visible: false }, { key: 14, label: `实际结束时间`, visible: true },
{ key: 15, label: `更新人`, visible: false }, { key: 15, label: `是否标识`, visible: false },
{ key: 16, label: `更新时间`, visible: false }, { key: 16, label: `创建人`, visible: false },
], { key: 17, label: `创建时间`, visible: false },
{ key: 18, label: `更新人`, visible: false },
{ key: 19, label: `更新时间`, visible: false }
],
// 产线工位选项 // 产线工位选项
productLineList: [], productLineList: []
}; }
}, },
created() { created() {
this.getList(); this.getList()
findProductLineList().then(response => { findProductLineList().then(response => {
this.productLineList = response.data; this.productLineList = response.data
}); })
}, },
methods: { methods: {
/** 查询生产计划列表 */ /** 查询生产计划列表 */
getList() { getList() {
this.loading = true; this.loading = true
this.queryParams.params = {}; this.queryParams.params = {}
if (null != this.daterangeBeginTime && '' != this.daterangeBeginTime) { if (null != this.daterangeBeginTime && '' != this.daterangeBeginTime) {
this.queryParams.params["beginBeginTime"] = this.daterangeBeginTime[0]; this.queryParams.params['beginBeginTime'] = this.daterangeBeginTime[0]
this.queryParams.params["endBeginTime"] = this.daterangeBeginTime[1]; this.queryParams.params['endBeginTime'] = this.daterangeBeginTime[1]
} }
if (null != this.daterangeEndTime && '' != this.daterangeEndTime) { if (null != this.daterangeEndTime && '' != this.daterangeEndTime) {
this.queryParams.params["beginEndTime"] = this.daterangeEndTime[0]; this.queryParams.params['beginEndTime'] = this.daterangeEndTime[0]
this.queryParams.params["endEndTime"] = this.daterangeEndTime[1]; this.queryParams.params['endEndTime'] = this.daterangeEndTime[1]
} }
listPlanInfo(this.queryParams).then(response => { listPlanInfo(this.queryParams).then(response => {
this.planInfoList = response.rows; this.planInfoList = response.rows
this.total = response.total; this.total = response.total
this.loading = false; this.loading = false
}); })
}, },
// 取消按钮 // 取消按钮
cancel() { cancel() {
this.open = false; this.open = false
this.reset(); this.reset()
}, },
// 表单重置 // 表单重置
reset() { reset() {
@ -359,72 +380,73 @@ export default {
createdTime: null, createdTime: null,
updatedBy: null, updatedBy: null,
updatedTime: null updatedTime: null
}; }
this.resetForm("form"); this.resetForm('form')
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.queryParams.pageNum = 1
this.getList(); this.getList()
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.daterangeBeginTime = []; this.daterangeBeginTime = []
this.daterangeEndTime = []; this.daterangeEndTime = []
this.resetForm("queryForm"); this.resetForm('queryForm')
this.handleQuery(); this.handleQuery()
}, },
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map(item => item.objId) this.ids = selection.map(item => item.objId)
this.single = selection.length!==1 this.single = selection.length !== 1
this.multiple = !selection.length this.multiple = !selection.length
}, },
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
this.reset(); this.reset()
this.open = true; this.open = true
this.title = "添加生产计划"; this.title = '添加生产计划'
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset()
const objId = row.objId || this.ids const objId = row.objId || this.ids
getPlanInfo(objId).then(response => { getPlanInfo(objId).then(response => {
this.form = response.data; this.form = response.data
this.open = true; this.open = true
this.title = "修改生产计划"; this.title = '修改生产计划'
}); })
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
this.$refs["form"].validate(valid => { this.$refs['form'].validate(valid => {
if (valid) { if (valid) {
if (this.form.objId != null) { if (this.form.objId != null) {
updatePlanInfo(this.form).then(response => { updatePlanInfo(this.form).then(response => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess('修改成功')
this.open = false; this.open = false
this.getList(); this.getList()
}); })
} else { } else {
addPlanInfo(this.form).then(response => { addPlanInfo(this.form).then(response => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess('新增成功')
this.open = false; this.open = false
this.getList(); this.getList()
}); })
} }
} }
}); })
}, },
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const objIds = row.objId || this.ids; const objIds = row.objId || this.ids
this.$modal.confirm('是否确认删除生产计划编号为"' + objIds + '"的数据项？').then(function() { this.$modal.confirm('是否确认删除生产计划编号为"' + objIds + '"的数据项？').then(function() {
return delPlanInfo(objIds); return delPlanInfo(objIds)
}).then(() => { }).then(() => {
this.getList(); this.getList()
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess('删除成功')
}).catch(() => {}); }).catch(() => {
})
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
@ -433,5 +455,5 @@ export default {
}, `planInfo_${new Date().getTime()}.xlsx`) }, `planInfo_${new Date().getTime()}.xlsx`)
} }
} }
}; }
</script> </script>

172
src/views/report/qualityDefectsStatisticalAnalysisReport/index.vue
Unescape Escape View File

@ -1,42 +1,42 @@
<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="100px"> <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-form-item label="产线" prop="PRODUCT_LINE_CODE">
<el-select v-model="queryParams.WORK_CENTER_CODE" placeholder="请选择产线"> <el-select v-model="queryParams.PRODUCT_LINE_CODE" placeholder="请选择产线">
<el-option <el-option
v-for="item in productLineList" v-for="item in productLineList"
:key="item.workCenterCode" :key="item.productLineCode"
:label="item.workCenterName" :label="item.productLineName"
:value="item.workCenterCode" :value="item.productLineCode"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item label="产品编码" prop="MATERIAL_CODE">--> <!-- <el-form-item label="产品编码" prop="MATERIAL_CODE">-->
<!-- <el-input--> <!-- <el-input-->
<!-- v-model="queryParams.MATERIAL_CODE"--> <!-- v-model="queryParams.MATERIAL_CODE"-->
<!-- placeholder="请输入产品编码"--> <!-- placeholder="请输入产品编码"-->
<!-- clearable--> <!-- clearable-->
<!-- @keyup.enter.native="handleQuery"--> <!-- @keyup.enter.native="handleQuery"-->
<!-- />--> <!-- />-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- <el-form-item label="产品名称" prop="MATERIAL_NAME">--> <!-- <el-form-item label="产品名称" prop="MATERIAL_NAME">-->
<!-- <el-input--> <!-- <el-input-->
<!-- v-model="queryParams.MATERIAL_NAME"--> <!-- v-model="queryParams.MATERIAL_NAME"-->
<!-- placeholder="请输入产品名称"--> <!-- placeholder="请输入产品名称"-->
<!-- clearable--> <!-- clearable-->
<!-- @keyup.enter.native="handleQuery"--> <!-- @keyup.enter.native="handleQuery"-->
<!-- />--> <!-- />-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- <el-form-item label="SAP订单编号" prop="ORDER_CODE">--> <!-- <el-form-item label="SAP订单编号" prop="ORDER_CODE">-->
<!-- <el-input--> <!-- <el-input-->
<!-- v-model="queryParams.ORDER_CODE"--> <!-- v-model="queryParams.ORDER_CODE"-->
<!-- placeholder="请输入SAP计划编号"--> <!-- placeholder="请输入SAP计划编号"-->
<!-- clearable--> <!-- clearable-->
<!-- @keyup.enter.native="handleQuery"--> <!-- @keyup.enter.native="handleQuery"-->
<!-- />--> <!-- />-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="工位"> <el-form-item label="工位">
<el-select v-model="queryParams.stationCode" placeholder="请选择工位"> <el-select v-model="queryParams.STATION_CODE" placeholder="请选择工位">
<el-option <el-option
v-for="item in findStationList" v-for="item in findStationList"
:key="item.productLineCode" :key="item.productLineCode"
@ -49,7 +49,7 @@
<el-date-picker <el-date-picker
v-model="daterangeBeginTime" v-model="daterangeBeginTime"
style="width: 340px" style="width: 340px"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange" type="datetimerange"
range-separator="-" range-separator="-"
start-placeholder="开始时间" start-placeholder="开始时间"
@ -79,15 +79,13 @@
<el-table v-loading="loading" :data="reportList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="reportList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"/> <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="objId" v-if="columns[0].visible"/>
<el-table-column label="工厂" align="center" prop="PRODUCT_STATION" v-if="columns[1].visible"/> <el-table-column label="工厂" align="center" prop="FACTORY_NAME" v-if="columns[1].visible"/>
<el-table-column label="产线" align="center" prop="ORDER_CODE" v-if="columns[2].visible"/> <el-table-column label="产线编号" align="center" prop="PRODUCT_LINE_CODE" v-if="columns[2].visible"/>
<el-table-column label="质检工位" align="center" prop="MATERIAL_CODE" v-if="columns[3].visible"> <el-table-column label="产线名称" align="center" prop="PRODUCT_LINE_NAME" v-if="columns[3].visible"/>
<template slot-scope="scope"> <el-table-column label="质检工位编号" align="center" prop="STATION_CODE" v-if="columns[4].visible"/>
<span>{{ parseTime(scope.row.BEGIN_DATE, '{y}-{m}-{d}') }}</span> <el-table-column label="质检工位名称" align="center" prop="STATION_NAME" v-if="columns[5].visible"/>
</template> <el-table-column label="检测数不合格数" align="center" prop="REWORK_NUMBER" v-if="columns[6].visible"/>
</el-table-column> <el-table-column label="合格率(%)" align="center" prop="RATE" v-if="columns[7].visible"/>
<el-table-column label="检测数不合格数" align="center" prop="MATERIAL_NAME" v-if="columns[4].visible"/>
<el-table-column label="合格率(%)" align="center" prop="PRODUCT_CODE" v-if="columns[5].visible"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -95,8 +93,8 @@
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleOrderDetails(scope.row)" @click="handleOrderDetails(scope.row)"
v-hasPermi="['report:pointDnb:edit']" >查看缺陷明细
>查看缺陷明细</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -108,16 +106,52 @@
<!-- @pagination="getList"--> <!-- @pagination="getList"-->
<!-- />--> <!-- />-->
<!-- 添加或修改记录对话框 -->
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row gutter="15">
<el-col :span="11">
<el-form-item label="产线" prop="PRODUCT_LINE_NAME">
<el-input v-model="form.PRODUCT_LINE_NAME" :disabled="true"/>
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item label="质检工位" prop="STATION_NAME">
<el-input v-model="form.STATION_NAME" :disabled="true"/>
</el-form-item>
</el-col>
</el-row>
<el-divider content-position="center">工位缺陷明细信息</el-divider>
<el-table :data="qualityDefectstList" ref="detailElectricalinspection"
>
<el-table-column type="selection" width="50" align="center"/>
<el-table-column label="序号" prop="SEQ" width="150">
</el-table-column>
<el-table-column label="缺陷名称" prop="QUALITY_DEFECT_NAME" width="150">
</el-table-column>
<el-table-column label="数量" prop="DEFECT_NUMBER" width="150">
</el-table-column>
<el-table-column label="比例" prop="RATE" width="150">
</el-table-column>
</el-table>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="cancel">关 闭</el-button>
</div>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { import {
qualityDefectsStatisticalAnalysisList qualityDefectsStatisticalAnalysisList,
qualityDefectsDetailList
} from '@/api/report/reportAPI' } from '@/api/report/reportAPI'
import { findProductLineList } from '@//api/base/productLine' import { findProductLineList } from '@//api/base/productLine'
import { parseTime } from '@//utils/ruoyi' import { parseTime } from '@//utils/ruoyi'
import { getPointDnb } from '@//api/report/pointDnb'
export default { export default {
name: 'ReportInfo', name: 'ReportInfo',
@ -138,6 +172,8 @@ export default {
total: 0, total: 0,
// 报表表格数据 // 报表表格数据
reportList: [], reportList: [],
// 质量数据
qualityDefectstList: [],
// 弹出层标题 // 弹出层标题
title: '', title: '',
// 是否显示弹出层 // 是否显示弹出层
@ -150,8 +186,8 @@ export default {
// pageSize: 10, // pageSize: 10,
beginBeginTime: null, beginBeginTime: null,
endBeginTime: null, endBeginTime: null,
WORK_CENTER_CODE: null, STATION_CODE: null,
PRODUCT_LINE_NAME: null, PRODUCT_LINE_CODE: 'CX_02',
ORDER_CODE: null, ORDER_CODE: null,
MATERIAL_CODE: null, MATERIAL_CODE: null,
MATERIAL_NAME: null, MATERIAL_NAME: null,
@ -163,13 +199,13 @@ export default {
rules: {}, rules: {},
columns: [ columns: [
{ key: 0, label: `主键标识`, visible: false }, { key: 0, label: `主键标识`, visible: false },
{ key: 1, label: `工位`, visible: true }, { key: 1, label: `工厂`, visible: true },
{ key: 2, label: `订单编号`, visible: true }, { key: 2, label: `产线编号`, visible: false },
{ key: 3, label: `物料编码`, visible: true }, { key: 3, label: `产线名称`, visible: true },
{ key: 4, label: `物料名称`, visible: true }, { key: 4, label: `质检工位编号`, visible: false },
{ key: 5, label: `产品编码`, visible: true }, { key: 5, label: `质检工位名称`, visible: true },
{ key: 6, label: `产品型号`, visible: true }, { key: 6, label: `检测数不合格数`, visible: true },
{ key: 7, label: `数量`, visible: true }, { key: 7, label: `合格率(%)`, visible: true }
], ],
// 产线选项 // 产线选项
productLineList: [], productLineList: [],
@ -181,12 +217,12 @@ export default {
findProductLineList({ productLineType: 1 }).then(response => { findProductLineList({ productLineType: 1 }).then(response => {
this.productLineList = response.data this.productLineList = response.data
}) })
findProductLineList({productLineType: 2}).then(response => { findProductLineList({ productLineType: 2, stationType: 2 }).then(response => {
this.findStationList = response.data; this.findStationList = response.data
}); })
const nowDate = parseTime(new Date(), '{y}-{m}-{d}') const nowDate = parseTime(new Date(), '{y}-{m}-{d}')
this.daterangeBeginTime[0] = nowDate this.daterangeBeginTime[0] = nowDate + ' 00:00:00'
this.daterangeBeginTime[1] = nowDate this.daterangeBeginTime[1] = nowDate + ' 23:59:59'
this.getList() this.getList()
}, },
methods: { methods: {
@ -201,8 +237,8 @@ export default {
this.queryParams.endBeginTime = null this.queryParams.endBeginTime = null
} }
qualityDefectsStatisticalAnalysisList(this.queryParams).then(response => { qualityDefectsStatisticalAnalysisList(this.queryParams).then(response => {
// this.reportList = response.data this.reportList = response.data
// this.total = response.total; this.total = response.total
this.loading = false this.loading = false
}) })
}, },
@ -234,9 +270,23 @@ export default {
this.resetForm('queryForm') this.resetForm('queryForm')
this.handleQuery() this.handleQuery()
}, },
/** 查看明细 */ /** 查看明细 */
handleOrderDetails(row) { handleOrderDetails(row) {
this.$tab.openPage("SAP订单信息","/order/orderInfo" , {ORDER_CODE: row.ORDER_CODE}); this.reset()
const objId = row.objId || this.ids
this.open = true
qualityDefectsDetailList({
stationCode: row.STATION_CODE,
beginBeginTime: this.queryParams.beginBeginTime,
endBeginTime: this.queryParams.endBeginTime
}).then(response => {
this.qualityDefectstList = response.data
this.form.PRODUCT_LINE_NAME = row.PRODUCT_LINE_NAME
this.form.STATION_NAME = row.STATION_NAME
this.open = true
this.title = '缺陷明细'
})
}, },
// 多选框选中数据 // 多选框选中数据

Write Preview
Loading…
Cancel
Save