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-main/src/main/java/com/jcdm/main/em/equipmentArchives/domain/EmEquipmentArchives.java | 23 ++-
jcdm-main/src/main/resources/mapper/em/equipmentArchives/EmEquipmentArchivesMapper.xml | 17 +-
jcdm-ui/src/views/main/em/equipmentArchives/index.vue | 62 +++++++++
jcdm-ui/src/views/main/da/paramCollection/index.vue | 167 ++++++++++++---------------
jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/domain/DaParamCollection.java | 49 ++++++++
jcdm-main/src/main/resources/mapper/da/paramCollection/DaParamCollectionMapper.xml | 23 +++
jcdm-ui/src/main.js | 16 ++
7 files changed, 248 insertions(+), 109 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/domain/DaParamCollection.java b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/domain/DaParamCollection.java
index 7077b10..ad11ae4 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/domain/DaParamCollection.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/domain/DaParamCollection.java
@@ -96,6 +96,15 @@
/** 绫诲瀷 */
@Excel(name = "绫诲瀷")
private String type;
+ @Excel(name = "鍙傛暟闆嗙紪鐮�")
+ private String parameterSetCode;
+ @Excel(name = "鍙傛暟闆嗗悕绉�")
+ private String parameterSetName;
+ @Excel(name = "宸ュ簭缂栧彿")
+ private String processesCode;
+ @Excel(name = "宸ュ簭鍚嶇О")
+ private String processesName;
+
public void setId(Long id)
{
@@ -286,6 +295,42 @@
{
return type;
}
+ public void setParameterSetCode(String parameterSetCode)
+ {
+ this.parameterSetCode = parameterSetCode;
+ }
+
+ public String getParameterSetCode()
+ {
+ return parameterSetCode;
+ }
+ public void setParameterSetName(String parameterSetName)
+ {
+ this.parameterSetName = parameterSetName;
+ }
+
+ public String getParameterSetName()
+ {
+ return parameterSetName;
+ }
+ public void setProcessesCode(String processesCode)
+ {
+ this.processesCode = processesCode;
+ }
+
+ public String getProcessesCode()
+ {
+ return processesCode;
+ }
+ public void setProcessesName(String processesName)
+ {
+ this.processesName = processesName;
+ }
+
+ public String getProcessesName()
+ {
+ return processesName;
+ }
@Override
public String toString() {
@@ -313,6 +358,10 @@
.append("paramName", getParamName())
.append("unit", getUnit())
.append("type", getType())
+ .append("parameterSetCode", getParameterSetCode())
+ .append("parameterSetName", getParameterSetName())
+ .append("processesCode", getProcessesCode())
+ .append("processesName", getProcessesName())
.toString();
}
}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/em/equipmentArchives/domain/EmEquipmentArchives.java b/jcdm-main/src/main/java/com/jcdm/main/em/equipmentArchives/domain/EmEquipmentArchives.java
index 7c1d0d5..b4f8c19 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/em/equipmentArchives/domain/EmEquipmentArchives.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/em/equipmentArchives/domain/EmEquipmentArchives.java
@@ -56,7 +56,9 @@
/** 宸ュ簭缂栫爜 */
@Excel(name = "宸ュ簭缂栫爜")
- private String processes;
+ private String processesCode;
+ @Excel(name = "宸ュ簭鍚嶇О")
+ private String processesName;
/** 璁惧鐘舵�� */
@Excel(name = "璁惧鐘舵��")
@@ -176,16 +178,22 @@
{
return lineCode;
}
- public void setProcesses(String processes)
+ public void setProcessesCode(String processesCode)
{
- this.processes = processes;
+ this.processesCode = processesCode;
}
- public String getProcesses()
+ public String getProcessesCode()
{
- return processes;
+ return processesCode;
}
- public void setStatus(String status)
+ public void setProcessesName(String processesName) {this.processesName = processesName; }
+
+ public String getProcessesName()
+ {
+ return processesName;
+ }
+ public void setStatus(String status)
{
this.status = status;
}
@@ -262,7 +270,8 @@
.append("equipmentTypeName", getEquipmentTypeName())
.append("workshopCode", getWorkshopCode())
.append("lineCode", getLineCode())
- .append("processes", getProcesses())
+ .append("processesCode", getProcessesCode())
+ .append("processesName", getProcessesName())
.append("status", getStatus())
.append("remark", getRemark())
.append("createUser", getCreateUser())
diff --git a/jcdm-main/src/main/resources/mapper/da/paramCollection/DaParamCollectionMapper.xml b/jcdm-main/src/main/resources/mapper/da/paramCollection/DaParamCollectionMapper.xml
index 8699587..43adf79 100644
--- a/jcdm-main/src/main/resources/mapper/da/paramCollection/DaParamCollectionMapper.xml
+++ b/jcdm-main/src/main/resources/mapper/da/paramCollection/DaParamCollectionMapper.xml
@@ -28,10 +28,15 @@
<result property="paramName" column="param_name" />
<result property="unit" column="unit" />
<result property="type" column="type" />
+ <result property="parameterSetCode" column="parameter_set_code" />
+ <result property="parameterSetName" column="parameter_set_name" />
+ <result property="processesCode" column="processes_code" />
+ <result property="processesName" column="processes_name" />
+
</resultMap>
<sql id="selectDaParamCollectionVo">
- select id, work_order_no, sfc_code, product_code, production_line, location_code, equipment_no, param_code, param_value, param_upper, param_lower, param_standard, collection_time, spare_field_1, spare_field_2, create_user, create_time, update_user, update_time, state, param_name, unit, type from da_param_collection
+ select id, work_order_no, sfc_code,processes_name,processes_code, parameter_set_code ,parameter_set_name, product_code, production_line, location_code, equipment_no, param_code, param_value, param_upper, param_lower, param_standard, collection_time, spare_field_1, spare_field_2, create_user, create_time, update_user, update_time, state, param_name, unit, type from da_param_collection
</sql>
<select id="selectDaParamCollectionList" parameterType="DaParamCollection" resultMap="DaParamCollectionResult">
@@ -40,6 +45,10 @@
<if test="workOrderNo != null and workOrderNo != ''"> and work_order_no = #{workOrderNo}</if>
<if test="sfcCode != null and sfcCode != ''"> and sfc_code = #{sfcCode}</if>
<if test="productCode != null and productCode != ''"> and product_code = #{productCode}</if>
+ <if test="parameterSetCode != null and parameterSetCode != ''"> and parameter_set_code = #{parameterSetCode}</if>
+ <if test="parameterSetName != null and parameterSetName != ''"> and parameter_set_name = #{parameterSetName}</if>
+ <if test="processesCode != null and processesCode != ''"> and processes_code = #{processesCode}</if>
+ <if test="processesName != null and processesName != ''"> and processes_name = #{processesName}</if>
<if test="productionLine != null and productionLine != ''"> and production_line = #{productionLine}</if>
<if test="locationCode != null and locationCode != ''"> and location_code = #{locationCode}</if>
<if test="equipmentNo != null and equipmentNo != ''"> and equipment_no = #{equipmentNo}</if>
@@ -61,6 +70,10 @@
<if test="productCode != null and productCode != ''">product_code,</if>
<if test="productionLine != null and productionLine != ''">production_line,</if>
<if test="locationCode != null and locationCode != ''">location_code,</if>
+ <if test="parameterSetCode != null and parameterSetCode != ''">parameter_set_code,</if>
+ <if test="parameterSetName != null and parameterSetName != ''">parameter_set_name,</if>
+ <if test="processesCode != null and processesCode != ''">processes_code,</if>
+ <if test="processesName != null and processesName != ''">processes_name,</if>
<if test="equipmentNo != null">equipment_no,</if>
<if test="paramCode != null and paramCode != ''">param_code,</if>
<if test="paramValue != null and paramValue != ''">param_value,</if>
@@ -86,6 +99,10 @@
<if test="productCode != null and productCode != ''">#{productCode},</if>
<if test="productionLine != null and productionLine != ''">#{productionLine},</if>
<if test="locationCode != null and locationCode != ''">#{locationCode},</if>
+ <if test="parameterSetCode != null and parameterSetCode != ''">#{parameter_set_code},</if>
+ <if test="parameterSetName != null and parameterSetName != ''">#{parameter_set_name},</if>
+ <if test="processesCode != null and processesCode != ''">#{processes_code},</if>
+ <if test="processesName != null and processesName != ''">#{processes_name},</if>
<if test="equipmentNo != null">#{equipmentNo},</if>
<if test="paramCode != null and paramCode != ''">#{paramCode},</if>
<if test="paramValue != null and paramValue != ''">#{paramValue},</if>
@@ -114,6 +131,10 @@
<if test="productCode != null and productCode != ''">product_code = #{productCode},</if>
<if test="productionLine != null and productionLine != ''">production_line = #{productionLine},</if>
<if test="locationCode != null and locationCode != ''">location_code = #{locationCode},</if>
+ <if test="parameterSetCode != null and parameterSetCode != ''">parameter_set_code = #{parameterSetCode},</if>
+ <if test="parameterSetName != null and parameterSetName != ''">parameter_set_name = #{parameterSetName},</if>
+ <if test="processesCode != null and processesCode != ''">processes_code = #{processesCode},</if>
+ <if test="processesName != null and processesName != ''">processes_name = #{processesName},</if>
<if test="equipmentNo != null">equipment_no = #{equipmentNo},</if>
<if test="paramCode != null and paramCode != ''">param_code = #{paramCode},</if>
<if test="paramValue != null and paramValue != ''">param_value = #{paramValue},</if>
diff --git a/jcdm-main/src/main/resources/mapper/em/equipmentArchives/EmEquipmentArchivesMapper.xml b/jcdm-main/src/main/resources/mapper/em/equipmentArchives/EmEquipmentArchivesMapper.xml
index b3342ef..a225b25 100644
--- a/jcdm-main/src/main/resources/mapper/em/equipmentArchives/EmEquipmentArchivesMapper.xml
+++ b/jcdm-main/src/main/resources/mapper/em/equipmentArchives/EmEquipmentArchivesMapper.xml
@@ -15,7 +15,8 @@
<result property="equipmentTypeName" column="equipment_type_name" />
<result property="workshopCode" column="workshop_code" />
<result property="lineCode" column="line_code" />
- <result property="processes" column="processes" />
+ <result property="processesCode" column="processes_code" />
+ <result property="processesName" column="processes_name" />
<result property="status" column="status" />
<result property="remark" column="remark" />
<result property="createUser" column="create_user" />
@@ -29,7 +30,7 @@
</resultMap>
<sql id="selectEmEquipmentArchivesVo">
- select id, equipment_code, equipment_name, equipment_brand, equipment_spec, equipment_type_id, equipment_type_code, equipment_type_name, workshop_code, line_code, processes, status, remark, create_user, create_time, update_user, update_time, spare_field_1, spare_field_2, spare_field_3, spare_field_4 from em_equipment_archives
+ select id, equipment_code, equipment_name, equipment_brand, equipment_spec, equipment_type_id, equipment_type_code, equipment_type_name, workshop_code, line_code, processes_code, processes_name , status, remark, create_user, create_time, update_user, update_time, spare_field_1, spare_field_2, spare_field_3, spare_field_4 from em_equipment_archives
</sql>
<select id="selectEmEquipmentArchivesList" parameterType="EmEquipmentArchives" resultMap="EmEquipmentArchivesResult">
@@ -44,7 +45,8 @@
<if test="equipmentTypeName != null and equipmentTypeName != ''"> and equipment_type_name like concat('%', #{equipmentTypeName}, '%')</if>
<if test="workshopCode != null and workshopCode != ''"> and workshop_code = #{workshopCode}</if>
<if test="lineCode != null and lineCode != ''"> and line_code = #{lineCode}</if>
- <if test="processes != null and processes != ''"> and processes = #{processes}</if>
+ <if test="processesName != null and processesName != ''"> and processes_name like concat('%', #{processesName}, '%')</if>
+ <if test="processesCode != null and processesCode != ''"> and processes_code = #{processesCode}</if>
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="createUser != null and createUser != ''"> and create_user = #{createUser}</if>
<if test="updateUser != null and updateUser != ''"> and update_user = #{updateUser}</if>
@@ -73,7 +75,8 @@
<if test="equipmentTypeName != null">equipment_type_name,</if>
<if test="workshopCode != null">workshop_code,</if>
<if test="lineCode != null">line_code,</if>
- <if test="processes != null">processes,</if>
+ <if test="processesName != null and processesName != ''">processes_name,</if>
+ <if test="processesCode != null">processes_code,</if>
<if test="status != null">status,</if>
<if test="remark != null">remark,</if>
<if test="createUser != null">create_user,</if>
@@ -96,7 +99,8 @@
<if test="equipmentTypeName != null">#{equipmentTypeName},</if>
<if test="workshopCode != null">#{workshopCode},</if>
<if test="lineCode != null">#{lineCode},</if>
- <if test="processes != null">#{processes},</if>
+ <if test="processesCode != null">#{processesCode},</if>
+ <if test="processesName != null and processesName != ''">#{processesName},</if>
<if test="status != null">#{status},</if>
<if test="remark != null">#{remark},</if>
<if test="createUser != null">#{createUser},</if>
@@ -122,7 +126,8 @@
<if test="equipmentTypeName != null">equipment_type_name = #{equipmentTypeName},</if>
<if test="workshopCode != null">workshop_code = #{workshopCode},</if>
<if test="lineCode != null">line_code = #{lineCode},</if>
- <if test="processes != null">processes = #{processes},</if>
+ <if test="processesCode != null">processes_code = #{processesCode},</if>
+ <if test="processesName != null and processesName != ''">processes_name = #{processesName},</if>
<if test="status != null">status = #{status},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="createUser != null">create_user = #{createUser},</if>
diff --git a/jcdm-ui/src/main.js b/jcdm-ui/src/main.js
index c9f70f1..aea3622 100644
--- a/jcdm-ui/src/main.js
+++ b/jcdm-ui/src/main.js
@@ -85,3 +85,19 @@
store,
render: h => h(App)
})
+//ip楠岃瘉
+Vue.directive('ipAddressValidator', {
+ bind(el, binding, vnode) {
+ el.addEventListener('input', () => {
+ const value = el.value;
+ // IPv4 address validation
+ if (/^((\d{1,2}|1\d{2}|2[0-4]\d|25[0-5])(\.((\d{1,2}|1\d{2}|2[0-4]\d|25[0-5]))){3})$/.test(value)) {
+ console.log("Valid IPv4 Address");
+ } else if (!/(^(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?\.)+[a-zA-Z]{2,}$)|(^(?:(?:[\x00-\x7F]|[\u0391-\uFFEF])+)(?:\.[a-zA-Z0-9]+)*$)/i.test(value)) {
+ console.log("Invalid IPv4 or IPv6 Address");
+ } else {
+ console.log("Valid IPv6 Address");
+ }
+ });
+ },
+});
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;
diff --git a/jcdm-ui/src/views/main/em/equipmentArchives/index.vue b/jcdm-ui/src/views/main/em/equipmentArchives/index.vue
index c3dd8e1..e7977d4 100644
--- a/jcdm-ui/src/views/main/em/equipmentArchives/index.vue
+++ b/jcdm-ui/src/views/main/em/equipmentArchives/index.vue
@@ -18,6 +18,16 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
+ <el-form-item label="鐘舵��" prop="status">
+ <el-select v-model="queryParams.status" placeholder="璇烽�夋嫨鐘舵��" clearable>
+ <el-option
+ v-for="dict in dict.type.sys_normal_disable"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
+ </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>
@@ -76,6 +86,12 @@
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="璁惧缂栫爜" align="center" prop="equipmentCode"/>
<el-table-column label="璁惧鍚嶇О" align="center" prop="equipmentName"/>
+ <el-table-column label="鐘舵��" align="center" prop="status" width="80">
+ <template slot-scope="scope">
+ <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
+ </template>
+ </el-table-column>
+ <el-table-column label="宸ュ簭缂栧彿" align="center" prop="processesCode"/>
<el-table-column label="鍝佺墝" align="center" prop="equipmentBrand"/>
<el-table-column label="瑙勬牸鍨嬪彿" align="center" prop="equipmentSpec"/>
<el-table-column label="杞﹂棿缂栫爜" align="center" prop="workshopCode"/>
@@ -128,6 +144,25 @@
<el-form-item label="璁惧鍚嶇О" prop="equipmentName">
<el-input v-model="form.equipmentName" placeholder="璇疯緭鍏ヨ澶囧悕绉�" />
</el-form-item>
+ <el-form-item label="鐘舵��" prop="status">
+ <el-radio-group v-model="form.status">
+ <el-radio
+ v-for="dict in dict.type.sys_normal_disable"
+ :key="dict.value"
+ :label="dict.value"
+ >{{dict.label}}</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ <el-form-item label="宸ュ簭缂栧彿" prop="processesCode">
+ <el-select style="width: 100%" @change="handleSelectChangeprocessesCode(form.processesCode)" v-model="form.processesCode" placeholder="璇烽�夋嫨宸ュ簭缂栧彿">
+ <el-option
+ v-for="item in processesCodeoptions"
+ :key="item.index"
+ :label="item.processesCode"
+ :value="item.processesCode">
+ </el-option>
+ </el-select>
+ </el-form-item>
<el-form-item label="鍝佺墝" prop="equipmentBrand">
<el-input v-model="form.equipmentBrand" placeholder="璇疯緭鍏ュ搧鐗�" />
</el-form-item>
@@ -175,9 +210,11 @@
import {listLineInfo} from "@/api/main/bs/lineInfo/lineInfo";
import ItemSelect from "@/components/itemSelect/single.vue";
import {listProductionOrde} from "@/api/main/om/productionOrde/productionOrde";
+import {listProcesses} from "@/api/main/bs/processes/processes";
export default {
name: "EquipmentArchives",
+ dicts: ['sys_normal_disable'],
components: {
ItemSelect ,
},
@@ -185,6 +222,7 @@
return {
// 閬僵灞�
lineOptions: [],
+ processesCodeoptions:[],
options: [],
loading: true,
titleName: "",
@@ -217,7 +255,7 @@
equipmentTypeName: null,
workshopCode: null,
lineCode: null,
- processes: null,
+ processesCode: null,
status: null,
createUser: null,
updateUser: null,
@@ -225,6 +263,11 @@
spareField2: null,
spareField3: null,
spareField4: null
+ },
+ processesCodeQueryParams:{
+ pageNum: 1,
+ pageSize: 10,
+ processesCodes: null,
},
// 琛ㄥ崟鍙傛暟
form: {},
@@ -248,6 +291,7 @@
created() {
this.getList();
this.initWorkshop();
+ this.initProcesses();
},
methods: {
@@ -267,8 +311,18 @@
this.lineOptions = response.rows;
});
},
+ handleSelectChangeprocessesCode(selectedOption) {
+ this.processesCodeQueryParams.processesCodes = selectedOption;
+ listProcesses(this.queryParams).then(response => {
+ this.form.processesName = response.rows[0].processesName;
+ });
+ },
+ initProcesses(){
+ listProcesses(this.queryParams).then(response => {
+ this.processesCodeoptions = response.rows;
+ });
+ },
getList() {
- // this.$modal.msgSuccess("淇敼鎴愬姛");
console.log(this.queryParams)
this.loading = true;
listEquipmentArchives(this.queryParams).then(response => {
@@ -295,8 +349,8 @@
equipmentTypeName: null,
workshopCode: null,
lineCode: null,
- processes: null,
- status: null,
+ processesCode: null,
+ status: "0",
remark: null,
createUser: null,
createTime: null,
--
Gitblit v1.9.3