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

Merge remote-tracking branch 'origin/anhui-mall-ui-test' into anhui-mall-ui-test

This commit is contained in:
syruan 2025-12-17 11:12:09 +08:00
parent c3269ee876 626155d519
commit f760c90592
7 changed files with 42 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/views/EquipmentEntryApply/equipmentInput/index.vue
View File

@ -27,26 +27,6 @@
<el-form :model="queryParams" ref="queryFormRef" :inline="true" inline label-width="auto" size="small">
<el-card class="search-box">
<el-row>
<el-form-item prop="orderCreateUser" label="申请人">
<el-input
clearable
style="width: 200px"
placeholder="请输入内容"
v-model.trim="queryParams.orderCreateUser"
/>
</el-form-item>
<el-form-item label="申请时间" prop="orderCreateTime">
<el-date-picker
type="daterange"
style="width: 200px"
unlink-panels
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd"
v-model="queryParams.orderCreateTime"
/>
</el-form-item>
<el-form-item label="审批状态" prop="status">
<el-select clearable style="width: 200px" placeholder="请选择审批状态" v-model="queryParams.status">

16
src/views/EquipmentEntryApproval/EquipmentDetailList.vue
View File

@ -4,7 +4,7 @@
:model="queryParams"
ref="queryFormRef"
inline
label-width="auto"
label-width="110px"
size="small"
>
<!-- 表单搜索 -->
@ -109,11 +109,11 @@
/>
</el-form-item>-->
<el-col :span="6">
<!-- <el-col :span="6"> -->
<el-form-item prop="originalValue" label="资产原值(万元)">
<el-input
clearable
style="width: 105px"
style="width: 103px"
placeholder="请输入"
v-model.trim="queryParams.minOriginalValue"
/>
@ -122,22 +122,24 @@
<el-form-item prop="maxOriginalValue">
<el-input
clearable
style="width: 105px"
style="width: 103px"
placeholder="请输入"
v-model.trim="queryParams.maxOriginalValue"
/>
</el-form-item>
</el-col>
<!-- </el-col> -->
<el-col :span="18" style="text-align: right;">
<!-- <el-col :span="18" style="text-align: right;"> -->
<el-form-item style="display: flex; justify-content: flex-end">
<el-button class="primary-lease" size="mini" type="primary" icon="el-icon-search" @click="getEquipmentApplyList">
查询
</el-button>
<el-button class="primary-lease" size="mini" icon="el-icon-refresh" @click="resetForm">
重置
</el-button>
</el-col>
</el-form-item>
<!-- </el-col> -->
</el-row>
</el-card>
</el-form>

5
src/views/EquipmentRoamRecord/maintenanceRecord/index.vue
View File

@ -212,9 +212,12 @@ export default {
methods: {
// 获取流转记录列表
async getRoamRecordList() {
if (this.dateRange.length > 0) {
if (this.dateRange&&this.dateRange.length > 0) {
this.queryParams.startTime = this.dateRange[0]
this.queryParams.endTime = this.dateRange[1]
}else{
this.queryParams.startTime = ''
this.queryParams.endTime = ''
}
const res = await getRoamRecordListAPI(this.queryParams)
this.tableData = res.rows

7
src/views/EquipmentRoamRecord/outboundRecord/index.vue
View File

@ -221,9 +221,12 @@ export default {
methods: {
// 获取流转记录列表
async getRoamRecordList() {
if (this.dateRange.length > 0) {
if (this.dateRange && this.dateRange.length > 0) {
this.queryParams.startTime = this.dateRange[0]
this.queryParams.endTime = this.dateRange[1]
}else{
this.queryParams.startTime = ''
this.queryParams.endTime = ''
}
const res = await getRoamRecordListAPI(this.queryParams)
this.tableData = res.rows
@ -247,7 +250,7 @@ export default {
// 重置
onHandleReset() {
this.queryParams = { keyWord: '', type: '', startTime: '', endTime: '', pageNum: 1, pageSize: 10 }
this.queryParams = { keyWord: '', type: '2', startTime: '', endTime: '', pageNum: 1, pageSize: 10 }
this.dateRange = []
this.getRoamRecordList()
},

5
src/views/EquipmentRoamRecord/retirementRecord/index.vue
View File

@ -222,9 +222,12 @@ export default {
methods: {
// 获取流转记录列表
async getRoamRecordList() {
if (this.dateRange.length > 0) {
if (this.dateRange&&this.dateRange.length > 0) {
this.queryParams.startTime = this.dateRange[0]
this.queryParams.endTime = this.dateRange[1]
}else{
this.queryParams.startTime = ''
this.queryParams.endTime = ''
}
const res = await getRoamRecordListAPI(this.queryParams)
this.tableData = res.rows

5
src/views/EquipmentRoamRecord/returnRecord/index.vue
View File

@ -212,9 +212,12 @@ export default {
methods: {
// 获取流转记录列表
async getRoamRecordList() {
if (this.dateRange.length > 0) {
if (this.dateRange &&this.dateRange.length > 0) {
this.queryParams.startTime = this.dateRange[0]
this.queryParams.endTime = this.dateRange[1]
}else{
this.queryParams.startTime = ''
this.queryParams.endTime = ''
}
const res = await getRoamRecordListAPI(this.queryParams)
this.tableData = res.rows

20
src/views/EquipmentServicing/index.vue
View File

@ -512,14 +512,20 @@ export default {
// 获取列表数据
async getLeaseListData() {
// 处理日期范围
if (this.qcTime.length > 0) {
if (this.qcTime &&this.qcTime.length > 0) {
console.log(this.qcTime)
this.searchParams.qcStartTime = this.qcTime[0]
this.searchParams.qcEndTime = this.qcTime[1]
}else{
this.searchParams.qcStartTime = ''
this.searchParams.qcEndTime = ''
}
if (this.createTime.length > 0) {
if (this.createTime && this.createTime.length > 0) {
this.searchParams.createStartTime = this.createTime[0]
this.searchParams.createEndTime = this.createTime[1]
}else{
this.searchParams.createStartTime = ''
this.searchParams.createEndTime = ''
}
try {
@ -610,13 +616,19 @@ export default {
// 获取详情列表数据
async getLeaseListDataInDialog() {
// 处理日期范围
if (this.qcTime_1.length > 0) {
if (this.qcTime_1 && this.qcTime_1.length > 0) {
this.searchParamsInDialog.qcStartTime = this.qcTime_1[0]
this.searchParamsInDialog.qcEndTime = this.qcTime_1[1]
}else{
this.searchParamsInDialog.qcStartTime = ''
this.searchParamsInDialog.qcEndTime = ''
}
if (this.createTime_1.length > 0) {
if (this.createTime_1 &&this.createTime_1.length > 0) {
this.searchParamsInDialog.createStartTime = this.createTime_1[0]
this.searchParamsInDialog.createEndTime = this.createTime_1[1]
}else{
this.searchParamsInDialog.createStartTime = ''
this.searchParamsInDialog.createEndTime = ''
}
try {