From 79e2bddb9b425d43ca2d43978c417f2f4d9f7aae Mon Sep 17 00:00:00 2001
From: DouDou <877258667@qq.com>
Date: Tue, 24 Sep 2024 14:59:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=85=B7=E5=B1=9E=E6=80=A7=E7=9A=84?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/demoComponents/orderProperties.vue          | 4 ++--
 .../modules/tooling/components/com_tool_property_show.vue     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/demoComponents/orderProperties.vue b/src/views/modules/demoComponents/orderProperties.vue
index 4ac0945..10599b6 100644
--- a/src/views/modules/demoComponents/orderProperties.vue
+++ b/src/views/modules/demoComponents/orderProperties.vue
@@ -380,10 +380,10 @@ export default {
               </div>
               <div v-else>
                 <el-select style="width: 100%;" v-if="scope.row.valueType === '文本'" v-model="scope.row.textValue">
-                  <el-option :value="i.availableValue" :label="i.availableValue" v-for="(i,key) in scope.row.availableList" :key="key"></el-option>
+                  <el-option :value="i.availableValue" :label="i.availableValue" v-for="(i,key) in scope.row.availableValueList" :key="key"></el-option>
                 </el-select>
                 <el-select style="width: 100%;" v-else v-model="scope.row.numValue">
-                  <el-option :value="i.availableValue" :label="i.availableValue" v-for="(i,key) in scope.row.availableList" :key="key"></el-option>
+                  <el-option :value="i.availableValue" :label="i.availableValue" v-for="(i,key) in scope.row.availableValueList" :key="key"></el-option>
                 </el-select>
               </div>
             </div>
diff --git a/src/views/modules/tooling/components/com_tool_property_show.vue b/src/views/modules/tooling/components/com_tool_property_show.vue
index 9bb7851..19b4f2e 100644
--- a/src/views/modules/tooling/components/com_tool_property_show.vue
+++ b/src/views/modules/tooling/components/com_tool_property_show.vue
@@ -16,7 +16,7 @@
                 <el-input v-model="pageData.toolId" disabled></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="8" >
+            <el-col :span="8" v-if="showFlag">
               <el-form-item label="工具实例">
                 <el-input v-model="pageData.toolInstance" disabled></el-input>
               </el-form-item>