From 24a64475ee9582f0f09f899b7800a4f7101eaa30 Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期二, 09 一月 2024 14:25:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-ui/src/views/main/da/paramCollection/index.vue | 167 +++++++++++++++++++++++++------------------------------
1 files changed, 76 insertions(+), 91 deletions(-)
diff --git a/jcdm-ui/src/views/main/da/paramCollection/index.vue b/jcdm-ui/src/views/main/da/paramCollection/index.vue
index 223ef78..4c028d8 100644
--- a/jcdm-ui/src/views/main/da/paramCollection/index.vue
+++ b/jcdm-ui/src/views/main/da/paramCollection/index.vue
@@ -1,28 +1,71 @@
<template>
<div class="app-container">
<el-card class="box-card">
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
- <el-form-item label="浜у搧缂栫爜" prop="productCode">
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+ <el-form-item label="鎬绘垚搴忓垪鍙�" prop="sfcCode">
<el-input
- v-model="queryParams.productCode"
- placeholder="璇疯緭鍏ヤ骇鍝佺紪鐮�"
+ v-model="queryParams.sfcCode"
+ placeholder="璇疯緭鍏ユ�绘垚搴忓垪鍙�"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="浜у搧鍚嶇О" prop="productName">
+ <el-form-item label="宸ュ崟缂栧彿" prop="workOrderNo">
<el-input
- v-model="queryParams.productName"
- placeholder="璇疯緭鍏ヤ骇鍝佸悕绉�"
+ v-model="queryParams.workOrderNo"
+ placeholder="璇疯緭鍏ュ伐鍗曠紪鍙�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="宸ュ簭缂栧彿" prop="processesCode">
+ <el-input
+ v-model="queryParams.processesCode"
+ 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 type="warning" icon="el-icon-copy-document" size="mini" @click="advancedQuery">楂樼骇鏌ヨ</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
</el-form>
+ <el-form :model="queryParams" ref="queryParams" size="small" :inline="true" v-show="advancedShowSearch" label-width="100px">
+ <el-form-item label="鍙傛暟闆嗙紪鐮�" prop="parameterSetCode">
+ <el-input
+ v-model="queryParams.parameterSetCode"
+ placeholder="璇疯緭鍏ュ弬鏁伴泦缂栫爜"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </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="type">
+ <el-input
+ v-model="queryParams.type"
+ placeholder="璇疯緭鍏ュ弬鏁扮被鍨�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="閲囬泦鏃堕棿" prop="collectionTime">
+ <el-date-picker clearable
+ v-model="queryParams.collectionTime"
+ type="date"
+ value-format="yyyy-MM-dd"
+ placeholder="璇烽�夋嫨閲囬泦鏃堕棿">
+ </el-date-picker>
+ </el-form-item>
+ </el-form>
</el-card>
<el-card style="margin-top: 10px" class="box-card">
<el-row :gutter="10" class="mb8">
@@ -73,61 +116,27 @@
<el-table v-loading="loading" border :data="paramCollectionList" @selection-change="handleSelectionChange" v-if="paramCollectionList.length > 0">
<el-table-column type="selection" width="55" align="center" />
- <el-table-column label="涓婚敭id" align="center" prop="id" />
<el-table-column label="宸ュ崟缂栧彿" align="center" prop="workOrderNo">
-<!-- <template slot-scope="scope">-->
-<!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.workOrderNo"/>-->
-<!-- </template>-->
</el-table-column>
<el-table-column label="鎬绘垚搴忓垪鍙�" align="center" width="100" prop="sfcCode">
-<!-- <template slot-scope="scope">-->
-<!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.sfcCode"/>-->
-<!-- </template>-->
</el-table-column>
<el-table-column label="浜у搧缂栧彿" align="center" prop="productCode">
-<!-- <template slot-scope="scope">-->
-<!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.productCode"/>-->
-<!-- </template>-->
</el-table-column>
<el-table-column label="浜х嚎缂栧彿" align="center" prop="productionLine">
-<!-- <template slot-scope="scope">-->
-<!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.productionLine"/>-->
-<!-- </template>-->
</el-table-column>
- <el-table-column label="宸ヤ綅缂栧彿" align="center" prop="locationCode">
-<!-- <template slot-scope="scope">-->
-<!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.locationCode"/>-->
-<!-- </template>-->
+ <el-table-column label="宸ュ簭缂栧彿" align="center" prop="processesCode">
</el-table-column>
<el-table-column label="璁惧缂栧彿" align="center" prop="equipmentNo">
-<!-- <template slot-scope="scope">-->
-<!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.equipmentNo"/>-->
-<!-- </template>-->
</el-table-column>
<el-table-column label="鍙傛暟缂栫爜" align="center" prop="paramCode">
-<!-- <template slot-scope="scope">-->
-<!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.paramCode"/>-->
-<!-- </template>-->
</el-table-column>
<el-table-column label="鍙傛暟鍊�" align="center" prop="paramValue">
-<!-- <template slot-scope="scope">-->
-<!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.paramValue"/>-->
-<!-- </template>-->
</el-table-column>
<el-table-column label="鍙傛暟涓婇檺" align="center" prop="paramUpper">
-<!-- <template slot-scope="scope">-->
-<!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.paramUpper"/>-->
-<!-- </template>-->
</el-table-column>
<el-table-column label="鍙傛暟涓嬮檺" align="center" prop="paramLower">
-<!-- <template slot-scope="scope">-->
-<!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.paramLower"/>-->
-<!-- </template>-->
</el-table-column>
<el-table-column label="鏍囧噯鍊�" align="center" prop="paramStandard">
-<!-- <template slot-scope="scope">-->
-<!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.paramStandard"/>-->
-<!-- </template>-->
</el-table-column>
<el-table-column label="閲囬泦鏃堕棿" align="center" prop="collectionTime" width="180">
<template slot-scope="scope">
@@ -135,37 +144,27 @@
</template>
</el-table-column>
<el-table-column label="鐘舵��" align="center" prop="state">
-<!-- <template slot-scope="scope">-->
-<!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.state"/>-->
-<!-- </template>-->
</el-table-column>
<el-table-column label="鍙傛暟鍚嶇О" align="center" prop="paramName">
-<!-- <template slot-scope="scope">-->
-<!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.paramName"/>-->
-<!-- </template>-->
</el-table-column>
<el-table-column label="鍗曚綅" align="center" prop="unit">
-<!-- <template slot-scope="scope">-->
-<!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.unit"/>-->
-<!-- </template>-->
</el-table-column>
- <el-table-column label="绫诲瀷" align="center" prop="type">
-<!-- <template slot-scope="scope">-->
-<!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.type"/>-->
-<!-- </template>-->
+ <el-table-column label="鍙傛暟绫诲瀷" align="center" prop="type">
</el-table-column>
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width" >
+ <el-table-column fixed="right" label="鎿嶄綔" width="200" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
- type="text"
+ type="success"
+ style="width: 72px"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['main:paramCollection:edit']"
>淇敼</el-button>
<el-button
size="mini"
- type="text"
+ type="danger"
+ style="width: 72px"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['main:paramCollection:remove']"
@@ -187,40 +186,40 @@
/>
<!-- 娣诲姞鎴栦慨鏀硅澶囦骇鍝佽繃绋嬪弬鏁伴噰闆嗗璇濇 -->
- <el-dialog v-dialogpop-up :title="title" :visible.sync="open" width="500px" append-to-body>
- <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+ <el-dialog v-dialogpop-up :title="title" :visible.sync="open" width="600px" append-to-body>
+ <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="宸ュ崟缂栧彿" prop="workOrderNo">
- <el-input v-model="form.workOrderNo" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
+ <el-input v-model="form.workOrderNo" placeholder="璇疯緭鍏ュ伐鍗曠紪鍙�" />
</el-form-item>
<el-form-item label="鎬绘垚搴忓垪鍙�" prop="sfcCode">
- <el-input v-model="form.sfcCode" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
+ <el-input v-model="form.sfcCode" placeholder="璇疯緭鍏ユ�绘垚搴忓垪鍙�" />
</el-form-item>
<el-form-item label="浜у搧缂栧彿" prop="productCode">
- <el-input v-model="form.productCode" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
+ <el-input v-model="form.productCode" placeholder="璇疯緭鍏ヤ骇鍝佺紪鍙�" />
</el-form-item>
<el-form-item label="浜х嚎缂栧彿" prop="productionLine">
- <el-input v-model="form.productionLine" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
+ <el-input v-model="form.productionLine" placeholder="璇疯緭鍏ヤ骇绾跨紪鍙�" />
</el-form-item>
- <el-form-item label="宸ヤ綅缂栧彿" prop="locationCode">
- <el-input v-model="form.locationCode" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
+ <el-form-item label="宸ュ簭缂栧彿" prop="processesCode">
+ <el-input v-model="form.processesCode" placeholder="璇疯緭鍏ュ伐搴忕紪鍙�" />
</el-form-item>
<el-form-item label="璁惧缂栧彿" prop="equipmentNo">
- <el-input v-model="form.equipmentNo" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
+ <el-input v-model="form.equipmentNo" placeholder="璇疯緭鍏ヨ澶囩紪鍙�" />
</el-form-item>
<el-form-item label="鍙傛暟缂栫爜" prop="paramCode">
- <el-input v-model="form.paramCode" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
+ <el-input v-model="form.paramCode" placeholder="璇疯緭鍏ュ弬鏁扮紪鐮�" />
</el-form-item>
<el-form-item label="鍙傛暟鍊�" prop="paramValue">
- <el-input v-model="form.paramValue" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
+ <el-input v-model="form.paramValue" placeholder="璇疯緭鍏ュ弬鏁板��" />
</el-form-item>
<el-form-item label="鍙傛暟涓婇檺" prop="paramUpper">
- <el-input v-model="form.paramUpper" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
+ <el-input v-model="form.paramUpper" placeholder="璇疯緭鍏ュ弬鏁颁笂闄�" />
</el-form-item>
<el-form-item label="鍙傛暟涓嬮檺" prop="paramLower">
- <el-input v-model="form.paramLower" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
+ <el-input v-model="form.paramLower" placeholder="璇疯緭鍏ュ弬鏁颁笅闄�" />
</el-form-item>
<el-form-item label="鏍囧噯鍊�" prop="paramStandard">
- <el-input v-model="form.paramStandard" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
+ <el-input v-model="form.paramStandard" placeholder="璇疯緭鍏ユ爣鍑嗗��" />
</el-form-item>
<el-form-item label="閲囬泦鏃堕棿" prop="collectionTime">
<el-date-picker clearable
@@ -230,18 +229,6 @@
placeholder="璇烽�夋嫨閲囬泦鏃堕棿">
</el-date-picker>
</el-form-item>
-<!-- <el-form-item label="棰勭暀瀛楁1" prop="spareField1">-->
-<!-- <el-input v-model="form.spareField1" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />-->
-<!-- </el-form-item>-->
-<!-- <el-form-item label="棰勭暀瀛楁2" prop="spareField2">-->
-<!-- <el-input v-model="form.spareField2" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />-->
-<!-- </el-form-item>-->
-<!-- <el-form-item label="鍒涘缓鐢ㄦ埛" prop="createUser">-->
-<!-- <el-input v-model="form.createUser" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />-->
-<!-- </el-form-item>-->
-<!-- <el-form-item label="鏇存敼鐢ㄦ埛" prop="updateUser">-->
-<!-- <el-input v-model="form.updateUser" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />-->
-<!-- </el-form-item>-->
<el-form-item label="鐘舵��" prop="state">
<el-input v-model="form.state" placeholder="璇疯緭鍏ョ姸鎬�" />
</el-form-item>
@@ -251,14 +238,8 @@
<el-form-item label="鍗曚綅" prop="unit">
<el-input v-model="form.unit" placeholder="璇疯緭鍏ュ崟浣�" />
</el-form-item>
- <el-form-item label="绫诲瀷" prop="type">
+ <el-form-item label="鍙傛暟绫诲瀷" prop="type">
<el-select v-model="form.type" placeholder="璇烽�夋嫨绫诲瀷">
-<!-- <el-option-->
-<!-- v-for="dict in dict.type.${dictType}"-->
-<!-- :key="dict.value"-->
-<!-- :label="dict.label"-->
-<!-- :value="dict.value"-->
-<!-- ></el-option>-->
</el-select>
</el-form-item>
</el-form>
@@ -291,6 +272,7 @@
total: 0,
// 璁惧浜у搧杩囩▼鍙傛暟閲囬泦琛ㄦ牸鏁版嵁
paramCollectionList: [],
+ advancedShowSearch: false,
// 寮瑰嚭灞傛爣棰�
title: "",
// 鏄惁鏄剧ず寮瑰嚭灞�
@@ -342,6 +324,9 @@
this.getList();
},
methods: {
+ advancedQuery(){
+ this.advancedShowSearch = (this.advancedShowSearch) ? this.advancedShowSearch = false : this.advancedShowSearch = true;
+ },
/** 鏌ヨ璁惧浜у搧杩囩▼鍙傛暟閲囬泦鍒楄〃 */
getList() {
this.loading = true;
--
Gitblit v1.9.3