yunpeng/EQC-UI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[fix]耗材管理

Browse Source
This commit is contained in:
yunpeng 2024-01-01 21:41:55 +08:00
parent 8b0873835e
commit 665e28a28a
7 changed files with 448 additions and 196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/api/equipments/consumables.js
View File

@ -3,7 +3,7 @@ import request from '@/utils/request'
// 查询设备耗材列表 // 查询设备耗材列表
export function listConsumables(query) { export function listConsumables(query) {
return request({ return request({
url: '/system/consumables/list', url: '/equipment/consumables/list',
method: 'get', method: 'get',
params: query params: query
}) })
@ -12,7 +12,7 @@ export function listConsumables(query) {
// 查询设备耗材详细 // 查询设备耗材详细
export function getConsumables(consumableId) { export function getConsumables(consumableId) {
return request({ return request({
url: '/system/consumables/' + consumableId, url: '/equipment/consumables/' + consumableId,
method: 'get' method: 'get'
}) })
} }
@ -20,7 +20,7 @@ export function getConsumables(consumableId) {
// 新增设备耗材 // 新增设备耗材
export function addConsumables(data) { export function addConsumables(data) {
return request({ return request({
url: '/system/consumables', url: '/equipment/consumables',
method: 'post', method: 'post',
data: data data: data
}) })
@ -29,7 +29,7 @@ export function addConsumables(data) {
// 修改设备耗材 // 修改设备耗材
export function updateConsumables(data) { export function updateConsumables(data) {
return request({ return request({
url: '/system/consumables', url: '/equipment/consumables',
method: 'put', method: 'put',
data: data data: data
}) })
@ -38,7 +38,7 @@ export function updateConsumables(data) {
// 删除设备耗材 // 删除设备耗材
export function delConsumables(consumableId) { export function delConsumables(consumableId) {
return request({ return request({
url: '/system/consumables/' + consumableId, url: '/equipment/consumables/' + consumableId,
method: 'delete' method: 'delete'
}) })
} }

8
src/api/equipments/equipments.js
View File

@ -42,3 +42,11 @@ export function delEquipments(equipmentId) {
method: 'delete' method: 'delete'
}) })
} }
// 获取设备选择框列表
export function optionSelect() {
return request({
url: '/equipments/optionSelect',
method: 'get'
})
}

7
src/api/system/user.js
View File

@ -133,3 +133,10 @@ export function deptTreeSelect() {
method: 'get' method: 'get'
}) })
} }
export function userOptionsSelect() {
return request({
url: '/system/user/optionsSelect',
method: 'get'
})
}

14
src/router/index.js
View File

@ -157,6 +157,20 @@ export const dynamicRoutes = [
meta: { title: '修改生成配置', activeMenu: '/tool/gen' } meta: { title: '修改生成配置', activeMenu: '/tool/gen' }
} }
] ]
},
{
path: '/equipments/consumables',
component: Layout,
hidden: true,
permissions: ['equipment:consumables:list'],
children: [
{
path: 'index/:equipmentId(\\d+)',
component: () => import('@/views/equipments/consumables'),
name: 'Consumables',
meta: { title: '设备耗材', activeMenu: '/equipments' }
}
]
} }
] ]

362
src/views/equipments/consumables.vue
View File

@ -1,13 +1,21 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px"> <el-form
<el-form-item label="设备id" prop="equipmentId"> :model="queryParams"
<el-input ref="queryRef"
v-model="queryParams.equipmentId" :inline="true"
placeholder="请输入设备id" v-show="showSearch"
clearable label-width="68px"
@keyup.enter="handleQuery" >
/> <el-form-item label="设备" prop="equipmentId">
<el-select v-model="queryParams.equipmentId" @keyup.enter="handleQuery">
<el-option
v-for="item in equipmentOptions"
:key="item.equipmentId"
:label="item.equipmentName"
:value="item.equipmentId"
/>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="耗材名称" prop="consumableName"> <el-form-item label="耗材名称" prop="consumableName">
<el-input <el-input
@ -25,7 +33,7 @@
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="开始使用时间" prop="activationTime"> <!-- <el-form-item label="开始使用时间" prop="activationTime">
<el-date-picker clearable <el-date-picker clearable
v-model="queryParams.activationTime" v-model="queryParams.activationTime"
type="date" type="date"
@ -48,17 +56,21 @@
clearable clearable
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
/> />
</el-form-item> </el-form-item> -->
<el-form-item label="负责人，到期后通知其更换" prop="chargeUser"> <el-form-item label="负责人" prop="chargeUser">
<el-input <el-select v-model="form.chargeUser" placeholder="请选择负责人" @keyup.enter="handleQuery">
v-model="queryParams.chargeUser" <el-option
placeholder="请输入负责人，到期后通知其更换" v-for="item in userOptions"
clearable :key="item.userId"
@keyup.enter="handleQuery" :label="item.nickName"
/> :value="item.userId"
/>
</el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="Search" @click="handleQuery"
>搜索</el-button
>
<el-button icon="Refresh" @click="resetQuery">重置</el-button> <el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -70,8 +82,9 @@
plain plain
icon="Plus" icon="Plus"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['system:consumables:add']" v-hasPermi="['equipment:consumables:add']"
>新增</el-button> >新增</el-button
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@ -80,8 +93,9 @@
icon="Edit" icon="Edit"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['system:consumables:edit']" v-hasPermi="['equipment:consumables:edit']"
>修改</el-button> >修改</el-button
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@ -90,8 +104,9 @@
icon="Delete" icon="Delete"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['system:consumables:remove']" v-hasPermi="['equipment:consumables:remove']"
>删除</el-button> >删除</el-button
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@ -99,38 +114,77 @@
plain plain
icon="Download" icon="Download"
@click="handleExport" @click="handleExport"
v-hasPermi="['system:consumables:export']" v-hasPermi="['equipment:consumables:export']"
>导出</el-button> >导出</el-button
>
</el-col> </el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar
v-model:showSearch="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="consumablesList" @selection-change="handleSelectionChange"> <el-table
v-loading="loading"
:data="consumablesList"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="主键" align="center" prop="consumableId" v-if="true"/> <el-table-column
<el-table-column label="设备id" align="center" prop="equipmentId" /> label="主键"
align="center"
prop="consumableId"
v-if="true"
/>
<el-table-column label="设备" align="center" prop="equipmentId" />
<el-table-column label="耗材名称" align="center" prop="consumableName" /> <el-table-column label="耗材名称" align="center" prop="consumableName" />
<el-table-column label="耗材编号" align="center" prop="consumableNo" /> <el-table-column label="耗材编号" align="center" prop="consumableNo" />
<el-table-column label="开始使用时间" align="center" prop="activationTime" width="180"> <el-table-column
label="开始使用时间"
align="center"
prop="activationTime"
width="180"
>
<template #default="scope"> <template #default="scope">
<span>{{ parseTime(scope.row.activationTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.activationTime, "{y}-{m}-{d}") }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="使用期效" align="center" prop="validity" /> <el-table-column label="使用期效" align="center" prop="validity">
<el-table-column label="使用期效单位" align="center" prop="validityUint" /> <template #default="scope">
<el-table-column label="负责人，到期后通知其更换" align="center" prop="chargeUser" /> <span>{{ scope.row.validity }}{{ scope.row.validityUint }}</span>
<el-table-column label="状态 0正在使用，1已报废 2未使用过" align="center" prop="status" /> </template>
</el-table-column>
<el-table-column label="负责人" align="center" prop="chargeUser" />
<el-table-column label="状态" align="center" prop="status" />
<el-table-column label="备注" align="center" prop="remark" /> <el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column
<template #default="scope"> label="操作"
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:consumables:edit']">修改</el-button> align="center"
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:consumables:remove']">删除</el-button> class-name="small-padding fixed-width"
</template> >
<template #default="scope">
<el-button
link
type="primary"
icon="Edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:consumables:edit']"
>修改</el-button
>
<el-button
link
type="primary"
icon="Delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:consumables:remove']"
>删除</el-button
>
</template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total > 0"
:total="total" :total="total"
v-model:page="queryParams.pageNum" v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize" v-model:limit="queryParams.pageSize"
@ -139,40 +193,87 @@
<!-- 添加或修改设备耗材对话框 --> <!-- 添加或修改设备耗材对话框 -->
<el-dialog :title="title" v-model="open" width="500px" append-to-body> <el-dialog :title="title" v-model="open" width="500px" append-to-body>
<el-form ref="consumablesRef" :model="form" :rules="rules" label-width="80px"> <el-form
<el-form-item label="设备id" prop="equipmentId"> ref="consumablesRef"
<el-input v-model="form.equipmentId" placeholder="请输入设备id" /> :model="form"
:rules="rules"
label-width="120px"
>
<el-form-item label="设备" prop="equipmentId">
<el-select
v-model="defaultEquipment"
placeholder="请选择设备"
disabled
>
<el-option
v-for="item in equipmentOptions"
:key="item.equipmentId"
:label="item.equipmentName"
:value="item.equipmentId"
/>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="耗材名称" prop="consumableName"> <el-form-item label="耗材名称" prop="consumableName">
<el-input v-model="form.consumableName" placeholder="请输入耗材名称" /> <el-input
v-model="form.consumableName"
placeholder="请输入耗材名称"
/>
</el-form-item> </el-form-item>
<el-form-item label="耗材编号" prop="consumableNo"> <el-form-item label="耗材编号" prop="consumableNo">
<el-input v-model="form.consumableNo" placeholder="请输入耗材编号" /> <el-input v-model="form.consumableNo" placeholder="请输入耗材编号" />
</el-form-item> </el-form-item>
<el-form-item label="开始使用时间" prop="activationTime"> <el-form-item label="开始使用时间" prop="activationTime">
<el-date-picker clearable <el-date-picker
clearable
v-model="form.activationTime" v-model="form.activationTime"
type="datetime" type="datetime"
value-format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
placeholder="请选择开始使用时间"> placeholder="请选择开始使用时间"
>
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="使用期效" prop="validity"> <el-form-item label="使用期效" prop="validity">
<el-input v-model="form.validity" placeholder="请输入使用期效" /> <el-col :span="8">
<el-input
v-model="form.validity"
type="number"
placeholder="请输入使用期效"
/>
</el-col>
<el-col :span="4" style="margin-left: 5px">
<el-select v-model="form.validityUint">
<el-option
v-for="dict in sys_time_unit"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-col>
</el-form-item> </el-form-item>
<el-form-item label="使用期效单位" prop="validityUint"> <el-form-item label="负责人" prop="chargeUser">
<el-input v-model="form.validityUint" placeholder="请输入使用期效单位" /> <el-select v-model="form.chargeUser" placeholder="请选择负责人">
</el-form-item> <el-option
<el-form-item label="负责人，到期后通知其更换" prop="chargeUser"> v-for="item in userOptions"
<el-input v-model="form.chargeUser" placeholder="请输入负责人，到期后通知其更换" /> :key="item.userId"
:label="item.nickName"
:value="item.userId"
/>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" /> <el-input
v-model="form.remark"
type="textarea"
placeholder="请输入内容"
/>
</el-form-item> </el-form-item>
</el-form> </el-form>
<template #footer> <template #footer>
<div class="dialog-footer"> <div class="dialog-footer">
<el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button> <el-button :loading="buttonLoading" type="primary" @click="submitForm"
>确 定</el-button
>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
</div> </div>
</template> </template>
@ -181,8 +282,15 @@
</template> </template>
<script setup name="Consumables"> <script setup name="Consumables">
import { listConsumables, getConsumables, delConsumables, addConsumables, updateConsumables } from "@/api/system/consumables"; import {
listConsumables,
getConsumables,
delConsumables,
addConsumables,
updateConsumables,
} from "@/api/equipments/consumables";
import { optionSelect as getEquipmentOptionSelect } from "@/api/equipments/equipments";
import { userOptionsSelect as getUserOptionSelect } from "@/api/system/user";
const { proxy } = getCurrentInstance(); const { proxy } = getCurrentInstance();
const consumablesList = ref([]); const consumablesList = ref([]);
@ -195,6 +303,11 @@ const single = ref(true);
const multiple = ref(true); const multiple = ref(true);
const total = ref(0); const total = ref(0);
const title = ref(""); const title = ref("");
const defaultEquipment = ref("");
const equipmentOptions = ref([]);
const userOptions = ref([]);
const route = useRoute();
const { sys_time_unit } = proxy.useDict("sys_time_unit");
const data = reactive({ const data = reactive({
form: {}, form: {},
@ -212,50 +325,70 @@ const data = reactive({
}, },
rules: { rules: {
consumableId: [ consumableId: [
{ required: true, message: "主键不能为空", trigger: "blur" } { required: true, message: "主键不能为空", trigger: "blur" },
], ],
equipmentId: [ equipmentId: [
{ required: true, message: "设备id不能为空", trigger: "blur" } { required: true, message: "设备id不能为空", trigger: "blur" },
], ],
consumableName: [ consumableName: [
{ required: true, message: "耗材名称不能为空", trigger: "blur" } { required: true, message: "耗材名称不能为空", trigger: "blur" },
], ],
consumableNo: [ consumableNo: [
{ required: true, message: "耗材编号不能为空", trigger: "blur" } { required: false, message: "耗材编号不能为空", trigger: "blur" },
], ],
activationTime: [ activationTime: [
{ required: true, message: "开始使用时间不能为空", trigger: "blur" } { required: false, message: "开始使用时间不能为空", trigger: "blur" },
], ],
validity: [ validity: [
{ required: true, message: "使用期效不能为空", trigger: "blur" } { required: false, message: "使用期效不能为空", trigger: "blur" },
], ],
validityUint: [ validityUint: [
{ required: true, message: "使用期效单位不能为空", trigger: "blur" } { required: false, message: "使用期效单位不能为空", trigger: "blur" },
], ],
chargeUser: [ chargeUser: [
{ required: true, message: "负责人，到期后通知其更换不能为空", trigger: "blur" } {
required: false,
message: "负责人不能为空",
trigger: "blur",
},
], ],
status: [ status: [
{ required: true, message: "状态 0正在使用，1已报废 2未使用过不能为空", trigger: "change" } {
required: true,
message: "状态 0正在使用，1已报废 2未使用过不能为空",
trigger: "change",
},
], ],
remark: [ remark: [{ required: false, message: "备注不能为空", trigger: "blur" }],
{ required: true, message: "备注不能为空", trigger: "blur" } },
]
}
}); });
const { queryParams, form, rules } = toRefs(data); const { queryParams, form, rules } = toRefs(data);
function getEquipment(equipmentId) { function getEquipment(equipmentId) {
queryParams.value.equipmentId = equipmentId; queryParams.value.equipmentId = equipmentId;
defaultEquipment.value = equipmentId;
getList(); getList();
} }
/** 查询设备列表 */
function getEquipmentList() {
getEquipmentOptionSelect().then((response) => {
equipmentOptions.value = response.data;
});
}
/** 查询用户列表 */
function getUserList() {
getUserOptionSelect().then((response) => {
userOptions.value = response.data;
});
}
/** 查询设备耗材列表 */ /** 查询设备耗材列表 */
function getList() { function getList() {
loading.value = true; loading.value = true;
listConsumables(queryParams.value).then(response => { listConsumables(queryParams.value).then((response) => {
consumablesList.value = response.rows; consumablesList.value = response.rows;
total.value = response.total; total.value = response.total;
loading.value = false; loading.value = false;
@ -284,7 +417,7 @@ function reset() {
createTime: null, createTime: null,
updateBy: null, updateBy: null,
updateTime: null, updateTime: null,
remark: null remark: null,
}; };
proxy.resetForm("consumablesRef"); proxy.resetForm("consumablesRef");
} }
@ -303,7 +436,7 @@ function resetQuery() {
// 多选框选中数据 // 多选框选中数据
function handleSelectionChange(selection) { function handleSelectionChange(selection) {
ids.value = selection.map(item => item.consumableId); ids.value = selection.map((item) => item.consumableId);
single.value = selection.length != 1; single.value = selection.length != 1;
multiple.value = !selection.length; multiple.value = !selection.length;
} }
@ -317,10 +450,10 @@ function handleAdd() {
/** 修改按钮操作 */ /** 修改按钮操作 */
function handleUpdate(row) { function handleUpdate(row) {
loading.value = true loading.value = true;
reset(); reset();
const _consumableId = row.consumableId || ids.value const _consumableId = row.consumableId || ids.value;
getConsumables(_consumableId).then(response => { getConsumables(_consumableId).then((response) => {
loading.value = false; loading.value = false;
form.value = response.data; form.value = response.data;
open.value = true; open.value = true;
@ -330,25 +463,29 @@ function handleUpdate(row) {
/** 提交按钮 */ /** 提交按钮 */
function submitForm() { function submitForm() {
proxy.$refs["consumablesRef"].validate(valid => { proxy.$refs["consumablesRef"].validate((valid) => {
if (valid) { if (valid) {
buttonLoading.value = true; buttonLoading.value = true;
if (form.value.consumableId != null) { if (form.value.consumableId != null) {
updateConsumables(form.value).then(response => { updateConsumables(form.value)
proxy.$modal.msgSuccess("修改成功"); .then((response) => {
open.value = false; proxy.$modal.msgSuccess("修改成功");
getList(); open.value = false;
}).finally(() => { getList();
buttonLoading.value = false; })
}); .finally(() => {
buttonLoading.value = false;
});
} else { } else {
addConsumables(form.value).then(response => { addConsumables(form.value)
proxy.$modal.msgSuccess("新增成功"); .then((response) => {
open.value = false; proxy.$modal.msgSuccess("新增成功");
getList(); open.value = false;
}).finally(() => { getList();
buttonLoading.value = false; })
}); .finally(() => {
buttonLoading.value = false;
});
} }
} }
}); });
@ -357,26 +494,35 @@ function submitForm() {
/** 删除按钮操作 */ /** 删除按钮操作 */
function handleDelete(row) { function handleDelete(row) {
const _consumableIds = row.consumableId || ids.value; const _consumableIds = row.consumableId || ids.value;
proxy.$modal.confirm('是否确认删除设备耗材编号为"' + _consumableIds + '"的数据项？').then(function() { proxy.$modal
loading.value = true; .confirm('是否确认删除设备耗材编号为"' + _consumableIds + '"的数据项？')
return delConsumables(_consumableIds); .then(function () {
}).then(() => { loading.value = true;
loading.value = true; return delConsumables(_consumableIds);
getList(); })
proxy.$modal.msgSuccess("删除成功"); .then(() => {
}).catch(() => { loading.value = true;
}).finally(() => { getList();
loading.value = false; proxy.$modal.msgSuccess("删除成功");
}); })
.catch(() => {})
.finally(() => {
loading.value = false;
});
} }
/** 导出按钮操作 */ /** 导出按钮操作 */
function handleExport() { function handleExport() {
proxy.download('system/consumables/export', { proxy.download(
...queryParams.value "equipment/consumables/export",
}, `consumables_${new Date().getTime()}.xlsx`) {
...queryParams.value,
},
`consumables_${new Date().getTime()}.xlsx`
);
} }
getEquipment(route.params && route.params.equipmentId); getEquipment(route.params && route.params.equipmentId);
getList(); getEquipmentList();
getUserList();
</script> </script>

239
src/views/equipments/index.vue
View File

@ -1,6 +1,12 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="80px"> <el-form
:model="queryParams"
ref="queryRef"
:inline="true"
v-show="showSearch"
label-width="80px"
>
<el-form-item label="设备名称" prop="equipmentName"> <el-form-item label="设备名称" prop="equipmentName">
<el-input <el-input
v-model="queryParams.equipmentName" v-model="queryParams.equipmentName"
@ -44,7 +50,9 @@
/> />
</el-form-item> --> </el-form-item> -->
<el-form-item> <el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="Search" @click="handleQuery"
>搜索</el-button
>
<el-button icon="Refresh" @click="resetQuery">重置</el-button> <el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -56,8 +64,9 @@
plain plain
icon="Plus" icon="Plus"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['system:equipments:add']" v-hasPermi="['equipments:add']"
>新增</el-button> >新增</el-button
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@ -66,8 +75,9 @@
icon="Edit" icon="Edit"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['system:equipments:edit']" v-hasPermi="['equipments:edit']"
>修改</el-button> >修改</el-button
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@ -76,8 +86,9 @@
icon="Delete" icon="Delete"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['system:equipments:remove']" v-hasPermi="['equipments:remove']"
>删除</el-button> >删除</el-button
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@ -85,37 +96,68 @@
plain plain
icon="Download" icon="Download"
@click="handleExport" @click="handleExport"
v-hasPermi="['system:equipments:export']" v-hasPermi="['equipments:export']"
>导出</el-button> >导出</el-button
>
</el-col> </el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar
v-model:showSearch="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="equipmentsList" @selection-change="handleSelectionChange"> <el-table
v-loading="loading"
:data="equipmentsList"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="主键" align="center" prop="equipmentId" v-if="true"/> --> <!-- <el-table-column label="主键" align="center" prop="equipmentId" v-if="true"/> -->
<el-table-column label="设备名称" align="center" prop="equipmentName" > <el-table-column label="设备名称" align="center" :show-overflow-tooltip="true">
<template #default="scope"> <template #default="scope">
<router-link :to="'/equipments/consumables/index/' + scope.row.equipmentId" class="link-type"> <router-link :to="'/equipments/consumables/index/' + scope.row.equipmentId" class="link-type">
<span>{{ scope.row.equipmentName }}</span> <span>{{ scope.row.equipmentName }}</span>
</router-link> </router-link>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="序列号" align="center" prop="equipmentNo" /> <el-table-column label="序列号" align="center" prop="equipmentNo" />
<el-table-column label="供应商" align="center" prop="equipmentSupplier" /> <el-table-column label="供应商" align="center" prop="equipmentSupplier" />
<el-table-column label="所属科室" align="center" prop="department" /> <el-table-column label="所属科室" align="center" prop="department">
<template #default="scope">
<span>{{ scope.row.department }}</span>
</template>
</el-table-column>
<el-table-column label="所在位置" align="center" prop="location" /> <el-table-column label="所在位置" align="center" prop="location" />
<el-table-column label="备注" align="center" prop="remark" /> <el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column
<template #default="scope"> label="操作"
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['equipments:edit']">修改</el-button> align="center"
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['equipments:remove']">删除</el-button> class-name="small-padding fixed-width"
</template> >
<template #default="scope">
<el-button
link
type="primary"
icon="Edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['equipments:edit']"
>修改</el-button
>
<el-button
link
type="primary"
icon="Delete"
@click="handleDelete(scope.row)"
v-hasPermi="['equipments:remove']"
>删除</el-button
>
</template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total > 0"
:total="total" :total="total"
v-model:page="queryParams.pageNum" v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize" v-model:limit="queryParams.pageSize"
@ -124,7 +166,12 @@
<!-- 添加或修改设备对话框 --> <!-- 添加或修改设备对话框 -->
<el-dialog :title="title" v-model="open" width="500px" append-to-body> <el-dialog :title="title" v-model="open" width="500px" append-to-body>
<el-form ref="equipmentsRef" :model="form" :rules="rules" label-width="80px"> <el-form
ref="equipmentsRef"
:model="form"
:rules="rules"
label-width="80px"
>
<el-form-item label="设备名称" prop="equipmentName"> <el-form-item label="设备名称" prop="equipmentName">
<el-input v-model="form.equipmentName" placeholder="请输入设备名称" /> <el-input v-model="form.equipmentName" placeholder="请输入设备名称" />
</el-form-item> </el-form-item>
@ -132,21 +179,37 @@
<el-input v-model="form.equipmentNo" placeholder="请输入设备序列号" /> <el-input v-model="form.equipmentNo" placeholder="请输入设备序列号" />
</el-form-item> </el-form-item>
<el-form-item label="供应商" prop="equipmentSupplier"> <el-form-item label="供应商" prop="equipmentSupplier">
<el-input v-model="form.equipmentSupplier" placeholder="请输入设备供应商" /> <el-input
v-model="form.equipmentSupplier"
placeholder="请输入设备供应商"
/>
</el-form-item> </el-form-item>
<el-form-item label="所属科室" prop="department"> <el-form-item label="所属科室" prop="department">
<el-input v-model="form.department" placeholder="请输入所属科室" /> <el-tree-select
v-model="form.department"
:data="deptOptions"
:props="{ value: 'id', label: 'label', children: 'children' }"
value-key="id"
placeholder="请选择所属科室"
check-strictly
/>
</el-form-item> </el-form-item>
<el-form-item label="所在位置" prop="location"> <el-form-item label="所在位置" prop="location">
<el-input v-model="form.location" placeholder="请输入所在位置" /> <el-input v-model="form.location" placeholder="请输入所在位置" />
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" /> <el-input
v-model="form.remark"
type="textarea"
placeholder="请输入内容"
/>
</el-form-item> </el-form-item>
</el-form> </el-form>
<template #footer> <template #footer>
<div class="dialog-footer"> <div class="dialog-footer">
<el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button> <el-button :loading="buttonLoading" type="primary" @click="submitForm"
>确 定</el-button
>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
</div> </div>
</template> </template>
@ -155,8 +218,14 @@
</template> </template>
<script setup name="Equipments"> <script setup name="Equipments">
import { listEquipments, getEquipments, delEquipments, addEquipments, updateEquipments } from "@/api/equipments/equipments"; import {
import {deptTreeSelect} from "@/api/system/user" listEquipments,
getEquipments,
delEquipments,
addEquipments,
updateEquipments,
} from "@/api/equipments/equipments";
import { deptTreeSelect } from "@/api/system/user";
const { proxy } = getCurrentInstance(); const { proxy } = getCurrentInstance();
const equipmentsList = ref([]); const equipmentsList = ref([]);
@ -173,10 +242,10 @@ const deptOptions = ref([]);
/** 查询部门下拉树结构 */ /** 查询部门下拉树结构 */
function getDeptTree() { function getDeptTree() {
deptTreeSelect().then(response => { deptTreeSelect().then((response) => {
deptOptions.value = response.data; deptOptions.value = response.data;
}); });
}; }
const data = reactive({ const data = reactive({
form: {}, form: {},
@ -190,28 +259,24 @@ const data = reactive({
location: undefined, location: undefined,
}, },
rules: { rules: {
equipmentId: [ equipmentId: [{ required: true, message: "主键不能为空", trigger: "blur" }],
{ required: true, message: "主键不能为空", trigger: "blur" }
],
equipmentName: [ equipmentName: [
{ required: true, message: "设备名称不能为空", trigger: "blur" } { required: true, message: "设备名称不能为空", trigger: "blur" },
], ],
equipmentNo: [ equipmentNo: [
{ required: false, message: "设备序列号不能为空", trigger: "blur" } { required: false, message: "设备序列号不能为空", trigger: "blur" },
], ],
equipmentSupplier: [ equipmentSupplier: [
{ required: false, message: "设备供应商不能为空", trigger: "blur" } { required: false, message: "设备供应商不能为空", trigger: "blur" },
], ],
department: [ department: [
{ required: false, message: "所属科室不能为空", trigger: "blur" } { required: false, message: "所属科室不能为空", trigger: "blur" },
], ],
location: [ location: [
{ required: false, message: "所在位置不能为空", trigger: "blur" } { required: false, message: "所在位置不能为空", trigger: "blur" },
], ],
remark: [ remark: [{ required: false, message: "备注不能为空", trigger: "blur" }],
{ required: false, message: "备注不能为空", trigger: "blur" } },
]
}
}); });
const { queryParams, form, rules } = toRefs(data); const { queryParams, form, rules } = toRefs(data);
@ -219,7 +284,7 @@ const { queryParams, form, rules } = toRefs(data);
/** 查询设备列表 */ /** 查询设备列表 */
function getList() { function getList() {
loading.value = true; loading.value = true;
listEquipments(queryParams.value).then(response => { listEquipments(queryParams.value).then((response) => {
equipmentsList.value = response.rows; equipmentsList.value = response.rows;
total.value = response.total; total.value = response.total;
loading.value = false; loading.value = false;
@ -245,7 +310,7 @@ function reset() {
createTime: null, createTime: null,
updateBy: null, updateBy: null,
updateTime: null, updateTime: null,
remark: null remark: null,
}; };
proxy.resetForm("equipmentsRef"); proxy.resetForm("equipmentsRef");
} }
@ -264,7 +329,7 @@ function resetQuery() {
// 多选框选中数据 // 多选框选中数据
function handleSelectionChange(selection) { function handleSelectionChange(selection) {
ids.value = selection.map(item => item.equipmentId); ids.value = selection.map((item) => item.equipmentId);
single.value = selection.length != 1; single.value = selection.length != 1;
multiple.value = !selection.length; multiple.value = !selection.length;
} }
@ -278,10 +343,10 @@ function handleAdd() {
/** 修改按钮操作 */ /** 修改按钮操作 */
function handleUpdate(row) { function handleUpdate(row) {
loading.value = true loading.value = true;
reset(); reset();
const _equipmentId = row.equipmentId || ids.value const _equipmentId = row.equipmentId || ids.value;
getEquipments(_equipmentId).then(response => { getEquipments(_equipmentId).then((response) => {
loading.value = false; loading.value = false;
form.value = response.data; form.value = response.data;
open.value = true; open.value = true;
@ -291,25 +356,29 @@ function handleUpdate(row) {
/** 提交按钮 */ /** 提交按钮 */
function submitForm() { function submitForm() {
proxy.$refs["equipmentsRef"].validate(valid => { proxy.$refs["equipmentsRef"].validate((valid) => {
if (valid) { if (valid) {
buttonLoading.value = true; buttonLoading.value = true;
if (form.value.equipmentId != null) { if (form.value.equipmentId != null) {
updateEquipments(form.value).then(response => { updateEquipments(form.value)
proxy.$modal.msgSuccess("修改成功"); .then((response) => {
open.value = false; proxy.$modal.msgSuccess("修改成功");
getList(); open.value = false;
}).finally(() => { getList();
buttonLoading.value = false; })
}); .finally(() => {
buttonLoading.value = false;
});
} else { } else {
addEquipments(form.value).then(response => { addEquipments(form.value)
proxy.$modal.msgSuccess("新增成功"); .then((response) => {
open.value = false; proxy.$modal.msgSuccess("新增成功");
getList(); open.value = false;
}).finally(() => { getList();
buttonLoading.value = false; })
}); .finally(() => {
buttonLoading.value = false;
});
} }
} }
}); });
@ -318,24 +387,32 @@ function submitForm() {
/** 删除按钮操作 */ /** 删除按钮操作 */
function handleDelete(row) { function handleDelete(row) {
const _equipmentIds = row.equipmentId || ids.value; const _equipmentIds = row.equipmentId || ids.value;
proxy.$modal.confirm('是否确认删除设备编号为"' + _equipmentIds + '"的数据项？').then(function() { proxy.$modal
loading.value = true; .confirm('是否确认删除设备编号为"' + _equipmentIds + '"的数据项？')
return delEquipments(_equipmentIds); .then(function () {
}).then(() => { loading.value = true;
loading.value = true; return delEquipments(_equipmentIds);
getList(); })
proxy.$modal.msgSuccess("删除成功"); .then(() => {
}).catch(() => { loading.value = true;
}).finally(() => { getList();
loading.value = false; proxy.$modal.msgSuccess("删除成功");
}); })
.catch(() => {})
.finally(() => {
loading.value = false;
});
} }
/** 导出按钮操作 */ /** 导出按钮操作 */
function handleExport() { function handleExport() {
proxy.download('system/equipments/export', { proxy.download(
...queryParams.value "/equipments/export",
}, `equipments_${new Date().getTime()}.xlsx`) {
...queryParams.value,
},
`equipments_${new Date().getTime()}.xlsx`
);
} }
getDeptTree(); getDeptTree();
getList(); getList();

4
vite.config.js
View File

@ -24,13 +24,13 @@ export default defineConfig(({ mode, command }) => {
}, },
// vite 相关配置 // vite 相关配置
server: { server: {
port: 8089, port: 80,
host: true, host: true,
open: true, open: true,
proxy: { proxy: {
// https://cn.vitejs.dev/config/#server-proxy // https://cn.vitejs.dev/config/#server-proxy
'/dev-api': { '/dev-api': {
target: 'http://localhost:8082', target: 'http://localhost:8080',
changeOrigin: true, changeOrigin: true,
rewrite: (p) => p.replace(/^\/dev-api/, '') rewrite: (p) => p.replace(/^\/dev-api/, '')
} }