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

代码合并

This commit is contained in:
BianLzhaoMin 2024-12-02 18:46:22 +08:00
parent 558691e218 676edb43bd
commit 0e48968c9a
1 changed files with 112 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

166
src/views/user/goodsManagement/index.vue
View File

@ -441,9 +441,10 @@ const equipRules = ref({
trigger: 'blur', trigger: 'blur',
}, },
], ],
// deviceWeight: [// deviceWeight: [
// { required: true, message: "整机重量不能为空", trigger: "blur" } //
// ], { required: true, message: '整机重量不能为空', trigger: 'blur' },
],
}) })
// 弹框保存提交 // 弹框保存提交
const submitBtn = () => { const submitBtn = () => {
@ -691,55 +692,107 @@ const handleRemove = (list: any, index: Number) => {
<template> <template>
<!-- 样式修改 --> <!-- 样式修改 -->
<!-- 商品管理 --> <!-- 商品管理 -->
<el-form :model="queryParams" ref="queryFormRef" :inline="true" size="default" label-width="0">
<!-- 表单搜索 -->
<el-row>
<el-col :span="6">
<el-form-item prop="deviceName">
<el-input
v-model.trim="queryParams.deviceName"
style="width: 100%"
clearable
placeholder="请输入装备名称"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item prop="code">
<el-input
v-model.trim="queryParams.code"
style="width: 100%"
clearable
placeholder="请输入装备编号"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item prop="maStatus">
<el-select
style="width: 100%"
v-model="queryParams.maStatus"
clearable
placeholder="请选择装备状态"
>
<el-option label="草稿状态" value="0"></el-option>
<el-option label="上架" value="1"></el-option>
<el-option label="下架" value="2"></el-option>
<el-option label="在租" value="3"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item prop="deviceTypeList">
<el-cascader
v-model="deviceTypeList"
:show-all-levels="false"
:options="deviceTypeTree"
:props="partTypeTreeProps"
filterable
clearable
collapse-tags
style="width: 100%"
placeholder="请选择装备类目"
ref="deviceTypeCascader"
@change="deviceTypeChange"
></el-cascader>
</el-form-item>
</el-col>
</el-row>
<el-form :model="queryParams" ref="queryFormRef" :inline="true" size="small" label-width="auto"> <el-row>
<el-form-item label="装备名称：" prop="deviceName"> <el-col :span="6">
<el-input v-model.trim="queryParams.deviceName" style="width: 160px" clearable /> <el-form-item prop="dateRange">
</el-form-item> <el-date-picker
<el-form-item label="装备编号：" prop="code"> style="width: 100%"
<el-input v-model.trim="queryParams.code" style="width: 160px" clearable /> v-model="dateRange"
</el-form-item> type="datetimerange"
<el-form-item label="装备状态：" prop="maStatus"> value-format="yyyy-MM-dd HH:mm:ss"
<el-select style="width: 160px" v-model="queryParams.maStatus" clearable> range-separator="至"
<el-option label="草稿状态" value="0"></el-option> start-placeholder="更新开始日期"
<el-option label="上架" value="1"></el-option> end-placeholder="更新结束日期"
<el-option label="下架" value="2"></el-option> >
<el-option label="在租" value="3"></el-option> </el-date-picker>
</el-select> </el-form-item>
</el-form-item> </el-col>
<el-form-item label="装备类目：" prop="deviceTypeList"> <el-col :span="18">
<el-cascader <el-form-item>
v-model="deviceTypeList" <el-button class="primary-lease" type="primary" @click="queryTableList"
:show-all-levels="false" >查询</el-button
:options="deviceTypeTree" >
:props="partTypeTreeProps" <el-button
filterable class="primary-lease"
clearable type="primary"
collapse-tags @click="resetTableList(queryFormRef)"
style="width: 160px" >重置</el-button
placeholder="请选择装备类目" >
ref="deviceTypeCascader" <el-button class="primary-lease" type="primary" @click="equipmentDeployment"
@change="deviceTypeChange" >装备新增</el-button
></el-cascader> >
</el-form-item> <el-button
<el-form-item label="更新时间：" prop="dateRange"> class="primary-lease"
<el-date-picker type="primary"
v-model="dateRange" @click="handleUpdateUpDown(null, 2)"
type="datetimerange" >批量上架</el-button
value-format="yyyy-MM-dd HH:mm:ss" >
range-separator="至" <el-button
start-placeholder="开始日期" class="primary-lease"
end-placeholder="结束日期" type="primary"
> @click="handleUpdateUpDown(null, 1)"
</el-date-picker> >批量下架</el-button
</el-form-item> >
<el-form-item> </el-form-item>
<el-button type="primary" @click="queryTableList">查询</el-button> </el-col>
<el-button type="success" @click="resetTableList(queryFormRef)">重置</el-button> </el-row>
<el-button type="primary" @click="equipmentDeployment">装备新增</el-button>
<el-button type="warning" @click="handleUpdateUpDown(null, 2)">批量上架</el-button>
<el-button type="warning" @click="handleUpdateUpDown(null, 1)">批量下架</el-button>
</el-form-item>
</el-form> </el-form>
<!-- 表格 --> <!-- 表格 -->
@ -748,8 +801,7 @@ const handleRemove = (list: any, index: Number) => {
style="width: auto" style="width: auto"
row-key="maId" row-key="maId"
show-overflow-tooltip show-overflow-tooltip
max-height="400px" :header-cell-style="{ background: '#00a288', color: '#fff' }"
:header-cell-style="{ background: '#3E98FF', color: '#fff' }"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="55" align="center" :reserve-selection="true" /> <el-table-column type="selection" width="55" align="center" :reserve-selection="true" />
@ -927,7 +979,8 @@ const handleRemove = (list: any, index: Number) => {
<!-- <el-form-item label="装备编号" prop="code"> <!-- <el-form-item label="装备编号" prop="code">
<el-input <el-input
autocomplete="off" autocomplete="off"
style="width: 350px" maxlength="40" style="width: 350px"
maxlength="40"
v-model="equipmentDeploymentParams.code" v-model="equipmentDeploymentParams.code"
clearable clearable
/> />
@ -1390,4 +1443,9 @@ const handleRemove = (list: any, index: Number) => {
font-size: 12px; font-size: 12px;
margin-left: 20px; margin-left: 20px;
} }
:deep.el-form--inline .el-form-item {
margin-right: 6px;
width: 95%;
}
</style> </style>