bonus
/
Zlpt_Portal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://192.168.0.56:3000/bonus/Zlpt_Portal

This commit is contained in:
BianLzhaoMin 2024-11-29 13:30:16 +08:00
parent b601e0a584 99ec2d950a
commit 835792270b
1 changed files with 42 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
src/views/user/goodsManagement/index.vue
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: '主展示图不得少于1张，不得多于6张'})
// 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>
@ -800,7 +804,7 @@
<el-input autocomplete="off" style="width: 850px" maxlength="30"
v-model="equipmentDeploymentParams.deviceName" clearable />
</el-form-item>
<el-row>
<el-row>
<el-form-item label="装备类目：" prop="deviceTypeList">
<el-cascader
v-model="equipmentDeploymentParams.deviceTypeList"
@ -815,40 +819,6 @@
@change="dialogTypeChange"
></el-cascader>
</el-form-item>
<el-form-item label="设备数量：" prop="deviceCount">
<el-input
@input="(v)=>(equipmentDeploymentParams.deviceCount=v.replace(/[^\d.]/g,''))"
v-model="equipmentDeploymentParams.deviceCount"
placeholder="请输入设备数量"
clearable maxlength="20"
style="width: 350px;" :disabled="countDisabled"
/>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="装备单位：" prop="unitName">
<el-input
autocomplete="off"
style="width: 350px" maxlength="20"
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">
<el-input
autocomplete="off"
style="width: 350px" maxlength="40"
v-model="equipmentDeploymentParams.code"
clearable />
</el-form-item>
<el-form-item label="所属公司：" prop="companyId">
<el-select
v-model="equipmentDeploymentParams.companyId"
@ -863,6 +833,41 @@
</el-select>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="设备数量：" prop="deviceCount">
<el-input
@input="(v)=>(equipmentDeploymentParams.deviceCount=v.replace(/[^\d.]/g,''))"
v-model="equipmentDeploymentParams.deviceCount"
placeholder="请输入设备数量"
clearable maxlength="20"
style="width: 350px;" :disabled="countDisabled"
/>
</el-form-item>
<el-form-item label="装备单位：" prop="unitName">
<el-input
autocomplete="off"
style="width: 350px" maxlength="20"
v-model="equipmentDeploymentParams.unitName"
clearable />
</el-form-item>
</el-row>
<el-row>
<el-form-item label="装备编号" prop="code">
<el-input
autocomplete="off"
style="width: 350px" maxlength="40"
v-model="equipmentDeploymentParams.code"
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="productionDate">
<el-date-picker