From 10bc47a275dfd896ba4e72f073d9f901c5390597 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 22 Mar 2023 16:05:14 +0800
Subject: [PATCH] 模块不绑定设备编码，设备编码绑定模块
---
src/views/equipment/equipment.vue | 40 ++++++++++++++++++++++++++++++++++++++++
src/views/modules/modules.vue | 18 ------------------
2 files changed, 40 insertions(+), 18 deletions(-)
diff --git a/src/views/equipment/equipment.vue b/src/views/equipment/equipment.vue
index cb7ad5d..de28382 100644
--- a/src/views/equipment/equipment.vue
+++ b/src/views/equipment/equipment.vue
@@ -131,6 +131,22 @@
message: "请选择设备类型",
trigger: "blur",
}],
+ },
+ {
+ label: "模块",
+ prop: "modulesId",
+ type: "select",
+ dicUrl: "/api/modules/modules/all",
+ props: {
+ label: "name",
+ value: "id"
+ },
+ rules: [{
+ required: true,
+ message: "请选择模块",
+ trigger: "blur",
+ }],
+ display:true,
}
]
},
@@ -155,8 +171,27 @@
return ids.join(",");
}
},
+ watch:{
+ "form.type":{
+ handler(newVal){
+ if (newVal){
+ let column = this.findObject(this.option.column,"modulesId")
+ if (newVal == 1){
+ column.display = false
+ }else {
+ column.display = true
+ }
+ }
+ }
+ }
+ },
methods: {
rowSave(row, done, loading) {
+
+ if (row.type == 1){
+ row.modulesId = ""
+ }
+
add(row).then(() => {
this.onLoad(this.page);
this.$message({
@@ -170,6 +205,11 @@
});
},
rowUpdate(row, index, done, loading) {
+
+ if (row.type == 1){
+ row.modulesId = ""
+ }
+
update(row).then(() => {
this.onLoad(this.page);
this.$message({
diff --git a/src/views/modules/modules.vue b/src/views/modules/modules.vue
index a8745b9..adea983 100644
--- a/src/views/modules/modules.vue
+++ b/src/views/modules/modules.vue
@@ -148,24 +148,6 @@
}],
},
{
- label: "设备编码",
- prop: "equipmentId",
- span:24,
- type: "select",
- dicUrl: `/api/equipment/equipment/all?type=2`,
- props: {
- label: "code",
- value: "id"
- },
- rules: [
- {
- required: true,
- message: '请选择设备',
- trigger: 'blur'
- }
- ]
- },
- {
label: "宽",
prop: "width",
type: "input",
--
Gitblit v1.9.3