diff --git a/src/views/wms/equipment/index.vue b/src/views/wms/equipment/index.vue
index 47596a2..f1b731c 100644
--- a/src/views/wms/equipment/index.vue
+++ b/src/views/wms/equipment/index.vue
@@ -229,6 +229,137 @@
取 消
+
+
+
+
+ 主属性
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 附属属性
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -261,6 +392,7 @@ export default {
title: "",
// 是否显示弹出层
open: false,
+ queryOpen: false,
// 查询参数
queryParams: {
pageNum: 1,
@@ -330,6 +462,11 @@ export default {
this.open = false;
this.reset();
},
+ // 取消按钮
+ queryCancel() {
+ this.queryOpen = false;
+ this.reset();
+ },
// 表单重置
reset() {
this.form = {
@@ -406,9 +543,12 @@ export default {
handleView(row){
this.reset();
const equipmentId = row.equipmentId || this.ids;
+ getWorkCenterList().then(response =>{
+ console.log(this.options1);
+ });
getEquipment(equipmentId).then(response => {
this.form = response.data;
- this.open = true;
+ this.queryOpen = true;
this.title = "查看设备信息";
this.optType = "view";
});