duy vor 4 Monaten
Ursprung
Commit
c1bccf12be
2 geänderte Dateien mit 12 neuen und 19 gelöschten Zeilen
  1. 1 1
      src/views/manager/contractinfo/detail.vue
  2. 11 18
      src/views/manager/projectinfo/detail.vue

+ 1 - 1
src/views/manager/contractinfo/detail.vue

@@ -99,7 +99,7 @@
                     </el-radio-group>
                   </el-form-item>
                 <el-form-item
-                  <el-form-item 
+                 
                   label="是否开启试验模块"
                   prop="isTestModule"
                 >

+ 11 - 18
src/views/manager/projectinfo/detail.vue

@@ -205,8 +205,7 @@
                       <el-radio :label="0">否</el-radio>
                     </el-radio-group>
                   </el-form-item>
-                </el-col>
-                <el-form-item
+                  <el-form-item
                     label="模板引用"
                     prop="templateType"
                   >
@@ -215,6 +214,7 @@
                       <el-radio :label="2">底层节点</el-radio>
                     </el-radio-group>
                   </el-form-item>
+                </el-col>
               </el-row>
             </el-form>
           </div>
@@ -612,9 +612,11 @@ export default {
         remarkType: [
             { required: true, message: '请选择电签类别', trigger: 'blur' },
         ],
-         templateType: [
-          { required: true, message: '请选择模板引用', trigger: 'blur' },
-         ]
+        templateType:[
+            { required: true, message: '请选择是否模板引用', trigger: 'blur' },
+        ],
+          
+        
 
       },
 
@@ -1137,7 +1139,6 @@ export default {
       }
 
       this.leftloading = true;
-      this.rightloading = true;
       if (value&&value.toString().indexOf(',') >= 0) {
         console.log('私有库');
          //私有库
@@ -1162,7 +1163,6 @@ export default {
             this.leftTreeData = [];
           }
           this.leftloading = false;
-          this.rightloading = false;
         })
           this.getRightTree()
       } else {
@@ -1298,7 +1298,6 @@ export default {
     treeChang () {
      let recordid= this.formatWbsId(this.wbsId)
      console.log(recordid,'recordid');
-     this.rightloading = true;
       if (this.templateType===2) {
         this.rightTreeData=this.$refs.treetotree.rightTreeData;
         // this.rightObj.push({
@@ -1325,7 +1324,7 @@ export default {
           this.rightObj1.objdata=this.rightTreeData1
         
       }
-      this.rightloading = false;
+    
       this.typeChang[2] = true;
     },
 
@@ -1474,8 +1473,6 @@ export default {
           value:priv.value,
           id:  priv.pkeyId 
         }
-        this.leftloading = true;
-        this.rightloading = true;
         let projectTree = await findProjectTree(this.projectForm.id, refId) //查询的右边的数据
            if (projectTree&&projectTree.data&&projectTree.data.data&&projectTree.data.data.length>0) {
             this.iswbsselected=true
@@ -1483,8 +1480,8 @@ export default {
              this.iswbsselected=false
           }
         if (Array.isArray(projectTree.data.data)) {
-          // this.leftloading = true;
-          // this.rightloading = true;
+          this.leftloading = true;
+          this.rightloading = true;
           if (this.projectForm.referenceWbsTemplateType == 'private') {
             //私有
             let leftData = await findProjectTree(priv.projectId, priv.wbsId)
@@ -1495,8 +1492,6 @@ export default {
             }
             this.leftloading = false;
           } else {
-            console.log(555555555555555);
-            
             //公有
             let leftData = await getAlltree(this.userInfo.tenant_id, '1', refId)
             if (Array.isArray(leftData.data.data)) {
@@ -1842,9 +1837,7 @@ export default {
          
 
             // findProjectTree(this.projectForm.id,  this.templateType === 1 ? WbsId : this.selectData.referenceWbsTemplateIdTrial).then((res) => {
-              this.rightloading = true;
             findProjectTree(this.projectForm.id, WbsId).then((res) => {
-              this.rightloading = false;
               if (this.rightTreeData.length>0&&this.templateType===2&&this.rightObj.wbsId==WbsId) {
                 this.$refs.treetotree.setRightTree(this.rightTreeData);
               }else if(this.rightTreeData1.length>0&&this.templateType===1&&this.rightObj1.wbsId==WbsId){
@@ -1877,7 +1870,7 @@ export default {
               }
       }
 
-      // this.rightloading = false;
+      this.rightloading = false;
     },
 
   }