装备列表问题修改

This commit is contained in:
zzyuan 2024-11-29 13:24:49 +08:00
parent da38da94dd
commit 171f694db1
2 changed files with 30 additions and 24 deletions

View File

@ -4,7 +4,7 @@ import { get, post, put } from '../../index'
// 获取装备列表
export const getEquipmentListApi = (data: any) => {
return get('/material-mall/dev/devList', data)
return post('/material-mall/dev/devList', data)
}
//获取装备详情

View File

@ -482,6 +482,10 @@
} else {
equipmentDeploymentParams.value.typeId = ""
}
if(equipmentDeploymentParams.value.deviceName==""||equipmentDeploymentParams.value.companyId==""){
ElMessage({type: 'error',message: '保存草稿请至少填写装备名称及所属公司!'})
return
}
// if(mainFileList.value.length==0||mainFileList.value.length>6){
// ElMessage({type: 'error',message: '16'})
// return
@ -676,7 +680,7 @@
<el-form-item label="装备名称:" prop="deviceName">
<el-input v-model.trim="queryParams.deviceName" style="width: 160px" clearable />
</el-form-item>
<el-form-item label="装备编" prop="code">
<el-form-item label="装备编" prop="code">
<el-input v-model.trim="queryParams.code" style="width: 160px" clearable />
</el-form-item>
<el-form-item label="装备状态:" prop="maStatus">
@ -726,7 +730,7 @@
<el-table-column type="selection" width="55" align="center" :reserve-selection="true"/>
<el-table-column label="序号" align="center" width="80" type="index"></el-table-column>
<el-table-column align="center" prop="deviceName" label="装备名称" />
<el-table-column align="center" prop="code" label="编码" />
<el-table-column align="center" prop="code" label="装备编号" />
<el-table-column align="center" prop="typeName" label="装备类目">
<template #default="{ row }">
<span>{{ row.firstName }} <span v-show="row.firstName">></span> {{ row.secondName }}<span v-show="row.secondName">></span>{{ row.thirdName }}</span>
@ -801,6 +805,19 @@
v-model="equipmentDeploymentParams.deviceName" clearable />
</el-form-item>
<el-row>
<el-form-item label="所属公司:" prop="companyId">
<el-select
v-model="equipmentDeploymentParams.companyId"
placeholder="请选择所属公司"
clearable style="width: 350px">
<el-option
v-for="item in companyDataList"
:key="item.companyId"
:label="item.companyName"
:value="item.companyId"
/>
</el-select>
</el-form-item>
<el-form-item label="装备类目:" prop="deviceTypeList">
<el-cascader
v-model="equipmentDeploymentParams.deviceTypeList"
@ -815,6 +832,9 @@
@change="dialogTypeChange"
></el-cascader>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="设备数量:" prop="deviceCount">
<el-input
@input="(v)=>(equipmentDeploymentParams.deviceCount=v.replace(/[^\d.]/g,''))"
@ -824,8 +844,6 @@
style="width: 350px;" :disabled="countDisabled"
/>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="装备单位:" prop="unitName">
<el-input
autocomplete="off"
@ -833,13 +851,7 @@
v-model="equipmentDeploymentParams.unitName"
clearable />
</el-form-item>
<el-form-item label="装备品牌" prop="brand">
<el-input
v-model="equipmentDeploymentParams.brand"
autocomplete="off" maxlength="20"
style="width: 350px"
clearable />
</el-form-item>
</el-row>
<el-row>
<el-form-item label="装备编号" prop="code">
@ -849,18 +861,12 @@
v-model="equipmentDeploymentParams.code"
clearable />
</el-form-item>
<el-form-item label="所属公司:" prop="companyId">
<el-select
v-model="equipmentDeploymentParams.companyId"
placeholder="请选择所属公司"
clearable style="width: 350px">
<el-option
v-for="item in companyDataList"
:key="item.companyId"
:label="item.companyName"
:value="item.companyId"
/>
</el-select>
<el-form-item label="装备品牌" prop="brand">
<el-input
v-model="equipmentDeploymentParams.brand"
autocomplete="off" maxlength="20"
style="width: 350px"
clearable />
</el-form-item>
</el-row>
<el-row>