From f6290cf3aa9794fea7edb882ca034063c5afb919 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期二, 26 十一月 2024 15:03:01 +0800
Subject: [PATCH] -物料信息 工位信息 优化
---
billion-ui/src/views/main/da/paramCollection/index.vue | 107 ++++++++++++++++++++++-------------------------------
1 files changed, 45 insertions(+), 62 deletions(-)
diff --git a/billion-ui/src/views/main/da/paramCollection/index.vue b/billion-ui/src/views/main/da/paramCollection/index.vue
index 90eb342..f42a756 100644
--- a/billion-ui/src/views/main/da/paramCollection/index.vue
+++ b/billion-ui/src/views/main/da/paramCollection/index.vue
@@ -9,10 +9,20 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
+ <el-form-item label-width="120" label="閲囬泦鏃堕棿" prop="timeQuery">
+ <el-date-picker
+ v-model="queryParams.timeQuery"
+ 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 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>
- <el-button icon="el-icon-setting" size="mini" @click="toggleAdvancedSearch">楂樼骇鏌ヨ</el-button>
+ <el-button icon="el-icon-setting" size="mini" @click="toggleAdvancedSearch">楂樼骇鏌ヨ</el-button>
</el-form-item>
<transition name="fade">
<div v-if="advancedSearchVisible" class="advanced-search">
@@ -40,14 +50,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="閲囬泦鏃堕棿" prop="collectTime">
- <el-date-picker
- v-model="queryParams.collectTime"
- type="datetime"
- placeholder="璇烽�夋嫨閲囬泦鏃堕棿"
- value-format="yyyy-MM-dd HH:mm:ss"
- />
- </el-form-item>
<!-- 鍙互缁х画娣诲姞鍏朵粬楂樼骇鏌ヨ鏉′欢 -->
<el-row>
<el-col :span="24" style="text-align: right;">
@@ -59,38 +61,38 @@
</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:paramCollection: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:paramCollection: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:paramCollection:remove']"
- >鍒犻櫎</el-button>
- </el-col>
+<!-- <el-col :span="1.5">-->
+<!-- <el-button-->
+<!-- type="primary"-->
+<!-- plain-->
+<!-- icon="el-icon-plus"-->
+<!-- size="mini"-->
+<!-- @click="handleAdd"-->
+<!-- v-hasPermi="['da:paramCollection: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:paramCollection: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:paramCollection:remove']"-->
+<!-- >鍒犻櫎</el-button>-->
+<!-- </el-col>-->
<el-col :span="1.5">
<el-button
type="warning"
@@ -113,24 +115,6 @@
<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">
- </el-table-column>
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
- <template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handleUpdate(scope.row)"
- v-hasPermi="['da:paramCollection:edit']"
- >淇敼</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- v-hasPermi="['da:paramCollection:remove']"
- >鍒犻櫎</el-button>
- </template>
</el-table-column>
</el-table>
@@ -176,6 +160,7 @@
name: "ParamCollection",
data() {
return {
+ value1: "",
advancedSearchVisible: false,
// 閬僵灞�
loading: true,
@@ -203,6 +188,7 @@
locationCode: null,
paramCode: null,
paramName: null,
+ timeQuery: []
},
// 琛ㄥ崟鍙傛暟
form: {},
@@ -233,7 +219,6 @@
methods: {
toggleAdvancedSearch() {
this.advancedSearchVisible = !this.advancedSearchVisible;
-
},
/** 鏌ヨ鍙傛暟閲囬泦鍒楄〃 */
getList() {
@@ -260,8 +245,6 @@
paramValue: null,
collectTime: null
};
-
-
this.resetForm("form");
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
--
Gitblit v1.9.3