From 9ef61aec5e8b218db9d60941ef3ad576a927338b Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 26 四月 2024 11:05:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 web/src/views/modules/taskReliability/ModelRbd.vue |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/web/src/views/modules/taskReliability/ModelRbd.vue b/web/src/views/modules/taskReliability/ModelRbd.vue
index cc9b8ab..c085529 100644
--- a/web/src/views/modules/taskReliability/ModelRbd.vue
+++ b/web/src/views/modules/taskReliability/ModelRbd.vue
@@ -3,7 +3,7 @@
     <el-row :gutter="5">
       <el-col :span="5">
         <div class="fa-card-a" style="margin-right: 5px;height: calc(100vh - 123px)">
-          <product-model-tree @on-selected="onProductSelected"/>
+          <product-model-tree @on-selected="onProductSelected" showXdy="true"/>
         </div>
       </el-col>
       <el-col :span="19">
@@ -20,9 +20,9 @@
                 <el-input v-model="dataForm.modelTag" placeholder="璇疯緭鍏ユā鍨嬫爣璇�" clearable></el-input>
               </el-form-item>
               <el-form-item>
-                <zt-button type="query" @click="table.query()"/>
-                <zt-button type="add" @click="add()"/>
-                <zt-button type="delete" @click="table.deleteHandle()"/>
+                <zt-button v-if="dataForm.productId" type="query" @click="table.query()"/>
+                <zt-button v-if="dataForm.productId" type="add" @click="add()"/>
+                <zt-button v-if="dataForm.productId" type="delete" @click="table.deleteHandle()"/>
               </el-form-item>
             </el-form>
             <el-table v-loading="table.dataLoading" :data="table.dataList" height="100px" v-adaptive="{bottomOffset:30}"
@@ -30,7 +30,7 @@
               <el-table-column type="selection" width="40" align="center"/>
               <el-table-column prop="modelName" label="妯″瀷鍚嶇О"/>
               <el-table-column prop="modelTag" label="妯″瀷鏍囪瘑"/>
-              <el-table-column prop="citedNum" label="琚紩鐢ㄦ暟"/>
+              <el-table-column prop="quoteNum" label="琚紩鐢ㄦ暟" align="center"/>
               <el-table-column prop="modelState" label="妯″瀷鐘舵��" align="center"/>
               <el-table-column prop="modelDataState" label="妯″瀷鏁版嵁鐘舵��" align="center"/>
               <el-table-column prop="remark" label="澶囨敞"/>

--
Gitblit v1.9.1