duy 2 роки тому
батько
коміт
2c4a355140

+ 4 - 3
src/views/tentative/detect/test-form.vue

@@ -618,9 +618,10 @@ const tableFormSaveClick = async () => {
             listItemBaseData.value.deviceUseIds=''
             checkTabId.value=''
             if(!isaddType){
-                // bussPdfsClick()
+                bussPdfsClick()
             }else{
-                toBackClick()
+                bussPdfsClick()
+                // toBackClick()
             }
            
             getTableDataAll()
@@ -629,7 +630,7 @@ const tableFormSaveClick = async () => {
        
          if(!isaddType){
                  window.$message?.warning('请先选择你需要编辑的表格')
-            //   bussPdfsClick()
+              bussPdfsClick()
          }else{
              window.$message?.warning('请先选择你需要新增的表格')
          }

+ 9 - 1
src/views/tentative/laboratory/print.vue

@@ -12,7 +12,14 @@
             </div>
             <div class="hc-tree-box">
                 <el-scrollbar>
-                    <WbsTree :autoExpandKeys="treeAutoExpandKeys" :projectId="projectId" :contractId="contractId" isColor @nodeTap="wbsElTreeClick"/>
+                    <!-- <WbsTree :autoExpandKeys="treeAutoExpandKeys" :projectId="projectId" :contractId="contractId" isColor @nodeTap="wbsElTreeClick"/> -->
+                     <TestTree
+                        :autoExpandKeys="treeAutoExpandKeys"
+                        :projectId="projectId"
+                        :wbsTempId="projectInfo?.referenceWbsTemplateIdTrial"
+                        :wbsType="2"
+                        :tenantId="userInfo?.tenant_id"
+                        @nodeTap="wbsElTreeClick"/>
                 </el-scrollbar>
             </div>
             <!--左右拖动-->
@@ -47,6 +54,7 @@
 import {ref, watch, onMounted} from "vue";
 import {useAppStore} from "~src/store";
 import WbsTree from "../../data-fill/components/WbsTree.vue"
+import TestTree from "../material/components/TestTree.vue"
 import {getStoreData, setStoreData} from '~src/utils/storage'
 
 //变量