修改

src/views/exctab/excelmodel/excelmodel.vue

@@ -1032,22 +1032,12 @@ export default {
       })
     },
     aumbitexcelmoudel() {
-      console.log(   this.dataList,'this.dataList');
-      let filList=[]
       let formData = new FormData()
       this.dataList.forEach((item,index) => {
-        console.log(item)
         formData.append(`filList[${index}].file`, item.raw)
         formData.append(`filList[${index}].fileName`, item.name)
-          // let obj={
-          //   file:item.raw,
-          //   fileName:item.name
-          // }
-          // filList.push(obj)
       })
-      console.log(filList,'filList');
       formData.append('id',this.uploadId)
-      console.log(formData)
       const loading = this.$loading({
           lock: true,
           text: 'Loading',

src/views/manager/projectinfo/tree.vue

@@ -2345,7 +2345,9 @@ export default {
         //   }
           
         // });
-        getAlltree(this.projectid, this.id, this.curTreeData.primaryKeyId).then((res) => {
+        let pid=this.curTreeData.primaryKeyId?this.curTreeData.primaryKeyId:this.curTreeData.pKeyId
+        
+        getAlltree(this.projectid, this.id, pid).then((res) => {
           this.testTreeLoad = false;
           console.log(res.data.data,'data');
             this.testTreeData=res.data.data
@@ -3370,7 +3372,7 @@ export default {
     },
 
     syncInfoHandle(item) {
-    if(this.curTreeData.primaryKeyId){
+    if(this.curTreeData.primaryKeyId||this.curTreeData.pKeyId){
       this.$confirm("是否同步节点参数?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -3382,7 +3384,8 @@ export default {
           ele.load=true
         }
       })
-        syncNodeParam(this.projectid,this.curTreeData.primaryKeyId)
+      let pid=this.curTreeData.primaryKeyId?this.curTreeData.primaryKeyId:this.curTreeData.pKeyId
+        syncNodeParam(this.projectid,pid)
           .then(() => {
             this.$message({
               type: "success",
@@ -3569,7 +3572,7 @@ export default {
       });
     },
     syncElectric(item){
-      if(this.curTreeData.primaryKeyId){
+      if(this.curTreeData.primaryKeyId||this.curTreeData.pKeyId){
           console.log('同步电签默认信息');
         this.$confirm("是否同步电签默认信息?", "提示", {
           confirmButtonText: "确定",
@@ -3582,8 +3585,8 @@ export default {
             ele.load=true
           }
         })
-
-          syncProjecteVisa(this.projectid,this.curTreeData.primaryKeyId)
+        let pid=this.curTreeData.primaryKeyId?this.curTreeData.primaryKeyId:this.curTreeData.pKeyId
+          syncProjecteVisa(this.projectid,pid)
             .then(() => {
               this.$message({
                 type: "success",
@@ -3629,8 +3632,8 @@ export default {
     tolinkEle(row){
       this.curLinkEleTable = row;
       this.linkCheckVisible = true;
-
-      selectFormElements(row.id,{type:3,nodeId:this.curTreeData.primaryKeyId}).then((res) => {
+      let pid=this.curTreeData.primaryKeyId?this.curTreeData.primaryKeyId:this.curTreeData.pKeyId
+      selectFormElements(row.id,{type:3,nodeId:pid}).then((res) => {
         res.data.data.forEach((ele)=>{
           ele.checked = false;
           ele.show = true;