Skip to content

M
mes-ui
Commit 4d630dcf authored by 沈翠玲's avatar 沈翠玲
Browse files
Options

序列号报工

parent 11b687bd
Show whitespace changes
Inline Side-by-side
Showing with 222 additions and 142 deletions
src/views/mes/pro/process/index.vue
View file @ 4d630dcf
......@@ -110,7 +110,7 @@
</el-table-column>
<el-table-column label="是否序列号报工" align="center" prop="isSerialReport">
<template slot-scope="scope">
{{ scope.row.isSerialReport === '1'? '是': '否' }}
{{ (scope.row.isSerialReport && Number(scope.row.isSerialReport) === 1)? '是': '否' }}
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true"/>
......
src/views/mes/pro/qrcodeRecord/index.vue
View file @ 4d630dcf
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="产品编码" prop="itemCode">
<el-input
v-model="queryParams.itemCode"
placeholder="请输入产品编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="产品名称" prop="itemName">
<el-row style="display: flex;" :gutter="16">
<el-col :span="8" >
<el-card style="min-height: 700px;">
<el-form
:model="queryWorkParams"
ref="queryWorkForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="70px"
>
<el-form-item label="工单编码" prop="workorderCode">
<el-input
v-model="queryParams.itemName"
placeholder="请输入产品名称"
v-model="queryWorkParams.workorderCode"
placeholder="请输入工单编码"
clearable
@keyup.enter.native="handleQuery"
@keyup.enter.native="handleQueryWorkorder"
/>
</el-form-item>
<el-form-item label="工单号" prop="workOrderNo">
<el-input
v-model="queryParams.workOrderNo"
placeholder="请输入工单号"
clearable
@keyup.enter.native="handleQuery"
/>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQueryWorkorder"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetWorkQuery"
>重置</el-button
>
</el-form-item>
<el-form-item label="客户名称" prop="clientName">
</el-form>
<el-table
v-loading="workorderloading"
:data="workorderList"
height="640px"
highlight-current-row
@current-change="handleCurrentChange"
>
<!-- <el-table-column type="selection" width="55" align="center" /> -->
<el-table-column width="50" align="center">
<template v-slot="scope">
<!-- 可以手动的修改label的值，从而控制选择哪一项 -->
<el-radio class="radio" v-model="selectedItemId" :label="scope.row.workorderCode"
>{{ "" }}</el-radio
>
</template>
</el-table-column>
<el-table-column label="生产单号" align="center" prop="workorderCode" />
<el-table-column label="客户名称" align="center" prop="clientName" />
<el-table-column label="产品名称" width="80" align="center" prop="productName" />
</el-table>
</el-card>
</el-col>
<el-col :span="16">
<el-card>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="序列号" prop="qrcode">
<el-input
v-model="queryParams.clientName"
placeholder="请输入客户名称"
v-model="queryParams.qrcode"
placeholder="请输入序列号"
clearable
@keyup.enter.native="handleQuery"
/>
......@@ -97,12 +130,10 @@
<el-table v-loading="loading" :data="qrcodeRecordList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="序列号" align="center" prop="qrcode" />
<el-table-column label="工单号" align="center" prop="workOrderNo" />
<el-table-column label="产品编码" align="center" prop="itemCode" />
<el-table-column label="产品名称" align="center" prop="itemName" />
<el-table-column label="客户名称" align="center" prop="clientName" />
<el-table-column label="产品描述" align="center" prop="itemDesc" />
<el-table-column label="序列号" align="center" prop="qrcode" />
<el-table-column label="创建日期" align="center" prop="createTime" />
<el-table-column label="打印次数" align="center" prop="printTime" />
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
......@@ -124,7 +155,6 @@
</template>
</el-table-column> -->
</el-table>
<pagination
v-show="total>0"
:total="total"
......@@ -132,6 +162,9 @@
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
</el-card>
</el-col>
</el-row>
<!-- 添加或修改产品序列号打印记录对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
......@@ -173,6 +206,8 @@
</template>
<script>
import { workorderList } from "@/api/mes/pro/packageLablePrint";
import { listQrcodeRecord, getQrcodeRecord, delQrcodeRecord, addQrcodeRecord, updateQrcodeRecord } from "@/api/mes/pro/qrcodeRecord";
import {postPrintPdf} from "@/utils/ruoyi"
......@@ -181,10 +216,14 @@ import {postPrintPdf} from "@/utils/ruoyi"
data() {
return {
// 遮罩层
loading: true,
loading: false,
// 遮罩层
workorderloading: false,
workorderList: [],
// 选中数组
ids: [],
selectRow: [],
selectedItemId: null,
// 非单个禁用
single: true,
// 非多个禁用
......@@ -199,11 +238,15 @@ import {postPrintPdf} from "@/utils/ruoyi"
title: "",
// 是否显示弹出层
open: false,
queryWorkParams: {
pageNum: 1,
workorderCode: null
},
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
itemId: null, itemCode: null, workOrderId: null, workOrderNo: null, printTime: null, qrcode: null, clientCode: null, clientName: null, itemDesc: null, },
qrcode: null, itemCode: null, workOrderId: null, workOrderNo: null, printTime: null, qrcode: null, clientCode: null, clientName: null, itemDesc: null, },
// 表单参数
form: {},
// 表单校验
......@@ -214,9 +257,27 @@ import {postPrintPdf} from "@/utils/ruoyi"
};
},
created() {
this.getList();
// this.getList();
},
methods: {
handleCurrentChange(row) {
console.log(row, 'row88')
this.selectedItemId = row.workorderCode
this.queryParams = {
pageNum: 1,
workOrderNo: row.workorderCode,
pageSize: 10,
itemId: null,
qrcode: null,
itemCode: null,
workOrderId: null,
printTime: null,
qrcode: null,
clientCode: null,
clientName: null,
itemDesc: null}
this.getList()
},
handlePrint(){},
printQrCode() {
let detail = []
......@@ -245,6 +306,22 @@ import {postPrintPdf} from "@/utils/ruoyi"
);
},
/** 查询工单列表 */
getWorkList() {
if (!this.queryWorkParams.workorderCode) {
this.$message.error('请输入查询条件')
return
}
this.workorderloading = true;
workorderList(this.queryWorkParams).then((response) => {
console.log(response, 'response')
this.workorderList = response.rows;
this.workordertotal = response.total;
this.workorderloading = false;
this.produceForm = {}
this.selectedItemId = null
});
},
/** 查询产品序列号打印记录列表 */
getList() {
this.loading = true;
......@@ -270,11 +347,20 @@ import {postPrintPdf} from "@/utils/ruoyi"
this.queryParams.pageNum = 1;
this.getList();
},
handleQueryWorkorder() {
this.queryParams.pageNum = 1;
this.getWorkList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
/** 重置按钮操作 */
resetWorkQuery() {
this.resetForm("queryWorkForm");
this.handleQueryWorkorder();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.recordId)
......
src/views/mes/pro/workorder/indexApply.vue
View file @ 4d630dcf
......@@ -204,8 +204,7 @@
</el-table-column>
<el-table-column label="单位" align="center" prop="unitOfMeasure" />
<el-table-column label="工单数量" align="center" prop="quantity" />
<el-table-column label="开始序列码" align="center" prop="startSerial" width="100px" />
<el-table-column label="结束序列码" align="center" prop="endSerial" width="100px" />
<el-table-column label="已排产数量" align="center" prop="quantityScheduled"/>
<el-table-column label="调整数量" align="center" prop="quantityChanged" />
<el-table-column label="已生产数量" align="center" width="100px" prop="quantityProduced" />
<el-table-column label="批次号" align="center" width="100px" prop="batchCode" />
......
src/views/mes/pro/workorder/proofingInfo.vue
View file @ 4d630dcf
......@@ -192,13 +192,8 @@
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="开始序列码" prop="startSerial">
<el-input v-model="form.startSerial" :disabled="mode == 'make'" placeholder="请输入开始序列码" />
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="结束序列码" prop="endSerial">
<el-input v-model="form.endSerial" :disabled="mode == 'make'" placeholder="请输入结束序列码" />
<el-form-item label="已排产数量" prop="quantityScheduled">
<el-input v-model="form.quantityScheduled" disabled />
</el-form-item>
</el-col>
<el-col :lg="18" :md="16" :sm="24" :xs="24">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment