Skip to content

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

产品序列号打印记录和产品二维码规则

parent cf1b26ee
Hide whitespace changes
Inline Side-by-side
Showing with 105 additions and 69 deletions
src/views/mes/pro/proQrcodeRule/index.vue
View file @ e664eaf8
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
v-hasPermi="['pro:proQrcodeRule:remove']" v-hasPermi="['pro:proQrcodeRule:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">
<el-button <el-button
type="warning" type="warning"
plain plain
...@@ -65,11 +65,12 @@ ...@@ -65,11 +65,12 @@
@click="handleExport" @click="handleExport"
v-hasPermi="['pro:proQrcodeRule:export']" v-hasPermi="['pro:proQrcodeRule:export']"
>导出</el-button> >导出</el-button>
</el-col> </el-col> -->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="proQrcodeRuleList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="proQrcodeRuleList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="产品编码" align="center" prop="itemCode" /> <el-table-column label="产品编码" align="center" prop="itemCode" />
<el-table-column label="产品名称" align="center" prop="itemName" /> <el-table-column label="产品名称" align="center" prop="itemName" />
<el-table-column label="客户编码" align="center" prop="clientCode" /> <el-table-column label="客户编码" align="center" prop="clientCode" />
...@@ -81,7 +82,7 @@ ...@@ -81,7 +82,7 @@
<el-table-column label="目前号段" align="center" prop="datePattern" /> <el-table-column label="目前号段" align="center" prop="datePattern" />
<el-table-column label="创建人" align="center" prop="createBy" /> <el-table-column label="创建人" align="center" prop="createBy" />
<el-table-column label="创建时间" align="center" prop="createTime" /> <el-table-column label="创建时间" align="center" prop="createTime" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="110">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
...@@ -110,45 +111,82 @@ ...@@ -110,45 +111,82 @@
/> />
<!-- 添加或修改产品二维码规则对话框 --> <!-- 添加或修改产品二维码规则对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="750px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="110px">
<el-form-item label="产品编码" prop="itemCode"> <el-row>
<el-input v-model="form.itemCode" placeholder="请输入产品编码" /> <el-col :lg="12" :md="12" :sm="24" :xs="24">
</el-form-item> <el-form-item label="产品编码" prop="itemCode">
<el-form-item label="编码前缀" prop="prefix"> <el-input v-model="form.itemCode" placeholder="请输入产品编码" >
<el-input v-model="form.prefix" placeholder="请输入编码前缀" /> <el-button
</el-form-item> slot="append"
<el-form-item label="编码时间格式化" prop="datePattern"> @click="handleSelectProduct"
<el-input v-model="form.datePattern" placeholder="请输入编码时间格式化" /> icon="el-icon-search"
</el-form-item> ></el-button>
<el-form-item label="编码流水长度" prop="serialLen"> </el-input>
<el-input v-model="form.serialLen" placeholder="请输入编码流水长度" /> </el-form-item>
</el-form-item> </el-col>
<el-form-item label="产品描述" prop="itemDesc"> <el-col :lg="12" :md="12" :sm="24" :xs="24">
<el-input v-model="form.itemDesc" type="textarea" placeholder="请输入内容" /> <el-form-item label="产品名称" prop="itemName">
</el-form-item> <el-input v-model="form.itemName" placeholder="请输入产品名称" >
<el-form-item label="客户编码" prop="clientCode"> </el-input>
<el-input v-model="form.clientCode" placeholder="请输入客户编码" /> </el-form-item>
</el-form-item> </el-col>
<el-form-item label="客户名称" prop="clientName"> <el-col :lg="12" :md="12" :sm="24" :xs="24">
<el-input v-model="form.clientName" placeholder="请输入客户名称" /> <el-form-item label="编码前缀" prop="prefix">
</el-form-item> <el-input v-model="form.prefix" placeholder="请输入编码前缀" />
<el-form-item label="当前流水" prop="currentSerial"> </el-form-item>
<el-input v-model="form.currentSerial" placeholder="请输入当前流水" /> </el-col>
</el-form-item> <el-col :lg="12" :md="12" :sm="24" :xs="24">
<el-form-item label="编码时间格式化" prop="datePattern">
<el-input v-model="form.datePattern" placeholder="请输入编码时间格式化" />
</el-form-item>
</el-col>
<el-col :lg="12" :md="12" :sm="24" :xs="24">
<el-form-item label="编码流水长度" prop="serialLen">
<el-input v-model="form.serialLen" placeholder="请输入编码流水长度" />
</el-form-item>
</el-col>
<el-col :lg="12" :md="12" :sm="24" :xs="24">
<el-form-item label="当前流水" prop="currentSerial">
<el-input v-model="form.currentSerial" placeholder="请输入当前流水" />
</el-form-item>
</el-col>
<el-col :lg="12" :md="12" :sm="24" :xs="24">
<el-form-item label="客户编码" prop="clientCode">
<el-input v-model="form.clientCode" placeholder="请输入客户编码" />
</el-form-item>
</el-col>
<el-col :lg="12" :md="12" :sm="24" :xs="24">
<el-form-item label="客户名称" prop="clientName">
<el-input v-model="form.clientName" placeholder="请输入客户名称" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col>
<el-form-item label="产品描述" prop="itemDesc">
<el-input v-model="form.itemDesc" type="textarea" placeholder="请输入内容" />
</el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
<ItemSelect ref="itemSelect" @onSelected="onItemSelected"> </ItemSelect>
</div> </div>
</template> </template>
<script> <script>
import { listProQrcodeRule, getProQrcodeRule, delProQrcodeRule, addProQrcodeRule, updateProQrcodeRule } from "@/api/mes/pro/proQrcodeRule";
import { listProQrcodeRule, getProQrcodeRule, delProQrcodeRule, addProQrcodeRule, updateProQrcodeRule } from "@/api/mes/pro/proQrcodeRule";
import ItemSelect from "@/components/itemSelect/single.vue";
export default { export default {
components: {
ItemSelect
},
name: "ProQrcodeRule", name: "ProQrcodeRule",
data() { data() {
return { return {
...@@ -189,6 +227,15 @@ ...@@ -189,6 +227,15 @@
this.getList(); this.getList();
}, },
methods: { methods: {
//物料选择弹出框
onItemSelected(obj) {
if (obj != undefined && obj != null) {
this.form.itemCode = obj.itemCode;
this.form.itemName = obj.itemName;
this.form.itemId = obj.itemId;
this.form.itemDesc = obj.itemDesc;
}
},
/** 查询产品二维码规则列表 */ /** 查询产品二维码规则列表 */
getList() { getList() {
this.loading = true; this.loading = true;
...@@ -198,6 +245,9 @@ ...@@ -198,6 +245,9 @@
this.loading = false; this.loading = false;
}); });
}, },
handleSelectProduct() {
this.$refs.itemSelect.showFlag = true;
},
// 取消按钮 // 取消按钮
cancel() { cancel() {
this.open = false; this.open = false;
...@@ -237,6 +287,7 @@ ...@@ -237,6 +287,7 @@
const ruleId = row.ruleId || this.ids const ruleId = row.ruleId || this.ids
getProQrcodeRule(ruleId).then(response => { getProQrcodeRule(ruleId).then(response => {
this.form = response.data; this.form = response.data;
this.form['itemName'] = row['itemName']
this.open = true; this.open = true;
this.title = "修改产品二维码规则"; this.title = "修改产品二维码规则";
}); });
......
src/views/mes/pro/qrcodeRecord/index.vue
View file @ e664eaf8
<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-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="产品ID" prop="itemId">
<el-input
v-model="queryParams.itemId"
placeholder="请输入产品ID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="产品编码" prop="itemCode"> <el-form-item label="产品编码" prop="itemCode">
<el-input <el-input
v-model="queryParams.itemCode" v-model="queryParams.itemCode"
...@@ -17,34 +9,18 @@ ...@@ -17,34 +9,18 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="工单ID" prop="workOrderId"> <el-form-item label="产品名称" prop="itemName">
<el-input <el-input
v-model="queryParams.workOrderId" v-model="queryParams.itemName"
placeholder="请输入工单ID" placeholder="请输入产品名称"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="工单编号" prop="workOrderNo"> <el-form-item label="工单号" prop="workOrderNo">
<el-input <el-input
v-model="queryParams.workOrderNo" v-model="queryParams.workOrderNo"
placeholder="请输入工单编号" placeholder="请输入工单号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="打印次数" prop="printTime">
<el-input
v-model="queryParams.printTime"
placeholder="请输入打印次数"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="客户编码" prop="clientCode">
<el-input
v-model="queryParams.clientCode"
placeholder="请输入客户编码"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
...@@ -63,8 +39,8 @@ ...@@ -63,8 +39,8 @@
</el-form-item> </el-form-item>
</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
...@@ -105,22 +81,30 @@ ...@@ -105,22 +81,30 @@
@click="handleExport" @click="handleExport"
v-hasPermi="['pro:qrcodeRecord:export']" v-hasPermi="['pro:qrcodeRecord:export']"
>导出</el-button> >导出</el-button>
</el-col> -->
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-print"
size="mini"
@click="handlePrint"
v-hasPermi="['pro:qrcodeRecord:print']"
>打印</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <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 v-loading="loading" :data="qrcodeRecordList" @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="ID" align="center" prop="recordId" /> <el-table-column label="工单号" align="center" prop="workOrderNo" />
<el-table-column label="产品ID" align="center" prop="itemId" />
<el-table-column label="产品编码" align="center" prop="itemCode" /> <el-table-column label="产品编码" align="center" prop="itemCode" />
<el-table-column label="工单ID" align="center" prop="workOrderId" /> <el-table-column label="产品名称" align="center" prop="itemName" />
<el-table-column label="工单编号" align="center" prop="workOrderNo" />
<el-table-column label="打印次数" align="center" prop="printTime" />
<el-table-column label="二维码" align="center" prop="qrcode" />
<el-table-column label="客户编码" align="center" prop="clientCode" />
<el-table-column label="客户名称" align="center" prop="clientName" /> <el-table-column label="客户名称" align="center" prop="clientName" />
<el-table-column label="产品描述" align="center" prop="itemDesc" /> <el-table-column label="产品描述" align="center" prop="itemDesc" />
<el-table-column label="序列号" align="center" prop="clientCode" />
<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"> <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
...@@ -231,6 +215,7 @@ ...@@ -231,6 +215,7 @@
this.getList(); this.getList();
}, },
methods: { methods: {
handlePrint(){},
/** 查询产品序列号打印记录列表 */ /** 查询产品序列号打印记录列表 */
getList() { getList() {
this.loading = true; this.loading = true;
......
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