|
|
@ -2,12 +2,12 @@
|
|
|
|
<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_NAME">
|
|
|
|
<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>
|
|
|
@ -35,21 +35,27 @@
|
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
|
/>
|
|
|
|
/>
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
|
<el-form-item label="工位">
|
|
|
|
<el-form-item label="MES条码" prop="BOX_CODE">
|
|
|
|
<el-select v-model="queryParams.stationCode" placeholder="请选择工位">
|
|
|
|
<el-input
|
|
|
|
<el-option
|
|
|
|
v-model="queryParams.BOX_CODE"
|
|
|
|
v-for="item in findStationList"
|
|
|
|
placeholder="请输入MES条码"
|
|
|
|
:key="item.productLineCode"
|
|
|
|
clearable
|
|
|
|
:label="item.productLineName"
|
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
|
:value="item.productLineCode"
|
|
|
|
/>
|
|
|
|
></el-option>
|
|
|
|
</el-form-item>
|
|
|
|
</el-select>
|
|
|
|
<el-form-item label="成品条码" prop="PRODUCT_SNCODE">
|
|
|
|
|
|
|
|
<el-input
|
|
|
|
|
|
|
|
v-model="queryParams.PRODUCT_SNCODE"
|
|
|
|
|
|
|
|
placeholder="请输入SAP成品条码"
|
|
|
|
|
|
|
|
clearable
|
|
|
|
|
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
|
|
|
|
|
/>
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
|
<el-form-item label="起止时间">
|
|
|
|
<el-form-item label="起止时间">
|
|
|
|
<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="开始时间"
|
|
|
@ -77,20 +83,17 @@
|
|
|
|
</el-row>
|
|
|
|
</el-row>
|
|
|
|
|
|
|
|
|
|
|
|
<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="PRODUCT_STATION" 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_NAME" v-if="columns[2].visible" width="70"/>
|
|
|
|
<el-table-column label="SAP订单编号" align="center" prop="MATERIAL_CODE" v-if="columns[3].visible">
|
|
|
|
<el-table-column label="SAP订单编号" align="center" prop="ORDER_CODE" v-if="columns[3].visible"/>
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<el-table-column label="销售订单号" align="center" prop="SALEORDER_CODE" v-if="columns[4].visible"/>
|
|
|
|
<span>{{ parseTime(scope.row.BEGIN_DATE, '{y}-{m}-{d}') }}</span>
|
|
|
|
<el-table-column label="销售订单行号" align="center" prop="SALEORDER_LINENUMBER" v-if="columns[5].visible"/>
|
|
|
|
</template>
|
|
|
|
<el-table-column label="产品编码" align="center" prop="MATERIAL_CODE" v-if="columns[6].visible"/>
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column label="产品名称" align="center" prop="MATERIAL_NAME" v-if="columns[7].visible" width="250"/>
|
|
|
|
<el-table-column label="销售订单号" align="center" prop="MATERIAL_NAME" v-if="columns[4].visible"/>
|
|
|
|
<el-table-column label="MES条码" align="center" prop="BOX_CODE" v-if="columns[8].visible" width="200"/>
|
|
|
|
<el-table-column label="销售订单行号" align="center" prop="PRODUCT_CODE" v-if="columns[5].visible"/>
|
|
|
|
<el-table-column label="成品条码" align="center" prop="PRODUCT_SNCODE" v-if="columns[9].visible" width="200"/>
|
|
|
|
<el-table-column label="物料编码" align="center" prop="PRODUCT_NAME" v-if="columns[6].visible"/>
|
|
|
|
|
|
|
|
<el-table-column label="MES条码" align="center" prop="COMPLETE_AMOUNT" v-if="columns[7].visible"/>
|
|
|
|
|
|
|
|
<el-table-column label="成品条码" align="center" prop="COMPLETE_AMOUNT" v-if="columns[7].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
|
|
|
@ -98,32 +101,82 @@
|
|
|
|
type="text"
|
|
|
|
type="text"
|
|
|
|
icon="el-icon-search"
|
|
|
|
icon="el-icon-search"
|
|
|
|
@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>
|
|
|
|
<!-- <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"
|
|
|
|
<!-- @pagination="getList"-->
|
|
|
|
@pagination="getList"
|
|
|
|
<!-- />-->
|
|
|
|
/>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<!-- 详情信息对话框 -->
|
|
|
|
|
|
|
|
<el-dialog :title="title" :visible.sync="open" width="1000px" 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="SAP订单编号" prop="ORDER_CODE">
|
|
|
|
|
|
|
|
<el-input v-model="form.ORDER_CODE" placeholder="请输入SAP订单编号" :disabled="true"/>
|
|
|
|
|
|
|
|
</el-form-item>
|
|
|
|
|
|
|
|
</el-col>
|
|
|
|
|
|
|
|
<el-col :span="11">
|
|
|
|
|
|
|
|
<el-form-item label="MES条码" prop="BOX_CODE">
|
|
|
|
|
|
|
|
<el-input v-model="form.BOX_CODE" placeholder="请输入MES条码" :disabled="true"/>
|
|
|
|
|
|
|
|
</el-form-item>
|
|
|
|
|
|
|
|
</el-col>
|
|
|
|
|
|
|
|
</el-row>
|
|
|
|
|
|
|
|
<el-divider content-position="center">产品检验详情信息</el-divider>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<el-table :data="reportDetailList" :row-class-name="rowDetailIndex"
|
|
|
|
|
|
|
|
ref="reportDetailRef"
|
|
|
|
|
|
|
|
>
|
|
|
|
|
|
|
|
<!-- <el-table-column type="selection" width="50" align="center"/>-->
|
|
|
|
|
|
|
|
<el-table-column label="序号" prop="index" width="150">
|
|
|
|
|
|
|
|
</el-table-column>
|
|
|
|
|
|
|
|
<el-table-column label="质检工位" prop="PRODUCT_LINE_NAME" width="150">
|
|
|
|
|
|
|
|
</el-table-column>
|
|
|
|
|
|
|
|
<el-table-column label="处理措施" prop="TREATMENT_MEASURE" width="150">
|
|
|
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
|
|
|
<dict-tag :options="dict.type.treatment_measures" :value="scope.row.TREATMENT_MEASURE"/>
|
|
|
|
|
|
|
|
</template>
|
|
|
|
|
|
|
|
</el-table-column>
|
|
|
|
|
|
|
|
<el-table-column label="返修结果" prop="PROCESS_RESULT" width="150">
|
|
|
|
|
|
|
|
</el-table-column>
|
|
|
|
|
|
|
|
<el-table-column label="检验时间" prop="INSPECTOR_TIME" width="150">
|
|
|
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
|
|
|
<span>{{ parseTime(scope.row.INSPECTOR_TIME, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
|
|
|
|
|
|
|
|
</template>
|
|
|
|
|
|
|
|
</el-table-column>
|
|
|
|
|
|
|
|
<el-table-column label="检验人" prop="USER_NAME" 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 {
|
|
|
|
productionExecutionReportList
|
|
|
|
productTraceabilityDetailList,
|
|
|
|
|
|
|
|
productTraceabilityReportList
|
|
|
|
} 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'
|
|
|
|
|
|
|
|
|
|
|
|
export default {
|
|
|
|
export default {
|
|
|
|
name: 'ReportInfo',
|
|
|
|
name: 'ReportInfo',
|
|
|
|
dicts: ['is_flag'],
|
|
|
|
dicts: ['is_flag', 'treatment_measures'],
|
|
|
|
data() {
|
|
|
|
data() {
|
|
|
|
return {
|
|
|
|
return {
|
|
|
|
// 遮罩层
|
|
|
|
// 遮罩层
|
|
|
@ -152,26 +205,29 @@ export default {
|
|
|
|
// pageSize: 10,
|
|
|
|
// pageSize: 10,
|
|
|
|
beginBeginTime: null,
|
|
|
|
beginBeginTime: null,
|
|
|
|
endBeginTime: null,
|
|
|
|
endBeginTime: null,
|
|
|
|
WORK_CENTER_CODE: null,
|
|
|
|
BOX_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,
|
|
|
|
BEGIN_DATE: null
|
|
|
|
PRODUCT_SNCODE: null
|
|
|
|
},
|
|
|
|
},
|
|
|
|
// 表单参数
|
|
|
|
// 表单参数
|
|
|
|
form: {},
|
|
|
|
form: {},
|
|
|
|
// 表单校验
|
|
|
|
// 表单校验
|
|
|
|
rules: {},
|
|
|
|
rules: {},
|
|
|
|
|
|
|
|
reportDetailList: [],
|
|
|
|
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: 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: `产品编码`, visible: true },
|
|
|
|
{ key: 7, label: `数量`, visible: true },
|
|
|
|
{ key: 7, label: `产品名称`, visible: true },
|
|
|
|
|
|
|
|
{ key: 8, label: `MES条码`, visible: true },
|
|
|
|
|
|
|
|
{ key: 9, label: `成品条码`, visible: true }
|
|
|
|
],
|
|
|
|
],
|
|
|
|
// 产线选项
|
|
|
|
// 产线选项
|
|
|
|
productLineList: [],
|
|
|
|
productLineList: [],
|
|
|
@ -183,12 +239,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}).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: {
|
|
|
@ -202,9 +258,9 @@ export default {
|
|
|
|
this.queryParams.beginBeginTime = null
|
|
|
|
this.queryParams.beginBeginTime = null
|
|
|
|
this.queryParams.endBeginTime = null
|
|
|
|
this.queryParams.endBeginTime = null
|
|
|
|
}
|
|
|
|
}
|
|
|
|
productionExecutionReportList(this.queryParams).then(response => {
|
|
|
|
productTraceabilityReportList(this.queryParams).then(response => {
|
|
|
|
// this.reportList = response.data
|
|
|
|
this.reportList = response.rows
|
|
|
|
// this.total = response.total;
|
|
|
|
this.total = response.total
|
|
|
|
this.loading = false
|
|
|
|
this.loading = false
|
|
|
|
})
|
|
|
|
})
|
|
|
|
},
|
|
|
|
},
|
|
|
@ -213,6 +269,10 @@ export default {
|
|
|
|
this.open = false
|
|
|
|
this.open = false
|
|
|
|
this.reset()
|
|
|
|
this.reset()
|
|
|
|
},
|
|
|
|
},
|
|
|
|
|
|
|
|
/** 数据明细序号 */
|
|
|
|
|
|
|
|
rowDetailIndex({ row, rowIndex }) {
|
|
|
|
|
|
|
|
row.index = rowIndex + 1
|
|
|
|
|
|
|
|
},
|
|
|
|
// 表单重置
|
|
|
|
// 表单重置
|
|
|
|
reset() {
|
|
|
|
reset() {
|
|
|
|
this.daterangeBeginTime = []
|
|
|
|
this.daterangeBeginTime = []
|
|
|
@ -220,6 +280,7 @@ export default {
|
|
|
|
WORK_CENTER_CODE: null,
|
|
|
|
WORK_CENTER_CODE: null,
|
|
|
|
PRODUCT_LINE_NAME: null,
|
|
|
|
PRODUCT_LINE_NAME: null,
|
|
|
|
ORDER_CODE: null,
|
|
|
|
ORDER_CODE: null,
|
|
|
|
|
|
|
|
BOX_CODE: null,
|
|
|
|
MATERIAL_CODE: null,
|
|
|
|
MATERIAL_CODE: null,
|
|
|
|
MATERIAL_NAME: null,
|
|
|
|
MATERIAL_NAME: null,
|
|
|
|
BEGIN_DATE: null
|
|
|
|
BEGIN_DATE: null
|
|
|
@ -238,7 +299,16 @@ export default {
|
|
|
|
},
|
|
|
|
},
|
|
|
|
/** 查看明细 */
|
|
|
|
/** 查看明细 */
|
|
|
|
handleOrderDetails(row) {
|
|
|
|
handleOrderDetails(row) {
|
|
|
|
this.$tab.openPage("SAP订单信息","/order/orderInfo" , {ORDER_CODE: row.ORDER_CODE});
|
|
|
|
// this.$tab.openPage("SAP订单信息","/order/orderInfo" , {ORDER_CODE: row.ORDER_CODE})
|
|
|
|
|
|
|
|
console.log(row)
|
|
|
|
|
|
|
|
this.form.BOX_CODE= row.BOX_CODE
|
|
|
|
|
|
|
|
this.form.ORDER_CODE= row.ORDER_CODE
|
|
|
|
|
|
|
|
productTraceabilityDetailList({ BOX_CODE: row.BOX_CODE }).then(response => {
|
|
|
|
|
|
|
|
this.reportDetailList = response.data
|
|
|
|
|
|
|
|
this.open = true
|
|
|
|
|
|
|
|
this.title = '产品检验详情'
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
|
|
},
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
|
|
// 多选框选中数据
|
|
|
|
// 多选框选中数据
|
|
|
|