Compare commits
No commits in common. "6d4f44fd68e95488eb9ac9559bffe289b525f9b4" and "443ca29d3fdcd33d0ca5feea2f435f5de573683c" have entirely different histories.
6d4f44fd68
...
443ca29d3f
2
.env.dev
2
.env.dev
@ -5,7 +5,7 @@ ENV = 'development'
|
|||||||
VUE_APP_TITLE = 芋道管理系统
|
VUE_APP_TITLE = 芋道管理系统
|
||||||
|
|
||||||
# 芋道管理系统/开发环境
|
# 芋道管理系统/开发环境
|
||||||
VUE_APP_BASE_API = 'http://192.168.0.33:48080'
|
VUE_APP_BASE_API = 'http://192.168.1.8:48080'
|
||||||
|
|
||||||
# 路由懒加载
|
# 路由懒加载
|
||||||
VUE_CLI_BABEL_TRANSPILE_MODULES = true
|
VUE_CLI_BABEL_TRANSPILE_MODULES = true
|
||||||
|
|||||||
@ -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",
|
||||||
|
|||||||
@ -1,5 +0,0 @@
|
|||||||
export default {
|
|
||||||
data() {
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,308 +1,227 @@
|
|||||||
<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-item label="检测内容" prop="content">
|
|
||||||
<el-input
|
|
||||||
v-model="queryParams.content"
|
|
||||||
placeholder="请输入检测内容"
|
|
||||||
clearable
|
|
||||||
@keyup.enter.native="handleQuery" />
|
|
||||||
</el-form-item>
|
|
||||||
<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"
|
|
||||||
range-separator="-"
|
|
||||||
start-placeholder="开始日期"
|
|
||||||
end-placeholder="结束日期"
|
|
||||||
:default-time="['00:00:00', '23:59:59']" />
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item>
|
|
||||||
<el-button type="primary" icon="el-icon-search" @click="handleQuery">
|
|
||||||
搜索
|
|
||||||
</el-button>
|
|
||||||
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
|
|
||||||
</el-form-item>
|
|
||||||
</el-form>
|
|
||||||
|
|
||||||
<!-- 操作工具栏 -->
|
<!-- 搜索工作栏 -->
|
||||||
<el-row :gutter="10" class="mb8">
|
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
|
||||||
<el-col :span="1.5">
|
<el-form-item label="检测内容" prop="content">
|
||||||
<el-button
|
<el-input v-model="queryParams.content" placeholder="请输入检测内容" clearable @keyup.enter.native="handleQuery"/>
|
||||||
type="primary"
|
</el-form-item>
|
||||||
plain
|
<el-form-item label="创建时间" prop="createTime">
|
||||||
icon="el-icon-plus"
|
<el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
|
||||||
size="mini"
|
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
|
||||||
@click="handleAdd"
|
</el-form-item>
|
||||||
v-hasPermi="['base:quality-inspection-det:create']">
|
<el-form-item>
|
||||||
新增
|
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
|
||||||
</el-button>
|
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
|
||||||
</el-col>
|
</el-form-item>
|
||||||
<el-col :span="1.5">
|
</el-form>
|
||||||
<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">
|
<el-row :gutter="10" class="mb8">
|
||||||
<el-table-column label="ID" align="center" prop="id" />
|
<el-col :span="1.5">
|
||||||
<el-table-column label="检测类型id" align="center" prop="typeId" />
|
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
|
||||||
<el-table-column label="检测内容" align="center" prop="content" />
|
v-hasPermi="['base:quality-inspection-det:create']">新增</el-button>
|
||||||
<el-table-column label="检测编码" align="center" prop="code" />
|
</el-col>
|
||||||
<el-table-column label="备注" align="center" prop="remark" />
|
<el-col :span="1.5">
|
||||||
<el-table-column
|
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
|
||||||
label="创建时间"
|
v-hasPermi="['base:quality-inspection-det:export']">导出</el-button>
|
||||||
align="center"
|
</el-col>
|
||||||
prop="createTime"
|
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||||
width="180">
|
</el-row>
|
||||||
<template v-slot="scope">
|
|
||||||
<span>{{ parseTime(scope.row.createTime) }}</span>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
<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)"
|
|
||||||
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>
|
|
||||||
</el-table-column>
|
|
||||||
</el-table>
|
|
||||||
<!-- 分页组件 -->
|
|
||||||
<pagination
|
|
||||||
v-show="total > 0"
|
|
||||||
:total="total"
|
|
||||||
:page.sync="queryParams.pageNo"
|
|
||||||
:limit.sync="queryParams.pageSize"
|
|
||||||
@pagination="getList" />
|
|
||||||
|
|
||||||
<!-- 对话框(添加 / 修改) -->
|
<!-- 列表 -->
|
||||||
<el-dialog
|
<el-table v-loading="loading" :data="list">
|
||||||
:title="title"
|
<el-table-column label="ID" align="center" prop="id" />
|
||||||
:visible.sync="open"
|
<el-table-column label="检测类型id" align="center" prop="typeId" />
|
||||||
width="500px"
|
<el-table-column label="检测内容" align="center" prop="content" />
|
||||||
v-dialogDrag
|
<el-table-column label="检测编码" align="center" prop="code" />
|
||||||
append-to-body>
|
<el-table-column label="备注" align="center" prop="remark" />
|
||||||
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
|
||||||
<el-form-item label="检测类型id" prop="typeId">
|
<template v-slot="scope">
|
||||||
<el-select v-model="form.typeId" placeholder="请选择检测类型id">
|
<span>{{ parseTime(scope.row.createTime) }}</span>
|
||||||
<el-option label="请选择字典生成" value="" />
|
</template>
|
||||||
</el-select>
|
</el-table-column>
|
||||||
</el-form-item>
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||||
<el-form-item label="检测内容" prop="content">
|
<template v-slot="scope">
|
||||||
<el-input v-model="form.content" placeholder="请输入检测内容" />
|
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
|
||||||
</el-form-item>
|
v-hasPermi="['base:quality-inspection-det:update']">修改</el-button>
|
||||||
<el-form-item label="检测编码" prop="code">
|
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
|
||||||
<el-input v-model="form.code" placeholder="请输入检测编码" />
|
v-hasPermi="['base:quality-inspection-det:delete']">删除</el-button>
|
||||||
</el-form-item>
|
</template>
|
||||||
<el-form-item label="备注" prop="remark">
|
</el-table-column>
|
||||||
<el-input v-model="form.remark" placeholder="请输入备注" />
|
</el-table>
|
||||||
</el-form-item>
|
<!-- 分页组件 -->
|
||||||
</el-form>
|
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
|
||||||
<div slot="footer" class="dialog-footer">
|
@pagination="getList"/>
|
||||||
<el-button type="primary" @click="submitForm">确 定</el-button>
|
|
||||||
<el-button @click="cancel">取 消</el-button>
|
<!-- 对话框(添加 / 修改) -->
|
||||||
</div>
|
<el-dialog :title="title" :visible.sync="open" width="500px" v-dialogDrag append-to-body>
|
||||||
</el-dialog>
|
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
||||||
</div>
|
<el-form-item label="检测类型id" prop="typeId">
|
||||||
|
<el-select v-model="form.typeId" placeholder="请选择检测类型id">
|
||||||
|
<el-option label="请选择字典生成" 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>
|
||||||
|
<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 {
|
import { createQualityInspectionDet, updateQualityInspectionDet, deleteQualityInspectionDet, getQualityInspectionDet, getQualityInspectionDetPage, exportQualityInspectionDetExcel } from "@/api/base/qualityInspectionDet";
|
||||||
createQualityInspectionDet,
|
|
||||||
updateQualityInspectionDet,
|
|
||||||
deleteQualityInspectionDet,
|
|
||||||
getQualityInspectionDet,
|
|
||||||
getQualityInspectionDetPage,
|
|
||||||
exportQualityInspectionDetExcel,
|
|
||||||
} from '@/api/base/qualityInspectionDet';
|
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'QualityInspectionDet',
|
name: "QualityInspectionDet",
|
||||||
components: {},
|
components: {
|
||||||
data() {
|
},
|
||||||
return {
|
data() {
|
||||||
// 遮罩层
|
return {
|
||||||
loading: true,
|
// 遮罩层
|
||||||
// 导出遮罩层
|
loading: true,
|
||||||
exportLoading: false,
|
// 导出遮罩层
|
||||||
// 显示搜索条件
|
exportLoading: false,
|
||||||
showSearch: true,
|
// 显示搜索条件
|
||||||
// 总条数
|
showSearch: true,
|
||||||
total: 0,
|
// 总条数
|
||||||
// 质量检测信息基础列表
|
total: 0,
|
||||||
list: [],
|
// 质量检测信息基础列表
|
||||||
// 弹出层标题
|
list: [],
|
||||||
title: '',
|
// 弹出层标题
|
||||||
// 是否显示弹出层
|
title: "",
|
||||||
open: false,
|
// 是否显示弹出层
|
||||||
// 查询参数
|
open: false,
|
||||||
queryParams: {
|
// 查询参数
|
||||||
pageNo: 1,
|
queryParams: {
|
||||||
pageSize: 10,
|
pageNo: 1,
|
||||||
content: null,
|
pageSize: 10,
|
||||||
createTime: [],
|
content: null,
|
||||||
},
|
createTime: [],
|
||||||
// 表单参数
|
},
|
||||||
form: {},
|
// 表单参数
|
||||||
// 表单校验
|
form: {},
|
||||||
rules: {
|
// 表单校验
|
||||||
typeId: [
|
rules: {
|
||||||
{ required: true, message: '检测类型id不能为空', trigger: 'change' },
|
typeId: [{ required: true, message: "检测类型id不能为空", trigger: "change" }],
|
||||||
],
|
content: [{ required: true, message: "检测内容不能为空", trigger: "blur" }],
|
||||||
content: [
|
}
|
||||||
{ required: true, message: '检测内容不能为空', trigger: 'blur' },
|
};
|
||||||
],
|
},
|
||||||
},
|
created() {
|
||||||
};
|
this.getList();
|
||||||
},
|
},
|
||||||
created() {
|
methods: {
|
||||||
this.getList();
|
/** 查询列表 */
|
||||||
},
|
getList() {
|
||||||
methods: {
|
this.loading = true;
|
||||||
/** 查询列表 */
|
// 执行查询
|
||||||
getList() {
|
getQualityInspectionDetPage(this.queryParams).then(response => {
|
||||||
this.loading = true;
|
this.list = response.data.list;
|
||||||
// 执行查询
|
this.total = response.data.total;
|
||||||
getQualityInspectionDetPage(this.queryParams).then((response) => {
|
this.loading = false;
|
||||||
this.list = response.data.list;
|
});
|
||||||
this.total = response.data.total;
|
},
|
||||||
this.loading = false;
|
/** 取消按钮 */
|
||||||
});
|
cancel() {
|
||||||
},
|
this.open = false;
|
||||||
/** 取消按钮 */
|
this.reset();
|
||||||
cancel() {
|
},
|
||||||
this.open = false;
|
/** 表单重置 */
|
||||||
this.reset();
|
reset() {
|
||||||
},
|
this.form = {
|
||||||
/** 表单重置 */
|
id: undefined,
|
||||||
reset() {
|
typeId: undefined,
|
||||||
this.form = {
|
content: undefined,
|
||||||
id: undefined,
|
code: undefined,
|
||||||
typeId: undefined,
|
remark: undefined,
|
||||||
content: undefined,
|
};
|
||||||
code: undefined,
|
this.resetForm("form");
|
||||||
remark: undefined,
|
},
|
||||||
};
|
/** 搜索按钮操作 */
|
||||||
this.resetForm('form');
|
handleQuery() {
|
||||||
},
|
this.queryParams.pageNo = 1;
|
||||||
/** 搜索按钮操作 */
|
this.getList();
|
||||||
handleQuery() {
|
},
|
||||||
this.queryParams.pageNo = 1;
|
/** 重置按钮操作 */
|
||||||
this.getList();
|
resetQuery() {
|
||||||
},
|
this.resetForm("queryForm");
|
||||||
/** 重置按钮操作 */
|
this.handleQuery();
|
||||||
resetQuery() {
|
},
|
||||||
this.resetForm('queryForm');
|
/** 新增按钮操作 */
|
||||||
this.handleQuery();
|
handleAdd() {
|
||||||
},
|
this.reset();
|
||||||
/** 新增按钮操作 */
|
this.open = true;
|
||||||
handleAdd() {
|
this.title = "添加质量检测信息基础";
|
||||||
this.reset();
|
},
|
||||||
this.open = true;
|
/** 修改按钮操作 */
|
||||||
this.title = '添加质量检测信息基础';
|
handleUpdate(row) {
|
||||||
},
|
this.reset();
|
||||||
/** 修改按钮操作 */
|
const id = row.id;
|
||||||
handleUpdate(row) {
|
getQualityInspectionDet(id).then(response => {
|
||||||
this.reset();
|
this.form = response.data;
|
||||||
const id = row.id;
|
this.open = true;
|
||||||
getQualityInspectionDet(id).then((response) => {
|
this.title = "修改质量检测信息基础";
|
||||||
this.form = response.data;
|
});
|
||||||
this.open = true;
|
},
|
||||||
this.title = '修改质量检测信息基础';
|
/** 提交按钮 */
|
||||||
});
|
submitForm() {
|
||||||
},
|
this.$refs["form"].validate(valid => {
|
||||||
/** 提交按钮 */
|
if (!valid) {
|
||||||
submitForm() {
|
return;
|
||||||
this.$refs['form'].validate((valid) => {
|
}
|
||||||
if (!valid) {
|
// 修改的提交
|
||||||
return;
|
if (this.form.id != null) {
|
||||||
}
|
updateQualityInspectionDet(this.form).then(response => {
|
||||||
// 修改的提交
|
this.$modal.msgSuccess("修改成功");
|
||||||
if (this.form.id != null) {
|
this.open = false;
|
||||||
updateQualityInspectionDet(this.form).then((response) => {
|
this.getList();
|
||||||
this.$modal.msgSuccess('修改成功');
|
});
|
||||||
this.open = false;
|
return;
|
||||||
this.getList();
|
}
|
||||||
});
|
// 添加的提交
|
||||||
return;
|
createQualityInspectionDet(this.form).then(response => {
|
||||||
}
|
this.$modal.msgSuccess("新增成功");
|
||||||
// 添加的提交
|
this.open = false;
|
||||||
createQualityInspectionDet(this.form).then((response) => {
|
this.getList();
|
||||||
this.$modal.msgSuccess('新增成功');
|
});
|
||||||
this.open = false;
|
});
|
||||||
this.getList();
|
},
|
||||||
});
|
/** 删除按钮操作 */
|
||||||
});
|
handleDelete(row) {
|
||||||
},
|
const id = row.id;
|
||||||
/** 删除按钮操作 */
|
this.$modal.confirm('是否确认删除质量检测信息基础编号为"' + id + '"的数据项?').then(function() {
|
||||||
handleDelete(row) {
|
return deleteQualityInspectionDet(id);
|
||||||
const id = row.id;
|
}).then(() => {
|
||||||
this.$modal
|
this.getList();
|
||||||
.confirm('是否确认删除质量检测信息基础编号为"' + id + '"的数据项?')
|
this.$modal.msgSuccess("删除成功");
|
||||||
.then(function () {
|
}).catch(() => {});
|
||||||
return deleteQualityInspectionDet(id);
|
},
|
||||||
})
|
/** 导出按钮操作 */
|
||||||
.then(() => {
|
handleExport() {
|
||||||
this.getList();
|
// 处理查询参数
|
||||||
this.$modal.msgSuccess('删除成功');
|
let params = {...this.queryParams};
|
||||||
})
|
params.pageNo = undefined;
|
||||||
.catch(() => {});
|
params.pageSize = undefined;
|
||||||
},
|
this.$modal.confirm('是否确认导出所有质量检测信息基础数据项?').then(() => {
|
||||||
/** 导出按钮操作 */
|
this.exportLoading = true;
|
||||||
handleExport() {
|
return exportQualityInspectionDetExcel(params);
|
||||||
// 处理查询参数
|
}).then(response => {
|
||||||
let params = { ...this.queryParams };
|
this.$download.excel(response, '质量检测信息基础.xls');
|
||||||
params.pageNo = undefined;
|
this.exportLoading = false;
|
||||||
params.pageSize = undefined;
|
}).catch(() => {});
|
||||||
this.$modal
|
}
|
||||||
.confirm('是否确认导出所有质量检测信息基础数据项?')
|
}
|
||||||
.then(() => {
|
|
||||||
this.exportLoading = true;
|
|
||||||
return exportQualityInspectionDetExcel(params);
|
|
||||||
})
|
|
||||||
.then((response) => {
|
|
||||||
this.$download.excel(response, '质量检测信息基础.xls');
|
|
||||||
this.exportLoading = false;
|
|
||||||
})
|
|
||||||
.catch(() => {});
|
|
||||||
},
|
|
||||||
},
|
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@ -1,26 +1,111 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="app-container">
|
<div class="app-container">
|
||||||
<!-- 搜索工作栏 -->
|
<!-- 搜索工作栏 -->
|
||||||
<SearchBar
|
<el-form
|
||||||
:formConfigs="searchBarFormConfig"
|
:model="queryParams"
|
||||||
ref="search-bar"
|
ref="queryForm"
|
||||||
@headBtnClick="handleSearchBarBtnClick" />
|
size="small"
|
||||||
|
:inline="true"
|
||||||
|
v-show="showSearch"
|
||||||
|
label-width="68px">
|
||||||
|
<el-form-item label="检测类型名称" prop="name">
|
||||||
|
<el-input
|
||||||
|
v-model="queryParams.name"
|
||||||
|
placeholder="请输入检测类型名称"
|
||||||
|
clearable
|
||||||
|
@keyup.enter.native="handleQuery" />
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item>
|
||||||
|
<el-button type="primary" icon="el-icon-search" @click="handleQuery">
|
||||||
|
搜索
|
||||||
|
</el-button>
|
||||||
|
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
|
||||||
|
</el-form-item>
|
||||||
|
</el-form>
|
||||||
|
|
||||||
|
<div
|
||||||
|
class="s"
|
||||||
|
style="
|
||||||
|
margin: 8px 0;
|
||||||
|
padding: 4px 12px;
|
||||||
|
border: 1px solid #ccc;
|
||||||
|
background: #f3f3f3;
|
||||||
|
">
|
||||||
|
<SearchBar
|
||||||
|
:formConfigs="searchBarFormConfig"
|
||||||
|
ref="search-bar"
|
||||||
|
@headBtnClick="handleSearchBarBtnClick" />
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- 操作工具栏 -->
|
||||||
|
<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-type: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-type:export']">
|
||||||
|
导出
|
||||||
|
</el-button>
|
||||||
|
</el-col>
|
||||||
|
<right-toolbar
|
||||||
|
:showSearch.sync="showSearch"
|
||||||
|
@queryTable="getList"></right-toolbar>
|
||||||
|
</el-row>
|
||||||
|
|
||||||
<!-- 列表 -->
|
<!-- 列表 -->
|
||||||
<base-table
|
<el-table v-loading="loading" :data="list">
|
||||||
:table-props="tableProps"
|
<el-table-column label="ID" align="center" prop="id" />
|
||||||
:page="queryParams.pageNo"
|
<el-table-column label="检测类型名称" align="center" prop="name" />
|
||||||
:limit="queryParams.pageSize"
|
<el-table-column label="检测类型编码" align="center" prop="code" />
|
||||||
:table-data="list"
|
<el-table-column label="备注" align="center" prop="remark" />
|
||||||
@emit-fun="handleEmitFun">
|
<el-table-column
|
||||||
<method-btn
|
label="创建时间"
|
||||||
v-if="tableBtn.length"
|
align="center"
|
||||||
slot="handleBtn"
|
prop="createTime"
|
||||||
|
width="180">
|
||||||
|
<template v-slot="scope">
|
||||||
|
<span>{{ parseTime(scope.row.createTime) }}</span>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column
|
||||||
label="操作"
|
label="操作"
|
||||||
:method-list="tableBtn"
|
align="center"
|
||||||
@clickBtn="handleTableBtnClick" />
|
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-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"
|
||||||
@ -30,12 +115,13 @@
|
|||||||
@pagination="getList" />
|
@pagination="getList" />
|
||||||
|
|
||||||
<!-- 对话框(添加 / 修改) -->
|
<!-- 对话框(添加 / 修改) -->
|
||||||
<base-dialog
|
<el-dialog
|
||||||
:dialogTitle="title"
|
:title="title"
|
||||||
:dialogVisible="open"
|
:visible.sync="open"
|
||||||
@cancel="cancel"
|
width="500px"
|
||||||
@confirm="submitForm">
|
v-dialogDrag
|
||||||
<el-form ref="form" :model="form" :rules="rules" label-width="128px">
|
append-to-body>
|
||||||
|
<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>
|
||||||
@ -46,14 +132,15 @@
|
|||||||
<el-input v-model="form.remark" placeholder="请输入备注" />
|
<el-input v-model="form.remark" placeholder="请输入备注" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
</base-dialog>
|
<div slot="footer" class="dialog-footer">
|
||||||
|
<el-button type="primary" @click="submitForm">确 定</el-button>
|
||||||
|
<el-button @click="cancel">取 消</el-button>
|
||||||
|
</div>
|
||||||
|
</el-dialog>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import moment from 'moment';
|
|
||||||
|
|
||||||
import {
|
import {
|
||||||
createQualityInspectionType,
|
createQualityInspectionType,
|
||||||
updateQualityInspectionType,
|
updateQualityInspectionType,
|
||||||
@ -68,61 +155,6 @@ export default {
|
|||||||
components: {},
|
components: {},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
tableBtn: [
|
|
||||||
{
|
|
||||||
type: 'edit',
|
|
||||||
btnName: '修改',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
type: 'delete',
|
|
||||||
btnName: '删除',
|
|
||||||
},
|
|
||||||
],
|
|
||||||
tableData: [],
|
|
||||||
tableProps: [
|
|
||||||
{
|
|
||||||
prop: 'createTime',
|
|
||||||
label: '添加时间',
|
|
||||||
fixed: true,
|
|
||||||
width: 180,
|
|
||||||
filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
|
|
||||||
},
|
|
||||||
{ prop: 'name', label: '检测类型名称', align: 'center' },
|
|
||||||
{ prop: 'code', label: '检测类型编码', align: 'center' },
|
|
||||||
{ prop: 'remark', label: '备注', align: 'center' },
|
|
||||||
// {
|
|
||||||
// label: '操作',
|
|
||||||
// alignt: 'center',
|
|
||||||
// subcomponent: {
|
|
||||||
// render: function (h) {
|
|
||||||
// return h('div', null, [
|
|
||||||
// h(
|
|
||||||
// 'el-button',
|
|
||||||
// {
|
|
||||||
// props: {
|
|
||||||
// icon: 'el-icon-edit',
|
|
||||||
// size: 'mini',
|
|
||||||
// type: 'text',
|
|
||||||
// },
|
|
||||||
// },
|
|
||||||
// ' 修改'
|
|
||||||
// ),
|
|
||||||
// h(
|
|
||||||
// 'el-button',
|
|
||||||
// {
|
|
||||||
// props: {
|
|
||||||
// icon: 'el-icon-edit',
|
|
||||||
// size: 'mini',
|
|
||||||
// type: 'text',
|
|
||||||
// },
|
|
||||||
// },
|
|
||||||
// ' 修改'
|
|
||||||
// ),
|
|
||||||
// ]);
|
|
||||||
// },
|
|
||||||
// },
|
|
||||||
// },
|
|
||||||
],
|
|
||||||
// 遮罩层
|
// 遮罩层
|
||||||
loading: true,
|
loading: true,
|
||||||
// 导出遮罩层
|
// 导出遮罩层
|
||||||
@ -167,31 +199,24 @@ export default {
|
|||||||
name: 'search',
|
name: 'search',
|
||||||
color: 'primary',
|
color: 'primary',
|
||||||
},
|
},
|
||||||
// {
|
|
||||||
// type: 'button',
|
|
||||||
// btnName: '重置',
|
|
||||||
// name: 'reset',
|
|
||||||
// },
|
|
||||||
{
|
{
|
||||||
type: 'separate'
|
type: 'button',
|
||||||
|
btnName: '重置',
|
||||||
|
name: 'reset',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: this.$auth.hasPermi('base:quality-inspection-type:create')
|
type: 'button',
|
||||||
? 'button'
|
|
||||||
: '',
|
|
||||||
btnName: '新增',
|
btnName: '新增',
|
||||||
name: 'add',
|
name: 'add',
|
||||||
plain: true,
|
plain: true,
|
||||||
color: 'success',
|
color: 'primary',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
type: 'button',
|
||||||
|
btnName: '导出',
|
||||||
|
name: 'export',
|
||||||
|
color: 'warning'
|
||||||
},
|
},
|
||||||
// {
|
|
||||||
// type: this.$auth.hasPermi('base:quality-inspection-type:export')
|
|
||||||
// ? 'button'
|
|
||||||
// : '',
|
|
||||||
// btnName: '导出',
|
|
||||||
// name: 'export',
|
|
||||||
// color: 'warning',
|
|
||||||
// },
|
|
||||||
],
|
],
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
@ -199,40 +224,22 @@ 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'];
|
console.log('btn', btn)
|
||||||
switch (btn.btnName) {
|
switch (btn.btnName) {
|
||||||
case 'search':
|
case 'search':
|
||||||
keys.forEach((key) => {
|
this.getList();
|
||||||
this.queryParams[key] = btn[key] || null;
|
|
||||||
});
|
|
||||||
this.handleQuery();
|
|
||||||
break;
|
|
||||||
case 'add':
|
|
||||||
this.handleAdd();
|
|
||||||
break;
|
|
||||||
case 'export':
|
|
||||||
this.handleExport();
|
|
||||||
break;
|
break;
|
||||||
case 'reset':
|
case 'reset':
|
||||||
this.$refs['search-bar'].resetForm();
|
this.$refs['search-bar'].resetForm();
|
||||||
this.resetQuery();
|
this.$nextTick(() => {
|
||||||
|
this.getList();
|
||||||
|
});
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
/** 查询列表 */
|
/** 查询列表 */
|
||||||
getList() {
|
getList() {
|
||||||
this.loading = true;
|
this.loading = true;
|
||||||
@ -274,9 +281,6 @@ export default {
|
|||||||
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();
|
||||||
|
|||||||
@ -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"
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user