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 0c43fd6879 853a68b3c5
commit d9b3a09f4c
6 changed files with 157 additions and 138 deletions
Show Stats Download Patch File Download Diff File

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

@ -47,8 +47,8 @@
<!-- />--> <!-- />-->
<!-- </el-select>--> <!-- </el-select>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="是否已下达到生产计划" prop="isRelease"> <el-form-item label="是否已下达" prop="isRelease">
<el-select v-model="queryParams.isRelease" placeholder="请选择工单类型" clearable> <el-select v-model="queryParams.isRelease" placeholder="是否已下达到生产计划" clearable>
<el-option <el-option
v-for="dict in dict.type.is_release" v-for="dict in dict.type.is_release"
:key="dict.value" :key="dict.value"
@ -115,26 +115,21 @@
<el-table-column label="SAP计划编号" align="center" prop="orderCode" width="100px" v-if="columns[1].visible"/> <el-table-column label="SAP计划编号" align="center" prop="orderCode" width="100px" v-if="columns[1].visible"/>
<el-table-column label="销售订单编号" align="center" prop="saleOrderCode" v-if="columns[2].visible"/> <el-table-column label="销售订单编号" align="center" prop="saleOrderCode" v-if="columns[2].visible"/>
<el-table-column label="销售订单行号" align="center" prop="saleOrderLineNumber" v-if="columns[3].visible"/> <el-table-column label="销售订单行号" align="center" prop="saleOrderLineNumber" v-if="columns[3].visible"/>
<el-table-column label="物料编码" align="center" prop="materialCode" width="100px" v-if="columns[4].visible"/> <el-table-column label="物料编码" align="center" prop="materialCode" width="100" v-if="columns[4].visible"/>
<el-table-column label="物料名称" align="center" prop="materialName" width="100px" v-if="columns[5].visible"/> <el-table-column label="物料名称" align="center" prop="materialName" width="180" v-if="columns[5].visible"/>
<el-table-column label="物料组" align="center" prop="matkl" v-if="columns[6].visible"/> <el-table-column label="物料组" align="center" prop="matkl" v-if="columns[6].visible"/>
<el-table-column label="订单计划数量" align="center" prop="orderAmount" v-if="columns[7].visible"/>
<el-table-column label="完成数量" align="center" prop="completeAmount" v-if="columns[8].visible"/>
<el-table-column label="工单类型" align="center" prop="orderType" v-if="columns[9].visible"> <el-table-column label="工单类型" align="center" prop="orderType" v-if="columns[9].visible">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.order_type" :value="scope.row.orderType"/> <dict-tag :options="dict.type.order_type" :value="scope.row.orderType"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="工单状态" align="center" prop="orderStatus" width="200" v-if="columns[10].visible"> <el-table-column label="工单状态" align="center" prop="orderStatus" v-if="columns[10].visible" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.order_status" :value="scope.row.orderStatus"/> <dict-tag :options="dict.type.order_status" :value="scope.row.orderStatus"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="是否已下达生产计划" align="center" prop="isRelease" v-if="columns[20].visible"> <el-table-column label="订单计划数量" align="center" prop="orderAmount" width="80" v-if="columns[7].visible"/>
<template slot-scope="scope"> <el-table-column label="完成数量" align="center" prop="completeAmount" width="80" v-if="columns[8].visible"/>
<dict-tag :options="dict.type.is_release" :value="scope.row.isRelease"/>
</template>
</el-table-column>
<el-table-column label="计划开始日期" align="center" prop="beginDate" width="100" v-if="columns[11].visible"> <el-table-column label="计划开始日期" align="center" prop="beginDate" width="100" v-if="columns[11].visible">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.beginDate, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.beginDate, '{y}-{m}-{d}') }}</span>
@ -145,13 +140,18 @@
<span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="是否已下达生产计划" align="center" prop="isRelease" v-if="columns[20].visible">
<template slot-scope="scope">
<dict-tag :options="dict.type.is_release" :value="scope.row.isRelease"/>
</template>
</el-table-column>
<el-table-column label="完成日期" align="center" prop="completeDate" width="100" v-if="columns[19].visible"> <el-table-column label="完成日期" align="center" prop="completeDate" width="100" v-if="columns[19].visible">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.completeDate, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.completeDate, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="工厂编码" align="center" prop="factoryCode" v-if="columns[13].visible"/> <el-table-column label="工厂编码" align="center" prop="factoryCode" v-if="columns[13].visible"/>
<el-table-column label="工作中心编码" align="center" prop="workCenterCode" v-if="columns[13].visible"/> <el-table-column label="工作中心编码" align="center" prop="workCenterCode" width="100" v-if="columns[21].visible"/>
<el-table-column label="启用标识" align="center" prop="isFlag" v-if="columns[14].visible"> <el-table-column label="启用标识" align="center" prop="isFlag" v-if="columns[14].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"/>
@ -206,7 +206,7 @@
<!-- 添加或修改工单信息对话框 --> <!-- 添加或修改工单信息对话框 -->
<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="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="SAP计划编号" prop="orderCode"> <el-form-item label="SAP计划编号" prop="orderCode">
<el-input v-model="form.orderCode" placeholder="请输入SAP计划编号" /> <el-input v-model="form.orderCode" placeholder="请输入SAP计划编号" />
</el-form-item> </el-form-item>
@ -242,14 +242,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="工单状态" prop="orderStatus"> <el-form-item label="工单状态" prop="orderStatus">
<el-select v-model="form.orderStatus" placeholder="请选择工单状态"> <el-input v-model="form.orderStatus" placeholder="请输入工单状态" />
<el-option
v-for="dict in dict.type.order_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="计划开始日期" prop="beginDate"> <el-form-item label="计划开始日期" prop="beginDate">
<el-date-picker clearable <el-date-picker clearable
@ -270,15 +263,6 @@
<el-form-item label="工厂编码" prop="factoryCode"> <el-form-item label="工厂编码" prop="factoryCode">
<el-input v-model="form.factoryCode" placeholder="请输入工厂编码" /> <el-input v-model="form.factoryCode" placeholder="请输入工厂编码" />
</el-form-item> </el-form-item>
<el-form-item label="启用标识" prop="isFlag">
<el-radio-group v-model="form.isFlag">
<el-radio
v-for="dict in dict.type.is_flag"
:key="dict.value"
:label="parseInt(dict.value)"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="完成日期" prop="completeDate"> <el-form-item label="完成日期" prop="completeDate">
<el-date-picker clearable <el-date-picker clearable
v-model="form.completeDate" v-model="form.completeDate"
@ -363,8 +347,8 @@ export default {
columns: [ columns: [
{ key: 0, label: `主键标识`, visible: false }, { key: 0, label: `主键标识`, visible: false },
{ key: 1, label: `SAP计划编号`, visible: true }, { key: 1, label: `SAP计划编号`, visible: true },
{ key: 2, label: `销售订单编号`, visible: true }, { key: 2, label: `销售订单编号`, visible: false },
{ key: 3, label: `销售订单行号`, visible: true }, { key: 3, label: `销售订单行号`, visible: false },
{ key: 4, label: `物料编码`, visible: true }, { key: 4, label: `物料编码`, visible: true },
{ key: 5, label: `物料名称`, visible: true }, { key: 5, label: `物料名称`, visible: true },
{ key: 6, label: `物料组`, visible: false }, { key: 6, label: `物料组`, visible: false },
@ -374,7 +358,7 @@ export default {
{ key: 10, label: `工单状态`, visible: true }, { key: 10, label: `工单状态`, visible: true },
{ key: 11, label: `计划开始日期`, visible: true }, { key: 11, label: `计划开始日期`, visible: true },
{ key: 12, label: `计划结束日期`, visible: true }, { key: 12, label: `计划结束日期`, visible: true },
{ key: 13, label: `工厂编码`, visible: true }, { key: 13, label: `工厂编码`, visible: false },
{ key: 14, label: `启用标识`, visible: false }, { key: 14, label: `启用标识`, visible: false },
{ key: 15, label: `创建人`, visible: false }, { key: 15, label: `创建人`, visible: false },
{ key: 16, label: `创建时间`, visible: false }, { key: 16, label: `创建时间`, visible: false },
@ -382,6 +366,7 @@ export default {
{ key: 18, label: `更新时间`, visible: false }, { key: 18, label: `更新时间`, visible: false },
{ key: 19, label: `完成日期`, visible: true }, { key: 19, label: `完成日期`, visible: true },
{ key: 20, label: `是否已下达生产计划`, visible: true }, { key: 20, label: `是否已下达生产计划`, visible: true },
{ key: 21, label: `工作中心编号`, visible: true },
], ],
// 产线选项 // 产线选项
productLineList: [], productLineList: [],

2
src/views/base/qualityInspectionItem/defectIndex.vue
Unescape Escape View File

@ -12,7 +12,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="缺陷小类" prop="materialSubclass"> <el-form-item label="缺陷小类" prop="materialSubclass">
<el-select v-model="queryParams.materialSubclass" placeholder="请选择缺陷大类" clearable> <el-select v-model="queryParams.materialSubclass" filterable placeholder="请选择缺陷大类" clearable>
<el-option <el-option
v-for="dict in dict.type.defect_subclass" v-for="dict in dict.type.defect_subclass"
:key="dict.value" :key="dict.value"

2
src/views/base/stationDefectRelation/index.vue
Unescape Escape View File

@ -140,7 +140,7 @@
<!-- <el-input v-model="form.stationName" placeholder="请输入质检工位名称" />--> <!-- <el-input v-model="form.stationName" placeholder="请输入质检工位名称" />-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="缺陷描述" prop="defectCode"> <el-form-item label="缺陷描述" prop="defectCode">
<el-select v-model="form.defectCode" placeholder="缺陷描述"> <el-select v-model="form.defectCode" filterable placeholder="缺陷描述">
<el-option <el-option
v-for="item in defectList" v-for="item in defectList"
:key="item.qualityDefectCode" :key="item.qualityDefectCode"

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

@ -120,9 +120,9 @@
<el-table-column label="销售订单行号" align="center" prop="saleorderLinenumber" width="100" v-if="columns[5].visible"/> <el-table-column label="销售订单行号" align="center" prop="saleorderLinenumber" 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="MES工单编号" align="center" prop="planCode" width="110" 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="materialCode" 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="materialName" width="240" 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="stationCode" width="100" 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="stationName" width="120" 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="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="completeAmount" v-if="columns[12].visible"/>
<el-table-column label="计划开始日期" align="center" prop="planBeginTime" width="100" v-if="columns[20].visible"/> <el-table-column label="计划开始日期" align="center" prop="planBeginTime" width="100" v-if="columns[20].visible"/>

143
src/views/report/WIPInquiryReport/index.vue
Unescape Escape View File

@ -2,26 +2,26 @@
<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.productLineCode" placeholder="请选择产线" clearable>
<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="PRODUCT_CODE">
<el-input <el-input
v-model="queryParams.MATERIAL_CODE" v-model="queryParams.PRODUCT_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="PRODUCT_NAME">
<el-input <el-input
v-model="queryParams.MATERIAL_NAME" v-model="queryParams.PRODUCT_NAME"
placeholder="请输入产品名称" placeholder="请输入产品名称"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
@ -35,26 +35,24 @@
@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.beginStationCode" placeholder="请选择起始工位" clearable>
<el-option <el-option
v-for="item in findStationList" v-for="item in findStationList"
:key="item.productLineCode" :key="item.executionSort"
:label="item.productLineName" :label="item.productLineName"
:value="item.productLineCode" :value="item.executionSort"
></el-option>
</el-select>
<span style="margin: 5px;">-</span>
<el-select v-model="queryParams.endStationCode" placeholder="请选择结束工位" clearable>
<el-option
v-for="item in findStationList"
:key="item.executionSort"
:label="item.productLineName"
:value="item.executionSort"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item>
<el-form-item label="起止时间">
<el-date-picker
v-model="daterangeBeginTime"
style="width: 340px"
value-format="yyyy-MM-dd"
type="datetimerange"
range-separator="-"
start-placeholder="开始时间"
end-placeholder="结束时间"
></el-date-picker>
</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>
@ -63,7 +61,11 @@
</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
type="info"
>合计数量：{{ totalSum }}
</el-button>
<!-- <el-button--> <!-- <el-button-->
<!-- type="warning"--> <!-- type="warning"-->
<!-- plain--> <!-- plain-->
@ -72,24 +74,20 @@
<!-- @click="handleExport"--> <!-- @click="handleExport"-->
<!-- >导出--> <!-- >导出-->
<!-- </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="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_LINE_NAME" width="80" 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="ORDER_CODE" width="100" v-if="columns[3].visible"/>
<el-table-column label="物料编码" align="center" prop="MATERIAL_CODE" v-if="columns[3].visible"> <el-table-column label="物料编号" align="center" prop="MATERIAL_CODE" width="130" v-if="columns[4].visible"/>
<template slot-scope="scope"> <el-table-column label="物料名称" align="center" prop="MATERIAL_NAME" width="430" v-if="columns[5].visible"/>
<span>{{ parseTime(scope.row.BEGIN_DATE, '{y}-{m}-{d}') }}</span> <el-table-column label="产品编号" align="center" prop="PRODUCT_CODE" width="130" v-if="columns[6].visible"/>
</template> <el-table-column label="产品名称" align="center" prop="PRODUCT_NAME" width="200" v-if="columns[7].visible"/>
</el-table-column> <el-table-column label="数量" align="center" prop="COMP_AMOUNT" width="80" v-if="columns[8].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" prop="PRODUCT_NAME" v-if="columns[6].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
@ -115,7 +113,7 @@
<script> <script>
import { import {
productionExecutionReportList WIPInquiryReportList
} 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'
@ -138,6 +136,8 @@ export default {
showSearch: true, showSearch: true,
// 总条数 // 总条数
total: 0, total: 0,
//合计数量
totalSum: 0,
// 报表表格数据 // 报表表格数据
reportList: [], reportList: [],
// 弹出层标题 // 弹出层标题
@ -152,11 +152,14 @@ export default {
// pageSize: 10, // pageSize: 10,
beginBeginTime: null, beginBeginTime: null,
endBeginTime: null, endBeginTime: null,
WORK_CENTER_CODE: null, productLineCode: 'CX_02',
PRODUCT_LINE_NAME: null, beginStationCode: null,
endStationCode: null,
ORDER_CODE: null, ORDER_CODE: null,
MATERIAL_CODE: null, MATERIAL_CODE: null,
MATERIAL_NAME: null, MATERIAL_NAME: null,
PRODUCT_CODE: null,
PRODUCT_NAME: null,
BEGIN_DATE: null BEGIN_DATE: null
}, },
// 表单参数 // 表单参数
@ -165,13 +168,14 @@ 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: true },
{ key: 3, label: `物料编码`, visible: true }, { key: 3, label: `订单编号`, visible: true },
{ key: 4, label: `物料名称`, visible: true }, { key: 4, label: `物料编号`, visible: true },
{ 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 },
{ key: 8, label: `数量`, visible: true },
], ],
// 产线选项 // 产线选项
productLineList: [], productLineList: [],
@ -179,13 +183,20 @@ export default {
findStationList: [] findStationList: []
} }
}, },
watch: {
'queryParams.productLineCode': function(newVal, oldVal) {
// 执行方法，可以在这里调用你的方法
this.getStationList()
}
},
created() { created() {
findProductLineList({ productLineType: 1 }).then(response => { findProductLineList({ productLineType: 1 }).then(response => {
this.productLineList = response.data this.productLineList = response.data
}).then(() => {
return findProductLineList({ productLineType: 2, parentId: this.queryParams.productLineCode })
}).then(response => {
this.findStationList = response.data
}) })
findProductLineList({productLineType: 2}).then(response => {
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
this.daterangeBeginTime[1] = nowDate this.daterangeBeginTime[1] = nowDate
@ -195,15 +206,12 @@ export default {
/** 查询工单信息列表 */ /** 查询工单信息列表 */
getList() { getList() {
this.loading = true this.loading = true
if (null != this.daterangeBeginTime && '' != this.daterangeBeginTime) { WIPInquiryReportList(this.queryParams).then(response => {
this.queryParams.beginBeginTime = this.daterangeBeginTime[0]
this.queryParams.endBeginTime = this.daterangeBeginTime[1]
} else {
this.queryParams.beginBeginTime = null
this.queryParams.endBeginTime = null
}
productionExecutionReportList(this.queryParams).then(response => {
this.reportList = response.data this.reportList = response.data
this.totalSum = 0;
this.reportList.forEach(e => {
this.totalSum += e.COMP_AMOUNT
})
// this.total = response.total; // this.total = response.total;
this.loading = false this.loading = false
}) })
@ -217,11 +225,13 @@ export default {
reset() { reset() {
this.daterangeBeginTime = [] this.daterangeBeginTime = []
this.form = { this.form = {
WORK_CENTER_CODE: null, beginStationCode: null,
PRODUCT_LINE_NAME: null, endStationCode: null,
ORDER_CODE: null, ORDER_CODE: null,
MATERIAL_CODE: null, MATERIAL_CODE: null,
MATERIAL_NAME: null, MATERIAL_NAME: null,
PRODUCT_CODE: null,
PRODUCT_NAME: null,
BEGIN_DATE: null BEGIN_DATE: null
} }
this.resetForm('form') this.resetForm('form')
@ -236,9 +246,20 @@ 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.$tab.openPage('生产计划', '/product/planInfo', { orderCode: row.ORDER_CODE })
},
/** 获取工位方法 */
getStationList() {
this.queryParams.beginStationCode = null;
this.queryParams.endStationCode = null;
findProductLineList({ productLineType: 2, parentId: this.queryParams.productLineCode })
.then(response => {
this.findStationList = response.data
})
}, },
// 多选框选中数据 // 多选框选中数据

59
src/views/report/productionExecutionReport/index.vue
Unescape Escape View File

@ -63,7 +63,11 @@
</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
type="info"
>合计数量：{{ totalSum }}
</el-button>
<!-- <el-button--> <!-- <el-button-->
<!-- type="warning"--> <!-- type="warning"-->
<!-- plain--> <!-- plain-->
@ -72,21 +76,21 @@
<!-- @click="handleExport"--> <!-- @click="handleExport"-->
<!-- >导出--> <!-- >导出-->
<!-- </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="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_LINE_NAME" v-if="columns[1].visible"/> <el-table-column label="产线" align="center" prop="PRODUCT_LINE_NAME" width="80" v-if="columns[1].visible"/>
<el-table-column label="工位" align="center" prop="STATION_NAME" v-if="columns[2].visible"/> <el-table-column label="工位" align="center" prop="STATION_NAME" width="130" v-if="columns[2].visible"/>
<el-table-column label="订单编号" align="center" prop="ORDER_CODE" v-if="columns[3].visible"/> <el-table-column label="订单编号" align="center" prop="ORDER_CODE" width="100" v-if="columns[3].visible"/>
<el-table-column label="物料编号" align="center" prop="MATERIAL_CODE" v-if="columns[4].visible"/> <el-table-column label="物料编号" align="center" prop="MATERIAL_CODE" width="130" v-if="columns[4].visible"/>
<el-table-column label="物料名称" align="center" prop="MATERIAL_NAME" v-if="columns[5].visible"/> <el-table-column label="物料名称" align="center" prop="MATERIAL_NAME" width="220" v-if="columns[5].visible"/>
<el-table-column label="产品编号" align="center" prop="PRODUCT_CODE" v-if="columns[6].visible"/> <el-table-column label="产品编号" align="center" prop="PRODUCT_CODE" width="130" v-if="columns[6].visible"/>
<el-table-column label="产品名称" align="center" prop="PRODUCT_NAME" v-if="columns[7].visible"/> <el-table-column label="产品名称" align="center" prop="PRODUCT_NAME" width="200" v-if="columns[7].visible"/>
<el-table-column label="数量" align="center" prop="COMP_AMOUNT" v-if="columns[8].visible"/> <el-table-column label="数量" align="center" prop="COMP_AMOUNT" width="80" v-if="columns[8].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
@ -99,13 +103,13 @@
</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"-->
/> <!-- />-->
</div> </div>
</template> </template>
@ -134,6 +138,8 @@ export default {
showSearch: true, showSearch: true,
// 总条数 // 总条数
total: 0, total: 0,
//合计数量
totalSum: 0,
// 报表表格数据 // 报表表格数据
reportList: [], reportList: [],
// 弹出层标题 // 弹出层标题
@ -144,8 +150,8 @@ export default {
daterangeBeginTime: [], daterangeBeginTime: [],
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, // pageNum: 1,
pageSize: 10, // pageSize: 10,
beginBeginTime: null, beginBeginTime: null,
endBeginTime: null, endBeginTime: null,
productLineCode: 'CX_02', productLineCode: 'CX_02',
@ -170,8 +176,7 @@ export default {
{ 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 },
{ key: 8, label: `数量`, visible: true }, { key: 8, label: `数量`, visible: true }
{ key: 9, label: `数量`, visible: true }
], ],
// 产线选项 // 产线选项
productLineList: [], productLineList: [],
@ -210,8 +215,12 @@ export default {
this.queryParams.endBeginTime = null this.queryParams.endBeginTime = null
} }
productionExecutionReportList(this.queryParams).then(response => { productionExecutionReportList(this.queryParams).then(response => {
this.reportList = response.rows this.reportList = response.data
this.total = response.total this.totalSum = 0;
this.reportList.forEach(e => {
this.totalSum += e.COMP_AMOUNT
})
// this.total = response.total
this.loading = false this.loading = false
}) })
}, },
@ -234,22 +243,26 @@ export default {
} }
this.resetForm('form') this.resetForm('form')
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
// this.queryParams.pageNum = 1; // this.queryParams.pageNum = 1;
this.getList() this.getList()
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.resetForm('queryForm') this.resetForm('queryForm')
this.handleQuery() this.handleQuery()
}, },
/** 查看明细 */ /** 查看明细 */
handleOrderDetails(row) { handleOrderDetails(row) {
this.$tab.openPage('生产计划', '/product/planInfo', { orderCode: row.ORDER_CODE }) this.$tab.openPage('生产计划', '/product/planInfo', { orderCode: row.ORDER_CODE })
}, },
/** 获取工位方法 */ /** 获取工位方法 */
getStationList() { getStationList() {
this.queryParams.stationCode = null
findProductLineList({ productLineType: 2, parentId: this.queryParams.productLineCode }) findProductLineList({ productLineType: 2, parentId: this.queryParams.productLineCode })
.then(response => { .then(response => {
this.findStationList = response.data this.findStationList = response.data

Write Preview
Loading…
Cancel
Save