add 设备工段绑定,设备分组

This commit is contained in:
lb 2023-08-28 09:22:28 +08:00
parent 3d24159743
commit 573192d27a
3 changed files with 388 additions and 248 deletions

View File

@ -53,7 +53,12 @@
:action="col.url" :action="col.url"
:on-success="handleUploadSuccess" :on-success="handleUploadSuccess"
v-bind="col.bind"> v-bind="col.bind">
<el-button size="small" type="primary" :disabled="col.bind?.disabled || false">点击上传</el-button> <el-button
size="small"
type="primary"
:disabled="col.bind?.disabled || false">
点击上传
</el-button>
<div class="el-upload__tip" slot="tip" v-if="col.uploadTips"> <div class="el-upload__tip" slot="tip" v-if="col.uploadTips">
{{ col.uploadTips || '只能上传jpg/png文件大小不超过2MB' }} {{ col.uploadTips || '只能上传jpg/png文件大小不超过2MB' }}
</div> </div>
@ -157,7 +162,7 @@ export default {
return response.data; return response.data;
}, },
async handleOptions(trigger = 'monuted') { async handleOptions(trigger = 'monuted') {
// console.log("[dialogForm:handleOptions]") console.log("[dialogForm:handleOptions]")
const promiseList = []; const promiseList = [];
this.rows.forEach((cols) => { this.rows.forEach((cols) => {
cols.forEach((opt) => { cols.forEach((opt) => {
@ -169,6 +174,32 @@ export default {
if (opt.options) { if (opt.options) {
this.$set(this.optionListOf, opt.prop, opt.options); this.$set(this.optionListOf, opt.prop, opt.options);
} else if (opt.url) { } else if (opt.url) {
// dependswatcher
if (opt.depends) {
console.log("[handleOptions] setting watch")
this.$watch(
() => this.form[opt.depends],
(id) => {
console.log(opt.depends, 'changed')
//
this.form[opt.prop] = null;
//
this.$axios({
url: `${opt.url}?id=${id}`,
}).then((res) => {
this.$set(
this.optionListOf,
opt.prop,
res.data.map((item) => ({
label: item[opt.labelKey ?? 'name'],
value: item[opt.valueKey ?? 'id'],
}))
);
});
}
);
return;
}
// //
if (opt.select || (opt.input && !this.form?.id)) { if (opt.select || (opt.input && !this.form?.id)) {
promiseList.push(async () => { promiseList.push(async () => {
@ -216,10 +247,16 @@ export default {
if (!promiseList.length) this.formLoading = false; if (!promiseList.length) this.formLoading = false;
}, },
// //
beforeUpload(){}, beforeUpload() {},
// bind // bind
handleUploadSuccess(response, file, fileList) { handleUploadSuccess(response, file, fileList) {
console.log('[dialogForm:handleUploadSuccess]', response, file, fileList, this.form); console.log(
'[dialogForm:handleUploadSuccess]',
response,
file,
fileList,
this.form
);
// //
if ('fileNames' in this.form) this.form.fileNames.push(file.name); if ('fileNames' in this.form) this.form.fileNames.push(file.name);
// //

View File

@ -1,253 +1,357 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<!-- 搜索工作栏 -->
<SearchBar
:formConfigs="searchBarFormConfig"
ref="search-bar"
@headBtnClick="handleSearchBarBtnClick" />
<!-- 搜索工作栏 --> <!-- 列表 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <base-table
<el-form-item label="工段ID" prop="workshopSectionId"> :table-props="tableProps"
<el-input v-model="queryParams.workshopSectionId" placeholder="请输入工段ID" clearable @keyup.enter.native="handleQuery"/> :page="queryParams.pageNo"
</el-form-item> :limit="queryParams.pageSize"
<el-form-item label="设备ID" prop="equipmentId"> :table-data="list"
<el-input v-model="queryParams.equipmentId" placeholder="请输入设备ID" clearable @keyup.enter.native="handleQuery"/> @emitFun="handleEmitFun">
</el-form-item> <method-btn
<el-form-item> v-if="tableBtn.length"
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button> slot="handleBtn"
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button> label="操作"
</el-form-item> :method-list="tableBtn"
</el-form> @clickBtn="handleTableBtnClick" />
</base-table>
<!-- 操作工具栏 --> <!-- 分页组件 -->
<el-row :gutter="10" class="mb8"> <pagination
<el-col :span="1.5"> v-show="total > 0"
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" :total="total"
v-hasPermi="['base:equipment-bind-section:create']">新增</el-button> :page.sync="queryParams.pageNo"
</el-col> :limit.sync="queryParams.pageSize"
<el-col :span="1.5"> @pagination="getList" />
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
v-hasPermi="['base:equipment-bind-section:export']">导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<!-- 列表 --> <!-- 对话框(添加 / 修改) -->
<el-table v-loading="loading" :data="list"> <base-dialog
<el-table-column label="ID" align="center" prop="id" /> :dialogTitle="title"
<el-table-column label="工段ID" align="center" prop="workshopSectionId" /> :dialogVisible="open"
<el-table-column label="设备ID" align="center" prop="equipmentId" /> width="700px"
<el-table-column label="排序" align="center" prop="sort" /> @close="cancel"
<el-table-column label="产线数据类型 0.无类型 1.进口计数 2.出口计数" align="center" prop="lineDataType"> @cancel="cancel"
<template v-slot="scope"> @confirm="submitForm">
<dict-tag :type="DICT_TYPE.EQU_DATA_TYPE" :value="scope.row.lineDataType" /> <DialogForm v-if="open" ref="form" :dataForm="form" :rows="rows" />
</template> </base-dialog>
</el-table-column> </div>
<el-table-column label="工段数据类型 0.无类型 1.进口计数 2.出口计数" align="center" prop="sectionDataType">
<template v-slot="scope">
<dict-tag :type="DICT_TYPE.EQU_DATA_TYPE" :value="scope.row.sectionDataType" />
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="版本号" align="center" prop="version" />
<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="操作" 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:equipment-bind-section:update']">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['base:equipment-bind-section: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 :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-item label="工段ID" prop="workshopSectionId">
<el-input v-model="form.workshopSectionId" placeholder="请输入工段ID" />
</el-form-item>
<el-form-item label="设备ID" prop="equipmentId">
<el-input v-model="form.equipmentId" placeholder="请输入设备ID" />
</el-form-item>
<el-form-item label="排序" prop="sort">
<el-input v-model="form.sort" placeholder="请输入排序" />
</el-form-item>
<el-form-item label="产线数据类型 0.无类型 1.进口计数 2.出口计数" prop="lineDataType">
<el-select v-model="form.lineDataType" placeholder="请选择产线数据类型 0.无类型 1.进口计数 2.出口计数">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.EQU_DATA_TYPE)"
:key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="工段数据类型 0.无类型 1.进口计数 2.出口计数" prop="sectionDataType">
<el-select v-model="form.sectionDataType" placeholder="请选择工段数据类型 0.无类型 1.进口计数 2.出口计数">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.EQU_DATA_TYPE)"
:key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
<el-form-item label="版本号" prop="version">
<el-input v-model="form.version" 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 { createEquipmentBindSection, updateEquipmentBindSection, deleteEquipmentBindSection, getEquipmentBindSection, getEquipmentBindSectionPage, exportEquipmentBindSectionExcel } from "@/api/base/equipmentBindSection"; import {
createEquipmentBindSection,
updateEquipmentBindSection,
deleteEquipmentBindSection,
getEquipmentBindSection,
getEquipmentBindSectionPage,
exportEquipmentBindSectionExcel,
} from '@/api/base/equipmentBindSection';
import moment from 'moment';
import basicPageMixin from '@/mixins/lb/basicPageMixin';
export default { export default {
name: "EquipmentBindSection", name: 'EquipmentBindSection',
components: { components: {},
}, mixins: [basicPageMixin],
data() { data() {
return { return {
// searchBarKeys: ['workshopSectionId', 'equipmentName'],
loading: true, tableBtn: [
// this.$auth.hasPermi('base:equipment-bind-section:update')
exportLoading: false, ? {
// type: 'edit',
showSearch: true, btnName: '修改',
// }
total: 0, : undefined,
// this.$auth.hasPermi('base:equipment-bind-section:delete')
list: [], ? {
// type: 'delete',
title: "", btnName: '删除',
// }
open: false, : undefined,
// ].filter((v) => v),
queryParams: { tableProps: [
pageNo: 1, {
pageSize: 10, prop: 'createTime',
workshopSectionId: null, label: '添加时间',
equipmentId: null, fixed: true,
}, width: 180,
// filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
form: {}, },
// { prop: 'productionLine', label: '产线名称', align: 'center' },
rules: { { prop: 'workshopSection', label: '工段名称', align: 'center' },
workshopSectionId: [{ required: true, message: "工段ID不能为空", trigger: "blur" }], { prop: 'equipment', label: '设备名称', align: 'center' },
equipmentId: [{ required: true, message: "设备ID不能为空", trigger: "blur" }], { prop: 'sort', label: '工段中排序', align: 'center' },
} {
}; prop: 'lineDataType',
}, label: '产线数据类型',
created() { align: 'center',
this.getList(); filter: (val) =>
}, val != null ? ['无类型', '进口计数', '出口计数'][val] : '-',
methods: { },
/** 查询列表 */ {
getList() { prop: 'sectionDataType',
this.loading = true; label: '工段数据类型',
// align: 'center',
getEquipmentBindSectionPage(this.queryParams).then(response => { filter: (val) =>
this.list = response.data.list; val != null ? ['无类型', '进口计数', '出口计数'][val] : '-',
this.total = response.data.total; },
this.loading = false; // {
}); // action: 'show-alert',
}, // label: '',
/** 取消按钮 */ // align: 'center',
cancel() { // subcomponent: {
this.open = false; // props: ['injectData'],
this.reset(); // render: function (h) {
}, // const _this = this;
/** 表单重置 */ // return h(
reset() { // 'el-button',
this.form = { // {
id: undefined, // props: { type: 'text', size: 'mini' },
workshopSectionId: undefined, // on: {
equipmentId: undefined, // click: function () {
sort: undefined, // console.log('inejctdata', _this.injectData);
lineDataType: undefined, // _this.$emit('emitData', {
sectionDataType: undefined, // action: _this.injectData.action,
remark: undefined, // value: _this.injectData.id,
version: undefined, // });
}; // },
this.resetForm("form"); // },
}, // },
/** 搜索按钮操作 */ // ''
handleQuery() { // );
this.queryParams.pageNo = 1; // },
this.getList(); // },
}, // },
/** 重置按钮操作 */ ],
resetQuery() { searchBarFormConfig: [
this.resetForm("queryForm"); {
this.handleQuery(); type: 'select',
}, label: '工段',
/** 新增按钮操作 */ placeholder: '请选择工段',
handleAdd() { param: 'workshopSectionId',
this.reset(); },
this.open = true; {
this.title = "添加工段设备绑定"; type: 'input',
}, label: '设备',
/** 修改按钮操作 */ placeholder: '请输入设备',
handleUpdate(row) { param: 'equipmentName',
this.reset(); },
const id = row.id; {
getEquipmentBindSection(id).then(response => { type: 'button',
this.form = response.data; btnName: '查询',
this.open = true; name: 'search',
this.title = "修改工段设备绑定"; color: 'primary',
}); },
}, {
/** 提交按钮 */ type: 'separate',
submitForm() { },
this.$refs["form"].validate(valid => { {
if (!valid) { type: this.$auth.hasPermi('base:equipment-bind-section:create')
return; ? 'button'
} : '',
// btnName: '新增',
if (this.form.id != null) { name: 'add',
updateEquipmentBindSection(this.form).then(response => { plain: true,
this.$modal.msgSuccess("修改成功"); color: 'success',
this.open = false; },
this.getList(); // {
}); // type: this.$auth.hasPermi('base:equipment-group:export') ? 'button' : '',
return; // btnName: '',
} // name: 'export',
// // color: 'warning',
createEquipmentBindSection(this.form).then(response => { // },
this.$modal.msgSuccess("新增成功"); ],
this.open = false; rows: [
this.getList(); [
}); {
}); select: true,
}, label: '产线',
/** 删除按钮操作 */ url: '/base/production-line/listAll',
handleDelete(row) { // prop: '__product_line', // __
const id = row.id; prop: 'productionLineId', // 线id使
this.$modal.confirm('是否确认删除工段设备绑定编号为"' + id + '"的数据项?').then(function() { rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
return deleteEquipmentBindSection(id); },
}).then(() => { {
this.getList(); select: true,
this.$modal.msgSuccess("删除成功"); label: '工段',
}).catch(() => {}); url: '/base/workshop-section/listByParentId', // 线
}, // depends: '__product_line', // 线
/** 导出按钮操作 */ depends: 'productionLineId',
handleExport() { prop: 'workshopSectionId',
// rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
let params = {...this.queryParams}; },
params.pageNo = undefined; ],
params.pageSize = undefined; [
this.$modal.confirm('是否确认导出所有工段设备绑定数据项?').then(() => { {
this.exportLoading = true; select: true,
return exportEquipmentBindSectionExcel(params); label: '设备',
}).then(response => { url: '/base/equipment/page?pageNo=1&pageSize=100',
this.$download.excel(response, '工段设备绑定.xls'); prop: 'equipmentId',
this.exportLoading = false; rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
}).catch(() => {}); },
} {
} input: true,
label: '工段排序',
prop: 'sort',
// url: '/base/equipment-group/getCode',
},
],
[
{
select: true,
label: '产线数据类型',
options: [
{ label: '无类型', value: 0 },
{ label: '进口统计', value: 1 },
{ label: '出口统计', value: 2 },
],
prop: 'lineDataType',
},
{
select: true,
label: '工段数据类型',
options: [
{ label: '无类型', value: 0 },
{ label: '进口统计', value: 1 },
{ label: '出口统计', value: 2 },
],
prop: 'sectionDataType',
},
],
],
//
open: false,
//
queryParams: {
pageNo: 1,
pageSize: 10,
workshopSectionId: null,
equipmentId: null,
},
//
form: {},
};
},
created() {
this.getList();
},
methods: {
/** 查询列表 */
getList() {
this.loading = true;
//
getEquipmentBindSectionPage(this.queryParams).then((response) => {
this.list = response.data.list;
this.total = response.data.total;
this.loading = false;
});
},
/** 取消按钮 */
cancel() {
this.open = false;
this.reset();
},
/** 表单重置 */
reset() {
this.form = {
id: undefined,
workshopSectionId: undefined,
equipmentId: undefined,
sort: undefined,
lineDataType: undefined,
sectionDataType: undefined,
remark: undefined,
version: undefined,
};
this.resetForm('form');
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNo = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm('queryForm');
this.handleQuery();
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = '添加工段设备绑定';
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id;
getEquipmentBindSection(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) {
updateEquipmentBindSection(this.form).then((response) => {
this.$modal.msgSuccess('修改成功');
this.open = false;
this.getList();
});
return;
}
//
createEquipmentBindSection(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 deleteEquipmentBindSection(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 exportEquipmentBindSectionExcel(params);
})
.then((response) => {
this.$download.excel(response, '工段设备绑定.xls');
this.exportLoading = false;
})
.catch(() => {});
},
},
}; };
</script> </script>

View File

@ -33,13 +33,12 @@
<base-dialog <base-dialog
:dialogTitle="title" :dialogTitle="title"
:dialogVisible="open" :dialogVisible="open"
width="500px" width="500px"
@close="cancel" @close="cancel"
@cancel="cancel" @cancel="cancel"
@confirm="submitForm"> @confirm="submitForm">
<DialogForm v-if="open" ref="form" :dataForm="form" :rows="rows" /> <DialogForm v-if="open" ref="form" :dataForm="form" :rows="rows" />
</base-dialog> </base-dialog>
</div> </div>
</template> </template>