待测样品

src/views/tentative/detect/test-form.vue

@@ -118,33 +118,7 @@
                 </div>
                 <div v-loading="linksRelateTreeLoading" class="hc-tree-scrollbar" element-loading-text="获取数据中...">
                     <el-scrollbar>
-                        <!-- <DivisionTree :datas="unmatchedTreeData" @nodeTap="divisionTreeClick" @nodeCheck="divisionTreeCheck" :defaultCheckarr="defaultCheckarrIds"/> -->
-
-
-                        <!-- <DivisionTree1
-                v-show="isSearchTree"
-                :ElTreeProps="seaElTreeProps"
-                :datas="searchTreeData"
-                :defaultCheckarr="defaultCheckarrIds"
-                :defaultExpandAll="true"
-                :divisionLoading="searchlinksRelateTreeLoading"
-                @nodeCheck="divisionTreeCheck"
-                @nodeTap="divisionTreeClick"/>
-
-
-            <DivisionTree
-
-                v-show="!isSearchTree"
-                ref="divisionTree"
-                :datas="unmatchedTreeData"
-                :defaultCheckarr="defaultCheckarrIds"
-                :divisionLoading="isdivisionLoading"
-                :linksRelateSearchTreeVal="linksRelateSearchTreeVal"
-                @nodeCheck="divisionTreeCheck"
-                @nodeTap="divisionTreeClick"
-            /> -->
-
-                        <HcLazyTree
+                        <hc-lazy-tree
                             ref="ElTreeRef"
                             :h-props="treeProps"
                             show-checkbox
@@ -176,7 +150,7 @@
                     </el-scrollbar>
                 </div>
                 <div class="hc-links-sample-table-box">
-                    <HcTable
+                    <hc-table
                         ref="tableRawRef" :column="linksRawTableColumn" :datas="linksRawTableData"
                         :is-index="false" :loading="linksRawTableLoading" is-new is-check :check-style="{ width: 29 }"
                         @selection-change="linksRawTableSelection"

src/views/tentative/detect/test.vue

@@ -174,10 +174,10 @@
                         <HcTooltip keys="tentative_detect_test_annex">
                             <el-link type="primary" @click="viewAttachmentModalClick(row)">附件</el-link>
                         </HcTooltip>
-                        <el-link v-if="authBtnTabKey === '3'" type="primary" @click="relatedSearchClick(row)">关联查阅</el-link>
-                        <HcTooltip v-else keys="tentative_detect_test_info">
+                        <el-link type="primary" @click="relatedSearchClick(row)">关联查阅</el-link>
+                        <!-- HcTooltip keys="tentative_detect_test_info">
                             <el-link type="primary" @click="samplingRecordModalClick(row)">样品信息</el-link>
-                        </HcTooltip>
+                        </HcTooltip -->
                     </template>
                 </HcTable>
                 <template #action>
@@ -976,17 +976,17 @@ const relatedSearchClick = (row) => {
 
 //样品信息
 const relatedColumn1 = [
-    { key: 'key1', name: '取样名称' },
-    { key: 'key2', name: '取样日期' },
-    { key: 'key3', name: '取样编号' },
-    { key: 'key4', name: '规格型号' },
-    { key: 'key5', name: '试样数量' },
-    { key: 'key6', name: '计算单位' },
-    { key: 'key7', name: '拟用部位' },
-    { key: 'key8', name: '代表数量' },
-    { key: 'key9', name: '取样人' },
-    { key: 'key10', name: '入库时间' },
-    { key: 'key11', name: '试验时间' },
+    { key: 'materialName', name: '样品名称' },
+    { key: 'samplingDate', name: '取样日期' },
+    { key: 'specificationNumber', name: '样品编号' },
+    { key: 'specificationModel', name: '规格型号' },
+    { key: 'materialCount', name: '试样数量' },
+    { key: 'calculationUnit', name: '计算单位' },
+    { key: 'proposedPosition', name: '拟用部位' },
+    { key: 'representativeCount', name: '代表数量' },
+    { key: 'userName', name: '取样人' },
+    { key: 'carryTime', name: '入库时间', align: 'center' },
+    { key: 'createTime', name: '试验时间', align: 'center' },
     { key: 'key12', name: '样品处理' },
     { key: 'key13', name: '时间(或处理原因)' },
 ]