From ae6879a7575f79d814c70781e6efc1b6218f3732 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期五, 14 三月 2025 14:10:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
billion-ui/src/views/main/da/materialCollection/index.vue | 70 ++++++----------------------------
1 files changed, 13 insertions(+), 57 deletions(-)
diff --git a/billion-ui/src/views/main/da/materialCollection/index.vue b/billion-ui/src/views/main/da/materialCollection/index.vue
index 7ab4717..bea8161 100644
--- a/billion-ui/src/views/main/da/materialCollection/index.vue
+++ b/billion-ui/src/views/main/da/materialCollection/index.vue
@@ -9,30 +9,16 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="宸ヤ綅缂栫爜" prop="locationCode">
- <el-input
- v-model="queryParams.locationCode"
- placeholder="璇疯緭鍏ュ伐浣嶇紪鐮�"
- clearable
- @keyup.enter.native="handleQuery"
- />
+ <el-form-item label-width="120" label="閲囬泦鏃堕棿">
+ <el-date-picker
+ v-model="dateRange"
+ type="datetimerange"
+ range-separator="鑷�"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡">
+ </el-date-picker>
</el-form-item>
-<!-- <el-form-item label="鍙傛暟缂栫爜" prop="paramCode">-->
-<!-- <el-input-->
-<!-- v-model="queryParams.paramCode"-->
-<!-- placeholder="璇疯緭鍏ュ弬鏁扮紪鐮�"-->
-<!-- clearable-->
-<!-- @keyup.enter.native="handleQuery"-->
-<!-- />-->
-<!-- </el-form-item>-->
-<!-- <el-form-item label="鍙傛暟鍚嶇О" prop="paramName">-->
-<!-- <el-input-->
-<!-- v-model="queryParams.paramName"-->
-<!-- placeholder="璇疯緭鍏ュ弬鏁板悕绉�"-->
-<!-- clearable-->
-<!-- @keyup.enter.native="handleQuery"-->
-<!-- />-->
-<!-- </el-form-item>-->
<el-form-item style="float: right">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
@@ -40,38 +26,6 @@
</el-form>
<el-row :gutter="10" class="mb8">
-<!-- <el-col :span="1.5">-->
-<!-- <el-button-->
-<!-- type="primary"-->
-<!-- plain-->
-<!-- icon="el-icon-plus"-->
-<!-- size="mini"-->
-<!-- @click="handleAdd"-->
-<!-- v-hasPermi="['da:materialCollection:add']"-->
-<!-- >鏂板</el-button>-->
-<!-- </el-col>-->
-<!-- <el-col :span="1.5">-->
-<!-- <el-button-->
-<!-- type="success"-->
-<!-- plain-->
-<!-- icon="el-icon-edit"-->
-<!-- size="mini"-->
-<!-- :disabled="single"-->
-<!-- @click="handleUpdate"-->
-<!-- v-hasPermi="['da:materialCollection:edit']"-->
-<!-- >淇敼</el-button>-->
-<!-- </el-col>-->
-<!-- <el-col :span="1.5">-->
-<!-- <el-button-->
-<!-- type="danger"-->
-<!-- plain-->
-<!-- icon="el-icon-delete"-->
-<!-- size="mini"-->
-<!-- :disabled="multiple"-->
-<!-- @click="handleDelete"-->
-<!-- v-hasPermi="['da:materialCollection:remove']"-->
-<!-- >鍒犻櫎</el-button>-->
-<!-- </el-col>-->
<el-col :span="1.5">
<el-button
type="warning"
@@ -89,7 +43,6 @@
<!-- <el-table-column label="涓婚敭id" align="center" prop="id" />-->
<el-table-column label="鎬绘垚搴忓垪鍙�" align="center" prop="sfcCode" />
<el-table-column label="宸ヤ綅缂栫爜" align="center" prop="locationCode" />
- <el-table-column label="鍙傛暟缂栫爜" align="center" prop="paramCode" />
<el-table-column label="鍙傛暟鍚嶇О" align="center" prop="paramName" />
<el-table-column label="鍙傛暟鍊�" align="center" prop="paramValue" />
<el-table-column label="閲囬泦鏃堕棿" align="center" prop="collectTime" width="180">
@@ -138,6 +91,8 @@
name: "MaterialCollection",
data() {
return {
+ // 鏃ユ湡鑼冨洿
+ dateRange: [],
// 閬僵灞�
loading: true,
// 閫変腑鏁扮粍
@@ -179,7 +134,7 @@
/** 鏌ヨ鐗╂枡閲囬泦鍒楄〃 */
getList() {
this.loading = true;
- listMaterialCollection(this.queryParams).then(response => {
+ listMaterialCollection(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
this.materialCollectionList = response.rows;
this.total = response.total;
this.loading = false;
@@ -205,6 +160,7 @@
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
+ this.dateRange = [];
this.queryParams.pageNum = 1;
this.getList();
},
--
Gitblit v1.9.3