mt-fe-group/yudao-dev
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge

Browse Source
This commit is contained in:
lb 2023-08-03 15:10:49 +08:00
commit 6b988bbaf7
6 changed files with 460 additions and 426 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main.js
View File

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

376
src/views/quality/base/qualityInspectionBoxBtn/index.vue
View File

@ -1,120 +1,243 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <SearchBar
<el-form-item> :formConfigs="searchBarFormConfig"
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button> ref="search-bar"
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button> @headBtnClick="handleSearchBarBtnClick" />
</el-form-item>
</el-form>
<!-- 操作工具栏 -->
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['base:quality-inspection-box-btn:create']">新增</el-button>
</el-col>
<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>
<!-- 列表 --> <!-- 列表 -->
<el-table v-loading="loading" :data="list"> <base-table
<el-table-column label="ID" align="center" prop="id" /> :table-props="tableProps"
<el-table-column label="该按钮绑定的检测内容id" align="center" prop="inspectionDetId" /> :page="queryParams.pageNo"
<el-table-column label="检测内容（设备推送消息时，可能无对应id，只填这个字段）" align="center" prop="inspectionDetContent" /> :limit="queryParams.pageSize"
<el-table-column label="按钮盒所在产线id" align="center" prop="productionId" /> :table-data="list"
<el-table-column label="按钮盒所在工段id" align="center" prop="sectionId" /> @emit-fun="handleEmitFun">
<el-table-column label="按钮盒模式" align="center" prop="model" /> <method-btn
<el-table-column label="按钮值" align="center" prop="keyValue" /> v-if="tableBtn.length"
<el-table-column label="创建时间" align="center" prop="createTime" width="180"> slot="handleBtn"
<template v-slot="scope"> label="操作"
<span>{{ parseTime(scope.row.createTime) }}</span> fixed="right"
</template> :method-list="tableBtn"
</el-table-column> @clickBtn="handleTableBtnClick" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> </base-table>
<template v-slot="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['base:quality-inspection-box-btn:update']">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['base:quality-inspection-box-btn:delete']">删除</el-button>
</template>
</el-table-column>
</el-table>
<!-- 分页组件 --> <!-- 分页组件 -->
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize" <pagination
@pagination="getList"/> 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> <base-dialog
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> :dialogTitle="title"
<el-form-item label="该按钮绑定的检测内容id" prop="inspectionDetId"> :dialogVisible="open"
<el-input v-model="form.inspectionDetId" placeholder="请输入该按钮绑定的检测内容id" /> width="50%"
</el-form-item> @close="cancel"
<el-form-item label="检测内容（设备推送消息时，可能无对应id，只填这个字段）" prop="inspectionDetContent"> @cancel="cancel"
<el-input v-model="form.inspectionDetContent" type="textarea" placeholder="请输入内容" /> @confirm="submitForm">
</el-form-item> <DialogForm
<el-form-item label="按钮盒所在产线id" prop="productionId"> v-if="open"
<el-input v-model="form.productionId" placeholder="请输入按钮盒所在产线id" /> ref="form"
</el-form-item> :dataForm="form"
<el-form-item label="按钮盒所在工段id" prop="sectionId"> :rows="[
<el-input v-model="form.sectionId" placeholder="请输入按钮盒所在工段id" /> [
</el-form-item> {
<el-form-item label="按钮盒模式" prop="model"> select: true,
<el-input v-model="form.model" placeholder="请输入按钮盒模式" /> label: '产线',
</el-form-item> url: '/base/production-line/listAll',
<el-form-item label="按钮值" prop="keyValue"> prop: 'productionId',
<el-input v-model="form.keyValue" placeholder="请输入按钮值" /> rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
</el-form-item> bind: {
</el-form> filterable: true,
<div slot="footer" class="dialog-footer"> },
<el-button type="primary" @click="submitForm">确 定</el-button> },
<el-button @click="cancel">取 消</el-button> ],
</div> [
</el-dialog> {
select: true,
label: '工段',
url: '/base/workshop-section/listAll',
prop: 'sectionId',
rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
},
// {
// select: true,
// url: '', //
// label: '检测内容',
// prop: 'inspectionDetContent',
// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
// },
],
[
{
input: true,
label: '按钮盒识别码',
prop: 'buttonId',
rules: [
{
type: 'number',
message: '请输入数字',
trigger: 'blur',
transform: (val) => Number(val),
},
],
},
],
[{ 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> </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',
},
{
type: this.$auth.hasPermi('base:quality-inspection-box-btn:create')
? 'button'
: '',
btnName: '新增',
name: 'add',
plain: true,
color: 'success',
},
],
tableBtn: [
this.$auth.hasPermi('base:quality-inspection-box-btn:update')
? {
type: 'edit',
btnName: '修改',
}
: undefined,
this.$auth.hasPermi('base:quality-inspection-box-btn:delete')
? {
type: 'delete',
btnName: '删除',
}
: undefined,
].filter((v) => v),
tableProps: [
{
prop: 'createTime',
label: '添加时间',
fixed: true,
width: 180,
filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
},
{
width: 128,
prop: 'productionName',
label: '产线',
align: 'center',
},
{
width: 128,
prop: 'sectionName',
label: '工段',
align: 'center',
},
{
width: 128,
prop: 'inspectionDetContent',
label: '检测内容',
align: 'center',
},
{
width: 160,
prop: 'buttonId',
label: '按钮盒识别码',
align: 'center',
},
// {
// width: 256,
// prop: 'productionId',
// label: '按钮盒所在产线ID',
// align: 'center',
// },
// {
// width: 256,
// prop: 'sectionId',
// label: '按钮盒所在工段ID',
// align: 'center',
// },
{ width: 90, prop: 'keyValue', label: '按钮值', align: 'center' },
{ width: 128, prop: 'model', label: '按钮盒模式', align: 'center' },
],
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 10,
inspectionDetContent: null, inspectionDetContent: null,
}, },
// 表单参数 // 搜索框需要的 keys, 与上面 queryParams 的除 pageNo, pageSize 之外的 key 一一对应
form: {}, searchBarKeys: ['inspectionDetContent'],
// 表单校验 form: {
rules: { id: undefined,
productionId: [{ required: true, message: "按钮盒所在产线id不能为空", trigger: "blur" }], inspectionDetId: undefined,
sectionId: [{ required: true, message: "按钮盒所在工段id不能为空", trigger: "blur" }], inspectionDetContent: undefined,
} productionId: undefined,
sectionId: undefined,
model: undefined,
keyValue: undefined,
},
}; };
}, },
created() { created() {
@ -125,17 +248,12 @@ export default {
getList() { getList() {
this.loading = true; this.loading = true;
// 执行查询 // 执行查询
getQualityInspectionBoxBtnPage(this.queryParams).then(response => { getQualityInspectionBoxBtnPage(this.queryParams).then((response) => {
this.list = response.data.list; this.list = response.data.list;
this.total = response.data.total; this.total = response.data.total;
this.loading = false; this.loading = false;
}); });
}, },
/** 取消按钮 */
cancel() {
this.open = false;
this.reset();
},
/** 表单重置 */ /** 表单重置 */
reset() { reset() {
this.form = { this.form = {
@ -147,52 +265,42 @@ export default {
model: undefined, model: undefined,
keyValue: undefined, keyValue: undefined,
}; };
this.resetForm("form"); this.resetForm('form');
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNo = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
}, },
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
this.reset(); this.reset();
this.open = true; this.open = true;
this.title = "添加安灯按钮16键对应"; this.title = '添加安灯按钮16键对应';
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset();
const id = row.id; const id = row.id;
getQualityInspectionBoxBtn(id).then(response => { getQualityInspectionBoxBtn(id).then((response) => {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "修改安灯按钮16键对应"; this.title = '修改安灯按钮16键对应';
}); });
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
this.$refs["form"].validate(valid => { this.$refs['form'].validate((valid) => {
if (!valid) { if (!valid) {
return; return;
} }
// 修改的提交 // 修改的提交
if (this.form.id != null) { if (this.form.id != null) {
updateQualityInspectionBoxBtn(this.form).then(response => { updateQualityInspectionBoxBtn(this.form).then((response) => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess('修改成功');
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
return; return;
} }
// 添加的提交 // 添加的提交
createQualityInspectionBoxBtn(this.form).then(response => { createQualityInspectionBoxBtn(this.form).then((response) => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess('新增成功');
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
@ -201,27 +309,35 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const id = row.id; const id = row.id;
this.$modal.confirm('是否确认删除安灯按钮16键对应编号为"' + id + '"的数据项?').then(function() { this.$modal
.confirm('是否确认删除安灯按钮16键对应编号为"' + id + '"的数据项?')
.then(function () {
return deleteQualityInspectionBoxBtn(id); return deleteQualityInspectionBoxBtn(id);
}).then(() => { })
.then(() => {
this.getList(); this.getList();
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess('删除成功');
}).catch(() => {}); })
.catch(() => {});
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
// 处理查询参数 // 处理查询参数
let params = {...this.queryParams}; let params = { ...this.queryParams };
params.pageNo = undefined; params.pageNo = undefined;
params.pageSize = undefined; params.pageSize = undefined;
this.$modal.confirm('是否确认导出所有安灯按钮16键对应数据项?').then(() => { this.$modal
.confirm('是否确认导出所有安灯按钮16键对应数据项?')
.then(() => {
this.exportLoading = true; this.exportLoading = true;
return exportQualityInspectionBoxBtnExcel(params); return exportQualityInspectionBoxBtnExcel(params);
}).then(response => { })
.then((response) => {
this.$download.excel(response, '安灯按钮16键对应.xls'); this.$download.excel(response, '安灯按钮16键对应.xls');
this.exportLoading = false; this.exportLoading = false;
}).catch(() => {}); })
} .catch(() => {});
} },
},
}; };
</script> </script>

170
src/views/quality/base/qualityInspectionDet/index.vue
View File

@ -17,6 +17,7 @@
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
label="操作" label="操作"
fixed="right"
:method-list="tableBtn" :method-list="tableBtn"
@clickBtn="handleTableBtnClick" /> @clickBtn="handleTableBtnClick" />
</base-table> </base-table>
@ -49,9 +50,9 @@
prop: 'typeId', prop: 'typeId',
url: '/base/quality-inspection-type/listAll', url: '/base/quality-inspection-type/listAll',
rules: [{ required: true, message: '不能为空', trigger: 'blur' }], rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
// bind: { bind: {
// disabled: true, // some condition, like detail mode... filterable: true,
// } },
}, },
], ],
[ [
@ -62,36 +63,17 @@
rules: [{ required: true, message: '不能为空', trigger: 'blur' }], rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
}, },
], ],
[{ input: true, label: '检测编码', prop: 'code' }], [
{
input: true,
label: '内容编码',
prop: 'code',
url: '/base/quality-inspection-det/getCode',
},
],
[{ input: true, label: '备注', prop: 'remark' }], [{ input: true, label: '备注', prop: 'remark' }],
]" /> ]" />
</base-dialog> </base-dialog>
<!-- <base-dialog
:dialogTitle="title"
:dialogVisible="open"
@cancel="cancel"
@confirm="submitForm">
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="检测类型id" prop="typeId">
<el-select v-model="form.typeId" placeholder="请选择检测类型">
<el-option
v-for="opt in typeList"
:key="opt.value"
:label="opt.label"
:value="opt.value" />
</el-select>
</el-form-item>
<el-form-item label="检测内容" prop="content">
<el-input v-model="form.content" placeholder="请输入检测内容" />
</el-form-item>
<el-form-item label="检测编码" prop="code">
<el-input v-model="form.code" placeholder="请输入检测编码" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
</el-form>
</base-dialog> -->
</div> </div>
</template> </template>
@ -106,11 +88,12 @@ import {
} from '@/api/base/qualityInspectionDet'; } from '@/api/base/qualityInspectionDet';
import moment from 'moment'; import moment from 'moment';
import DialogForm from '../../components/dialogForm.vue';
import basicPageMixin from '../../mixin/basicPageMixin';
export default { export default {
name: 'QualityInspectionDet', name: 'QualityInspectionDet',
components: { DialogForm }, mixins: [basicPageMixin],
data() { data() {
return { return {
typeList: [], // 检测类型列表 typeList: [], // 检测类型列表
@ -121,20 +104,20 @@ export default {
placeholder: '请输入检测内容', placeholder: '请输入检测内容',
param: 'content', param: 'content',
}, },
{ // {
type: 'datePicker', // type: 'datePicker',
label: '创建时间', // label: '创建时间',
dateType: 'daterange', // datetimerange // dateType: 'daterange', // datetimerange
// format: 'yyyy-MM-dd HH:mm:ss', // // format: 'yyyy-MM-dd HH:mm:ss',
format: 'yyyy-MM-dd', // format: 'yyyy-MM-dd',
valueFormat: 'yyyy-MM-dd HH:mm:ss', // valueFormat: 'yyyy-MM-dd HH:mm:ss',
rangeSeparator: '-', // rangeSeparator: '-',
startPlaceholder: '开始日期', // startPlaceholder: '开始日期',
endPlaceholder: '结束日期', // endPlaceholder: '结束日期',
defaultTime: ['00:00:00', '23:59:59'], // defaultTime: ['00:00:00', '23:59:59'],
param: 'createTime', // param: 'createTime',
width: 350, // width: 350,
}, // },
{ {
type: 'button', type: 'button',
btnName: '查询', btnName: '查询',
@ -181,7 +164,6 @@ export default {
} }
: undefined, : undefined,
].filter((v) => v), ].filter((v) => v),
tableData: [],
tableProps: [ tableProps: [
{ {
prop: 'createTime', prop: 'createTime',
@ -190,25 +172,11 @@ export default {
width: 180, width: 180,
filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'), filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
}, },
{ prop: 'typeId', label: '检测类型ID', align: 'center' }, { prop: 'typeName', label: '类型名称', align: 'center' },
{ prop: 'content', label: '检测类型内容', align: 'center' }, { prop: 'content', label: '检测内容', align: 'center' },
{ prop: 'code', label: '检测编码', align: 'center' }, { prop: 'code', label: '检测编码', align: 'center' },
{ prop: 'remark', label: '备注', align: 'center' }, { prop: 'remark', label: '备注', align: 'center' },
], ],
// 遮罩层
loading: true,
// 导出遮罩层
exportLoading: false,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 质量检测信息基础列表
list: [],
// 弹出层标题
title: '',
// 是否显示弹出层
open: false,
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNo: 1, pageNo: 1,
@ -216,16 +184,14 @@ export default {
content: null, content: null,
createTime: [], createTime: [],
}, },
// 表单参数 // 搜索框需要的 keys, 与上面 queryParams 的除 pageNo, pageSize 之外的 key 一一对应
form: {}, searchBarKeys: ['content', 'createTime'],
// 表单校验 form: {
rules: { id: undefined,
typeId: [ typeId: undefined,
{ required: true, message: '检测类型id不能为空', trigger: 'change' }, content: undefined,
], code: undefined,
content: [ remark: undefined,
{ required: true, message: '检测内容不能为空', trigger: 'blur' },
],
}, },
}; };
}, },
@ -234,49 +200,6 @@ export default {
this.getTypeList(); this.getTypeList();
}, },
methods: { 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 = ['content', 'createTime']; // timeVal
switch (btn.btnName) {
case 'search':
keys.forEach((key) => {
if (key == 'timeVal') {
this.queryParams['startTime'] = btn.timeVal[0];
this.queryParams['endTime'] = btn.timeVal[1];
return;
}
console.log('key', key, btn[key])
this.queryParams[key] = btn[key] || null;
});
console.log('queryParams', this.queryParams)
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);
},
/** 获取检测类型id */ /** 获取检测类型id */
getTypeList() { getTypeList() {
this.$axios('/base/quality-inspection-type/listAll').then((response) => { this.$axios('/base/quality-inspection-type/listAll').then((response) => {
@ -298,11 +221,6 @@ export default {
this.loading = false; this.loading = false;
}); });
}, },
/** 取消按钮 */
cancel() {
this.open = false;
this.reset();
},
/** 表单重置 */ /** 表单重置 */
reset() { reset() {
this.form = { this.form = {
@ -314,16 +232,6 @@ export default {
}; };
this.resetForm('form'); this.resetForm('form');
}, },
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNo = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm('queryForm');
this.handleQuery();
},
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
this.reset(); this.reset();

45
src/views/quality/base/qualityInspectionType/index.vue
View File

@ -52,7 +52,14 @@
// } // }
}, },
], ],
[{ input: true, label: '检测类型编码', prop: 'code' }], [
{
input: true,
label: '检测类型编码',
prop: 'code',
url: '/base/quality-inspection-type/getCode',
},
],
[{ input: true, label: '备注', prop: 'remark' }], [{ input: true, label: '备注', prop: 'remark' }],
]" /> ]" />
</base-dialog> </base-dialog>
@ -61,7 +68,6 @@
<script> <script>
import moment from 'moment'; import moment from 'moment';
import DialogForm from '../../components/dialogForm.vue';
import { import {
createQualityInspectionType, createQualityInspectionType,
@ -71,10 +77,11 @@ import {
getQualityInspectionTypePage, getQualityInspectionTypePage,
exportQualityInspectionTypeExcel, exportQualityInspectionTypeExcel,
} from '@/api/base/qualityInspectionType'; } from '@/api/base/qualityInspectionType';
import basicPageMixin from '../../mixin/basicPageMixin';
export default { export default {
name: 'QualityInspectionType', name: 'QualityInspectionType',
components: { DialogForm }, mixins: [basicPageMixin],
data() { data() {
return { return {
tableBtn: [ tableBtn: [
@ -91,7 +98,6 @@ export default {
} }
: undefined, : undefined,
].filter((v) => v), ].filter((v) => v),
tableData: [],
tableProps: [ tableProps: [
{ {
prop: 'createTime', prop: 'createTime',
@ -192,18 +198,6 @@ export default {
// [{ input: true, label: '检测类型编码', prop: 'code' }], // [{ input: true, label: '检测类型编码', prop: 'code' }],
// [{ input: true, label: '备注', prop: 'remark' }], // [{ input: true, label: '备注', prop: 'remark' }],
// ], // ],
// 遮罩层
loading: true,
// 导出遮罩层
exportLoading: false,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 质量检测类型基础列表
list: [],
// 弹出层标题
title: '',
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
// 查询参数 // 查询参数
@ -261,7 +255,6 @@ export default {
break; break;
} }
}, },
/** 查询列表 */ /** 查询列表 */
getList() { getList() {
this.loading = true; this.loading = true;
@ -272,11 +265,6 @@ export default {
this.loading = false; this.loading = false;
}); });
}, },
/** 取消按钮 */
cancel() {
this.open = false;
this.reset();
},
/** 表单重置 */ /** 表单重置 */
reset() { reset() {
this.form = { this.form = {
@ -287,25 +275,12 @@ export default {
}; };
this.resetForm('form'); this.resetForm('form');
}, },
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNo = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm('queryForm');
this.handleQuery();
},
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
this.reset(); this.reset();
this.open = true; this.open = true;
this.title = '添加质量检测类型基础'; this.title = '添加质量检测类型基础';
}, },
handleEmitFun(val) {
console.log('emit unf', val);
},
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset();

41
src/views/quality/components/dialogForm.vue
View File

@ -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]"
@ -90,10 +97,9 @@ export default {
get() { get() {
return this.dataForm; return this.dataForm;
}, },
// set(val) { set(val) {
// console.log('set form', val); console.log('set form', val);
// // this.$emit('update', val); },
// },
}, },
}, },
mounted() { mounted() {
@ -108,7 +114,11 @@ export default {
resetFields(args) { resetFields(args) {
return this.$refs.form.resetFields(args); return this.$refs.form.resetFields(args);
}, },
// getCode
async getCode(url) {
const response = await this.$axios(url);
return response.data;
},
handleOptions() { handleOptions() {
// console.log("[dialogForm:handleOptions]") // console.log("[dialogForm:handleOptions]")
const promiseList = []; const promiseList = [];
@ -117,13 +127,19 @@ export default {
if (opt.options) { if (opt.options) {
this.optionListOf[opt.prop] = opt.options; this.optionListOf[opt.prop] = opt.options;
} else if (opt.url) { } else if (opt.url) {
// 如果是下拉框，或者新增模式下的输入框，才去请求
if (opt.select || (opt.input && !this.form?.id)) {
promiseList.push(async () => { promiseList.push(async () => {
const response = await this.$axios(opt.url, { const response = await this.$axios(opt.url, {
method: opt.method ?? 'get', method: opt.method ?? 'get',
}); });
console.log('[dialogForm:handleOptions:response]', response); console.log('[dialogForm:handleOptions:response]', response);
if (opt.select) {
// 处理下拉框选项
const list = const list =
'list' in response.data ? response.data.list : response.data; 'list' in response.data
? response.data.list
: response.data;
this.$set( this.$set(
this.optionListOf, this.optionListOf,
opt.prop, opt.prop,
@ -132,7 +148,12 @@ export default {
value: item[opt.valueKey ?? 'id'], value: item[opt.valueKey ?? 'id'],
})) }))
); );
} else if (opt.input) {
// 处理输入框数据
this.form[opt.prop] = response.data;
}
}); });
}
try { try {
// this.formLoading = true; // this.formLoading = true;
// console.log("[dialogForm:handleOptions:promiseList]", promiseList) // console.log("[dialogForm:handleOptions:promiseList]", promiseList)
@ -146,10 +167,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>

50
src/views/quality/mixin/basicPageMixin.js
View File

@ -1,4 +1,7 @@
import DialogForm from '../components/dialogForm.vue';
export default { export default {
components: { DialogForm },
data() { data() {
return { return {
// 遮罩层 // 遮罩层
@ -15,28 +18,20 @@ export default {
title: '', title: '',
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
// 查询参数
queryParams: {
pageNo: 1,
pageSize: 10,
},
// 列表数据 // 列表数据
tableData: [], tableData: [],
tableProps: [], // 占位 // 弹窗的表单
tableBtn: [], // 占位 // form: {}, // 占位
searchBarFormConfig: [], // 占位 // 搜索框需要的 keys
// 弹窗表单配置 // searchBarKeys: [], // 占位
dialogFormConfig: [], // 占位 // tableProps: [], // 占位
// tableBtn: [], // 占位
// searchBarFormConfig: [], // 占位
// // 弹窗表单配置
// dialogFormConfig: [], // 占位
}; };
}, },
mounted() { mounted() {},
if (this.prepareSelectOptions) {
// 准备列表的options
// TODO: 也许需要挪到 dialogForm.vue 里
this.prepareSelectOptions();
}
},
methods: { methods: {
// 处理搜索条件 // 处理搜索条件
handleSearchBarBtnClick() {}, handleSearchBarBtnClick() {},
@ -53,10 +48,10 @@ export default {
}, },
// 处理搜索栏按钮 // 处理搜索栏按钮
handleSearchBarBtnClick(btn) { handleSearchBarBtnClick(btn) {
const keys = ['name', 'createTime']; // timeVal // const keys = ['name', 'createTime']; // timeVal // 已被 searchBarKeys 替代
switch (btn.btnName) { switch (btn.btnName) {
case 'search': case 'search':
keys.forEach((key) => { this.searchBarKeys.forEach((key) => {
if (key == 'timeVal') { if (key == 'timeVal') {
this.queryParams['startTime'] = btn.timeVal[0]; this.queryParams['startTime'] = btn.timeVal[0];
this.queryParams['endTime'] = btn.timeVal[1]; this.queryParams['endTime'] = btn.timeVal[1];
@ -83,5 +78,20 @@ export default {
}, },
// 获取列表数据 // 获取列表数据
getList() {}, getList() {},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNo = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm('queryForm');
this.handleQuery();
},
/** 取消按钮 */
cancel() {
this.open = false;
this.reset();
},
}, },
}; };