Skip to content

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

增加标签模板

parent 2f8eb6b0
Show whitespace changes
Inline Side-by-side
Showing with 944 additions and 674 deletions
src/i18n/lang/th_TH.json
View file @ e3d070f5
...@@ -2962,5 +2962,8 @@ ...@@ -2962,5 +2962,8 @@
"委外加工商必选": "ต้องเลือกผู้ประมวลผลเอาท์ซอร์ส", "委外加工商必选": "ต้องเลือกผู้ประมวลผลเอาท์ซอร์ส",
"ERP数据同步": "การซิงโครไนซ์ข้อมูล ERP", "ERP数据同步": "การซิงโครไนซ์ข้อมูล ERP",
"车间异常单编号": "หมายเลขคําสั่งซื้อข้อยกเว้นร้านค้า", "车间异常单编号": "หมายเลขคําสั่งซื้อข้อยกเว้นร้านค้า",
"开始": "เริ่ม" "开始": "เริ่ม",
"标签模板": "เทมเพลตแท็ก",
"请选择标签模板": "โปรดเลือกแม่แบบฉลาก",
"没有配置标签模版": "ไม่มีการกำหนดค่าลายฉลุฉลาก"
} }
\ No newline at end of file
src/i18n/lang/zh_CN.json
View file @ e3d070f5
...@@ -2962,5 +2962,8 @@ ...@@ -2962,5 +2962,8 @@
"委外加工商必选": "委外加工商必选", "委外加工商必选": "委外加工商必选",
"ERP数据同步": "ERP数据同步", "ERP数据同步": "ERP数据同步",
"车间异常单编号": "车间异常单编号", "车间异常单编号": "车间异常单编号",
"开始": "开始" "开始": "开始",
"标签模板": "标签模板",
"请选择标签模板": "请选择标签模板",
"没有配置标签模版": "没有配置标签模版"
} }
src/views/mes/pro/proQrcodeRule/index.vue
View file @ e3d070f5
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" @submit.native.prevent ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form
:model="queryParams"
@submit.native.prevent
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<el-form-item :label="$t('产品编码')" prop="itemCode"> <el-form-item :label="$t('产品编码')" prop="itemCode">
<el-input <el-input
v-model="queryParams.itemCode" v-model="queryParams.itemCode"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
...@@ -12,14 +19,21 @@ ...@@ -12,14 +19,21 @@
<el-form-item :label="$t('产品名称')" prop="itemName"> <el-form-item :label="$t('产品名称')" prop="itemName">
<el-input <el-input
v-model="queryParams.itemName" v-model="queryParams.itemName"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{ $t('common.search') }}</el-button> <el-button
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ $t('common.reset') }}</el-button> type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>{{ $t('common.search') }}</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{
$t('common.reset')
}}</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
...@@ -32,7 +46,8 @@ ...@@ -32,7 +46,8 @@
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['pro:proQrcodeRule:add']" v-hasPermi="['pro:proQrcodeRule:add']"
>{{ $t('common.add') }}</el-button> >{{ $t('common.add') }}</el-button
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
...@@ -43,7 +58,8 @@ ...@@ -43,7 +58,8 @@
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['pro:proQrcodeRule:edit']" v-hasPermi="['pro:proQrcodeRule:edit']"
>{{ $t('common.edit') }}</el-button> >{{ $t('common.edit') }}</el-button
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
...@@ -54,7 +70,8 @@ ...@@ -54,7 +70,8 @@
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['pro:proQrcodeRule:remove']" v-hasPermi="['pro:proQrcodeRule:remove']"
>{{ $t('common.del') }}</el-button> >{{ $t('common.del') }}</el-button
>
</el-col> </el-col>
<!-- <el-col :span="1.5"> <!-- <el-col :span="1.5">
<el-button <el-button
...@@ -66,23 +83,64 @@ ...@@ -66,23 +83,64 @@
v-hasPermi="['pro:proQrcodeRule:export']" v-hasPermi="['pro:proQrcodeRule:export']"
>{{ $t('common.export') }}</el-button> >{{ $t('common.export') }}</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 type="selection" width="55" align="center" />
<el-table-column :label="$t('产品编码')" align="center" prop="itemCode" /> <el-table-column :label="$t('产品编码')" align="center" prop="itemCode" />
<el-table-column :label="$t('产品名称')" align="center" prop="itemName" /> <el-table-column :label="$t('产品名称')" align="center" prop="itemName" />
<el-table-column :label="$t('客户编码')" align="center" prop="clientCode" /> <el-table-column
<el-table-column :label="$t('客户名称')" align="center" prop="clientName" /> :label="$t('客户编码')"
align="center"
prop="clientCode"
/>
<el-table-column
:label="$t('标签模板')"
align="center"
prop="templateName"
/>
<el-table-column
:label="$t('客户名称')"
align="center"
prop="clientName"
/>
<el-table-column :label="$t('产品描述')" align="center" prop="itemDesc" /> <el-table-column :label="$t('产品描述')" align="center" prop="itemDesc" />
<el-table-column :label="$t('编码前缀')" align="center" prop="prefix" /> <el-table-column :label="$t('编码前缀')" align="center" prop="prefix" />
<el-table-column :label="$t('编码流水长度')" align="center" prop="serialLen" /> <el-table-column
<el-table-column :label="$t('编码时间格式化')" align="center" prop="datePattern" /> :label="$t('编码流水长度')"
<el-table-column :label="$t('目前号段')" align="center" prop="currentSerial" /> align="center"
prop="serialLen"
/>
<el-table-column
:label="$t('编码时间格式化')"
align="center"
prop="datePattern"
/>
<el-table-column
:label="$t('目前号段')"
align="center"
prop="currentSerial"
/>
<el-table-column :label="$t('创建人')" align="center" prop="createBy" /> <el-table-column :label="$t('创建人')" align="center" prop="createBy" />
<el-table-column :label="$t('common.create_time')" align="center" prop="createTime" /> <el-table-column
<el-table-column :label="$t('common.option')" align="center" class-name="small-padding fixed-width" width="110"> :label="$t('common.create_time')"
align="center"
prop="createTime"
/>
<el-table-column
:label="$t('common.option')"
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"
...@@ -90,20 +148,22 @@ ...@@ -90,20 +148,22 @@
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['pro:proQrcodeRule:edit']" v-hasPermi="['pro:proQrcodeRule:edit']"
>{{ $t('common.edit') }}</el-button> >{{ $t('common.edit') }}</el-button
>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['pro:proQrcodeRule:remove']" v-hasPermi="['pro:proQrcodeRule:remove']"
>{{ $t('common.del') }}</el-button> >{{ $t('common.del') }}</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"
...@@ -116,7 +176,7 @@ ...@@ -116,7 +176,7 @@
<el-row> <el-row>
<el-col :lg="12" :md="12" :sm="24" :xs="24"> <el-col :lg="12" :md="12" :sm="24" :xs="24">
<el-form-item :label="$t('产品编码')" prop="itemCode"> <el-form-item :label="$t('产品编码')" prop="itemCode">
<el-input v-model="form.itemCode" > <el-input v-model="form.itemCode">
<el-button <el-button
slot="append" slot="append"
@click="handleSelectProduct" @click="handleSelectProduct"
...@@ -127,8 +187,7 @@ ...@@ -127,8 +187,7 @@
</el-col> </el-col>
<el-col :lg="12" :md="12" :sm="24" :xs="24"> <el-col :lg="12" :md="12" :sm="24" :xs="24">
<el-form-item :label="$t('产品名称')" prop="itemName"> <el-form-item :label="$t('产品名称')" prop="itemName">
<el-input v-model="form.itemName" > <el-input v-model="form.itemName"> </el-input>
</el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :lg="12" :md="12" :sm="24" :xs="24"> <el-col :lg="12" :md="12" :sm="24" :xs="24">
...@@ -146,10 +205,25 @@ ...@@ -146,10 +205,25 @@
<el-input v-model="form.serialLen" /> <el-input v-model="form.serialLen" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :lg="12" :md="12" :sm="24" :xs="24">
<el-form-item :label="$t('标签模板')" prop="templateName">
<el-input v-model="form.templateName">
<el-button
slot="append"
@click="visible = true"
icon="el-icon-search"
></el-button>
</el-input>
</el-form-item>
</el-col>
<el-col :lg="12" :md="12" :sm="24" :xs="24"> <el-col :lg="12" :md="12" :sm="24" :xs="24">
<el-form-item :label="$t('客户编码')" prop="clientCode"> <el-form-item :label="$t('客户编码')" prop="clientCode">
<el-input v-model="form.clientCode"> <el-input v-model="form.clientCode">
<el-button slot="append" @click="handleSelectClient" icon="el-icon-search"></el-button> <el-button
slot="append"
@click="handleSelectClient"
icon="el-icon-search"
></el-button>
</el-input> </el-input>
<ClientSelect ref="clientSelect" @onSelected="onClientSelected"> <ClientSelect ref="clientSelect" @onSelected="onClientSelected">
</ClientSelect> </ClientSelect>
...@@ -170,28 +244,58 @@ ...@@ -170,28 +244,58 @@
</el-row> </el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">{{ $t('common.confirm') }}</el-button> <el-button type="primary" @click="submitForm">{{
$t('common.confirm')
}}</el-button>
<el-button @click="cancel">{{ $t('common.cancel') }}</el-button> <el-button @click="cancel">{{ $t('common.cancel') }}</el-button>
</div> </div>
</el-dialog> </el-dialog>
<!-- 标签模板对话框 -->
<el-dialog
:title="$t('标签模板')"
:visible.sync="visible"
width="960px"
append-to-body
>
<templatePrint
ref="templatePrintRef"
v-if="visible"
type="single"
reportType="qrcode"
:operation="false"
></templatePrint>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="handleSubmitPrint">{{
$t('common.confirm')
}}</el-button>
<el-button @click="visible = false">{{
$t('common.cancel')
}}</el-button>
</div>
</el-dialog>
<ItemSelect ref="itemSelect" @onSelected="onItemSelected"> </ItemSelect> <ItemSelect ref="itemSelect" @onSelected="onItemSelected"> </ItemSelect>
</div> </div>
</template> </template>
<script> <script>
import {
listProQrcodeRule,
getProQrcodeRule,
delProQrcodeRule,
addProQrcodeRule,
updateProQrcodeRule,
} from '@/api/mes/pro/proQrcodeRule'
import ItemSelect from '@/components/itemSelect/single.vue'
import ClientSelect from '@/components/clientSelect/single.vue'
import templatePrint from '@/views/mes/report/index'
export default {
import { listProQrcodeRule, getProQrcodeRule, delProQrcodeRule, addProQrcodeRule, updateProQrcodeRule } from "@/api/mes/pro/proQrcodeRule";
import ItemSelect from "@/components/itemSelect/single.vue";
import ClientSelect from "@/components/clientSelect/single.vue";
export default {
components: { components: {
ItemSelect, ItemSelect,
ClientSelect templatePrint,
ClientSelect,
}, },
name: "ProQrcodeRule", name: 'ProQrcodeRule',
data() { data() {
return { return {
// 遮罩层 // 遮罩层
...@@ -209,7 +313,7 @@ ...@@ -209,7 +313,7 @@
// 产品二维码规则表格数据 // 产品二维码规则表格数据
proQrcodeRuleList: [], proQrcodeRuleList: [],
// 弹出层标题 // 弹出层标题
title: "", title: '',
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
// 查询参数 // 查询参数
...@@ -217,132 +321,172 @@ ...@@ -217,132 +321,172 @@
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
itemCode: null, itemCode: null,
itemName: null}, itemName: null,
},
// 表单参数 // 表单参数
form: {}, form: {},
visible: false,
// 表单校验 // 表单校验
rules: { rules: {
itemCode: [ itemCode: [
{ required: true, message: this.$t('产品编码不能为空'), trigger: "blur" } {
], } required: true,
}; message: this.$t('产品编码不能为空'),
trigger: 'blur',
},
],
},
}
}, },
created() { created() {
this.getList(); this.getList()
}, },
methods: { methods: {
handleSubmitPrint() {
if (!this.$refs.templatePrintRef.selectedItemId) {
this.$message.warning(this.$t('请选择标签模板'))
return
}
this.form.templateName = this.$refs.templatePrintRef.currentData.name
this.form.templateId = this.$refs.templatePrintRef.selectedItemId
this.form.templateCode = this.$refs.templatePrintRef.selectedItemId + ''
this.form.templateType = this.$refs.templatePrintRef.currentData.reportType
this.visible = false
},
//物料选择弹出框 //物料选择弹出框
onItemSelected(obj) { onItemSelected(obj) {
if (obj != undefined && obj != null) { if (obj != undefined && obj != null) {
this.form.itemCode = obj.itemCode; this.form.itemCode = obj.itemCode
this.form.itemName = obj.itemName; this.form.itemName = obj.itemName
this.form.itemId = obj.itemId; this.form.itemId = obj.itemId
this.form.itemDesc = obj.itemDesc; this.form.itemDesc = obj.itemDesc
} }
}, },
handleSelectClient() { handleSelectClient() {
this.$refs.clientSelect.showFlag = true; this.$refs.clientSelect.showFlag = true
}, },
onClientSelected(obj) { onClientSelected(obj) {
if (obj != undefined && obj != null) { if (obj != undefined && obj != null) {
this.form.clientId = obj.clientId; this.form.clientId = obj.clientId
this.form.clientCode = obj.clientCode; this.form.clientCode = obj.clientCode
this.form.clientName = obj.clientName; this.form.clientName = obj.clientName
} }
}, },
/** 查询产品二维码规则列表 */ /** 查询产品二维码规则列表 */
getList() { getList() {
this.loading = true; this.loading = true
listProQrcodeRule(this.queryParams).then(response => { listProQrcodeRule(this.queryParams).then((response) => {
this.proQrcodeRuleList = response.rows; this.proQrcodeRuleList = response.rows
this.total = response.total; this.total = response.total
this.loading = false; this.loading = false
}); })
}, },
handleSelectProduct() { handleSelectProduct() {
this.$refs.itemSelect.showFlag = true; this.$refs.itemSelect.showFlag = true
}, },
// 取消按钮 // 取消按钮
cancel() { cancel() {
this.open = false; this.open = false
this.reset(); this.reset()
}, },
// 表单重置 // 表单重置
reset() { reset() {
this.form = { this.form = {
ruleId: null, itemId: null, itemCode: null, prefix: null, datePattern: null, serialLen: null, itemDesc: null, clientCode: null, clientName: null, currentSerial: null, createBy: null, createTime: null, updateBy: null, updateTime: null }; ruleId: null,
this.resetForm("form"); itemId: null,
itemCode: null,
prefix: null,
datePattern: null,
serialLen: null,
itemDesc: null,
clientCode: null,
clientName: null,
currentSerial: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
}
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()
}, },
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map(item => item.ruleId) this.ids = selection.map((item) => item.ruleId)
this.single = selection.length!==1 this.single = selection.length !== 1
this.multiple = !selection.length this.multiple = !selection.length
}, },
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
this.reset(); this.reset()
this.open = true; this.open = true
this.title = this.$t('添加产品二维码规则'); this.title = this.$t('添加产品二维码规则')
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset()
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.form['itemName'] = row['itemName']
this.open = true; this.open = true
this.title = this.$t('修改产品二维码规则'); this.title = this.$t('修改产品二维码规则')
}); })
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
this.$refs["form"].validate(valid => { this.$refs['form'].validate((valid) => {
if (valid) { if (valid) {
if (this.form.ruleId != null) { if (this.form.ruleId != null) {
updateProQrcodeRule(this.form).then(response => { updateProQrcodeRule(this.form).then((response) => {
this.$modal.msgSuccess(this.$t('common.edit_success')); this.$modal.msgSuccess(this.$t('common.edit_success'))
this.open = false; this.open = false
this.getList(); this.getList()
}); })
} else { } else {
addProQrcodeRule(this.form).then(response => { addProQrcodeRule(this.form).then((response) => {
this.$modal.msgSuccess(this.$t('common.add_success')); this.$modal.msgSuccess(this.$t('common.add_success'))
this.open = false; this.open = false
this.getList(); this.getList()
}); })
} }
} }
}); })
}, },
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const ruleIds = row.ruleId || this.ids; const ruleIds = row.ruleId || this.ids
this.$modal.confirm(this.$t('common.confirm_del_data')).then(function() { this.$modal
return delProQrcodeRule(ruleIds); .confirm(this.$t('common.confirm_del_data'))
}).then(() => { .then(function () {
this.getList(); return delProQrcodeRule(ruleIds)
this.$modal.msgSuccess(this.$t('common.del_success')); })
}).catch(() => {}); .then(() => {
this.getList()
this.$modal.msgSuccess(this.$t('common.del_success'))
})
.catch(() => {})
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
this.download('pro/proQrcodeRule/export', { this.download(
...this.queryParams 'pro/proQrcodeRule/export',
}, `proQrcodeRule_${new Date().getTime()}.xlsx`) {
} ...this.queryParams,
} },
}; `proQrcodeRule_${new Date().getTime()}.xlsx`
</script> )
},
},
}
</script>
\ No newline at end of file
src/views/mes/pro/qrcodeRecord/index.vue
View file @ e3d070f5
<template> <template>
<div class="app-container"> <div class="app-container">
<el-row style="display: flex;" :gutter="16"> <el-row style="display: flex" :gutter="16">
<el-col :span="8" > <el-col :span="8">
<el-card style="min-height: 700px;"> <el-card style="min-height: 700px">
<el-form <el-form
:model="queryWorkParams" :model="queryWorkParams"
ref="queryWorkForm" ref="queryWorkForm"
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
<el-form-item :label="$t('工单编码')" prop="workorderCode"> <el-form-item :label="$t('工单编码')" prop="workorderCode">
<el-input <el-input
v-model="queryWorkParams.workorderCode" v-model="queryWorkParams.workorderCode"
clearable clearable
@keyup.enter.native="handleQueryWorkorder" @keyup.enter.native="handleQueryWorkorder"
/> />
...@@ -28,7 +27,10 @@ ...@@ -28,7 +27,10 @@
@click="handleQueryWorkorder" @click="handleQueryWorkorder"
>{{ $t('common.search') }}</el-button >{{ $t('common.search') }}</el-button
> >
<el-button icon="el-icon-refresh" size="mini" @click="resetWorkQuery" <el-button
icon="el-icon-refresh"
size="mini"
@click="resetWorkQuery"
>{{ $t('common.reset') }}</el-button >{{ $t('common.reset') }}</el-button
> >
</el-form-item> </el-form-item>
...@@ -45,20 +47,44 @@ ...@@ -45,20 +47,44 @@
<el-table-column width="50" align="center"> <el-table-column width="50" align="center">
<template v-slot="scope"> <template v-slot="scope">
<!-- 可以手动的修改label的值，从而控制选择哪一项 --> <!-- 可以手动的修改label的值，从而控制选择哪一项 -->
<el-radio class="radio" v-model="selectedItemId" :label="scope.row.workorderCode" <el-radio
>{{ "" }}</el-radio class="radio"
v-model="selectedItemId"
:label="scope.row.workorderCode"
>{{ '' }}</el-radio
> >
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('生产单号')" align="center" prop="workorderCode" /> <el-table-column
<el-table-column :label="$t('客户名称')" align="center" prop="clientName" /> :label="$t('生产单号')"
<el-table-column :label="$t('产品名称')" width="80" align="center" prop="productName" /> align="center"
prop="workorderCode"
/>
<el-table-column
:label="$t('客户名称')"
align="center"
prop="clientName"
/>
<el-table-column
:label="$t('产品名称')"
width="80"
align="center"
prop="productName"
/>
</el-table> </el-table>
</el-card> </el-card>
</el-col> </el-col>
<el-col :span="16"> <el-col :span="16">
<el-card> <el-card>
<el-form :model="queryParams" @submit.native.prevent ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px" > <el-form
:model="queryParams"
@submit.native.prevent
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<el-form-item :label="$t('序列号')" prop="qrcode"> <el-form-item :label="$t('序列号')" prop="qrcode">
<el-input <el-input
v-model="queryParams.qrcode" v-model="queryParams.qrcode"
...@@ -67,8 +93,19 @@ ...@@ -67,8 +93,19 @@
/> />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{ $t('common.search') }}</el-button> <el-button
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ $t('common.reset') }}</el-button> type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>{{ $t('common.search') }}</el-button
>
<el-button
icon="el-icon-refresh"
size="mini"
@click="resetQuery"
>{{ $t('common.reset') }}</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
...@@ -123,19 +160,51 @@ ...@@ -123,19 +160,51 @@
size="mini" size="mini"
@click="printQrCode" @click="printQrCode"
v-hasPermi="['pro:qrcodeRecord:print']" v-hasPermi="['pro:qrcodeRecord:print']"
>{{$t('打印')}}</el-button> >{{ $t('打印') }}</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="$t('序列号')" align="center" prop="qrcode" /> <el-table-column
<el-table-column :label="$t('工单号')" align="center" prop="workOrderNo" /> :label="$t('序列号')"
<el-table-column :label="$t('产品编码')" align="center" prop="itemCode" /> align="center"
<el-table-column :label="$t('产品描述')" align="center" prop="itemDesc" /> prop="qrcode"
<el-table-column :label="$t('创建日期')" align="center" prop="createTime" /> />
<el-table-column :label="$t('打印次数')" align="center" prop="printTime" /> <el-table-column
:label="$t('工单号')"
align="center"
prop="workOrderNo"
/>
<el-table-column
:label="$t('产品编码')"
align="center"
prop="itemCode"
/>
<el-table-column
:label="$t('产品描述')"
align="center"
prop="itemDesc"
/>
<el-table-column
:label="$t('创建日期')"
align="center"
prop="createTime"
/>
<el-table-column
:label="$t('打印次数')"
align="center"
prop="printTime"
/>
<!-- <el-table-column :label="$t('common.option')" align="center" class-name="small-padding fixed-width"> <!-- <el-table-column :label="$t('common.option')" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
...@@ -156,7 +225,7 @@ ...@@ -156,7 +225,7 @@
</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"
...@@ -198,23 +267,29 @@ ...@@ -198,23 +267,29 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">{{ $t('common.confirm') }}</el-button> <el-button type="primary" @click="submitForm">{{
$t('common.confirm')
}}</el-button>
<el-button @click="cancel">{{ $t('common.cancel') }}</el-button> <el-button @click="cancel">{{ $t('common.cancel') }}</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { workorderList } from '@/api/mes/pro/packageLablePrint'
import {
listQrcodeRecord,
getQrcodeRecord,
delQrcodeRecord,
addQrcodeRecord,
updateQrcodeRecord,
} from '@/api/mes/pro/qrcodeRecord'
import { postPrintPdf } from '@/utils/ruoyi'
import { workorderList } from "@/api/mes/pro/packageLablePrint"; export default {
name: 'QrcodeRecord',
import { listQrcodeRecord, getQrcodeRecord, delQrcodeRecord, addQrcodeRecord, updateQrcodeRecord } from "@/api/mes/pro/qrcodeRecord";
import {postPrintPdf} from "@/utils/ruoyi"
export default {
name: "QrcodeRecord",
data() { data() {
return { return {
// 遮罩层 // 遮罩层
...@@ -237,26 +312,40 @@ import {postPrintPdf} from "@/utils/ruoyi" ...@@ -237,26 +312,40 @@ import {postPrintPdf} from "@/utils/ruoyi"
// 产品序列号打印记录表格数据 // 产品序列号打印记录表格数据
qrcodeRecordList: [], qrcodeRecordList: [],
// 弹出层标题 // 弹出层标题
title: "", title: '',
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
queryWorkParams: { queryWorkParams: {
pageNum: 1, pageNum: 1,
workorderCode: null workorderCode: null,
}, },
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
qrcode: 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: {},
// 表单校验 // 表单校验
rules: { rules: {
itemId: [ itemId: [
{ required: true, message: this.$t('产品ID不能为空'), trigger: "blur" } {
], } required: true,
}; message: this.$t('产品ID不能为空'),
trigger: 'blur',
},
],
},
}
}, },
created() { created() {
// this.getList(); // this.getList();
...@@ -277,36 +366,45 @@ import {postPrintPdf} from "@/utils/ruoyi" ...@@ -277,36 +366,45 @@ import {postPrintPdf} from "@/utils/ruoyi"
qrcode: null, qrcode: null,
clientCode: null, clientCode: null,
clientName: null, clientName: null,
itemDesc: null} itemDesc: null,
}
this.getList() this.getList()
}, },
handlePrint(){}, handlePrint() {},
printQrCode() { printQrCode() {
let detail = []
const promise = [] const promise = []
this.selectRow.forEach((s,i)=>{ const noTemplate = []
promise.push(updateQrcodeRecord({...s, ...{printTime: s.printTime + 1}})) this.selectRow.forEach((s, i) => {
let detail = []
if (s.templateName) {
promise.push(
updateQrcodeRecord({ ...s, ...{ printTime: s.printTime + 1 } })
)
detail.push({ detail.push({
"barcode": s.qrcode, barcode: s.qrcode,
"showText" : '', showText: '',
"gp": i+1 gp: i + 1,
}) })
detail.push({ detail.push({
"barcode": s.qrcode, barcode: s.qrcode,
"showText" : '', showText: '',
"gp":i+1 gp: i + 1,
}) })
}); postPrintPdf(s.templateName, {
Promise.all(promise).then(res => { detail,
this.getList(); })
} else {
noTemplate.push(s.qrcode)
}
})
if(noTemplate.length > 0) {
this.$message.warning(noTemplate.join(',') + this.$t('没有配置标签模版'))
}
if (promise.length > 0) {
Promise.all(promise).then((res) => {
this.getList()
}) })
postPrintPdf(
"qrcode-50*50-2",
{
detail
} }
);
}, },
/** 查询工单列表 */ /** 查询工单列表 */
getWorkList() { getWorkList() {
...@@ -314,115 +412,137 @@ import {postPrintPdf} from "@/utils/ruoyi" ...@@ -314,115 +412,137 @@ import {postPrintPdf} from "@/utils/ruoyi"
this.$message.error(this.$t('请输入查询条件')) this.$message.error(this.$t('请输入查询条件'))
return return
} }
this.workorderloading = true; this.workorderloading = true
workorderList(this.queryWorkParams).then((response) => { workorderList(this.queryWorkParams).then((response) => {
console.log(response, 'response') console.log(response, 'response')
this.workorderList = response.rows; this.workorderList = response.rows
this.workordertotal = response.total; this.workordertotal = response.total
this.workorderloading = false; this.workorderloading = false
this.produceForm = {} this.produceForm = {}
this.selectedItemId = null this.selectedItemId = null
}); })
}, },
/** 查询产品序列号打印记录列表 */ /** 查询产品序列号打印记录列表 */
getList() { getList() {
this.loading = true; this.loading = true
listQrcodeRecord(this.queryParams).then(response => { listQrcodeRecord(this.queryParams).then((response) => {
this.qrcodeRecordList = response.rows; this.qrcodeRecordList = response.rows
this.total = response.total; this.total = response.total
this.loading = false; this.loading = false
}); })
}, },
// 取消按钮 // 取消按钮
cancel() { cancel() {
this.open = false; this.open = false
this.reset(); this.reset()
}, },
// 表单重置 // 表单重置
reset() { reset() {
this.form = { this.form = {
recordId: null, itemId: null, itemCode: null, workOrderId: null, workOrderNo: null, printTime: null, qrcode: null, clientCode: null, clientName: null, itemDesc: null, createBy: null, createTime: null, updateBy: null, updateTime: null }; recordId: null,
this.resetForm("form"); itemId: null,
itemCode: null,
workOrderId: null,
workOrderNo: null,
printTime: null,
qrcode: null,
clientCode: null,
clientName: null,
itemDesc: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
}
this.resetForm('form')
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.queryParams.pageNum = 1
this.getList(); this.getList()
}, },
handleQueryWorkorder() { handleQueryWorkorder() {
this.queryParams.pageNum = 1; this.queryParams.pageNum = 1
this.getWorkList(); this.getWorkList()
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.resetForm("queryForm"); this.resetForm('queryForm')
this.handleQuery(); this.handleQuery()
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetWorkQuery() { resetWorkQuery() {
this.resetForm("queryWorkForm"); this.resetForm('queryWorkForm')
this.handleQueryWorkorder(); this.handleQueryWorkorder()
}, },
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map(item => item.recordId) this.ids = selection.map((item) => item.recordId)
this.selectRow = selection; this.selectRow = selection
this.single = selection.length!==1 this.single = selection.length !== 1
this.multiple = !selection.length this.multiple = !selection.length
}, },
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
this.reset(); this.reset()
this.open = true; this.open = true
this.title = this.$t('添加产品序列号打印记录'); this.title = this.$t('添加产品序列号打印记录')
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset()
const recordId = row.recordId || this.ids const recordId = row.recordId || this.ids
getQrcodeRecord(recordId).then(response => { getQrcodeRecord(recordId).then((response) => {
this.form = response.data; this.form = response.data
this.open = true; this.open = true
this.title = this.$t('修改产品序列号打印记录'); this.title = this.$t('修改产品序列号打印记录')
}); })
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
this.$refs["form"].validate(valid => { this.$refs['form'].validate((valid) => {
if (valid) { if (valid) {
if (this.form.recordId != null) { if (this.form.recordId != null) {
updateQrcodeRecord(this.form).then(response => { updateQrcodeRecord(this.form).then((response) => {
this.$modal.msgSuccess(this.$t('common.edit_success')); this.$modal.msgSuccess(this.$t('common.edit_success'))
this.open = false; this.open = false
this.getList(); this.getList()
}); })
} else { } else {
addQrcodeRecord(this.form).then(response => { addQrcodeRecord(this.form).then((response) => {
this.$modal.msgSuccess(this.$t('common.add_success')); this.$modal.msgSuccess(this.$t('common.add_success'))
this.open = false; this.open = false
this.getList(); this.getList()
}); })
} }
} }
}); })
}, },
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const recordIds = row.recordId || this.ids; const recordIds = row.recordId || this.ids
this.$modal.confirm(this.$t('common.confirm_del_data')).then(function() { this.$modal
return delQrcodeRecord(recordIds); .confirm(this.$t('common.confirm_del_data'))
}).then(() => { .then(function () {
this.getList(); return delQrcodeRecord(recordIds)
this.$modal.msgSuccess(this.$t('common.del_success')); })
}).catch(() => {}); .then(() => {
this.getList()
this.$modal.msgSuccess(this.$t('common.del_success'))
})
.catch(() => {})
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
this.download('pro/qrcodeRecord/export', { this.download(
...this.queryParams 'pro/qrcodeRecord/export',
}, `qrcodeRecord_${new Date().getTime()}.xlsx`) {
} ...this.queryParams,
} },
}; `qrcodeRecord_${new Date().getTime()}.xlsx`
</script> )
},
},
}
</script>
\ No newline at end of file
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