duy 1 nedēļu atpakaļ
vecāks
revīzija
370dd7c300
1 mainītis faili ar 19 papildinājumiem un 4 dzēšanām
  1. 19 4
      src/views/manager/projectinfo/tree.vue

+ 19 - 4
src/views/manager/projectinfo/tree.vue

@@ -283,7 +283,7 @@
         <el-col :span="16" class="h-100p flex flex-d-c">
           <template v-if="leftType == 5">
             <div class="mg-b-10" v-if='isNodeType'>节点信息</div>
-            <div v-if='isNodeType'>
+            <div v-if="isNodeType">
               <el-table :data="tableData" border style="width: 100%">
                 <el-table-column
                   align="center"
@@ -333,7 +333,7 @@
                   @click="editEditElementForm()"
                 ></el-button>
                 <el-button
-               v-if="isNodeType"
+             v-if="isNodeType"
                   type="text"
                   icon="el-icon-sort"
                   class="text-icon"
@@ -386,6 +386,8 @@
                   <template slot-scope="scope">
                     <el-button
                       size="mini"
+                     
+
                       @click="handlePreview(scope.$index, scope.row)"
                       >预览
                     </el-button>
@@ -3071,6 +3073,7 @@ export default {
     },
      // 重新加载整棵树
   async reloadEntireTree() {
+    this.isNodeType=false
         // 1. 保存当前状态
     const currentKey = this.$refs.treeByType.getCurrentKey();
     this.saveTreeState();
@@ -3180,6 +3183,10 @@ export default {
 
     handlePreview(index, row) {
       this.curEleTable = row;
+      if(!this.curEleTable.initTableId){
+        this.$message({ type: "warning", message: '请先关联清表' })
+         return 
+      }
       selectPrivateFormElements(this.curEleTable.initTableId).then((res) => {
         res.data.data.forEach((element) => {
           this.eleReg.exec(element.eAllowDeviation);
@@ -4121,8 +4128,10 @@ clearSearch1() {
           });
           // selectByNodeTable刷新表单列表
             // await this.updateNodeTable()
-            selectByNodeTable( this.curTreeData.id, this.projectid, this.id).then(
+          if(this.isNodeType){
+              selectByNodeTable( this.curTreeData.id, this.projectid, this.id).then(
                 (res) => {
+                 
                   if (res.data.data && res.data.data.length) {
                     this.formData = res.data.data;
                           this.GLExcel = false;
@@ -4147,7 +4156,13 @@ clearSearch1() {
                     this.formData = [];
                   }
                 }
-              );
+              ).finally(() => {
+                this.GLExcel = false;
+              })
+          }else{
+            this.reloadEntireTree();
+             this.GLExcel = false;
+          }
            
       
         }