Skip to content

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

序列号报工

parent 11b687bd
Hide 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 @@ ...@@ -110,7 +110,7 @@
</el-table-column> </el-table-column>
<el-table-column label="是否序列号报工" align="center" prop="isSerialReport"> <el-table-column label="是否序列号报工" align="center" prop="isSerialReport">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.isSerialReport === '1'? '是': '否' }} {{ (scope.row.isSerialReport && Number(scope.row.isSerialReport) === 1)? '是': '否' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true"/> <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true"/>
......
src/views/mes/pro/qrcodeRecord/index.vue
View file @ 4d630dcf
<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="68px"> <el-row style="display: flex;" :gutter="16">
<el-form-item label="产品编码" prop="itemCode"> <el-col :span="8" >
<el-input <el-card style="min-height: 700px;">
v-model="queryParams.itemCode" <el-form
placeholder="请输入产品编码" :model="queryWorkParams"
clearable ref="queryWorkForm"
@keyup.enter.native="handleQuery" size="small"
/> :inline="true"
</el-form-item> v-show="showSearch"
<el-form-item label="产品名称" prop="itemName"> label-width="70px"
<el-input >
v-model="queryParams.itemName" <el-form-item label="工单编码" prop="workorderCode">
placeholder="请输入产品名称" <el-input
clearable v-model="queryWorkParams.workorderCode"
@keyup.enter.native="handleQuery" placeholder="请输入工单编码"
/> clearable
</el-form-item> @keyup.enter.native="handleQueryWorkorder"
<el-form-item label="工单号" prop="workOrderNo"> />
<el-input </el-form-item>
v-model="queryParams.workOrderNo" <el-form-item>
placeholder="请输入工单号" <el-button
clearable type="primary"
@keyup.enter.native="handleQuery" icon="el-icon-search"
/> size="mini"
</el-form-item> @click="handleQueryWorkorder"
<el-form-item label="客户名称" prop="clientName"> >搜索</el-button
<el-input >
v-model="queryParams.clientName" <el-button icon="el-icon-refresh" size="mini" @click="resetWorkQuery"
placeholder="请输入客户名称" >重置</el-button
clearable >
@keyup.enter.native="handleQuery" </el-form-item>
/> </el-form>
</el-form-item>
<el-form-item> <el-table
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> v-loading="workorderloading"
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> :data="workorderList"
</el-form-item> height="640px"
</el-form> highlight-current-row
@current-change="handleCurrentChange"
<el-row :gutter="10" class="mb8"> >
<!-- <el-col :span="1.5"> <!-- <el-table-column type="selection" width="55" align="center" /> -->
<el-button <el-table-column width="50" align="center">
type="primary" <template v-slot="scope">
plain <!-- 可以手动的修改label的值，从而控制选择哪一项 -->
icon="el-icon-plus" <el-radio class="radio" v-model="selectedItemId" :label="scope.row.workorderCode"
size="mini" >{{ "" }}</el-radio
@click="handleAdd" >
v-hasPermi="['pro:qrcodeRecord:add']" </template>
>新增</el-button> </el-table-column>
</el-col> <el-table-column label="生产单号" align="center" prop="workorderCode" />
<el-col :span="1.5"> <el-table-column label="客户名称" align="center" prop="clientName" />
<el-button <el-table-column label="产品名称" width="80" align="center" prop="productName" />
type="success" </el-table>
plain </el-card>
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['pro:qrcodeRecord: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="['pro:qrcodeRecord:remove']"
>删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="16">
<el-button <el-card>
type="warning" <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
plain <el-form-item label="序列号" prop="qrcode">
icon="el-icon-download" <el-input
size="mini" v-model="queryParams.qrcode"
@click="handleExport" placeholder="请输入序列号"
v-hasPermi="['pro:qrcodeRecord:export']" clearable
>导出</el-button> @keyup.enter.native="handleQuery"
</el-col> --> />
<el-col :span="1.5"> </el-form-item>
<el-button <el-form-item>
type="warning" <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
plain <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
icon="el-icon-print" </el-form-item>
size="mini" </el-form>
@click="printQrCode"
v-hasPermi="['pro:qrcodeRecord:print']" <el-row :gutter="10" class="mb8">
>打印</el-button> <!-- <el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['pro:qrcodeRecord: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="['pro:qrcodeRecord: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="['pro:qrcodeRecord: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="['pro:qrcodeRecord:export']"
>导出</el-button>
</el-col> -->
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-print"
size="mini"
@click="printQrCode"
v-hasPermi="['pro:qrcodeRecord:print']"
>打印</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<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="itemDesc" />
<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">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['pro:qrcodeRecord:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['pro:qrcodeRecord:remove']"
>删除</el-button>
</template>
</el-table-column> -->
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
</el-card>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<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="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">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['pro:qrcodeRecord:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['pro:qrcodeRecord:remove']"
>删除</el-button>
</template>
</el-table-column> -->
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改产品序列号打印记录对话框 --> <!-- 添加或修改产品序列号打印记录对话框 -->
<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="80px">
...@@ -173,6 +206,8 @@ ...@@ -173,6 +206,8 @@
</template> </template>
<script> <script>
import { workorderList } from "@/api/mes/pro/packageLablePrint";
import { listQrcodeRecord, getQrcodeRecord, delQrcodeRecord, addQrcodeRecord, updateQrcodeRecord } from "@/api/mes/pro/qrcodeRecord"; import { listQrcodeRecord, getQrcodeRecord, delQrcodeRecord, addQrcodeRecord, updateQrcodeRecord } from "@/api/mes/pro/qrcodeRecord";
import {postPrintPdf} from "@/utils/ruoyi" import {postPrintPdf} from "@/utils/ruoyi"
...@@ -181,10 +216,14 @@ import {postPrintPdf} from "@/utils/ruoyi" ...@@ -181,10 +216,14 @@ import {postPrintPdf} from "@/utils/ruoyi"
data() { data() {
return { return {
// 遮罩层 // 遮罩层
loading: true, loading: false,
// 遮罩层
workorderloading: false,
workorderList: [],
// 选中数组 // 选中数组
ids: [], ids: [],
selectRow: [], selectRow: [],
selectedItemId: null,
// 非单个禁用 // 非单个禁用
single: true, single: true,
// 非多个禁用 // 非多个禁用
...@@ -199,11 +238,15 @@ import {postPrintPdf} from "@/utils/ruoyi" ...@@ -199,11 +238,15 @@ import {postPrintPdf} from "@/utils/ruoyi"
title: "", title: "",
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
queryWorkParams: {
pageNum: 1,
workorderCode: null
},
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, 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: {}, form: {},
// 表单校验 // 表单校验
...@@ -214,9 +257,27 @@ import {postPrintPdf} from "@/utils/ruoyi" ...@@ -214,9 +257,27 @@ import {postPrintPdf} from "@/utils/ruoyi"
}; };
}, },
created() { created() {
this.getList(); // this.getList();
}, },
methods: { 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(){}, handlePrint(){},
printQrCode() { printQrCode() {
let detail = [] let detail = []
...@@ -245,6 +306,22 @@ import {postPrintPdf} from "@/utils/ruoyi" ...@@ -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() { getList() {
this.loading = true; this.loading = true;
...@@ -270,11 +347,20 @@ import {postPrintPdf} from "@/utils/ruoyi" ...@@ -270,11 +347,20 @@ import {postPrintPdf} from "@/utils/ruoyi"
this.queryParams.pageNum = 1; this.queryParams.pageNum = 1;
this.getList(); this.getList();
}, },
handleQueryWorkorder() {
this.queryParams.pageNum = 1;
this.getWorkList();
},
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.resetForm("queryForm"); this.resetForm("queryForm");
this.handleQuery(); this.handleQuery();
}, },
/** 重置按钮操作 */
resetWorkQuery() {
this.resetForm("queryWorkForm");
this.handleQueryWorkorder();
},
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map(item => item.recordId) this.ids = selection.map(item => item.recordId)
......
src/views/mes/pro/workorder/indexApply.vue
View file @ 4d630dcf
...@@ -204,8 +204,7 @@ ...@@ -204,8 +204,7 @@
</el-table-column> </el-table-column>
<el-table-column label="单位" align="center" prop="unitOfMeasure" /> <el-table-column label="单位" align="center" prop="unitOfMeasure" />
<el-table-column label="工单数量" align="center" prop="quantity" /> <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="quantityScheduled"/>
<el-table-column label="结束序列码" align="center" prop="endSerial" width="100px" />
<el-table-column label="调整数量" align="center" prop="quantityChanged" /> <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="quantityProduced" />
<el-table-column label="批次号" align="center" width="100px" prop="batchCode" /> <el-table-column label="批次号" align="center" width="100px" prop="batchCode" />
......
src/views/mes/pro/workorder/proofingInfo.vue
View file @ 4d630dcf
...@@ -192,13 +192,8 @@ ...@@ -192,13 +192,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12"> <el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="开始序列码" prop="startSerial"> <el-form-item label="已排产数量" prop="quantityScheduled">
<el-input v-model="form.startSerial" :disabled="mode == 'make'" placeholder="请输入开始序列码" /> <el-input v-model="form.quantityScheduled" disabled />
</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> </el-form-item>
</el-col> </el-col>
<el-col :lg="18" :md="16" :sm="24" :xs="24"> <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