Compare commits

..

No commits in common. "a49db190e3a7d237d5846a219ff4e8eccfb3a3ab" and "3d1bc2cc985a68fe8e3dea2e3978e8e826e425d6" have entirely different histories.

8 changed files with 636 additions and 1262 deletions

View File

@ -58,7 +58,6 @@
"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,343 +1,227 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<!-- 搜索工作栏 -->
<SearchBar
:formConfigs="searchBarFormConfig"
ref="search-bar"
@headBtnClick="handleSearchBarBtnClick" />
<!-- 列表 --> <!-- 搜索工作栏 -->
<base-table <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
:table-props="tableProps" <el-form-item>
:page="queryParams.pageNo" <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
:limit="queryParams.pageSize" <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
:table-data="list" </el-form-item>
@emit-fun="handleEmitFun"> </el-form>
<method-btn
v-if="tableBtn.length"
slot="handleBtn"
label="操作"
fixed="right"
:method-list="tableBtn"
@clickBtn="handleTableBtnClick" />
</base-table>
<!-- 分页组件 --> <!-- 操作工具栏 -->
<pagination <el-row :gutter="10" class="mb8">
v-show="total > 0" <el-col :span="1.5">
:total="total" <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
:page.sync="queryParams.pageNo" v-hasPermi="['base:quality-inspection-box-btn:create']">新增</el-button>
:limit.sync="queryParams.pageSize" </el-col>
@pagination="getList" /> <el-col :span="1.5">
<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>
<!-- 对话框(添加 / 修改) --> <!-- 列表 -->
<base-dialog <el-table v-loading="loading" :data="list">
:dialogTitle="title" <el-table-column label="ID" align="center" prop="id" />
:dialogVisible="open" <el-table-column label="该按钮绑定的检测内容id" align="center" prop="inspectionDetId" />
width="50%" <el-table-column label="检测内容设备推送消息时可能无对应id只填这个字段" align="center" prop="inspectionDetContent" />
@close="cancel" <el-table-column label="按钮盒所在产线id" align="center" prop="productionId" />
@cancel="cancel" <el-table-column label="按钮盒所在工段id" align="center" prop="sectionId" />
@confirm="submitForm"> <el-table-column label="按钮盒模式" align="center" prop="model" />
<DialogForm <el-table-column label="按钮值" align="center" prop="keyValue" />
v-if="open" <el-table-column label="创建时间" align="center" prop="createTime" width="180">
ref="form" <template v-slot="scope">
:dataForm="form" <span>{{ parseTime(scope.row.createTime) }}</span>
:rows="[ </template>
[ </el-table-column>
{ <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
select: true, <template v-slot="scope">
label: '产线', <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
url: '/base/production-line/listAll', v-hasPermi="['base:quality-inspection-box-btn:update']">修改</el-button>
prop: 'productionId', <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
rules: [{ required: true, message: '不能为空', trigger: 'blur' }], v-hasPermi="['base:quality-inspection-box-btn:delete']">删除</el-button>
bind: { </template>
filterable: true, </el-table-column>
}, </el-table>
}, <!-- 分页组件 -->
], <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
[ @pagination="getList"/>
{
select: true, <!-- 对话框(添加 / 修改) -->
label: '工段', <el-dialog :title="title" :visible.sync="open" width="500px" v-dialogDrag append-to-body>
url: '/base/workshop-section/listAll', <el-form ref="form" :model="form" :rules="rules" label-width="80px">
prop: 'sectionId', <el-form-item label="该按钮绑定的检测内容id" prop="inspectionDetId">
rules: [{ required: true, message: '不能为空', trigger: 'blur' }], <el-input v-model="form.inspectionDetId" placeholder="请输入该按钮绑定的检测内容id" />
}, </el-form-item>
// { <el-form-item label="检测内容设备推送消息时可能无对应id只填这个字段" prop="inspectionDetContent">
// select: true, <el-input v-model="form.inspectionDetContent" type="textarea" placeholder="请输入内容" />
// url: '', // </el-form-item>
// label: '', <el-form-item label="按钮盒所在产线id" prop="productionId">
// prop: 'inspectionDetContent', <el-input v-model="form.productionId" placeholder="请输入按钮盒所在产线id" />
// rules: [{ required: true, message: '', trigger: 'blur' }], </el-form-item>
// }, <el-form-item label="按钮盒所在工段id" prop="sectionId">
], <el-input v-model="form.sectionId" placeholder="请输入按钮盒所在工段id" />
[ </el-form-item>
{ <el-form-item label="按钮盒模式" prop="model">
input: true, <el-input v-model="form.model" placeholder="请输入按钮盒模式" />
label: '按钮盒识别码', </el-form-item>
prop: 'buttonId', <el-form-item label="按钮值" prop="keyValue">
rules: [ <el-input v-model="form.keyValue" placeholder="请输入按钮值" />
{ </el-form-item>
type: 'number', </el-form>
message: '请输入数字', <div slot="footer" class="dialog-footer">
trigger: 'blur', <el-button type="primary" @click="submitForm"> </el-button>
transform: (val) => Number(val), <el-button @click="cancel"> </el-button>
}, </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 { import { createQualityInspectionBoxBtn, updateQualityInspectionBoxBtn, deleteQualityInspectionBoxBtn, getQualityInspectionBoxBtn, getQualityInspectionBoxBtnPage, exportQualityInspectionBoxBtnExcel } from "@/api/base/qualityInspectionBoxBtn";
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",
mixins: [basicPageMixin], components: {
components: {}, },
data() { data() {
return { return {
searchBarFormConfig: [ //
{ loading: true,
type: 'input', //
label: '检查内容', exportLoading: false,
placeholder: '请输入检查内容', //
param: 'inspectionDetContent', showSearch: true,
}, //
{ total: 0,
type: 'button', // 16
btnName: '查询', list: [],
name: 'search', //
color: 'primary', title: "",
}, //
{ open: false,
type: 'separate', //
}, queryParams: {
{ pageNo: 1,
type: this.$auth.hasPermi('base:quality-inspection-box-btn:create') pageSize: 10,
? 'button' inspectionDetContent: null,
: '', },
btnName: '新增', //
name: 'add', form: {},
plain: true, //
color: 'success', rules: {
}, productionId: [{ required: true, message: "按钮盒所在产线id不能为空", trigger: "blur" }],
], sectionId: [{ required: true, message: "按钮盒所在工段id不能为空", trigger: "blur" }],
tableBtn: [ }
this.$auth.hasPermi('base:quality-inspection-box-btn:update') };
? { },
type: 'edit', created() {
btnName: '修改', this.getList();
} },
: undefined, methods: {
this.$auth.hasPermi('base:quality-inspection-box-btn:delete') /** 查询列表 */
? { getList() {
type: 'delete', this.loading = true;
btnName: '删除', //
} getQualityInspectionBoxBtnPage(this.queryParams).then(response => {
: undefined, this.list = response.data.list;
].filter((v) => v), this.total = response.data.total;
tableProps: [ this.loading = false;
{ });
prop: 'createTime', },
label: '添加时间', /** 取消按钮 */
fixed: true, cancel() {
width: 180, this.open = false;
filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'), this.reset();
}, },
{ /** 表单重置 */
width: 128, reset() {
prop: 'productionName', this.form = {
label: '产线', id: undefined,
align: 'center', inspectionDetId: undefined,
}, inspectionDetContent: undefined,
{ productionId: undefined,
width: 128, sectionId: undefined,
prop: 'sectionName', model: undefined,
label: '工段', keyValue: undefined,
align: 'center', };
}, this.resetForm("form");
{ },
width: 128, /** 搜索按钮操作 */
prop: 'inspectionDetContent', handleQuery() {
label: '检测内容', this.queryParams.pageNo = 1;
align: 'center', this.getList();
}, },
{ /** 重置按钮操作 */
width: 160, resetQuery() {
prop: 'buttonId', this.resetForm("queryForm");
label: '按钮盒识别码', this.handleQuery();
align: 'center', },
}, /** 新增按钮操作 */
// { handleAdd() {
// width: 256, this.reset();
// prop: 'productionId', this.open = true;
// label: '线ID', this.title = "添加安灯按钮16键对应";
// align: 'center', },
// }, /** 修改按钮操作 */
// { handleUpdate(row) {
// width: 256, this.reset();
// prop: 'sectionId', const id = row.id;
// label: 'ID', getQualityInspectionBoxBtn(id).then(response => {
// align: 'center', this.form = response.data;
// }, this.open = true;
{ width: 90, prop: 'keyValue', label: '按钮值', align: 'center' }, this.title = "修改安灯按钮16键对应";
{ width: 128, prop: 'model', label: '按钮盒模式', align: 'center' }, });
], },
// /** 提交按钮 */
queryParams: { submitForm() {
pageNo: 1, this.$refs["form"].validate(valid => {
pageSize: 10, if (!valid) {
inspectionDetContent: null, return;
}, }
// keys, queryParams pageNo, pageSize key //
searchBarKeys: ['inspectionDetContent'], if (this.form.id != null) {
form: { updateQualityInspectionBoxBtn(this.form).then(response => {
id: undefined, this.$modal.msgSuccess("修改成功");
inspectionDetId: undefined, this.open = false;
inspectionDetContent: undefined, this.getList();
productionId: undefined, });
sectionId: undefined, return;
model: undefined, }
keyValue: undefined, //
}, createQualityInspectionBoxBtn(this.form).then(response => {
}; this.$modal.msgSuccess("新增成功");
}, this.open = false;
created() { this.getList();
this.getList(); });
}, });
methods: { },
/** 查询列表 */ /** 删除按钮操作 */
getList() { handleDelete(row) {
this.loading = true; const id = row.id;
// this.$modal.confirm('是否确认删除安灯按钮16键对应编号为"' + id + '"的数据项?').then(function() {
getQualityInspectionBoxBtnPage(this.queryParams).then((response) => { return deleteQualityInspectionBoxBtn(id);
this.list = response.data.list; }).then(() => {
this.total = response.data.total; this.getList();
this.loading = false; this.$modal.msgSuccess("删除成功");
}); }).catch(() => {});
}, },
/** 表单重置 */ /** 导出按钮操作 */
reset() { handleExport() {
this.form = { //
id: undefined, let params = {...this.queryParams};
inspectionDetId: undefined, params.pageNo = undefined;
inspectionDetContent: undefined, params.pageSize = undefined;
productionId: undefined, this.$modal.confirm('是否确认导出所有安灯按钮16键对应数据项?').then(() => {
sectionId: undefined, this.exportLoading = true;
model: undefined, return exportQualityInspectionBoxBtnExcel(params);
keyValue: undefined, }).then(response => {
}; this.$download.excel(response, '安灯按钮16键对应.xls');
this.resetForm('form'); this.exportLoading = false;
}, }).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,314 +1,227 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<!-- 搜索工作栏 -->
<SearchBar
:formConfigs="searchBarFormConfig"
ref="search-bar"
@headBtnClick="handleSearchBarBtnClick" />
<!-- 列表 --> <!-- 搜索工作栏 -->
<base-table <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
:table-props="tableProps" <el-form-item label="检测内容" prop="content">
:page="queryParams.pageNo" <el-input v-model="queryParams.content" placeholder="请输入检测内容" clearable @keyup.enter.native="handleQuery"/>
:limit="queryParams.pageSize" </el-form-item>
:table-data="list" <el-form-item label="创建时间" prop="createTime">
@emit-fun="handleEmitFun"> <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
<method-btn range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
v-if="tableBtn.length" </el-form-item>
slot="handleBtn" <el-form-item>
label="操作" <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
fixed="right" <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
:method-list="tableBtn" </el-form-item>
@clickBtn="handleTableBtnClick" /> </el-form>
</base-table>
<!-- 分页组件 --> <!-- 操作工具栏 -->
<pagination <el-row :gutter="10" class="mb8">
v-show="total > 0" <el-col :span="1.5">
:total="total" <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
:page.sync="queryParams.pageNo" v-hasPermi="['base:quality-inspection-det:create']">新增</el-button>
:limit.sync="queryParams.pageSize" </el-col>
@pagination="getList" /> <el-col :span="1.5">
<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>
<!-- 对话框(添加 / 修改) --> <!-- 列表 -->
<base-dialog <el-table v-loading="loading" :data="list">
:dialogTitle="title" <el-table-column label="ID" align="center" prop="id" />
:dialogVisible="open" <el-table-column label="检测类型id" align="center" prop="typeId" />
width="40%" <el-table-column label="检测内容" align="center" prop="content" />
@close="cancel" <el-table-column label="检测编码" align="center" prop="code" />
@cancel="cancel" <el-table-column label="备注" align="center" prop="remark" />
@confirm="submitForm"> <el-table-column label="创建时间" align="center" prop="createTime" width="180">
<DialogForm <template v-slot="scope">
v-if="open" <span>{{ parseTime(scope.row.createTime) }}</span>
ref="form" </template>
:dataForm="form" </el-table-column>
:rows="[ <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
[ <template v-slot="scope">
{ <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
select: true, v-hasPermi="['base:quality-inspection-det:update']">修改</el-button>
label: '检测类型', <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
prop: 'typeId', v-hasPermi="['base:quality-inspection-det:delete']">删除</el-button>
url: '/base/quality-inspection-type/listAll', </template>
rules: [{ required: true, message: '不能为空', trigger: 'blur' }], </el-table-column>
bind: { </el-table>
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>
input: true, <el-form ref="form" :model="form" :rules="rules" label-width="80px">
label: '检测内容', <el-form-item label="检测类型id" prop="typeId">
prop: 'content', <el-select v-model="form.typeId" placeholder="请选择检测类型id">
rules: [{ required: true, message: '不能为空', trigger: 'blur' }], <el-option label="请选择字典生成" value="" />
}, </el-select>
], </el-form-item>
[ <el-form-item label="检测内容" prop="content">
{ <el-input v-model="form.content" placeholder="请输入检测内容" />
input: true, </el-form-item>
label: '内容编码', <el-form-item label="检测编码" prop="code">
prop: 'code', <el-input v-model="form.code" placeholder="请输入检测编码" />
url: '/base/quality-inspection-det/getCode', </el-form-item>
}, <el-form-item label="备注" prop="remark">
], <el-input v-model="form.remark" placeholder="请输入备注" />
[{ input: true, label: '备注', prop: 'remark' }], </el-form-item>
]" /> </el-form>
</base-dialog> <div slot="footer" class="dialog-footer">
</div> <el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>
</div>
</template> </template>
<script> <script>
import { import { createQualityInspectionDet, updateQualityInspectionDet, deleteQualityInspectionDet, getQualityInspectionDet, getQualityInspectionDetPage, exportQualityInspectionDetExcel } from "@/api/base/qualityInspectionDet";
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",
mixins: [basicPageMixin], components: {
data() { },
return { data() {
typeList: [], // return {
searchBarFormConfig: [ //
{ loading: true,
type: 'input', //
label: '检测内容', exportLoading: false,
placeholder: '请输入检测内容', //
param: 'content', showSearch: true,
}, //
// { total: 0,
// type: 'datePicker', //
// label: '', list: [],
// dateType: 'daterange', // datetimerange //
// // format: 'yyyy-MM-dd HH:mm:ss', title: "",
// format: 'yyyy-MM-dd', //
// valueFormat: 'yyyy-MM-dd HH:mm:ss', open: false,
// rangeSeparator: '-', //
// startPlaceholder: '', queryParams: {
// endPlaceholder: '', pageNo: 1,
// defaultTime: ['00:00:00', '23:59:59'], pageSize: 10,
// param: 'createTime', content: null,
// width: 350, createTime: [],
// }, },
{ //
type: 'button', form: {},
btnName: '查询', //
name: 'search', rules: {
color: 'primary', typeId: [{ required: true, message: "检测类型id不能为空", trigger: "change" }],
}, content: [{ required: true, message: "检测内容不能为空", trigger: "blur" }],
// { }
// type: 'button', };
// btnName: '', },
// name: 'reset', created() {
// }, this.getList();
{ },
type: 'separate', methods: {
}, /** 查询列表 */
{ getList() {
type: this.$auth.hasPermi('base:quality-inspection-det:create') this.loading = true;
? 'button' //
: '', getQualityInspectionDetPage(this.queryParams).then(response => {
btnName: '新增', this.list = response.data.list;
name: 'add', this.total = response.data.total;
plain: true, this.loading = false;
color: 'success', });
}, },
// { /** 取消按钮 */
// type: this.$auth.hasPermi('base:quality-inspection-type:export') cancel() {
// ? 'button' this.open = false;
// : '', this.reset();
// btnName: '', },
// name: 'export', /** 表单重置 */
// color: 'warning', reset() {
// }, this.form = {
], id: undefined,
tableBtn: [ typeId: undefined,
this.$auth.hasPermi('base:quality-inspection-det:update') content: undefined,
? { code: undefined,
type: 'edit', remark: undefined,
btnName: '修改', };
} this.resetForm("form");
: undefined, },
this.$auth.hasPermi('base:quality-inspection-det:delete') /** 搜索按钮操作 */
? { handleQuery() {
type: 'delete', this.queryParams.pageNo = 1;
btnName: '删除', this.getList();
} },
: undefined, /** 重置按钮操作 */
].filter((v) => v), resetQuery() {
tableProps: [ this.resetForm("queryForm");
{ this.handleQuery();
prop: 'createTime', },
label: '添加时间', /** 新增按钮操作 */
fixed: true, handleAdd() {
width: 180, this.reset();
filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'), this.open = true;
}, this.title = "添加质量检测信息基础";
{ prop: 'typeName', label: '类型名称', align: 'center' }, },
{ prop: 'content', label: '检测内容', align: 'center' }, /** 修改按钮操作 */
{ prop: 'code', label: '检测编码', align: 'center' }, handleUpdate(row) {
{ prop: 'remark', label: '备注', align: 'center' }, this.reset();
], const id = row.id;
// getQualityInspectionDet(id).then(response => {
queryParams: { this.form = response.data;
pageNo: 1, this.open = true;
pageSize: 10, this.title = "修改质量检测信息基础";
content: null, });
createTime: [], },
}, /** 提交按钮 */
// keys, queryParams pageNo, pageSize key submitForm() {
searchBarKeys: ['content', 'createTime'], this.$refs["form"].validate(valid => {
form: { if (!valid) {
id: undefined, return;
typeId: undefined, }
content: undefined, //
code: undefined, if (this.form.id != null) {
remark: undefined, updateQualityInspectionDet(this.form).then(response => {
}, this.$modal.msgSuccess("修改成功");
}; this.open = false;
}, this.getList();
created() { });
this.getList(); return;
this.getTypeList(); }
}, //
methods: { createQualityInspectionDet(this.form).then(response => {
/** 获取检测类型id */ this.$modal.msgSuccess("新增成功");
getTypeList() { this.open = false;
this.$axios('/base/quality-inspection-type/listAll').then((response) => { this.getList();
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(() => {
getList() { this.getList();
this.loading = true; this.$modal.msgSuccess("删除成功");
// }).catch(() => {});
getQualityInspectionDetPage(this.queryParams).then((response) => { },
this.list = response.data.list; /** 导出按钮操作 */
this.total = response.data.total; handleExport() {
this.loading = false; //
}); let params = {...this.queryParams};
}, params.pageNo = undefined;
/** 表单重置 */ params.pageSize = undefined;
reset() { this.$modal.confirm('是否确认导出所有质量检测信息基础数据项?').then(() => {
this.form = { this.exportLoading = true;
id: undefined, return exportQualityInspectionDetExcel(params);
typeId: undefined, }).then(response => {
content: undefined, this.$download.excel(response, '质量检测信息基础.xls');
code: undefined, this.exportLoading = false;
remark: undefined, }).catch(() => {});
}; }
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,354 +1,214 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<!-- 搜索工作栏 -->
<SearchBar
:formConfigs="searchBarFormConfig"
ref="search-bar"
@headBtnClick="handleSearchBarBtnClick" />
<!-- 列表 --> <!-- 搜索工作栏 -->
<base-table <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
:table-props="tableProps" <el-form-item label="检测类型名称" prop="name">
:page="queryParams.pageNo" <el-input v-model="queryParams.name" placeholder="请输入检测类型名称" clearable @keyup.enter.native="handleQuery"/>
:limit="queryParams.pageSize" </el-form-item>
:table-data="list" <el-form-item>
@emit-fun="handleEmitFun"> <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<method-btn <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
v-if="tableBtn.length" </el-form-item>
slot="handleBtn" </el-form>
label="操作"
:method-list="tableBtn"
@clickBtn="handleTableBtnClick" />
</base-table>
<!-- 分页组件 --> <!-- 操作工具栏 -->
<pagination <el-row :gutter="10" class="mb8">
v-show="total > 0" <el-col :span="1.5">
:total="total" <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
:page.sync="queryParams.pageNo" v-hasPermi="['base:quality-inspection-type:create']">新增</el-button>
:limit.sync="queryParams.pageSize" </el-col>
@pagination="getList" /> <el-col :span="1.5">
<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>
<!-- 对话框(添加 / 修改) --> <!-- 列表 -->
<base-dialog <el-table v-loading="loading" :data="list">
:dialogTitle="title" <el-table-column label="ID" align="center" prop="id" />
:dialogVisible="open" <el-table-column label="检测类型名称" align="center" prop="name" />
@close="cancel" <el-table-column label="检测类型编码" align="center" prop="code" />
@cancel="cancel" <el-table-column label="备注" align="center" prop="remark" />
@confirm="submitForm"> <el-table-column label="创建时间" align="center" prop="createTime" width="180">
<DialogForm <template v-slot="scope">
v-if="open" <span>{{ parseTime(scope.row.createTime) }}</span>
ref="form" </template>
:dataForm="form" </el-table-column>
:rows="[ <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
[ <template v-slot="scope">
{ <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
input: true, v-hasPermi="['base:quality-inspection-type:update']">修改</el-button>
label: '检测类型名称', <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
prop: 'name', v-hasPermi="['base:quality-inspection-type:delete']">删除</el-button>
rules: [{ required: true, message: '不能为空', trigger: 'blur' }], </template>
// bind: { </el-table-column>
// disabled: true, // some condition, like detail mode... </el-table>
// } <!-- 分页组件 -->
}, <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
], @pagination="getList"/>
[
{ <!-- 对话框(添加 / 修改) -->
input: 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">
prop: 'code', <el-form-item label="检测类型名称" prop="name">
url: '/base/quality-inspection-type/getCode', <el-input v-model="form.name" placeholder="请输入检测类型名称" />
}, </el-form-item>
], <el-form-item label="检测类型编码" prop="code">
[{ input: true, label: '备注', prop: 'remark' }], <el-input v-model="form.code" placeholder="请输入检测类型编码" />
]" /> </el-form-item>
</base-dialog> <el-form-item label="备注" prop="remark">
</div> <el-input v-model="form.remark" placeholder="请输入备注" />
</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 moment from 'moment'; import { createQualityInspectionType, updateQualityInspectionType, deleteQualityInspectionType, getQualityInspectionType, getQualityInspectionTypePage, exportQualityInspectionTypeExcel } from "@/api/base/qualityInspectionType";
import {
createQualityInspectionType,
updateQualityInspectionType,
deleteQualityInspectionType,
getQualityInspectionType,
getQualityInspectionTypePage,
exportQualityInspectionTypeExcel,
} from '@/api/base/qualityInspectionType';
import basicPageMixin from '../../mixin/basicPageMixin';
export default { export default {
name: 'QualityInspectionType', name: "QualityInspectionType",
mixins: [basicPageMixin], components: {
data() { },
return { data() {
tableBtn: [ return {
this.$auth.hasPermi('base:quality-inspection-type:update') //
? { loading: true,
type: 'edit', //
btnName: '修改', exportLoading: false,
} //
: undefined, showSearch: true,
this.$auth.hasPermi('base:quality-inspection-type:delete') //
? { total: 0,
type: 'delete', //
btnName: '删除', list: [],
} //
: undefined, title: "",
].filter((v) => v), //
tableProps: [ open: false,
{ //
prop: 'createTime', queryParams: {
label: '添加时间', pageNo: 1,
fixed: true, pageSize: 10,
width: 180, name: null,
filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'), },
}, //
{ prop: 'name', label: '检测类型名称', align: 'center' }, form: {},
{ prop: 'code', label: '检测类型编码', align: 'center' }, //
{ prop: 'remark', label: '备注', align: 'center' }, rules: {
// { name: [{ required: true, message: "检测类型名称不能为空", trigger: "blur" }],
// label: '', }
// alignt: 'center', };
// subcomponent: { },
// render: function (h) { created() {
// return h('div', null, [ this.getList();
// h( },
// 'el-button', methods: {
// { /** 查询列表 */
// props: { getList() {
// icon: 'el-icon-edit', this.loading = true;
// size: 'mini', //
// type: 'text', getQualityInspectionTypePage(this.queryParams).then(response => {
// }, this.list = response.data.list;
// }, this.total = response.data.total;
// ' ' this.loading = false;
// ), });
// h( },
// 'el-button', /** 取消按钮 */
// { cancel() {
// props: { this.open = false;
// icon: 'el-icon-edit', this.reset();
// size: 'mini', },
// type: 'text', /** 表单重置 */
// }, reset() {
// }, this.form = {
// ' ' id: undefined,
// ), name: undefined,
// ]); code: undefined,
// }, remark: undefined,
// }, };
// }, this.resetForm("form");
], },
// /** 搜索按钮操作 */
searchBarFormConfig: [ handleQuery() {
{ this.queryParams.pageNo = 1;
type: 'input', this.getList();
label: '检测类型', },
placeholder: '请输入检测类型', /** 重置按钮操作 */
param: 'name', resetQuery() {
}, this.resetForm("queryForm");
{ this.handleQuery();
type: 'button', },
btnName: '查询', /** 新增按钮操作 */
name: 'search', handleAdd() {
color: 'primary', this.reset();
}, this.open = true;
// { this.title = "添加质量检测类型基础";
// type: 'button', },
// btnName: '', /** 修改按钮操作 */
// name: 'reset', handleUpdate(row) {
// }, this.reset();
{ const id = row.id;
type: 'separate', getQualityInspectionType(id).then(response => {
}, this.form = response.data;
{ this.open = true;
type: this.$auth.hasPermi('base:quality-inspection-type:create') this.title = "修改质量检测类型基础";
? 'button' });
: '', },
btnName: '新增', /** 提交按钮 */
name: 'add', submitForm() {
plain: true, this.$refs["form"].validate(valid => {
color: 'success', if (!valid) {
}, return;
// { }
// type: this.$auth.hasPermi('base:quality-inspection-type:export') //
// ? 'button' if (this.form.id != null) {
// : '', updateQualityInspectionType(this.form).then(response => {
// btnName: '', this.$modal.msgSuccess("修改成功");
// name: 'export', this.open = false;
// color: 'warning', this.getList();
// }, });
], return;
// }
// formRows: [ //
// [ createQualityInspectionType(this.form).then(response => {
// { this.$modal.msgSuccess("新增成功");
// input: true, this.open = false;
// label: '', this.getList();
// 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() {
// [{ input: true, label: '', prop: 'code' }], return deleteQualityInspectionType(id);
// [{ input: true, label: '', prop: 'remark' }], }).then(() => {
// ], this.getList();
// this.$modal.msgSuccess("删除成功");
open: false, }).catch(() => {});
// },
queryParams: { /** 导出按钮操作 */
pageNo: 1, handleExport() {
pageSize: 10, //
name: null, let params = {...this.queryParams};
}, params.pageNo = undefined;
// params.pageSize = undefined;
form: {}, this.$modal.confirm('是否确认导出所有质量检测类型基础数据项?').then(() => {
}; this.exportLoading = true;
}, return exportQualityInspectionTypeExcel(params);
// watch: { }).then(response => {
// form: { this.$download.excel(response, '质量检测类型基础.xls');
// handler: (val) => { this.exportLoading = false;
// console.log('form changed', val); }).catch(() => {});
// }, }
// 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

@ -1,180 +0,0 @@
<!--
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

@ -1,97 +0,0 @@
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,11 +6842,6 @@ 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"