Merge branch 'master' of http://47.110.251.215:3000/web/saber into master

src/views/exctab/excelmodel/excelmodel.vue

@@ -426,8 +426,8 @@ export default {
         this.wbsdata = res.data
       }
     },
-    async selectByNodeTable (id, wbsType) {//wbs树获取表
-      const { data: res } = await selectByNodeTable({ id, wbsType })
+    async selectByNodeTable (id, wbsType,projectid) {//wbs树获取表
+      const { data: res } = await selectByNodeTable({ id, wbsType ,projectid})
       console.log(res);
       if (res.code === 200) {
         console.log(Array.isArray(res.data));
@@ -615,7 +615,7 @@ export default {
       this.wbsform.wbsType = data.type
       this.wbsform.wbsName = data.deptName
       if (this.tableList == '') {
-        this.selectByNodeTable(data.id, data.type)
+        this.selectByNodeTable(data.id, data.type,this.excelForm.wbsId)
       } else {
         let tag = true
         this.tableList.forEach((val) => {
@@ -625,7 +625,7 @@ export default {
           }
         })
         if (tag) {
-          this.selectByNodeTable(data.id, data.type)
+          this.selectByNodeTable(data.id, data.type,this.excelForm.wbsId)
         }
       }
 
@@ -667,7 +667,7 @@ export default {
               let linkIds = ''
               val.arrs.forEach(da => {
                 if (da.isLinkTable != da.changeTable) {
-                  linkIds = `${linkIds}${linkIds != '' ? ',' : ''}${da.id}`
+                  linkIds = `${linkIds}${linkIds != '' ? ',' : ''}${da.pkeyId}`
                 }
               })
               if (linkIds != '') {
@@ -798,4 +798,4 @@ export default {
     justify-content: center;
   }
 }
-</style>
+</style>