Merge branch 'anhui-mall-ui-test' of http://192.168.30.2:3000/bonus/bonus-ui into anhui-mall-ui-test

This commit is contained in:
zzyuan 2026-01-28 14:41:36 +08:00
commit dafa5b03a0
2 changed files with 304 additions and 438 deletions

View File

@ -138,14 +138,14 @@
<div class="status-operation-bar" style="margin-top: 15px;margin-bottom: 2px;"> <div class="status-operation-bar" style="margin-top: 15px;margin-bottom: 2px;">
<el-form <el-form
ref="queryForm" ref="queryForm"
label-width="110px" label-width="120px"
v-show="showSearch" v-show="showSearch"
:model="queryParams" :model="queryParams"
:rules="queryRules" :rules="queryRules"
style="margin-top: 10px;width: 100%;" style="margin-top: 10px;width: 100%;"
> >
<!-- 始终显示的查询条件 --> <!-- 始终显示的查询条件 -->
<el-row :gutter="15"> <el-row :gutter="20">
<!-- <el-col :span="6"> <!-- <el-col :span="6">
<el-form-item label="所属省份" prop="province"> <el-form-item label="所属省份" prop="province">
<el-select <el-select
@ -230,41 +230,44 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-row :gutter="20">
<el-form-item label="装备编码" prop="code"> <el-col :span="8">
<el-input v-model="queryParams.code" placeholder="请输入装备编码" clearable/> <el-form-item label="装备编码" prop="code">
</el-form-item> <el-input v-model="queryParams.code" placeholder="请输入装备编码" clearable/>
</el-col> </el-form-item>
<el-col :span="8"> </el-col>
<el-form-item label="生产日期" prop="productionDate"> <el-col :span="8">
<el-date-picker <el-form-item label="生产日期" prop="productionDate">
v-model="queryParams.productionDate" <el-date-picker
type="daterange" v-model="queryParams.productionDate"
unlink-panels type="daterange"
range-separator="至" unlink-panels
start-placeholder="开始日期" range-separator="至"
end-placeholder="结束日期" start-placeholder="开始日期"
value-format="yyyy-MM-dd" end-placeholder="结束日期"
clearable value-format="yyyy-MM-dd"
style="width: 100%" clearable
/> style="width: 100%"
</el-form-item> />
</el-col> </el-form-item>
<el-col :span="8"> </el-col>
<el-form-item label="采购日期" prop="purchaseDate"> <el-col :span="8">
<el-date-picker <el-form-item label="采购日期" prop="purchaseDate">
v-model="queryParams.purchaseDate" <el-date-picker
type="daterange" v-model="queryParams.purchaseDate"
unlink-panels type="daterange"
range-separator="至" unlink-panels
start-placeholder="开始日期" range-separator="至"
end-placeholder="结束日期" start-placeholder="开始日期"
value-format="yyyy-MM-dd" end-placeholder="结束日期"
clearable value-format="yyyy-MM-dd"
style="width: 100%" clearable
/> style="width: 100%"
</el-form-item> />
</el-col> </el-form-item>
</el-col>
</el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="资产原值(万元)" prop="originalValue"> <el-form-item label="资产原值(万元)" prop="originalValue">
<el-input-number <el-input-number
@ -273,7 +276,7 @@
clearable clearable
:controls="false" :controls="false"
:min="0" :min="0"
style="width: 150px" style="width: 100%"
/> />
<span> - </span> <span> - </span>
<el-input-number <el-input-number
@ -282,7 +285,7 @@
clearable clearable
:controls="false" :controls="false"
:min="0" :min="0"
style="width: 150px" style="width: 100%"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>

File diff suppressed because it is too large Load Diff