试验修改

src/views/tentative/detect/components/DivisionTree.vue

@@ -12,6 +12,7 @@
     @check-change="handleCheckChange"
      :default-checked-keys="defaultCheckarr"
      :default-expand-all="defaultExpandAll"
+     v-loading="divisionLoading"
     >
         <template #default="{ node, data }">
             <div class="data-custom-tree-node" :id="`${idPrefix}${data['primaryKeyId']}`">
@@ -22,7 +23,7 @@
 </template>
 
 <script setup>
-import { ref } from "vue";
+import { ref , watch} from "vue";
 //参数
 const props = defineProps({
     datas: {
@@ -47,11 +48,22 @@ const props = defineProps({
     defaultExpandAll:{
         type:Boolean,
         default:false
+    },
+    divisionLoading:{
+        type:Boolean,
+        default:false
     }
 })
-
+//监听
+watch(() => [
+    props.divisionLoading,
+   
+], ([divisionLoading]) => {
+   isdivisionLoading.value=divisionLoading
+})
 //变量
 const ElTreeRef = ref(null)
+const isdivisionLoading=ref(props.divisionLoading)
 // const ElTreeProps = ref({
 //     label: 'fullName',
 //     children: 'children'

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

@@ -92,10 +92,10 @@
                          <!-- <DivisionTree :datas="unmatchedTreeData" @nodeTap="divisionTreeClick" @nodeCheck="divisionTreeCheck" :defaultCheckarr="defaultCheckarrIds"/> -->
                             <KeepAlive>
                             <template v-if="isSearchTree">
-                               <DivisionTree :datas="searchTreeData" @nodeTap="divisionTreeClick" @nodeCheck="divisionTreeCheck" :defaultCheckarr="defaultCheckarrIds" :ElTreeProps="seaElTreeProps" :defaultExpandAll="true" :check-strictly="true"/>
+                               <DivisionTree :datas="searchTreeData" @nodeTap="divisionTreeClick" @nodeCheck="divisionTreeCheck" :defaultCheckarr="defaultCheckarrIds" :ElTreeProps="seaElTreeProps" :defaultExpandAll="true" :check-strictly="true" :divisionLoading="searchlinksRelateTreeLoading"/>
                             </template>
                             <template v-else>
-                               <DivisionTree :datas="unmatchedTreeData" @nodeTap="divisionTreeClick" @nodeCheck="divisionTreeCheck" :defaultCheckarr="defaultCheckarrIds"  :check-strictly="true"/>
+                               <DivisionTree :datas="unmatchedTreeData" @nodeTap="divisionTreeClick" @nodeCheck="divisionTreeCheck" :defaultCheckarr="defaultCheckarrIds"  :check-strictly="true"  :divisionLoading="isdivisionLoading"/>
                             </template>
                         </KeepAlive>
                     </el-scrollbar>
@@ -320,7 +320,9 @@ const linksRelateModalClick = () => {
 //获取导入树
 const unmatchedTreeData = ref([])
 const defaultCheckarrIds=ref([])
+const isdivisionLoading=ref(false)
 const getContractInfoTreeApi = async () => {
+    isdivisionLoading.value=true
     const {error, code, data} = await divisionApi.getengineerInfoTree1({
         projectId: projectId.value,
         contractId: contractId.value,
@@ -335,6 +337,7 @@ const getContractInfoTreeApi = async () => {
     } else {
         unmatchedTreeData.value = []
     }
+     isdivisionLoading.value=false
 }
 
 //关联树
@@ -366,7 +369,7 @@ const isSearchTree = ref(false)
 const searchTreeClick = async () => {
     if (linksRelateSearchTreeVal.value) {
         isSearchTree.value = true
-        searchlinksRelateTreeLoading.value = false
+        searchlinksRelateTreeLoading.value = true
       const {error, code, data} = await queryApi.searchContractTree({
             contractId: contractId.value,
             queryValue: linksRelateSearchTreeVal.value
@@ -376,12 +379,13 @@ const searchTreeClick = async () => {
             searchTreeData.value = getArrValue(data)
             searchlinksRelateTreeLoading.value = false
         } else {
-            searchlinksRelateTreeLoading.value = true
+            searchlinksRelateTreeLoading.value = false
             searchTreeData.value = []
         }
     } else {
         searchlinksRelateTreeLoading.value = true
         isSearchTree.value = false
+        searchlinksRelateTreeLoading.value = false
     }
 }
 //确认关联

src/views/tentative/material/approach.vue

@@ -345,6 +345,8 @@ const editFormModalClick = () => {
     if (keys.length === 1) {
         addEditFormModel.value = keys[0]
         addEditFormModel.value.materialType= addEditFormModel.value.materialType+''
+        addEditFormModel.value.materialCount=addEditFormModel.value.materialCount===-1?'':addEditFormModel.value.materialCount
+        addEditFormModel.value.materialPrice=addEditFormModel.value.materialPrice===-1?'':addEditFormModel.value.materialPrice
         addEditFormModal.value = true
     } else if (keys.length > 1) {
         window?.$message?.warning('只能选择一条数据编辑')