From 66d5eb69cbbf11dab9bdb4a1d6c7d2d8b8eeb874 Mon Sep 17 00:00:00 2001
From: wangxy <xinyao.wang@le-it.com.cn>
Date: Fri, 26 Nov 2021 15:39:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=B1=9E=E6=80=A7=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E5=8E=BB=E6=8E=89=E5=B1=9E=E6=80=A7=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../standardProperties/addOrEdit.vue             | 16 +++++++++++-----
 .../factoryModel/standardProperties/index.vue    |  2 +-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/views/factoryModel/standardProperties/addOrEdit.vue b/src/views/factoryModel/standardProperties/addOrEdit.vue
index 2c5fa19..5586e47 100644
--- a/src/views/factoryModel/standardProperties/addOrEdit.vue
+++ b/src/views/factoryModel/standardProperties/addOrEdit.vue
@@ -83,7 +83,7 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="24">
+        <!-- <el-col :span="24">
           <el-table
             :data="formData.Valst"
             style="width: 100%; margin-bottom: 10px"
@@ -112,7 +112,7 @@
               </template>
             </el-table-column>
           </el-table>
-        </el-col>
+        </el-col> -->
       </el-row>
     </el-form>
     <template #footer>
@@ -131,7 +131,7 @@
   </el-dialog>
 </template>
 <script>
-import { add, edit } from "@/server/factoryModel/standardProperties";
+import { getDetails, add, edit } from "@/server/factoryModel/standardProperties";
 export default {
   name: "editField",
   props: {
@@ -147,7 +147,7 @@ export default {
       loading: false,
       // 表单参数
       formData: {
-        Valst:[],
+        // Valst:[],
       },
       // 表单校验
       rules: {
@@ -180,7 +180,13 @@ export default {
   },
   mounted() {
     if (this.isAddOrEdit == "edit") {
-      this.formData = this.item;
+			getDetails(this.item['Attribute-AttrCode']).then(({code, data}) => {
+				if (code === 200) {
+					if (!data.Valst) 
+						data.Valst = []
+					this.formData = data
+				}
+			})
     }
   },
   methods: {
diff --git a/src/views/factoryModel/standardProperties/index.vue b/src/views/factoryModel/standardProperties/index.vue
index 44aefc7..36b2a86 100644
--- a/src/views/factoryModel/standardProperties/index.vue
+++ b/src/views/factoryModel/standardProperties/index.vue
@@ -143,7 +143,7 @@ export default {
     },
     // 重置按钮操作
     resetQuery() {
-      this.queryParams.uomId = undefined;
+      this.queryParams.AttrCode = undefined;
       this.handleQuery();
     },
     // 删除按钮操作