test #47
@ -82,7 +82,7 @@ import Tinymce from '@/components/tinymce/index.vue';
|
|||||||
Vue.component('tinymce', Tinymce);
|
Vue.component('tinymce', Tinymce);
|
||||||
import '@/assets/icons';
|
import '@/assets/icons';
|
||||||
import request from '@/utils/request'; // 实现 form generator 使用自己定义的 axios request 对象
|
import request from '@/utils/request'; // 实现 form generator 使用自己定义的 axios request 对象
|
||||||
console.log(request);
|
// console.log(request);
|
||||||
Vue.prototype.$axios = request;
|
Vue.prototype.$axios = request;
|
||||||
import '@/styles/index.scss';
|
import '@/styles/index.scss';
|
||||||
|
|
||||||
|
|||||||
@ -1,227 +1,343 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="app-container">
|
<div class="app-container">
|
||||||
|
<!-- 搜索工作栏 -->
|
||||||
|
<SearchBar
|
||||||
|
:formConfigs="searchBarFormConfig"
|
||||||
|
ref="search-bar"
|
||||||
|
@headBtnClick="handleSearchBarBtnClick" />
|
||||||
|
|
||||||
<!-- 搜索工作栏 -->
|
<!-- 列表 -->
|
||||||
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
|
<base-table
|
||||||
<el-form-item>
|
:table-props="tableProps"
|
||||||
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
|
:page="queryParams.pageNo"
|
||||||
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
|
:limit="queryParams.pageSize"
|
||||||
</el-form-item>
|
:table-data="list"
|
||||||
</el-form>
|
@emit-fun="handleEmitFun">
|
||||||
|
<method-btn
|
||||||
|
v-if="tableBtn.length"
|
||||||
|
slot="handleBtn"
|
||||||
|
label="操作"
|
||||||
|
fixed="right"
|
||||||
|
:method-list="tableBtn"
|
||||||
|
@clickBtn="handleTableBtnClick" />
|
||||||
|
</base-table>
|
||||||
|
|
||||||
<!-- 操作工具栏 -->
|
<!-- 分页组件 -->
|
||||||
<el-row :gutter="10" class="mb8">
|
<pagination
|
||||||
<el-col :span="1.5">
|
v-show="total > 0"
|
||||||
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
|
:total="total"
|
||||||
v-hasPermi="['base:quality-inspection-box-btn:create']">新增</el-button>
|
:page.sync="queryParams.pageNo"
|
||||||
</el-col>
|
:limit.sync="queryParams.pageSize"
|
||||||
<el-col :span="1.5">
|
@pagination="getList" />
|
||||||
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
|
|
||||||
v-hasPermi="['base:quality-inspection-box-btn:export']">导出</el-button>
|
|
||||||
</el-col>
|
|
||||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
|
||||||
</el-row>
|
|
||||||
|
|
||||||
<!-- 列表 -->
|
<!-- 对话框(添加 / 修改) -->
|
||||||
<el-table v-loading="loading" :data="list">
|
<base-dialog
|
||||||
<el-table-column label="ID" align="center" prop="id" />
|
:dialogTitle="title"
|
||||||
<el-table-column label="该按钮绑定的检测内容id" align="center" prop="inspectionDetId" />
|
:dialogVisible="open"
|
||||||
<el-table-column label="检测内容（设备推送消息时，可能无对应id，只填这个字段）" align="center" prop="inspectionDetContent" />
|
width="50%"
|
||||||
<el-table-column label="按钮盒所在产线id" align="center" prop="productionId" />
|
@close="cancel"
|
||||||
<el-table-column label="按钮盒所在工段id" align="center" prop="sectionId" />
|
@cancel="cancel"
|
||||||
<el-table-column label="按钮盒模式" align="center" prop="model" />
|
@confirm="submitForm">
|
||||||
<el-table-column label="按钮值" align="center" prop="keyValue" />
|
<DialogForm
|
||||||
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
|
v-if="open"
|
||||||
<template v-slot="scope">
|
ref="form"
|
||||||
<span>{{ parseTime(scope.row.createTime) }}</span>
|
:dataForm="form"
|
||||||
</template>
|
:rows="[
|
||||||
</el-table-column>
|
[
|
||||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
{
|
||||||
<template v-slot="scope">
|
select: true,
|
||||||
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
|
label: '产线',
|
||||||
v-hasPermi="['base:quality-inspection-box-btn:update']">修改</el-button>
|
url: '/base/production-line/listAll',
|
||||||
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
|
prop: 'productionId',
|
||||||
v-hasPermi="['base:quality-inspection-box-btn:delete']">删除</el-button>
|
rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
|
||||||
</template>
|
bind: {
|
||||||
</el-table-column>
|
filterable: true,
|
||||||
</el-table>
|
},
|
||||||
<!-- 分页组件 -->
|
},
|
||||||
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
|
],
|
||||||
@pagination="getList"/>
|
[
|
||||||
|
{
|
||||||
<!-- 对话框(添加 / 修改) -->
|
select: true,
|
||||||
<el-dialog :title="title" :visible.sync="open" width="500px" v-dialogDrag append-to-body>
|
label: '工段',
|
||||||
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
url: '/base/workshop-section/listAll',
|
||||||
<el-form-item label="该按钮绑定的检测内容id" prop="inspectionDetId">
|
prop: 'sectionId',
|
||||||
<el-input v-model="form.inspectionDetId" placeholder="请输入该按钮绑定的检测内容id" />
|
rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
|
||||||
</el-form-item>
|
},
|
||||||
<el-form-item label="检测内容（设备推送消息时，可能无对应id，只填这个字段）" prop="inspectionDetContent">
|
// {
|
||||||
<el-input v-model="form.inspectionDetContent" type="textarea" placeholder="请输入内容" />
|
// select: true,
|
||||||
</el-form-item>
|
// url: '', //
|
||||||
<el-form-item label="按钮盒所在产线id" prop="productionId">
|
// label: '检测内容',
|
||||||
<el-input v-model="form.productionId" placeholder="请输入按钮盒所在产线id" />
|
// prop: 'inspectionDetContent',
|
||||||
</el-form-item>
|
// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
|
||||||
<el-form-item label="按钮盒所在工段id" prop="sectionId">
|
// },
|
||||||
<el-input v-model="form.sectionId" placeholder="请输入按钮盒所在工段id" />
|
],
|
||||||
</el-form-item>
|
[
|
||||||
<el-form-item label="按钮盒模式" prop="model">
|
{
|
||||||
<el-input v-model="form.model" placeholder="请输入按钮盒模式" />
|
input: true,
|
||||||
</el-form-item>
|
label: '按钮盒识别码',
|
||||||
<el-form-item label="按钮值" prop="keyValue">
|
prop: 'buttonId',
|
||||||
<el-input v-model="form.keyValue" placeholder="请输入按钮值" />
|
rules: [
|
||||||
</el-form-item>
|
{
|
||||||
</el-form>
|
type: 'number',
|
||||||
<div slot="footer" class="dialog-footer">
|
message: '请输入数字',
|
||||||
<el-button type="primary" @click="submitForm">确 定</el-button>
|
trigger: 'blur',
|
||||||
<el-button @click="cancel">取 消</el-button>
|
transform: (val) => Number(val),
|
||||||
</div>
|
},
|
||||||
</el-dialog>
|
],
|
||||||
</div>
|
},
|
||||||
|
],
|
||||||
|
[{ input: true, label: '按钮盒模式', prop: 'model' }],
|
||||||
|
[
|
||||||
|
{
|
||||||
|
input: true,
|
||||||
|
label: '按钮值',
|
||||||
|
prop: 'keyValue',
|
||||||
|
rules: [
|
||||||
|
{
|
||||||
|
type: 'number',
|
||||||
|
message: '请输入100以内的数字',
|
||||||
|
trigger: 'blur',
|
||||||
|
transform: (val) => Number(val) <= 100 && Number(val),
|
||||||
|
},
|
||||||
|
],
|
||||||
|
bind: { type: 'number', min: 0, max: 100 },
|
||||||
|
},
|
||||||
|
],
|
||||||
|
[
|
||||||
|
{
|
||||||
|
textarea: true,
|
||||||
|
label: '检测内容',
|
||||||
|
prop: 'inspectionDetContent',
|
||||||
|
rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
|
||||||
|
},
|
||||||
|
],
|
||||||
|
]" />
|
||||||
|
</base-dialog>
|
||||||
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { createQualityInspectionBoxBtn, updateQualityInspectionBoxBtn, deleteQualityInspectionBoxBtn, getQualityInspectionBoxBtn, getQualityInspectionBoxBtnPage, exportQualityInspectionBoxBtnExcel } from "@/api/base/qualityInspectionBoxBtn";
|
import {
|
||||||
|
createQualityInspectionBoxBtn,
|
||||||
|
updateQualityInspectionBoxBtn,
|
||||||
|
deleteQualityInspectionBoxBtn,
|
||||||
|
getQualityInspectionBoxBtn,
|
||||||
|
getQualityInspectionBoxBtnPage,
|
||||||
|
exportQualityInspectionBoxBtnExcel,
|
||||||
|
} from '@/api/base/qualityInspectionBoxBtn';
|
||||||
|
import basicPageMixin from '../../mixin/basicPageMixin';
|
||||||
|
import moment from 'moment';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: "QualityInspectionBoxBtn",
|
name: 'QualityInspectionBoxBtn',
|
||||||
components: {
|
mixins: [basicPageMixin],
|
||||||
},
|
components: {},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
// 遮罩层
|
searchBarFormConfig: [
|
||||||
loading: true,
|
{
|
||||||
// 导出遮罩层
|
type: 'input',
|
||||||
exportLoading: false,
|
label: '检查内容',
|
||||||
// 显示搜索条件
|
placeholder: '请输入检查内容',
|
||||||
showSearch: true,
|
param: 'inspectionDetContent',
|
||||||
// 总条数
|
},
|
||||||
total: 0,
|
{
|
||||||
// 安灯按钮16键对应列表
|
type: 'button',
|
||||||
list: [],
|
btnName: '查询',
|
||||||
// 弹出层标题
|
name: 'search',
|
||||||
title: "",
|
color: 'primary',
|
||||||
// 是否显示弹出层
|
},
|
||||||
open: false,
|
{
|
||||||
// 查询参数
|
type: 'separate',
|
||||||
queryParams: {
|
},
|
||||||
pageNo: 1,
|
{
|
||||||
pageSize: 10,
|
type: this.$auth.hasPermi('base:quality-inspection-box-btn:create')
|
||||||
inspectionDetContent: null,
|
? 'button'
|
||||||
},
|
: '',
|
||||||
// 表单参数
|
btnName: '新增',
|
||||||
form: {},
|
name: 'add',
|
||||||
// 表单校验
|
plain: true,
|
||||||
rules: {
|
color: 'success',
|
||||||
productionId: [{ required: true, message: "按钮盒所在产线id不能为空", trigger: "blur" }],
|
},
|
||||||
sectionId: [{ required: true, message: "按钮盒所在工段id不能为空", trigger: "blur" }],
|
],
|
||||||
}
|
tableBtn: [
|
||||||
};
|
this.$auth.hasPermi('base:quality-inspection-box-btn:update')
|
||||||
},
|
? {
|
||||||
created() {
|
type: 'edit',
|
||||||
this.getList();
|
btnName: '修改',
|
||||||
},
|
}
|
||||||
methods: {
|
: undefined,
|
||||||
/** 查询列表 */
|
this.$auth.hasPermi('base:quality-inspection-box-btn:delete')
|
||||||
getList() {
|
? {
|
||||||
this.loading = true;
|
type: 'delete',
|
||||||
// 执行查询
|
btnName: '删除',
|
||||||
getQualityInspectionBoxBtnPage(this.queryParams).then(response => {
|
}
|
||||||
this.list = response.data.list;
|
: undefined,
|
||||||
this.total = response.data.total;
|
].filter((v) => v),
|
||||||
this.loading = false;
|
tableProps: [
|
||||||
});
|
{
|
||||||
},
|
prop: 'createTime',
|
||||||
/** 取消按钮 */
|
label: '添加时间',
|
||||||
cancel() {
|
fixed: true,
|
||||||
this.open = false;
|
width: 180,
|
||||||
this.reset();
|
filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
|
||||||
},
|
},
|
||||||
/** 表单重置 */
|
{
|
||||||
reset() {
|
width: 128,
|
||||||
this.form = {
|
prop: 'productionName',
|
||||||
id: undefined,
|
label: '产线',
|
||||||
inspectionDetId: undefined,
|
align: 'center',
|
||||||
inspectionDetContent: undefined,
|
},
|
||||||
productionId: undefined,
|
{
|
||||||
sectionId: undefined,
|
width: 128,
|
||||||
model: undefined,
|
prop: 'sectionName',
|
||||||
keyValue: undefined,
|
label: '工段',
|
||||||
};
|
align: 'center',
|
||||||
this.resetForm("form");
|
},
|
||||||
},
|
{
|
||||||
/** 搜索按钮操作 */
|
width: 128,
|
||||||
handleQuery() {
|
prop: 'inspectionDetContent',
|
||||||
this.queryParams.pageNo = 1;
|
label: '检测内容',
|
||||||
this.getList();
|
align: 'center',
|
||||||
},
|
},
|
||||||
/** 重置按钮操作 */
|
{
|
||||||
resetQuery() {
|
width: 160,
|
||||||
this.resetForm("queryForm");
|
prop: 'buttonId',
|
||||||
this.handleQuery();
|
label: '按钮盒识别码',
|
||||||
},
|
align: 'center',
|
||||||
/** 新增按钮操作 */
|
},
|
||||||
handleAdd() {
|
// {
|
||||||
this.reset();
|
// width: 256,
|
||||||
this.open = true;
|
// prop: 'productionId',
|
||||||
this.title = "添加安灯按钮16键对应";
|
// label: '按钮盒所在产线ID',
|
||||||
},
|
// align: 'center',
|
||||||
/** 修改按钮操作 */
|
// },
|
||||||
handleUpdate(row) {
|
// {
|
||||||
this.reset();
|
// width: 256,
|
||||||
const id = row.id;
|
// prop: 'sectionId',
|
||||||
getQualityInspectionBoxBtn(id).then(response => {
|
// label: '按钮盒所在工段ID',
|
||||||
this.form = response.data;
|
// align: 'center',
|
||||||
this.open = true;
|
// },
|
||||||
this.title = "修改安灯按钮16键对应";
|
{ width: 90, prop: 'keyValue', label: '按钮值', align: 'center' },
|
||||||
});
|
{ width: 128, prop: 'model', label: '按钮盒模式', align: 'center' },
|
||||||
},
|
],
|
||||||
/** 提交按钮 */
|
// 查询参数
|
||||||
submitForm() {
|
queryParams: {
|
||||||
this.$refs["form"].validate(valid => {
|
pageNo: 1,
|
||||||
if (!valid) {
|
pageSize: 10,
|
||||||
return;
|
inspectionDetContent: null,
|
||||||
}
|
},
|
||||||
// 修改的提交
|
// 搜索框需要的 keys, 与上面 queryParams 的除 pageNo, pageSize 之外的 key 一一对应
|
||||||
if (this.form.id != null) {
|
searchBarKeys: ['inspectionDetContent'],
|
||||||
updateQualityInspectionBoxBtn(this.form).then(response => {
|
form: {
|
||||||
this.$modal.msgSuccess("修改成功");
|
id: undefined,
|
||||||
this.open = false;
|
inspectionDetId: undefined,
|
||||||
this.getList();
|
inspectionDetContent: undefined,
|
||||||
});
|
productionId: undefined,
|
||||||
return;
|
sectionId: undefined,
|
||||||
}
|
model: undefined,
|
||||||
// 添加的提交
|
keyValue: undefined,
|
||||||
createQualityInspectionBoxBtn(this.form).then(response => {
|
},
|
||||||
this.$modal.msgSuccess("新增成功");
|
};
|
||||||
this.open = false;
|
},
|
||||||
this.getList();
|
created() {
|
||||||
});
|
this.getList();
|
||||||
});
|
},
|
||||||
},
|
methods: {
|
||||||
/** 删除按钮操作 */
|
/** 查询列表 */
|
||||||
handleDelete(row) {
|
getList() {
|
||||||
const id = row.id;
|
this.loading = true;
|
||||||
this.$modal.confirm('是否确认删除安灯按钮16键对应编号为"' + id + '"的数据项?').then(function() {
|
// 执行查询
|
||||||
return deleteQualityInspectionBoxBtn(id);
|
getQualityInspectionBoxBtnPage(this.queryParams).then((response) => {
|
||||||
}).then(() => {
|
this.list = response.data.list;
|
||||||
this.getList();
|
this.total = response.data.total;
|
||||||
this.$modal.msgSuccess("删除成功");
|
this.loading = false;
|
||||||
}).catch(() => {});
|
});
|
||||||
},
|
},
|
||||||
/** 导出按钮操作 */
|
/** 表单重置 */
|
||||||
handleExport() {
|
reset() {
|
||||||
// 处理查询参数
|
this.form = {
|
||||||
let params = {...this.queryParams};
|
id: undefined,
|
||||||
params.pageNo = undefined;
|
inspectionDetId: undefined,
|
||||||
params.pageSize = undefined;
|
inspectionDetContent: undefined,
|
||||||
this.$modal.confirm('是否确认导出所有安灯按钮16键对应数据项?').then(() => {
|
productionId: undefined,
|
||||||
this.exportLoading = true;
|
sectionId: undefined,
|
||||||
return exportQualityInspectionBoxBtnExcel(params);
|
model: undefined,
|
||||||
}).then(response => {
|
keyValue: undefined,
|
||||||
this.$download.excel(response, '安灯按钮16键对应.xls');
|
};
|
||||||
this.exportLoading = false;
|
this.resetForm('form');
|
||||||
}).catch(() => {});
|
},
|
||||||
}
|
/** 新增按钮操作 */
|
||||||
}
|
handleAdd() {
|
||||||
|
this.reset();
|
||||||
|
this.open = true;
|
||||||
|
this.title = '添加安灯按钮16键对应';
|
||||||
|
},
|
||||||
|
/** 修改按钮操作 */
|
||||||
|
handleUpdate(row) {
|
||||||
|
this.reset();
|
||||||
|
const id = row.id;
|
||||||
|
getQualityInspectionBoxBtn(id).then((response) => {
|
||||||
|
this.form = response.data;
|
||||||
|
this.open = true;
|
||||||
|
this.title = '修改安灯按钮16键对应';
|
||||||
|
});
|
||||||
|
},
|
||||||
|
/** 提交按钮 */
|
||||||
|
submitForm() {
|
||||||
|
this.$refs['form'].validate((valid) => {
|
||||||
|
if (!valid) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// 修改的提交
|
||||||
|
if (this.form.id != null) {
|
||||||
|
updateQualityInspectionBoxBtn(this.form).then((response) => {
|
||||||
|
this.$modal.msgSuccess('修改成功');
|
||||||
|
this.open = false;
|
||||||
|
this.getList();
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// 添加的提交
|
||||||
|
createQualityInspectionBoxBtn(this.form).then((response) => {
|
||||||
|
this.$modal.msgSuccess('新增成功');
|
||||||
|
this.open = false;
|
||||||
|
this.getList();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
},
|
||||||
|
/** 删除按钮操作 */
|
||||||
|
handleDelete(row) {
|
||||||
|
const id = row.id;
|
||||||
|
this.$modal
|
||||||
|
.confirm('是否确认删除安灯按钮16键对应编号为"' + id + '"的数据项?')
|
||||||
|
.then(function () {
|
||||||
|
return deleteQualityInspectionBoxBtn(id);
|
||||||
|
})
|
||||||
|
.then(() => {
|
||||||
|
this.getList();
|
||||||
|
this.$modal.msgSuccess('删除成功');
|
||||||
|
})
|
||||||
|
.catch(() => {});
|
||||||
|
},
|
||||||
|
/** 导出按钮操作 */
|
||||||
|
handleExport() {
|
||||||
|
// 处理查询参数
|
||||||
|
let params = { ...this.queryParams };
|
||||||
|
params.pageNo = undefined;
|
||||||
|
params.pageSize = undefined;
|
||||||
|
this.$modal
|
||||||
|
.confirm('是否确认导出所有安灯按钮16键对应数据项?')
|
||||||
|
.then(() => {
|
||||||
|
this.exportLoading = true;
|
||||||
|
return exportQualityInspectionBoxBtnExcel(params);
|
||||||
|
})
|
||||||
|
.then((response) => {
|
||||||
|
this.$download.excel(response, '安灯按钮16键对应.xls');
|
||||||
|
this.exportLoading = false;
|
||||||
|
})
|
||||||
|
.catch(() => {});
|
||||||
|
},
|
||||||
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@ -20,6 +20,13 @@
|
|||||||
@change="$emit('update', form)"
|
@change="$emit('update', form)"
|
||||||
:placeholder="`请输入${col.label}`"
|
:placeholder="`请输入${col.label}`"
|
||||||
v-bind="col.bind" />
|
v-bind="col.bind" />
|
||||||
|
<el-input
|
||||||
|
v-if="col.textarea"
|
||||||
|
type="textarea"
|
||||||
|
v-model="form[col.prop]"
|
||||||
|
@change="$emit('update', form)"
|
||||||
|
:placeholder="`请输入${col.label}`"
|
||||||
|
v-bind="col.bind" />
|
||||||
<el-select
|
<el-select
|
||||||
v-if="col.select"
|
v-if="col.select"
|
||||||
v-model="form[col.prop]"
|
v-model="form[col.prop]"
|
||||||
@ -142,10 +149,14 @@ export default {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
// this.formLoading = false;
|
if (!promiseList.length) this.formLoading = false;
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style scoped lang="scss"></style>
|
<style scoped lang="scss">
|
||||||
|
.el-select {
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user