Преглед изворни кода

资料填报页面搜索子节点修改

duy пре 2 година
родитељ
комит
5901135fb1
3 измењених фајлова са 35 додато и 12 уклоњено
  1. 0 1
      src/views/data-fill/division.vue
  2. 1 1
      src/views/data-fill/query.vue
  3. 34 10
      src/views/data-fill/wbs.vue

+ 0 - 1
src/views/data-fill/division.vue

@@ -1180,7 +1180,6 @@ const dialogTableSelectAll = (rows) => {
         })
     }
 
-    console.log(selectItems.value, "dialogTableSelectAll selectItems")
 }
 
 const dialogTableSelect = ({selection, row}) => {

+ 1 - 1
src/views/data-fill/query.vue

@@ -205,7 +205,7 @@ onMounted(() => {
     getReportNumber()
     getFirstTaskStatus()
     getDictBizClassify()
-     getSearchTreeData()
+    getSearchTreeData()
 
 })
 

+ 34 - 10
src/views/data-fill/wbs.vue

@@ -108,7 +108,7 @@
                         <el-scrollbar>
                             <KeepAlive>
                                 <template v-if="isSearchTree">
-                                    <HcTreeData :datas="searchTreeData" :menus="ElTreeMenu" :isMark="TreeMark" :autoExpandKeys="TreeAutoExpandKeys" isColor @nodeTap="wbsElTreeClick" @menuTap="ElTreeMenuClick"/>
+                                    <HcTreeData :datas="searchTreeData" :menus="ElTreeMenu" :isMark="TreeMark" :autoExpandKeys="TreeAutoExpandKeys" :searchTreeVal="searchTreeVal" isColor @nodeTap="wbsElTreeClick" @menuTap="ElTreeMenuClick"  @changeSearch="changeisSearch"/>
                                 </template>
                                 <template v-else>
                                     <WbsTree :menus="ElTreeMenu" :isMark="TreeMark" :autoExpandKeys="TreeAutoExpandKeys" :projectId="projectId" :contractId="contractId" isColor @nodeTap="wbsElTreeClick" @menuTap="ElTreeMenuClick" @nodeLoading="ElTreeNodeLoading"/>
@@ -355,6 +355,7 @@ import {getStoreData, setStoreData} from '~src/utils/storage'
 import {isType, deepClone, formValidate} from "vue-utils-plus"
 import {getDictionary, eVisaTaskCheckApi} from "~api/other"
 import wbsApi from "~api/data-fill/wbs"
+import queryApi from '~api/data-fill/query';
 import Draggable from "vuedraggable";
 
 //初始变量
@@ -390,6 +391,7 @@ onMounted(()=> {
     treeLoading.value = typeName === 'tree';
     setContractType(contractInfo.value?.contractType)
     getDictionaryApi()
+  
 })
 
 //身份按钮切换数据
@@ -435,6 +437,7 @@ const wbsTypeTabChange = (item) => {
             type: item?.key
         }
     })
+    getSearchTreeData()
 }
 
 //上传文件的
@@ -497,14 +500,18 @@ const searchTreeKeyUp = (e) => {
         searchTreeClick()
     }
 }
+const changeisSearch=()=>{
+    isSearchTree.value=false
+}
 const treeLoading = ref(false)
 const searchTreeClick = async () => {
-    if (searchTreeVal.value) {
-        isSearchTree.value = true
-        treeLoading.value = true
-        const {error, code, data} = await wbsApi.searchContractTree({
+     isSearchTree.value=true
+}
+const getSearchTreeData=async()=>{
+        const {error, code, data} = await queryApi.getTreeall({
             contractId: contractId.value,
-            queryValue: searchTreeVal.value
+            projectId: projectId.value,
+            wbsId:projectInfo?.value.referenceWbsTemplateId
         })
         //判断状态
         if (!error && code === 200) {
@@ -514,11 +521,28 @@ const searchTreeClick = async () => {
             treeLoading.value = false
             searchTreeData.value = []
         }
-    } else {
-        treeLoading.value = false
-        isSearchTree.value = false
-    }
+    
 }
+    // if (searchTreeVal.value) {
+    //     isSearchTree.value = true
+    //     treeLoading.value = true
+    //     const {error, code, data} = await wbsApi.searchContractTree({
+    //         contractId: contractId.value,
+    //         queryValue: searchTreeVal.value
+    //     })
+    //     //判断状态
+    //     if (!error && code === 200) {
+    //         searchTreeData.value = getArrValue(data)
+    //         treeLoading.value = false
+    //     } else {
+    //         treeLoading.value = false
+    //         searchTreeData.value = []
+    //     }
+    // } else {
+    //     treeLoading.value = false
+    //     isSearchTree.value = false
+    // }
+
 
 //树被点击
 const wbsElTreeClick = ({node, data, keys}) => {