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

test #47

Merged
gtz217 merged 273 commits from test into master 2023-10-17 08:53:54 +08:00
Conversation 0 Commits 273 Files Changed 256 +384 -327
2 changed files with 384 additions and 327 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 30e8548a0d - Show all commits

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

@ -1,17 +1,35 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="68px">
<el-form-item label="检测内容" prop="content"> <el-form-item label="检测内容" prop="content">
<el-input v-model="queryParams.content" placeholder="请输入检测内容" clearable @keyup.enter.native="handleQuery"/> <el-input
v-model="queryParams.content"
placeholder="请输入检测内容"
clearable
@keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="创建时间" prop="createTime"> <el-form-item label="创建时间" prop="createTime">
<el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange" <el-date-picker
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" /> v-model="queryParams.createTime"
style="width: 240px"
value-format="yyyy-MM-dd HH:mm:ss"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="['00:00:00', '23:59:59']" />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" @click="handleQuery">
搜索
</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -19,14 +37,31 @@
<!-- 操作工具栏 --> <!-- 操作工具栏 -->
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" <el-button
v-hasPermi="['base:quality-inspection-det:create']">新增</el-button> type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['base:quality-inspection-det:create']">
新增
</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading" <el-button
v-hasPermi="['base:quality-inspection-det:export']">导出</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> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"></right-toolbar>
</el-row> </el-row>
<!-- 列表 --> <!-- 列表 -->
@ -36,26 +71,54 @@
<el-table-column label="检测内容" align="center" prop="content" /> <el-table-column label="检测内容" align="center" prop="content" />
<el-table-column label="检测编码" align="center" prop="code" /> <el-table-column label="检测编码" align="center" prop="code" />
<el-table-column label="备注" align="center" prop="remark" /> <el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180"> <el-table-column
label="创建时间"
align="center"
prop="createTime"
width="180">
<template v-slot="scope"> <template v-slot="scope">
<span>{{ parseTime(scope.row.createTime) }}</span> <span>{{ parseTime(scope.row.createTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width">
<template v-slot="scope"> <template v-slot="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" <el-button
v-hasPermi="['base:quality-inspection-det:update']">修改</el-button> size="mini"
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" type="text"
v-hasPermi="['base:quality-inspection-det:delete']">删除</el-button> icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['base:quality-inspection-det:update']">
修改
</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['base:quality-inspection-det:delete']">
删除
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<!-- 分页组件 --> <!-- 分页组件 -->
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize" <pagination
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNo"
:limit.sync="queryParams.pageSize"
@pagination="getList" /> @pagination="getList" />
<!-- 对话框(添加 / 修改) --> <!-- 对话框(添加 / 修改) -->
<el-dialog :title="title" :visible.sync="open" width="500px" v-dialogDrag append-to-body> <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"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="检测类型id" prop="typeId"> <el-form-item label="检测类型id" prop="typeId">
<el-select v-model="form.typeId" placeholder="请选择检测类型id"> <el-select v-model="form.typeId" placeholder="请选择检测类型id">
@ -81,12 +144,18 @@
</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';
export default { export default {
name: "QualityInspectionDet", name: 'QualityInspectionDet',
components: { components: {},
},
data() { data() {
return { return {
// 遮罩层 // 遮罩层
@ -100,7 +169,7 @@ export default {
// 质量检测信息基础列表 // 质量检测信息基础列表
list: [], list: [],
// 弹出层标题 // 弹出层标题
title: "", title: '',
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
// 查询参数 // 查询参数
@ -114,9 +183,13 @@ export default {
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {
typeId: [{ required: true, message: "检测类型id不能为空", trigger: "change" }], typeId: [
content: [{ required: true, message: "检测内容不能为空", trigger: "blur" }], { required: true, message: '检测类型id不能为空', trigger: 'change' },
} ],
content: [
{ required: true, message: '检测内容不能为空', trigger: 'blur' },
],
},
}; };
}, },
created() { created() {
@ -127,7 +200,7 @@ export default {
getList() { getList() {
this.loading = true; this.loading = true;
// 执行查询 // 执行查询
getQualityInspectionDetPage(this.queryParams).then(response => { getQualityInspectionDetPage(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;
@ -147,7 +220,7 @@ export default {
code: undefined, code: undefined,
remark: undefined, remark: undefined,
}; };
this.resetForm("form"); this.resetForm('form');
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
@ -156,43 +229,43 @@ export default {
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.resetForm("queryForm"); this.resetForm('queryForm');
this.handleQuery(); this.handleQuery();
}, },
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
this.reset(); this.reset();
this.open = true; this.open = true;
this.title = "添加质量检测信息基础"; this.title = '添加质量检测信息基础';
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset();
const id = row.id; const id = row.id;
getQualityInspectionDet(id).then(response => { getQualityInspectionDet(id).then((response) => {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "修改质量检测信息基础"; this.title = '修改质量检测信息基础';
}); });
}, },
/** 提交按钮 */ /** 提交按钮 */
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) {
updateQualityInspectionDet(this.form).then(response => { updateQualityInspectionDet(this.form).then((response) => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess('修改成功');
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
return; return;
} }
// 添加的提交 // 添加的提交
createQualityInspectionDet(this.form).then(response => { createQualityInspectionDet(this.form).then((response) => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess('新增成功');
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
@ -201,12 +274,16 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const id = row.id; const id = row.id;
this.$modal.confirm('是否确认删除质量检测信息基础编号为"' + id + '"的数据项?').then(function() { this.$modal
.confirm('是否确认删除质量检测信息基础编号为"' + id + '"的数据项?')
.then(function () {
return deleteQualityInspectionDet(id); return deleteQualityInspectionDet(id);
}).then(() => { })
.then(() => {
this.getList(); this.getList();
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess('删除成功');
}).catch(() => {}); })
.catch(() => {});
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
@ -214,14 +291,18 @@ export default {
let params = { ...this.queryParams }; let params = { ...this.queryParams };
params.pageNo = undefined; params.pageNo = undefined;
params.pageSize = undefined; params.pageSize = undefined;
this.$modal.confirm('是否确认导出所有质量检测信息基础数据项?').then(() => { this.$modal
.confirm('是否确认导出所有质量检测信息基础数据项?')
.then(() => {
this.exportLoading = true; this.exportLoading = true;
return exportQualityInspectionDetExcel(params); return exportQualityInspectionDetExcel(params);
}).then(response => { })
.then((response) => {
this.$download.excel(response, '质量检测信息基础.xls'); this.$download.excel(response, '质量检测信息基础.xls');
this.exportLoading = false; this.exportLoading = false;
}).catch(() => {}); })
} .catch(() => {});
} },
},
}; };
</script> </script>

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

@ -1,62 +1,26 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<SearchBar <SearchBar
:formConfigs="searchBarFormConfig" :formConfigs="searchBarFormConfig"
ref="search-bar" ref="search-bar"
@headBtnClick="handleSearchBarBtnClick" /> @headBtnClick="handleSearchBarBtnClick" />
<div <!-- 列表 -->
class="st"
style="border: 1px solid #ccc; padding: 12px; margin: 12px 0">
<base-table <base-table
:table-props="tableProps" :table-props="tableProps"
:page="queryParams.pageNo" :page="queryParams.pageNo"
:limit="queryParams.pageSize" :limit="queryParams.pageSize"
:table-data="list" :table-data="list"
@emit-fun="handleEmitFun" /> @emit-fun="handleEmitFun">
</div> <method-btn
v-if="tableBtn.length"
<!-- 列表 --> slot="handleBtn"
<el-table v-loading="loading" :data="list">
<el-table-column label="ID" align="center" prop="id" />
<el-table-column label="检测类型名称" align="center" prop="name" />
<el-table-column label="检测类型编码" align="center" prop="code" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column
label="创建时间"
align="center"
prop="createTime"
width="180">
<template v-slot="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column
label="操作" label="操作"
align="center" :method-list="tableBtn"
class-name="small-padding fixed-width"> @clickBtn="handleTableBtnClick" />
<template v-slot="scope"> </base-table>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['base:quality-inspection-type:update']">
修改
</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['base:quality-inspection-type:delete']">
删除
</el-button>
</template>
</el-table-column>
</el-table>
<!-- 分页组件 --> <!-- 分页组件 -->
<pagination <pagination
v-show="total > 0" v-show="total > 0"
@ -66,13 +30,12 @@
@pagination="getList" /> @pagination="getList" />
<!-- 对话框(添加 / 修改) --> <!-- 对话框(添加 / 修改) -->
<el-dialog <base-dialog
:title="title" :dialogTitle="title"
:visible.sync="open" :dialogVisible="open"
width="500px" @cancel="cancel"
v-dialogDrag @confirm="submitForm">
append-to-body> <el-form ref="form" :model="form" :rules="rules" label-width="128px">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="检测类型名称" prop="name"> <el-form-item label="检测类型名称" prop="name">
<el-input v-model="form.name" placeholder="请输入检测类型名称" /> <el-input v-model="form.name" placeholder="请输入检测类型名称" />
</el-form-item> </el-form-item>
@ -83,11 +46,8 @@
<el-input v-model="form.remark" placeholder="请输入备注" /> <el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> </base-dialog>
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div> </div>
</template> </template>
@ -108,6 +68,16 @@ export default {
components: {}, components: {},
data() { data() {
return { return {
tableBtn: [
{
type: 'edit',
btnName: '修改',
},
{
type: 'delete',
btnName: '删除',
},
],
tableData: [], tableData: [],
tableProps: [ tableProps: [
{ {
@ -120,42 +90,38 @@ export default {
{ prop: 'name', label: '检测类型名称', align: 'center' }, { prop: 'name', label: '检测类型名称', align: 'center' },
{ prop: 'code', label: '检测类型编码', align: 'center' }, { prop: 'code', label: '检测类型编码', align: 'center' },
{ prop: 'remark', label: '备注', align: 'center' }, { prop: 'remark', label: '备注', align: 'center' },
{ // {
label: '操作', // label: '操作',
alignt: 'center', // alignt: 'center',
subcomponent: { // subcomponent: {
render: function (h) { // render: function (h) {
return h( // return h('div', null, [
'div', // h(
null, // 'el-button',
[ // {
h( // props: {
'el-button', // icon: 'el-icon-edit',
{ // size: 'mini',
props: { // type: 'text',
icon: 'el-icon-edit', // },
size: 'mini', // },
type: 'text', // ' 修改'
}, // ),
}, // h(
' 修改' // 'el-button',
), // {
h( // props: {
'el-button', // icon: 'el-icon-edit',
{ // size: 'mini',
props: { // type: 'text',
icon: 'el-icon-edit', // },
size: 'mini', // },
type: 'text', // ' 修改'
}, // ),
}, // ]);
' 修改' // },
), // },
] // },
);
},
},
},
], ],
// 遮罩层 // 遮罩层
loading: true, loading: true,
@ -201,11 +167,11 @@ export default {
name: 'search', name: 'search',
color: 'primary', color: 'primary',
}, },
{ // {
type: 'button', // type: 'button',
btnName: '重置', // btnName: '重置',
name: 'reset', // name: 'reset',
}, // },
{ {
type: this.$auth.hasPermi('base:quality-inspection-type:create') type: this.$auth.hasPermi('base:quality-inspection-type:create')
? 'button' ? 'button'
@ -215,14 +181,14 @@ export default {
plain: true, plain: true,
color: 'primary', color: 'primary',
}, },
{ // {
type: this.$auth.hasPermi('base:quality-inspection-type:export') // type: this.$auth.hasPermi('base:quality-inspection-type:export')
? 'button' // ? 'button'
: '', // : '',
btnName: '导出', // btnName: '导出',
name: 'export', // name: 'export',
color: 'warning', // color: 'warning',
}, // },
], ],
}; };
}, },
@ -230,10 +196,20 @@ export default {
this.getList(); this.getList();
}, },
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 */ /** search bar related */
handleSearchBarBtnClick(btn) { handleSearchBarBtnClick(btn) {
const keys = ['name']; const keys = ['name'];
console.log('btn', btn);
switch (btn.btnName) { switch (btn.btnName) {
case 'search': case 'search':
keys.forEach((key) => { keys.forEach((key) => {