lb #9

Merged
g7hoo merged 18 commits from lb into test 2023-08-03 15:15:37 +08:00
8 changed files with 1262 additions and 636 deletions

View File

@ -58,6 +58,7 @@
"js-beautify": "1.13.0", "js-beautify": "1.13.0",
"jsencrypt": "3.3.1", "jsencrypt": "3.3.1",
"min-dash": "3.5.2", "min-dash": "3.5.2",
"moment": "^2.29.4",
"nprogress": "0.2.0", "nprogress": "0.2.0",
"qrcode.vue": "^1.7.0", "qrcode.vue": "^1.7.0",
"quill": "1.3.7", "quill": "1.3.7",

View File

@ -85,7 +85,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';

View File

@ -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>

View File

@ -1,227 +1,314 @@
<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 label="检测内容" prop="content"> :table-props="tableProps"
<el-input v-model="queryParams.content" placeholder="请输入检测内容" clearable @keyup.enter.native="handleQuery"/> :page="queryParams.pageNo"
</el-form-item> :limit="queryParams.pageSize"
<el-form-item label="创建时间" prop="createTime"> :table-data="list"
<el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange" @emit-fun="handleEmitFun">
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" /> <method-btn
</el-form-item> v-if="tableBtn.length"
<el-form-item> slot="handleBtn"
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button> label="操作"
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button> fixed="right"
</el-form-item> :method-list="tableBtn"
</el-form> @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-det: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-det: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="typeId" /> :dialogVisible="open"
<el-table-column label="检测内容" align="center" prop="content" /> width="40%"
<el-table-column label="检测编码" align="center" prop="code" /> @close="cancel"
<el-table-column label="备注" align="center" prop="remark" /> @cancel="cancel"
<el-table-column label="创建时间" align="center" prop="createTime" width="180"> @confirm="submitForm">
<template v-slot="scope"> <DialogForm
<span>{{ parseTime(scope.row.createTime) }}</span> v-if="open"
</template> ref="form"
</el-table-column> :dataForm="form"
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> :rows="[
<template v-slot="scope"> [
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" {
v-hasPermi="['base:quality-inspection-det:update']">修改</el-button> select: true,
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" label: '检测类型',
v-hasPermi="['base:quality-inspection-det:delete']">删除</el-button> prop: 'typeId',
</template> url: '/base/quality-inspection-type/listAll',
</el-table-column> rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
</el-table> bind: {
<!-- 分页组件 --> filterable: true,
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize" },
@pagination="getList"/> },
],
<!-- 对话框(添加 / 修改) --> [
<el-dialog :title="title" :visible.sync="open" width="500px" v-dialogDrag append-to-body> {
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> input: true,
<el-form-item label="检测类型id" prop="typeId"> label: '检测内容',
<el-select v-model="form.typeId" placeholder="请选择检测类型id"> prop: 'content',
<el-option label="请选择字典生成" value="" /> rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
</el-select> },
</el-form-item> ],
<el-form-item label="检测内容" prop="content"> [
<el-input v-model="form.content" placeholder="请输入检测内容" /> {
</el-form-item> input: true,
<el-form-item label="检测编码" prop="code"> label: '内容编码',
<el-input v-model="form.code" placeholder="请输入检测编码" /> prop: 'code',
</el-form-item> url: '/base/quality-inspection-det/getCode',
<el-form-item label="备注" prop="remark"> },
<el-input v-model="form.remark" placeholder="请输入备注" /> ],
</el-form-item> [{ input: true, label: '备注', prop: 'remark' }],
</el-form> ]" />
<div slot="footer" class="dialog-footer"> </base-dialog>
<el-button type="primary" @click="submitForm"> </el-button> </div>
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>
</div>
</template> </template>
<script> <script>
import { createQualityInspectionDet, updateQualityInspectionDet, deleteQualityInspectionDet, getQualityInspectionDet, getQualityInspectionDetPage, exportQualityInspectionDetExcel } from "@/api/base/qualityInspectionDet"; import {
createQualityInspectionDet,
updateQualityInspectionDet,
deleteQualityInspectionDet,
getQualityInspectionDet,
getQualityInspectionDetPage,
exportQualityInspectionDetExcel,
} from '@/api/base/qualityInspectionDet';
import moment from 'moment';
import basicPageMixin from '../../mixin/basicPageMixin';
export default { export default {
name: "QualityInspectionDet", name: 'QualityInspectionDet',
components: { mixins: [basicPageMixin],
}, data() {
data() { return {
return { typeList: [], //
// searchBarFormConfig: [
loading: true, {
// type: 'input',
exportLoading: false, label: '检测内容',
// placeholder: '请输入检测内容',
showSearch: true, param: 'content',
// },
total: 0, // {
// // type: 'datePicker',
list: [], // label: '',
// // dateType: 'daterange', // datetimerange
title: "", // // format: 'yyyy-MM-dd HH:mm:ss',
// // format: 'yyyy-MM-dd',
open: false, // valueFormat: 'yyyy-MM-dd HH:mm:ss',
// // rangeSeparator: '-',
queryParams: { // startPlaceholder: '',
pageNo: 1, // endPlaceholder: '',
pageSize: 10, // defaultTime: ['00:00:00', '23:59:59'],
content: null, // param: 'createTime',
createTime: [], // width: 350,
}, // },
// {
form: {}, type: 'button',
// btnName: '查询',
rules: { name: 'search',
typeId: [{ required: true, message: "检测类型id不能为空", trigger: "change" }], color: 'primary',
content: [{ required: true, message: "检测内容不能为空", trigger: "blur" }], },
} // {
}; // type: 'button',
}, // btnName: '',
created() { // name: 'reset',
this.getList(); // },
}, {
methods: { type: 'separate',
/** 查询列表 */ },
getList() { {
this.loading = true; type: this.$auth.hasPermi('base:quality-inspection-det:create')
// ? 'button'
getQualityInspectionDetPage(this.queryParams).then(response => { : '',
this.list = response.data.list; btnName: '新增',
this.total = response.data.total; name: 'add',
this.loading = false; plain: true,
}); color: 'success',
}, },
/** 取消按钮 */ // {
cancel() { // type: this.$auth.hasPermi('base:quality-inspection-type:export')
this.open = false; // ? 'button'
this.reset(); // : '',
}, // btnName: '',
/** 表单重置 */ // name: 'export',
reset() { // color: 'warning',
this.form = { // },
id: undefined, ],
typeId: undefined, tableBtn: [
content: undefined, this.$auth.hasPermi('base:quality-inspection-det:update')
code: undefined, ? {
remark: undefined, type: 'edit',
}; btnName: '修改',
this.resetForm("form"); }
}, : undefined,
/** 搜索按钮操作 */ this.$auth.hasPermi('base:quality-inspection-det:delete')
handleQuery() { ? {
this.queryParams.pageNo = 1; type: 'delete',
this.getList(); btnName: '删除',
}, }
/** 重置按钮操作 */ : undefined,
resetQuery() { ].filter((v) => v),
this.resetForm("queryForm"); tableProps: [
this.handleQuery(); {
}, prop: 'createTime',
/** 新增按钮操作 */ label: '添加时间',
handleAdd() { fixed: true,
this.reset(); width: 180,
this.open = true; filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
this.title = "添加质量检测信息基础"; },
}, { prop: 'typeName', label: '类型名称', align: 'center' },
/** 修改按钮操作 */ { prop: 'content', label: '检测内容', align: 'center' },
handleUpdate(row) { { prop: 'code', label: '检测编码', align: 'center' },
this.reset(); { prop: 'remark', label: '备注', align: 'center' },
const id = row.id; ],
getQualityInspectionDet(id).then(response => { //
this.form = response.data; queryParams: {
this.open = true; pageNo: 1,
this.title = "修改质量检测信息基础"; pageSize: 10,
}); content: null,
}, createTime: [],
/** 提交按钮 */ },
submitForm() { // keys, queryParams pageNo, pageSize key
this.$refs["form"].validate(valid => { searchBarKeys: ['content', 'createTime'],
if (!valid) { form: {
return; id: undefined,
} typeId: undefined,
// content: undefined,
if (this.form.id != null) { code: undefined,
updateQualityInspectionDet(this.form).then(response => { remark: undefined,
this.$modal.msgSuccess("修改成功"); },
this.open = false; };
this.getList(); },
}); created() {
return; this.getList();
} this.getTypeList();
// },
createQualityInspectionDet(this.form).then(response => { methods: {
this.$modal.msgSuccess("新增成功"); /** 获取检测类型id */
this.open = false; getTypeList() {
this.getList(); this.$axios('/base/quality-inspection-type/listAll').then((response) => {
}); this.typeList = response.data.map((item) => {
}); return {
}, label: item.name,
/** 删除按钮操作 */ value: item.id,
handleDelete(row) { };
const id = row.id; });
this.$modal.confirm('是否确认删除质量检测信息基础编号为"' + id + '"的数据项?').then(function() { });
return deleteQualityInspectionDet(id); },
}).then(() => { /** 查询列表 */
this.getList(); getList() {
this.$modal.msgSuccess("删除成功"); this.loading = true;
}).catch(() => {}); //
}, getQualityInspectionDetPage(this.queryParams).then((response) => {
/** 导出按钮操作 */ this.list = response.data.list;
handleExport() { this.total = response.data.total;
// this.loading = false;
let params = {...this.queryParams}; });
params.pageNo = undefined; },
params.pageSize = undefined; /** 表单重置 */
this.$modal.confirm('是否确认导出所有质量检测信息基础数据项?').then(() => { reset() {
this.exportLoading = true; this.form = {
return exportQualityInspectionDetExcel(params); id: undefined,
}).then(response => { typeId: undefined,
this.$download.excel(response, '质量检测信息基础.xls'); content: undefined,
this.exportLoading = false; code: undefined,
}).catch(() => {}); remark: undefined,
} };
} this.resetForm('form');
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = '添加质量检测信息';
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id;
getQualityInspectionDet(id).then((response) => {
this.form = response.data;
this.open = true;
this.title = '修改质量检测信息';
});
},
/** 提交按钮 */
submitForm() {
this.$refs['form'].validate((valid) => {
if (!valid) {
return;
}
//
if (this.form.id != null) {
updateQualityInspectionDet(this.form).then((response) => {
this.$modal.msgSuccess('修改成功');
this.open = false;
this.getList();
});
return;
}
//
createQualityInspectionDet(this.form).then((response) => {
this.$modal.msgSuccess('新增成功');
this.open = false;
this.getList();
});
});
},
/** 删除按钮操作 */
handleDelete(row) {
const id = row.id;
this.$modal
.confirm('是否确认删除质量检测信息基础编号为"' + id + '"的数据项?')
.then(function () {
return deleteQualityInspectionDet(id);
})
.then(() => {
this.getList();
this.$modal.msgSuccess('删除成功');
})
.catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
//
let params = { ...this.queryParams };
params.pageNo = undefined;
params.pageSize = undefined;
this.$modal
.confirm('是否确认导出所有质量检测信息基础数据项?')
.then(() => {
this.exportLoading = true;
return exportQualityInspectionDetExcel(params);
})
.then((response) => {
this.$download.excel(response, '质量检测信息基础.xls');
this.exportLoading = false;
})
.catch(() => {});
},
},
}; };
</script> </script>
<style>
.el-select {
width: 100% !important;
}
</style>

View File

@ -1,214 +1,354 @@
<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 label="检测类型名称" prop="name"> :table-props="tableProps"
<el-input v-model="queryParams.name" placeholder="请输入检测类型名称" clearable @keyup.enter.native="handleQuery"/> :page="queryParams.pageNo"
</el-form-item> :limit="queryParams.pageSize"
<el-form-item> :table-data="list"
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button> @emit-fun="handleEmitFun">
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button> <method-btn
</el-form-item> v-if="tableBtn.length"
</el-form> slot="handleBtn"
label="操作"
: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-type: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-type: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="检测类型名称" align="center" prop="name" /> :dialogVisible="open"
<el-table-column label="检测类型编码" align="center" prop="code" /> @close="cancel"
<el-table-column label="备注" align="center" prop="remark" /> @cancel="cancel"
<el-table-column label="创建时间" align="center" prop="createTime" width="180"> @confirm="submitForm">
<template v-slot="scope"> <DialogForm
<span>{{ parseTime(scope.row.createTime) }}</span> v-if="open"
</template> ref="form"
</el-table-column> :dataForm="form"
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> :rows="[
<template v-slot="scope"> [
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" {
v-hasPermi="['base:quality-inspection-type:update']">修改</el-button> input: true,
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" label: '检测类型名称',
v-hasPermi="['base:quality-inspection-type:delete']">删除</el-button> prop: 'name',
</template> rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
</el-table-column> // bind: {
</el-table> // disabled: true, // some condition, like detail mode...
<!-- 分页组件 --> // }
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize" },
@pagination="getList"/> ],
[
<!-- 对话框(添加 / 修改) --> {
<el-dialog :title="title" :visible.sync="open" width="500px" v-dialogDrag append-to-body> input: true,
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> label: '检测类型编码',
<el-form-item label="检测类型名称" prop="name"> prop: 'code',
<el-input v-model="form.name" placeholder="请输入检测类型名称" /> url: '/base/quality-inspection-type/getCode',
</el-form-item> },
<el-form-item label="检测类型编码" prop="code"> ],
<el-input v-model="form.code" placeholder="请输入检测类型编码" /> [{ input: true, label: '备注', prop: 'remark' }],
</el-form-item> ]" />
<el-form-item label="备注" prop="remark"> </base-dialog>
<el-input v-model="form.remark" placeholder="请输入备注" /> </div>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>
</div>
</template> </template>
<script> <script>
import { createQualityInspectionType, updateQualityInspectionType, deleteQualityInspectionType, getQualityInspectionType, getQualityInspectionTypePage, exportQualityInspectionTypeExcel } from "@/api/base/qualityInspectionType"; import moment from 'moment';
import {
createQualityInspectionType,
updateQualityInspectionType,
deleteQualityInspectionType,
getQualityInspectionType,
getQualityInspectionTypePage,
exportQualityInspectionTypeExcel,
} from '@/api/base/qualityInspectionType';
import basicPageMixin from '../../mixin/basicPageMixin';
export default { export default {
name: "QualityInspectionType", name: 'QualityInspectionType',
components: { mixins: [basicPageMixin],
}, data() {
data() { return {
return { tableBtn: [
// this.$auth.hasPermi('base:quality-inspection-type:update')
loading: true, ? {
// type: 'edit',
exportLoading: false, btnName: '修改',
// }
showSearch: true, : undefined,
// this.$auth.hasPermi('base:quality-inspection-type:delete')
total: 0, ? {
// type: 'delete',
list: [], btnName: '删除',
// }
title: "", : undefined,
// ].filter((v) => v),
open: false, tableProps: [
// {
queryParams: { prop: 'createTime',
pageNo: 1, label: '添加时间',
pageSize: 10, fixed: true,
name: null, width: 180,
}, filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
// },
form: {}, { prop: 'name', label: '检测类型名称', align: 'center' },
// { prop: 'code', label: '检测类型编码', align: 'center' },
rules: { { prop: 'remark', label: '备注', align: 'center' },
name: [{ required: true, message: "检测类型名称不能为空", trigger: "blur" }], // {
} // label: '',
}; // alignt: 'center',
}, // subcomponent: {
created() { // render: function (h) {
this.getList(); // return h('div', null, [
}, // h(
methods: { // 'el-button',
/** 查询列表 */ // {
getList() { // props: {
this.loading = true; // icon: 'el-icon-edit',
// // size: 'mini',
getQualityInspectionTypePage(this.queryParams).then(response => { // type: 'text',
this.list = response.data.list; // },
this.total = response.data.total; // },
this.loading = false; // ' '
}); // ),
}, // h(
/** 取消按钮 */ // 'el-button',
cancel() { // {
this.open = false; // props: {
this.reset(); // icon: 'el-icon-edit',
}, // size: 'mini',
/** 表单重置 */ // type: 'text',
reset() { // },
this.form = { // },
id: undefined, // ' '
name: undefined, // ),
code: undefined, // ]);
remark: undefined, // },
}; // },
this.resetForm("form"); // },
}, ],
/** 搜索按钮操作 */ //
handleQuery() { searchBarFormConfig: [
this.queryParams.pageNo = 1; {
this.getList(); type: 'input',
}, label: '检测类型',
/** 重置按钮操作 */ placeholder: '请输入检测类型',
resetQuery() { param: 'name',
this.resetForm("queryForm"); },
this.handleQuery(); {
}, type: 'button',
/** 新增按钮操作 */ btnName: '查询',
handleAdd() { name: 'search',
this.reset(); color: 'primary',
this.open = true; },
this.title = "添加质量检测类型基础"; // {
}, // type: 'button',
/** 修改按钮操作 */ // btnName: '',
handleUpdate(row) { // name: 'reset',
this.reset(); // },
const id = row.id; {
getQualityInspectionType(id).then(response => { type: 'separate',
this.form = response.data; },
this.open = true; {
this.title = "修改质量检测类型基础"; type: this.$auth.hasPermi('base:quality-inspection-type:create')
}); ? 'button'
}, : '',
/** 提交按钮 */ btnName: '新增',
submitForm() { name: 'add',
this.$refs["form"].validate(valid => { plain: true,
if (!valid) { color: 'success',
return; },
} // {
// // type: this.$auth.hasPermi('base:quality-inspection-type:export')
if (this.form.id != null) { // ? 'button'
updateQualityInspectionType(this.form).then(response => { // : '',
this.$modal.msgSuccess("修改成功"); // btnName: '',
this.open = false; // name: 'export',
this.getList(); // color: 'warning',
}); // },
return; ],
} //
// // formRows: [
createQualityInspectionType(this.form).then(response => { // [
this.$modal.msgSuccess("新增成功"); // {
this.open = false; // input: true,
this.getList(); // label: '',
}); // prop: 'name',
}); // rules: [{ required: true, message: '', trigger: 'blur' }],
}, // // bind: {
/** 删除按钮操作 */ // // disabled: true, // some condition, like detail mode...
handleDelete(row) { // // }
const id = row.id; // },
this.$modal.confirm('是否确认删除质量检测类型基础编号为"' + id + '"的数据项?').then(function() { // ],
return deleteQualityInspectionType(id); // [{ input: true, label: '', prop: 'code' }],
}).then(() => { // [{ input: true, label: '', prop: 'remark' }],
this.getList(); // ],
this.$modal.msgSuccess("删除成功"); //
}).catch(() => {}); open: false,
}, //
/** 导出按钮操作 */ queryParams: {
handleExport() { pageNo: 1,
// pageSize: 10,
let params = {...this.queryParams}; name: null,
params.pageNo = undefined; },
params.pageSize = undefined; //
this.$modal.confirm('是否确认导出所有质量检测类型基础数据项?').then(() => { form: {},
this.exportLoading = true; };
return exportQualityInspectionTypeExcel(params); },
}).then(response => { // watch: {
this.$download.excel(response, '质量检测类型基础.xls'); // form: {
this.exportLoading = false; // handler: (val) => {
}).catch(() => {}); // console.log('form changed', val);
} // },
} // deep: true
// },
// },
created() {
this.getList();
},
methods: {
/** base table related */
handleTableBtnClick({ data, type }) {
switch (type) {
case 'edit':
this.handleUpdate(data);
break;
case 'delete':
this.handleDelete(data);
break;
}
},
/** search bar related */
handleSearchBarBtnClick(btn) {
const keys = ['name'];
switch (btn.btnName) {
case 'search':
keys.forEach((key) => {
this.queryParams[key] = btn[key] || null;
});
this.handleQuery();
break;
case 'add':
this.handleAdd();
break;
case 'export':
this.handleExport();
break;
case 'reset':
this.$refs['search-bar'].resetForm();
this.resetQuery();
break;
}
},
/** 查询列表 */
getList() {
this.loading = true;
//
getQualityInspectionTypePage(this.queryParams).then((response) => {
this.list = response.data.list;
this.total = response.data.total;
this.loading = false;
});
},
/** 表单重置 */
reset() {
this.form = {
id: undefined,
name: undefined,
code: undefined,
remark: undefined,
};
this.resetForm('form');
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = '添加质量检测类型基础';
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id;
getQualityInspectionType(id).then((response) => {
this.form = response.data;
this.open = true;
this.title = '修改质量检测类型基础';
});
},
/** 提交按钮 */
submitForm() {
// console.log('this.$refs.form', this.$refs.form);
// return;
this.$refs['form'].validate((valid) => {
if (!valid) {
return;
}
console.log('final form', JSON.stringify(this.form));
//
if (this.form.id != null) {
updateQualityInspectionType(this.form).then((response) => {
this.$modal.msgSuccess('修改成功');
this.open = false;
this.getList();
});
return;
}
//
createQualityInspectionType(this.form).then((response) => {
this.$modal.msgSuccess('新增成功');
this.open = false;
this.getList();
});
});
},
/** 删除按钮操作 */
handleDelete(row) {
const id = row.id;
this.$modal
.confirm('是否确认删除质量检测类型基础编号为"' + id + '"的数据项?')
.then(function () {
return deleteQualityInspectionType(id);
})
.then(() => {
this.getList();
this.$modal.msgSuccess('删除成功');
})
.catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
//
let params = { ...this.queryParams };
params.pageNo = undefined;
params.pageSize = undefined;
this.$modal
.confirm('是否确认导出所有质量检测类型基础数据项?')
.then(() => {
this.exportLoading = true;
return exportQualityInspectionTypeExcel(params);
})
.then((response) => {
this.$download.excel(response, '质量检测类型基础.xls');
this.exportLoading = false;
})
.catch(() => {});
},
},
}; };
</script> </script>

View File

@ -0,0 +1,180 @@
<!--
filename: dialogForm.vue
author: liubin
date: 2023-08-02 10:32:36
description: 弹窗的表单组件
-->
<template>
<el-form
ref="form"
:model="form"
:label-width="`${labelWidth}px`"
v-loading="formLoading">
<el-row :gutter="20" v-for="(row, rindex) in rows" :key="rindex">
<el-col v-for="col in row" :key="col.label" :span="24 / row.length">
<el-form-item :label="col.label" :prop="col.prop" :rules="col.rules">
<el-input
v-if="col.input"
v-model="form[col.prop]"
@change="$emit('update', form)"
:placeholder="`请输入${col.label}`"
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
v-if="col.select"
v-model="form[col.prop]"
:placeholder="`请选择${col.label}`"
@change="$emit('update', form)"
v-bind="col.bind">
<el-option
v-for="opt in optionListOf[col.prop]"
:key="opt.value"
:label="opt.label"
:value="opt.value" />
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
</template>
<script>
/**
* 找到最长的label
* @param {*} options
*/
function findMaxLabelWidth(rows) {
let max = 0;
rows.forEach((row) => {
row.forEach((opt) => {
if (opt.label.length > max) {
max = opt.label.length;
}
});
});
return max;
}
export default {
name: 'DialogForm',
model: {
prop: 'dataForm',
event: 'update',
},
emits: ['update'],
components: {},
props: {
rows: {
type: Array,
default: () => [],
},
dataForm: {
type: Object,
default: () => ({}),
},
},
data() {
return {
formLoading: true,
optionListOf: {},
};
},
computed: {
labelWidth() {
let max = findMaxLabelWidth(this.rows);
// 20px
return max * 20;
// return max * 20 + 'px';
},
form: {
get() {
return this.dataForm;
},
set(val) {
console.log('set form', val);
},
},
},
mounted() {
// options
this.handleOptions();
},
methods: {
/** 模拟透传 ref */
validate(cb) {
return this.$refs.form.validate(cb);
},
resetFields(args) {
return this.$refs.form.resetFields(args);
},
// getCode
async getCode(url) {
const response = await this.$axios(url);
return response.data;
},
handleOptions() {
// console.log("[dialogForm:handleOptions]")
const promiseList = [];
this.rows.forEach((cols) => {
cols.forEach(async (opt) => {
if (opt.options) {
this.optionListOf[opt.prop] = opt.options;
} else if (opt.url) {
//
if (opt.select || (opt.input && !this.form?.id)) {
promiseList.push(async () => {
const response = await this.$axios(opt.url, {
method: opt.method ?? 'get',
});
console.log('[dialogForm:handleOptions:response]', response);
if (opt.select) {
//
const list =
'list' in response.data
? response.data.list
: response.data;
this.$set(
this.optionListOf,
opt.prop,
list.map((item) => ({
label: item[opt.labelKey ?? 'name'],
value: item[opt.valueKey ?? 'id'],
}))
);
} else if (opt.input) {
//
this.form[opt.prop] = response.data;
}
});
}
try {
// this.formLoading = true;
// console.log("[dialogForm:handleOptions:promiseList]", promiseList)
await Promise.all(promiseList.map((fn) => fn()));
this.formLoading = false;
// console.log("[dialogForm:handleOptions:optionListOf]", this.optionListOf)
} catch (error) {
console.log('[dialogForm:handleOptions:error]', error);
this.formLoading = false;
}
}
});
});
if (!promiseList.length) this.formLoading = false;
},
},
};
</script>
<style scoped lang="scss">
.el-select {
width: 100%;
}
</style>

View File

@ -0,0 +1,97 @@
import DialogForm from '../components/dialogForm.vue';
export default {
components: { DialogForm },
data() {
return {
// 遮罩层
loading: true,
// 导出遮罩层
exportLoading: false,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 质量检测信息基础列表
list: [],
// 弹出层标题
title: '',
// 是否显示弹出层
open: false,
// 列表数据
tableData: [],
// 弹窗的表单
// form: {}, // 占位
// 搜索框需要的 keys
// searchBarKeys: [], // 占位
// tableProps: [], // 占位
// tableBtn: [], // 占位
// searchBarFormConfig: [], // 占位
// // 弹窗表单配置
// dialogFormConfig: [], // 占位
};
},
mounted() {},
methods: {
// 处理搜索条件
handleSearchBarBtnClick() {},
// 处理表格按钮
handleTableBtnClick({ data, type }) {
switch (type) {
case 'edit':
this.handleUpdate(data);
break;
case 'delete':
this.handleDelete(data);
break;
}
},
// 处理搜索栏按钮
handleSearchBarBtnClick(btn) {
// const keys = ['name', 'createTime']; // timeVal // 已被 searchBarKeys 替代
switch (btn.btnName) {
case 'search':
this.searchBarKeys.forEach((key) => {
if (key == 'timeVal') {
this.queryParams['startTime'] = btn.timeVal[0];
this.queryParams['endTime'] = btn.timeVal[1];
return;
}
this.queryParams[key] = btn[key] || null;
});
this.handleQuery();
break;
case 'add':
this.handleAdd();
break;
case 'export':
this.handleExport();
break;
case 'reset':
this.$refs['search-bar'].resetForm();
this.resetQuery();
break;
}
},
handleEmitFun(val) {
console.log('emit unf', val);
},
// 获取列表数据
getList() {},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNo = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm('queryForm');
this.handleQuery();
},
/** 取消按钮 */
cancel() {
this.open = false;
this.reset();
},
},
};

View File

@ -6842,6 +6842,11 @@ moddle@^5.0.2:
dependencies: dependencies:
min-dash "^3.0.0" min-dash "^3.0.0"
moment@^2.29.4:
version "2.29.4"
resolved "https://registry.npmmirror.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108"
integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==
move-concurrently@^1.0.1: move-concurrently@^1.0.1:
version "1.0.1" version "1.0.1"
resolved "https://registry.npmmirror.com/move-concurrently/-/move-concurrently-1.0.1.tgz" resolved "https://registry.npmmirror.com/move-concurrently/-/move-concurrently-1.0.1.tgz"