Skip to content

P
pda-ui
Commit 3caac670 authored by chenzj's avatar chenzj
Browse files
Options

Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-ui into dev

parents e657817f 7aed3f5c
Hide whitespace changes
Inline Side-by-side
Showing with 325 additions and 180 deletions
src/api/mes/tm/toolmachinesrecord.js
View file @ 3caac670
...@@ -3,7 +3,7 @@ import request from "@/utils/request"; ...@@ -3,7 +3,7 @@ import request from "@/utils/request";
// 查询刀模板上下机记录列表 // 查询刀模板上下机记录列表
export function listRecord(query) { export function listRecord(query) {
return request({ return request({
url: "/tm/tmToolMachinesRecord/list", url: "/tm/tmToolMachines/list",
method: "get", method: "get",
params: query, params: query,
}); });
......
src/views/mes/tm/toolmachinesrecord/index.vue
View file @ 3caac670
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
<el-table-column label="工作单元名称" min-width="100" align="center" prop="workunitName" /> <el-table-column label="工作单元名称" min-width="100" align="center" prop="workunitName" />
<el-table-column label="工作单元id" min-width="100" align="center" prop="workunitId" /> <el-table-column label="工作单元id" min-width="100" align="center" prop="workunitId" />
<el-table-column label="操作" align="center" width="100" fixed="right" class-name="small-padding fixed-width"> <!-- <el-table-column label="操作" align="center" width="100" fixed="right" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
...@@ -159,7 +159,7 @@ ...@@ -159,7 +159,7 @@
icon="el-icon-bottom-right" icon="el-icon-bottom-right"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['tm:toolmachinesrecord:edit']" v-hasPermi="['tm:toolmachinesrecord:edit']"
>入库</el-button> >入库</el-button> -->
<!-- <el-button <!-- <el-button
size="mini" size="mini"
type="text" type="text"
...@@ -167,8 +167,8 @@ ...@@ -167,8 +167,8 @@
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['tm:toolmachinesrecord:remove']" v-hasPermi="['tm:toolmachinesrecord:remove']"
>删除</el-button> --> >删除</el-button> -->
</template> <!-- </template>
</el-table-column> </el-table-column> -->
</el-table> </el-table>
<pagination <pagination
...@@ -229,7 +229,7 @@ export default { ...@@ -229,7 +229,7 @@ export default {
showSearch: true, showSearch: true,
// 总条数 // 总条数
total: 0, total: 0,
// 刀模板上下机记录表格数据 // 刀模版上下机记录表格数据
recordList: [], recordList: [],
// 弹出层标题 // 弹出层标题
title: "", title: "",
...@@ -275,7 +275,7 @@ export default { ...@@ -275,7 +275,7 @@ export default {
handleInWareHouse(e) { handleInWareHouse(e) {
console.log(e, 'House') console.log(e, 'House')
}, },
/** 查询刀模板上下机记录列表 */ /** 查询刀模版上下机记录列表 */
getList() { getList() {
this.loading = true; this.loading = true;
const params = Object.assign({}, this.queryParams) const params = Object.assign({}, this.queryParams)
...@@ -326,17 +326,14 @@ export default { ...@@ -326,17 +326,14 @@ export default {
handleAdd() { handleAdd() {
this.reset(); this.reset();
this.open = true; this.open = true;
this.title = "添加刀模板上下机记录"; this.title = "添加刀模版上下机记录";
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset();
const toolMachinesRecordId = row.toolMachinesRecordId || this.ids this.form = Object.assign(row, {})
getRecord(toolMachinesRecordId).then(response => { this.open = true;
this.form = response.data; this.title = "申请入库";
this.open = true;
this.title = "申请入库";
});
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
...@@ -367,7 +364,7 @@ export default { ...@@ -367,7 +364,7 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const toolMachinesRecordIds = row.toolMachinesRecordId || this.ids; const toolMachinesRecordIds = row.toolMachinesRecordId || this.ids;
this.$modal.confirm('是否确认删除刀模板上下机记录编号为"' + toolMachinesRecordIds + '"的数据项？').then(function() { this.$modal.confirm('是否确认删除刀模版上下机记录编号为"' + toolMachinesRecordIds + '"的数据项？').then(function() {
return delRecord(toolMachinesRecordIds); return delRecord(toolMachinesRecordIds);
}).then(() => { }).then(() => {
this.getList(); this.getList();
......
src/views/mes/tm/toolrequest/index.vue
View file @ 3caac670
...@@ -181,7 +181,7 @@ ...@@ -181,7 +181,7 @@
@pagination="getList" @pagination="getList"
/> />
<!-- 添加或修改刀模板申请单对话框 --> <!-- 添加或修改刀模版申请单对话框 -->
<el-dialog v-if="open" :destroy-on-close="true" :title="title" :visible.sync="open" width="960px" append-to-body :close-on-click-modal="false"> <el-dialog v-if="open" :destroy-on-close="true" :title="title" :visible.sync="open" width="960px" append-to-body :close-on-click-modal="false">
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row> <el-row>
...@@ -191,8 +191,8 @@ ...@@ -191,8 +191,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col v-if="optType === 'add'" :span="12"> <el-col v-if="optType === 'add'" :span="12">
<el-form-item label="任务单" prop="taskId"> <el-form-item label="任务排产单" prop="taskId">
<el-input v-model="form.taskId" placeholder="请选择任务单" <el-input v-model="form.taskId" placeholder="请选择任务排产单"
disabled> disabled>
<el-button <el-button
v-if="optType === 'add'" v-if="optType === 'add'"
...@@ -257,7 +257,7 @@ ...@@ -257,7 +257,7 @@
<el-input v-model="form.arrangeCode" placeholder="请输入编排单号" /> <el-input v-model="form.arrangeCode" placeholder="请输入编排单号" />
</el-form-item> --> </el-form-item> -->
</el-form> </el-form>
<el-divider content-position="center">刀模板申请详细</el-divider> <el-divider content-position="center">刀模版申请详细</el-divider>
<el-card shadow="always" class="box-card"> <el-card shadow="always" class="box-card">
<itemline ref="line" :quantity="form.requestNum" :toolRequestId="form.toolRequestId" :taskId="form.taskId" :optType="optType" @sum="handleSumNum"></itemline> <itemline ref="line" :quantity="form.requestNum" :toolRequestId="form.toolRequestId" :taskId="form.taskId" :optType="optType" @sum="handleSumNum"></itemline>
</el-card> </el-card>
...@@ -328,7 +328,7 @@ export default { ...@@ -328,7 +328,7 @@ export default {
showSearch: true, showSearch: true,
// 总条数 // 总条数
total: 0, total: 0,
// 刀模板申请单表格数据 // 刀模版申请单表格数据
tmToolRequestList: [], tmToolRequestList: [],
// 弹出层标题 // 弹出层标题
title: "", title: "",
...@@ -386,7 +386,7 @@ export default { ...@@ -386,7 +386,7 @@ export default {
pdf_path: 'http://192.168.23.19:8081/static/123.pdf', pdf_path: 'http://192.168.23.19:8081/static/123.pdf',
}); });
}, },
/** 查询刀模板申请单列表 */ /** 查询刀模版申请单列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listTmToolRequest(this.queryParams).then(response => { listTmToolRequest(this.queryParams).then(response => {
...@@ -465,7 +465,7 @@ export default { ...@@ -465,7 +465,7 @@ export default {
handleAdd() { handleAdd() {
this.reset() this.reset()
this.gCode() this.gCode()
this.title = '添加刀模板申请单' this.title = '添加刀模版申请单'
this.open = true; this.open = true;
this.optType = "add" this.optType = "add"
}, },
...@@ -498,7 +498,7 @@ export default { ...@@ -498,7 +498,7 @@ export default {
getTmToolRequest(toolRequestId).then(response => { getTmToolRequest(toolRequestId).then(response => {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "修改刀模板申请单"; this.title = "修改刀模版申请单";
}); });
}, },
/** 提交按钮 */ /** 提交按钮 */
...@@ -532,7 +532,7 @@ export default { ...@@ -532,7 +532,7 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const toolRequestIds = row.toolRequestId || this.ids; const toolRequestIds = row.toolRequestId || this.ids;
this.$modal.confirm('是否确认删除刀模板申请单编号为"' + toolRequestIds + '"的数据项？').then(function() { this.$modal.confirm('是否确认删除刀模版申请单编号为"' + toolRequestIds + '"的数据项？').then(function() {
return delTmToolRequest(toolRequestIds); return delTmToolRequest(toolRequestIds);
}).then(() => { }).then(() => {
this.getList(); this.getList();
......
src/views/mes/tm/toolrequest/selectTask.vue
View file @ 3caac670
...@@ -74,33 +74,23 @@ ...@@ -74,33 +74,23 @@
> --> > -->
<!-- 可以手动的修改label的值，从而控制选择哪一项 --> <!-- 可以手动的修改label的值，从而控制选择哪一项 -->
<el-radio class="radio" v-model="selectedItemId" :label="scope.row.taskId" <el-radio class="radio" v-model="selectedItemId" :label="scope.row.taskId"
>&nbsp;</el-radio >{{ "" }}</el-radio
> >
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="任务单编码" label="排产任务id"
width="120" width="100"
align="center"
key="taskCode"
prop="taskCode"
>
</el-table-column>
<el-table-column
label="工序名称"
min-width="120"
align="center" align="center"
key="processName" key="taskWorkunitId"
prop="processName" prop="taskWorkunitId"
:show-overflow-tooltip="true"
/> />
<el-table-column <el-table-column
label="产品名称" label="排产数量"
min-width="100"
align="center" align="center"
key="itemName" key="quantity"
min-width="150" prop="quantity"
prop="itemName"
:show-overflow-tooltip="true"
/> />
<el-table-column <el-table-column
label="单位" label="单位"
...@@ -118,7 +108,6 @@ ...@@ -118,7 +108,6 @@
prop="quantity" prop="quantity"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column label="工作单元编码" align="center" prop="workunitId" />
<el-table-column <el-table-column
label="开始生产时间" label="开始生产时间"
align="center" align="center"
...@@ -132,7 +121,30 @@ ...@@ -132,7 +121,30 @@
}}</span> }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
label="结束生产时间"
align="center"
prop="endTime"
width="180"
:show-overflow-tooltip="true"
>
<template slot-scope="scope">
<span>{{
parseTime(scope.row.endTime, "{y}-{m}-{d}:{h}-{m}-{s}")
}}</span>
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="true" width="100" label="状态" align="center" prop="statusName" />
<el-table-column :show-overflow-tooltip="true" min-width="180" label="工序任务编码" align="center" prop="taskCode" />
<el-table-column :show-overflow-tooltip="true" min-width="300" label="工序任务名称" align="center" prop="taskName" />
<el-table-column :show-overflow-tooltip="true" width="100" label="工作单元名称" align="center" prop="workunitName" />
<el-table-column :show-overflow-tooltip="true" width="100" label="工作单元编码" align="center" prop="workunitCode" />
<el-table-column :show-overflow-tooltip="true" width="100" label="工站编码" align="center" prop="workstationCode" />
<el-table-column :show-overflow-tooltip="true" width="100" label="工站名称" align="center" prop="workstationName" />
<el-table-column :show-overflow-tooltip="true" width="100" label="工艺名称" align="center" prop="routeName" />
<el-table-column :show-overflow-tooltip="true" width="100" label="工艺编码" align="center" prop="routeCode" />
<el-table-column :show-overflow-tooltip="true" min-width="150" label="工序编码" align="center" prop="processCode" />
<el-table-column :show-overflow-tooltip="true" width="100" label="工序名称" align="center" prop="processName" />
</el-table> </el-table>
<pagination <pagination
......
src/views/mes/tm/toolrequestlist/index.vue
View file @ 3caac670
...@@ -73,10 +73,10 @@ ...@@ -73,10 +73,10 @@
<!-- <el-table-column type="selection" width="55" align="center" /> --> <!-- <el-table-column type="selection" width="55" align="center" /> -->
<el-table-column label="物料编码" width="130" align="center" prop="itemCode" /> <el-table-column label="物料编码" width="130" align="center" prop="itemCode" />
<el-table-column label="物料名称" width="100" align="center" prop="itemName" /> <el-table-column label="物料名称" width="100" align="center" prop="itemName" />
<el-table-column label="任务编码" width="120" align="center" prop="taskCode" />
<el-table-column label="任务名称" show-overflow-tooltip min-width="220" align="center" prop="taskName" />
<el-table-column label="工作单元编码" min-width="100" align="center" prop="workunitCode" /> <el-table-column label="工作单元编码" min-width="100" align="center" prop="workunitCode" />
<el-table-column label="工作单元名称" min-width="120" align="center" prop="workunitName" /> <el-table-column label="工作单元名称" min-width="120" align="center" prop="workunitName" />
<el-table-column label="任务编码" width="120" align="center" prop="taskCode" />
<el-table-column label="任务名称" show-overflow-tooltip min-width="220" align="center" prop="taskName" />
<el-table-column label="上机状态" width="100" align="center" prop="typeName" /> <el-table-column label="上机状态" width="100" align="center" prop="typeName" />
<el-table-column label="数量" width="80" align="center" prop="allQuantity" /> <el-table-column label="数量" width="80" align="center" prop="allQuantity" />
<el-table-column label="使用寿命" width="80" align="center" prop="nextMaintenPeriod" /> <el-table-column label="使用寿命" width="80" align="center" prop="nextMaintenPeriod" />
...@@ -108,14 +108,14 @@ ...@@ -108,14 +108,14 @@
@pagination="getList" @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">
<el-form-item label="刀模板上下机主表ID" prop="toolMachinesId"> <el-form-item label="刀模版上下机主表ID" prop="toolMachinesId">
<el-input v-model="form.toolMachinesId" placeholder="请输入刀模板上下机主表ID" /> <el-input v-model="form.toolMachinesId" placeholder="请输入刀模版上下机主表ID" />
</el-form-item> </el-form-item>
<el-form-item label="刀模板领用单附表id" prop="toolRequestUseItemId"> <el-form-item label="刀模版领用单附表id" prop="toolRequestUseItemId">
<el-input v-model="form.toolRequestUseItemId" placeholder="请输入刀模板领用单附表id" /> <el-input v-model="form.toolRequestUseItemId" placeholder="请输入刀模版领用单附表id" />
</el-form-item> </el-form-item>
<el-form-item label="上下机类型(1上机2下机)" prop="type"> <el-form-item label="上下机类型(1上机2下机)" prop="type">
<el-select v-model="form.type" placeholder="请选择上下机类型(1上机2下机)"> <el-select v-model="form.type" placeholder="请选择上下机类型(1上机2下机)">
...@@ -166,7 +166,7 @@ export default { ...@@ -166,7 +166,7 @@ export default {
showSearch: true, showSearch: true,
// 总条数 // 总条数
total: 0, total: 0,
// 刀模板上下机记录表格数据 // 刀模版上下机记录表格数据
recordList: [], recordList: [],
// 弹出层标题 // 弹出层标题
title: "", title: "",
...@@ -234,7 +234,7 @@ export default { ...@@ -234,7 +234,7 @@ export default {
handleAdd() { handleAdd() {
this.reset(); this.reset();
this.open = true; this.open = true;
this.title = "添加刀模板上下机记录"; this.title = "添加刀模版上下机记录";
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
...@@ -243,7 +243,7 @@ export default { ...@@ -243,7 +243,7 @@ export default {
getRecord(toolMachinesRecordId).then(response => { getRecord(toolMachinesRecordId).then(response => {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "修改刀模板上下机记录"; this.title = "修改刀模版上下机记录";
}); });
}, },
/** 提交按钮 */ /** 提交按钮 */
...@@ -269,7 +269,7 @@ export default { ...@@ -269,7 +269,7 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const toolMachinesRecordIds = row.toolMachinesRecordId || this.ids; const toolMachinesRecordIds = row.toolMachinesRecordId || this.ids;
this.$modal.confirm('是否确认删除刀模板上下机记录编号为"' + toolMachinesRecordIds + '"的数据项？').then(function() { this.$modal.confirm('是否确认删除刀模版上下机记录编号为"' + toolMachinesRecordIds + '"的数据项？').then(function() {
return delRecord(toolMachinesRecordIds); return delRecord(toolMachinesRecordIds);
}).then(() => { }).then(() => {
this.getList(); this.getList();
......
src/views/system/printerConfig/index.vue
View file @ 3caac670
<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="100px">
<el-form-item label="打印机类型" prop="printerType"> <el-row>
<el-select v-model="queryParams.printerType" placeholder="请选择打印机类型" clearable> <el-col :span="6">
<el-option label="请选择字典生成" value="" /> <el-form-item label="打印机类型" prop="printerType">
</el-select> <el-select v-model="queryParams.printerType" placeholder="请选择打印机类型" clearable>
</el-form-item> <el-option
<el-form-item label="打印机名称" prop="printerName"> v-for="dict in dict.type.printer_type"
<el-input :key="dict.value"
v-model="queryParams.printerName" :label="dict.label"
placeholder="请输入打印机名称" :value="dict.label"
clearable >
@keyup.enter.native="handleQuery" </el-option>
/> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="品牌" prop="brand"> </el-col>
<el-input <el-col :span="6">
v-model="queryParams.brand" <el-form-item label="打印机名称" prop="printerName">
placeholder="请输入品牌" <el-input
clearable v-model="queryParams.printerName"
@keyup.enter.native="handleQuery" placeholder="请输入打印机名称"
/> clearable
</el-form-item> @keyup.enter.native="handleQuery"
<el-form-item label="品牌" prop="printerPlace"> />
<el-input </el-form-item>
v-model="queryParams.printerPlace" </el-col>
placeholder="请输入品牌" <el-col :span="6">
clearable </el-col>
@keyup.enter.native="handleQuery" <el-col :span="6">
/> <el-form-item label="品牌" prop="brand">
</el-form-item> <el-input
<el-form-item label="型号" prop="printerModel"> v-model="queryParams.brand"
<el-input placeholder="请输入品牌"
v-model="queryParams.printerModel" clearable
placeholder="请输入型号" @keyup.enter.native="handleQuery"
clearable />
@keyup.enter.native="handleQuery" </el-form-item>
/> </el-col>
</el-form-item> <el-col :span="6">
<el-form-item label="连接类型" prop="connectionType"> <el-form-item label="品牌" prop="printerPlace">
<el-select v-model="queryParams.connectionType" placeholder="请选择连接类型" clearable> <el-input
<el-option label="请选择字典生成" value="" /> v-model="queryParams.printerPlace"
</el-select> placeholder="请输入品牌"
</el-form-item> clearable
<el-form-item label="图片URL" prop="printerUrl"> @keyup.enter.native="handleQuery"
<el-input />
v-model="queryParams.printerUrl" </el-form-item>
placeholder="请输入图片URL" </el-col>
clearable <el-col :span="6">
@keyup.enter.native="handleQuery" <el-form-item label="型号" prop="printerModel">
/> <el-input
</el-form-item> v-model="queryParams.printerModel"
<el-form-item label="启用状态" prop="enableFlag"> placeholder="请输入型号"
<el-input clearable
v-model="queryParams.enableFlag" @keyup.enter.native="handleQuery"
placeholder="请输入启用状态" />
clearable </el-form-item>
@keyup.enter.native="handleQuery" </el-col>
/> <el-col :span="6">
</el-form-item> <el-form-item label="连接类型" prop="connectionType">
<el-form-item label="打印机状态" prop="status"> <el-select v-model="queryParams.connectionType" placeholder="请选择连接类型" clearable>
<el-select v-model="queryParams.status" placeholder="请选择打印机状态" clearable> <el-option
<el-option label="请选择字典生成" value="" /> v-for="dict in dict.type.printer_link_type"
</el-select> :key="dict.value"
</el-form-item> :label="dict.label"
<el-form-item> :value="dict.label"
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> >
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> </el-option>
</el-form-item> </el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="图片URL" prop="printerUrl">
<el-input
v-model="queryParams.printerUrl"
placeholder="请输入图片URL"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="启用状态" prop="enableFlag">
<el-select
v-model="queryParams.enableFlag"
placeholder="请选择启用状态"
clearable
style="width: 240px"
>
<el-option
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="打印机状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择打印机状态" clearable>
<el-option
v-for="dict in dict.type.printer_status"
:key="dict.value"
:label="dict.label"
:value="dict.label"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
...@@ -118,16 +167,43 @@ ...@@ -118,16 +167,43 @@
<el-table v-loading="loading" :data="printerConfigList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="printerConfigList" @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="printerId" /> <el-table-column label="打印机类型" align="center" prop="printerType">
<el-table-column label="打印机类型" align="center" prop="printerType" /> <template slot-scope="scope">
<dict-tag
:options="dict.type.printer_type"
:value="scope.row.printerType"
/>
</template>
</el-table-column>
<el-table-column label="打印机名称" align="center" prop="printerName" /> <el-table-column label="打印机名称" align="center" prop="printerName" />
<el-table-column label="品牌" align="center" prop="brand" /> <el-table-column label="品牌" align="center" prop="brand" />
<el-table-column label="品牌" align="center" prop="printerPlace" /> <el-table-column label="品牌" align="center" prop="printerPlace" />
<el-table-column label="型号" align="center" prop="printerModel" /> <el-table-column label="型号" align="center" prop="printerModel" />
<el-table-column label="连接类型" align="center" prop="connectionType" /> <el-table-column label="连接类型" align="center" prop="connectionType">
<template slot-scope="scope">
<dict-tag
:options="dict.type.printer_link_type"
:value="scope.row.connectionType"
/>
</template>
</el-table-column>
<el-table-column label="图片URL" align="center" prop="printerUrl" /> <el-table-column label="图片URL" align="center" prop="printerUrl" />
<el-table-column label="启用状态" align="center" prop="enableFlag" /> <el-table-column label="启用状态" align="center" prop="enableFlag">
<el-table-column label="打印机状态" align="center" prop="status" /> <template slot-scope="scope">
<dict-tag
:options="dict.type.sys_yes_no"
:value="scope.row.enableFlag"
/>
</template>
</el-table-column>
<el-table-column label="打印机状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag
:options="dict.type.printer_status"
:value="scope.row.status"
/>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" /> <el-table-column label="备注" align="center" prop="remark" />
<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">
...@@ -158,56 +234,95 @@ ...@@ -158,56 +234,95 @@
/> />
<!-- 添加或修改打印机配置对话框 --> <!-- 添加或修改打印机配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="打印机类型" prop="printerType"> <el-row>
<el-select v-model="form.printerType" placeholder="请选择打印机类型"> <el-col :span="12">
<el-option label="请选择字典生成" value="" /> <el-form-item label="打印机类型" prop="printerType">
</el-select> <el-select style="width:100%;" v-model="form.printerType" placeholder="请选择打印机类型">
</el-form-item> <el-option
<el-form-item label="打印机名称" prop="printerName"> v-for="dict in dict.type.printer_type"
<el-input v-model="form.printerName" placeholder="请输入打印机名称" /> :key="dict.value"
</el-form-item> :label="dict.label"
<el-form-item label="品牌" prop="brand"> :value="dict.label"
<el-input v-model="form.brand" placeholder="请输入品牌" /> >
</el-form-item> </el-option>
<el-form-item label="品牌" prop="printerPlace"> </el-select>
<el-input v-model="form.printerPlace" placeholder="请输入品牌" /> </el-form-item>
</el-form-item> </el-col>
<el-form-item label="型号" prop="printerModel"> <el-col :span="12">
<el-input v-model="form.printerModel" placeholder="请输入型号" /> <el-form-item label="打印机名称" prop="printerName">
</el-form-item> <el-input v-model="form.printerName" placeholder="请输入打印机名称" />
<el-form-item label="连接类型" prop="connectionType"> </el-form-item>
<el-select v-model="form.connectionType" placeholder="请选择连接类型"> </el-col>
<el-option label="请选择字典生成" value="" /> <el-col :span="12">
</el-select> <el-form-item label="品牌" prop="brand">
</el-form-item> <el-input v-model="form.brand" placeholder="请输入品牌" />
<el-form-item label="图片URL" prop="printerUrl"> </el-form-item>
<el-input v-model="form.printerUrl" placeholder="请输入图片URL" /> </el-col>
</el-form-item> <el-col :span="12">
<el-form-item label="启用状态" prop="enableFlag"> <el-form-item label="品牌" prop="printerPlace">
<el-input v-model="form.enableFlag" placeholder="请输入启用状态" /> <el-input v-model="form.printerPlace" placeholder="请输入品牌" />
</el-form-item> </el-form-item>
<el-form-item label="打印机状态"> </el-col>
<el-radio-group v-model="form.status"> <el-col :span="12">
<el-radio label="1">请选择字典生成</el-radio> <el-form-item label="型号" prop="printerModel">
</el-radio-group> <el-input v-model="form.printerModel" placeholder="请输入型号" />
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="remark"> </el-col>
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" /> <el-col :span="12">
</el-form-item> <el-form-item label="连接类型" prop="connectionType">
<el-form-item label="预留字段1" prop="attr1"> <el-select style="width:100%;" v-model="form.connectionType" placeholder="请选择连接类型">
<el-input v-model="form.attr1" placeholder="请输入预留字段1" /> <el-option
</el-form-item> v-for="dict in dict.type.printer_link_type"
<el-form-item label="预留字段2" prop="attr2"> :key="dict.value"
<el-input v-model="form.attr2" placeholder="请输入预留字段2" /> :label="dict.label"
</el-form-item> :value="dict.label"
<el-form-item label="预留字段3" prop="attr3"> >
<el-input v-model="form.attr3" placeholder="请输入预留字段3" /> </el-option>
</el-form-item> </el-select>
<el-form-item label="预留字段4" prop="attr4"> </el-form-item>
<el-input v-model="form.attr4" placeholder="请输入预留字段4" /> </el-col>
</el-form-item> <el-col :span="12">
<el-form-item label="图片URL" prop="printerUrl">
<el-input v-model="form.printerUrl" placeholder="请输入图片URL" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="启用状态" prop="enableFlag">
<el-select
v-model="form.enableFlag"
placeholder="请选择启用状态"
clearable
style="width: 100%;"
>
<el-option
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="打印机状态" prop="status">
<el-select
v-model="form.status"
placeholder="请选择打印机状态"
clearable
style="width: 100%;"
>
<el-option
v-for="dict in dict.type.printer_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</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>
...@@ -222,6 +337,12 @@ import { listPrinterConfig, getPrinterConfig, delPrinterConfig, addPrinterConfig ...@@ -222,6 +337,12 @@ import { listPrinterConfig, getPrinterConfig, delPrinterConfig, addPrinterConfig
export default { export default {
name: "PrinterConfig", name: "PrinterConfig",
dicts: [
"printer_type",
"printer_link_type",
"printer_status",
"sys_yes_no"
],
data() { data() {
return { return {
// 遮罩层 // 遮罩层
...@@ -277,7 +398,22 @@ export default { ...@@ -277,7 +398,22 @@ export default {
// 表单重置 // 表单重置
reset() { reset() {
this.form = { this.form = {
printerId: null, printerType: null, printerName: null, brand: null, printerPlace: null, printerModel: null, connectionType: null, printerUrl: null, enableFlag: null, status: "0", remark: null, attr1: null, attr2: null, attr3: null, attr4: null, createBy: null, createTime: null, updateBy: null, updateTime: null }; printerId: null,
printerType: null,
printerName: null,
brand: null,
printerPlace: null,
printerModel: null,
connectionType: null,
printerUrl: null,
enableFlag: null,
status: null,
remark: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null
};
this.resetForm("form"); this.resetForm("form");
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
......
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