From cc077cba0e6a0c1d9ec11af6c89ee5c898cee423 Mon Sep 17 00:00:00 2001
From: gaosp <gaosp>
Date: 星期三, 17 一月 2024 00:25:06 +0800
Subject: [PATCH] updatte
---
src/container/ledger/index.vue | 41 ++++++++++++++++++++++++++---------------
1 files changed, 26 insertions(+), 15 deletions(-)
diff --git a/src/container/ledger/index.vue b/src/container/ledger/index.vue
index 8f1aff7..84dd4a1 100644
--- a/src/container/ledger/index.vue
+++ b/src/container/ledger/index.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-01-06 17:40:19
* @LastEditors: Sneed
- * @LastEditTime: 2024-01-14 18:56:40
+ * @LastEditTime: 2024-01-17 00:21:37
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/mdc/src/container/ledger/index.vue
-->
<template>
@@ -11,26 +11,26 @@
<template slot="search">
<div class="item">
<span>缁熶竴缂栧彿</span>
- <el-input class="item-value" v-model="queryInfo.uuid"></el-input>
+ <el-input class="item-value" v-model="queryInfo.uuid" clearable></el-input>
</div>
<div class="item">
<span>璁惧瑙勬牸</span>
- <el-input class="item-value" v-model="queryInfo.specification"></el-input>
+ <el-input class="item-value" v-model="queryInfo.specification" clearable></el-input>
</div>
<div class="item">
<span>璁惧鍨嬪彿</span>
- <el-input class="item-value" v-model="queryInfo.type"></el-input>
+ <el-input class="item-value" v-model="queryInfo.type" clearable></el-input>
</div>
<div class="item">
<span>鍔犲伐绫诲瀷</span>
- <el-select class="item-value" v-model="queryInfo.category" placeholder="">
+ <el-select class="item-value" v-model="queryInfo.category" placeholder="" clearable>
<el-option v-for="item in deviceType" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</div>
<div class="item">
<span>璐﹀姟灞炴��</span>
- <el-select class="item-value" v-model="queryInfo.accountingAttribute" placeholder="">
+ <el-select class="item-value" v-model="queryInfo.accountingAttribute" placeholder="" clearable>
<el-option v-for="item in accountingAttribute" :key="item.value" :label="item.label"
:value="item.value">
</el-option>
@@ -38,14 +38,14 @@
</div>
<div class="item">
<span>浣跨敤閮ㄩ棬</span>
- <el-select class="item-value" v-model="queryInfo.department">
+ <el-select class="item-value" v-model="queryInfo.department" clearable>
<el-option v-for="item in departmentlist" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</div>
<div class="item">
<span>璁惧绠＄悊鍒嗙被</span>
- <el-select class="item-value" v-model="queryInfo.manageType">
+ <el-select class="item-value" v-model="queryInfo.manageType" clearable>
<el-option value="A">A</el-option>
<el-option value="B">B</el-option>
<el-option value="C">C</el-option>
@@ -54,17 +54,22 @@
<div class="item">
<span>鎶曚骇鏃ユ湡</span>
<el-date-picker class="item-value" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
- v-model="queryInfo.productionDate" type="date" clearable placeholder="閫夋嫨鏃ユ湡"></el-date-picker>
+ v-model="queryInfo.productionDate" type="date" clearable placeholder="閫夋嫨鏃ユ湡" clearable></el-date-picker>
</div>
<div class="item">
<span>鐢熶骇鍘傚</span>
- <el-input class="item-value" v-model="queryInfo.manufacturer"></el-input>
+ <el-input class="item-value" v-model="queryInfo.manufacturer" clearable></el-input>
</div>
<div class="item">
+ <span>璁惧绫诲瀷</span>
+ <el-select class="item-value" v-model="queryInfo.deviceTypeId" placeholder="" clearable>
+ <el-option v-for="item in deviceTypeIds" :key="item.id" :label="item.name"
+ :value="item.id">
+ </el-option>
+ </el-select>
+ </div>
+ <div class="item" style="flex: 1 1 auto;justify-content: flex-end;">
<el-button type="primary" size="small" @click="query">鏌ヨ</el-button>
- <!-- <div class="query btn" @click="query">鏌ヨ</div> -->
- </div>
- <div class="item">
<el-button type="primary" size="small" @click="reset">閲嶇疆</el-button>
<!-- <div class="reset btn" @click="reset">閲嶇疆</div> -->
</div>
@@ -94,7 +99,7 @@
align="center"
prop="classes">
</el-table-column> -->
- <el-table-column label="浣跨敤閮ㄩ棬" align="center" prop="department">
+ <el-table-column label="浣跨敤閮ㄩ棬" align="center" prop="departmentName">
</el-table-column>
<el-table-column label="璁惧绫诲瀷" align="center" prop="category">
</el-table-column>
@@ -136,7 +141,7 @@
</List>
<manage-add-update v-if="addOrUpdateVisible" :addVisible="addOrUpdateVisible" @close="close" @confirm="confirm"
:deviceType="deviceType" :departmentlist="departmentlist" :isselectlist="isselectlist"
- :deviceStatus="deviceStatus" :financePro="financePro" :row="row"></manage-add-update>
+ :deviceStatus="deviceStatus" :financePro="financePro" :deviceTypeIds="deviceTypeIds" :row="row"></manage-add-update>
</div>
</template>
<script>
@@ -179,6 +184,7 @@
{ value: 'IDLE', label: '绌洪棽' },
{ value: 'ALARM', label: '鎶ヨ' }
],
+ deviceTypeIds: [],
// 璐﹀姟灞炴��
financePro: [
{ value: '甯愬唴', label: '甯愬唴' },
@@ -195,6 +201,7 @@
manageType: '',
productionDate: '',
manufacturer: '',
+ deviceTypeId: ''
},
options: [{}],
row: {},
@@ -216,6 +223,10 @@
}
})
})
+
+ getRequest('deviceTypeList').then(res => {
+ this.deviceTypeIds = res.data || []
+ })
},
query() {
this.$refs.list.pageQuery(this.queryInfo)
--
Gitblit v1.9.3