1

src/util/filter.js

@@ -0,0 +1,12 @@
+/**
+ * 省略多余字符，用...显示
+ * @param {String} value
+ * @param {number} len
+ */
+ export function ellipsis(value, len) {
+    if (!value) return ''
+    if (value.length > len) {
+      return value.slice(0, len) + '...'
+    }
+    return value
+  }

src/views/manager/projectinfo/independent.vue

@@ -197,9 +197,9 @@
 
 <script>
 import {tabTypeLazyTree,delAprojectTab} from "@/api/manager/wbsprivate";
-import {selectFormElements,} from "@/api/manager/wbstree";
+import {selectFormElements,selectPrivateFormElements} from "@/api/manager/wbstree";
 import {getExcelHtml} from "@/api/exctab/excelmodel"
-import Qute from "./qutediaolog/qute.vue";//引入元素库
+import Qute from "./qutediaolog/qute1.vue";//引入元素库
 import Relation from './qutediaolog/relation.vue'//关联清表
 import EditElement from "@/views/manager/projectinfo/editElement/editElement.vue";//编辑元素
 import dynamicExcel from "./treeTemplate/dynamicExcel.vue";
@@ -553,8 +553,8 @@ export default {
     handleEditFormula(row) {
       console.log(row,'公式');
       this.curEleTable = row;
-      //  selectFormElements(this.curEleTable.initTableId).then((res) => {
-      selectFormElements(this.curEleTable.id).then((res) => {
+        selectPrivateFormElements(this.curEleTable.initTableId).then((res) => {
+      // selectFormElements(this.curEleTable.id).then((res) => {
         this.editEleListFilter = res.data.data;
         this.editEleListAll = [].concat(this.editEleListFilter);
       });

src/views/manager/wbsinfo/PublicWbs.vue

@@ -171,8 +171,6 @@ import {  getAlltree } from "@/api/manager/wbstree";
 import { getDictionary } from "@/api/system/dict";
 import { dictionarydataType } from "@/api/exctab/editelement";
 import {
-  tabLazytree,
-  getExcelHtmlCol,
   excelType,
   submitExcelRelationWbsTreeAndElement,
   getWbsTypeList,
@@ -180,11 +178,8 @@ import {
   cancelRelation,
   saveRelation,
   searchNodeTables,
-  tabLazytreeAll,
-  exctabcellSave,
-  exctabcellRemove,
-  exctabcellUpdate,
-} from "@/api/exctab/excelmodel";
+  savelinktableInfo
+ } from "@/api/exctab/excelmodel";
 import { getColByTabId } from "@/api/manager/AdjustForm";
 
 export default {
@@ -407,10 +402,16 @@ export default {
                     });
             },
              relationMD(row, type) {
+               console.log('关联元素表',row);
                 //关联取消关联
                 row.loading = true;
                 if (type == "关联") {
-                    saveRelation(row.id, this.from.id, this.tableData)
+                    // saveRelation(row.id, this.from.id, this.tableData)
+                   savelinktableInfo({
+                    linkids: row.id,
+                    tabId: this.from.id,
+                    type:1
+                    })
                     .then(() => {
                         row.checknd = true;
                         row.isLinkTable = 2;
@@ -501,17 +502,26 @@ export default {
                         });
                         return;
                         }
+                       savelinktableInfo({
+                        linkids: this.selectNodeIds,
+                        tabId: this.from.id,
+                        type:2
+                        }).then((res)=>{
+                          console.log(res,'添加元素表');
 
-                        this.submitExcelRelationWbsTreeAndElement({
-                        nodeName: this.addElementForm.nodeName,
-                        tableType: this.addElementForm.tableType,
-                        tableOwner: this.addElementForm.tableOwner,
-                        wbsId: this.addElementForm.wbsId,
-                        elementList: this.tableData,
-                        nodeIds: this.selectNodeIds,
-                        excelTabId: this.from.id,
-                        submitStatus: 2,
-                        });
+                        })
+                       
+                        // this.submitExcelRelationWbsTreeAndElement({
+                        // nodeName: this.addElementForm.nodeName,
+                        // tableType: this.addElementForm.tableType,
+                        // tableOwner: this.addElementForm.tableOwner,
+                        // wbsId: this.addElementForm.wbsId,
+                        // elementList: this.tableData,
+                        // nodeIds: this.selectNodeIds,
+                        // excelTabId: this.from.id,
+                        // submitStatus: 2,
+                        // });
+                 
                     } else {
                         this.$message({
                         type: "warning",
@@ -592,7 +602,6 @@ export default {
                     ele.eAllowDeviation = ele.textDeviation;
                 });
                 const { data: res } = await submitExcelRelationWbsTreeAndElement(da);
-                console.log(res);
                 if (res.code == 200) {
                     this.$message({
                     type: "success",
@@ -602,11 +611,12 @@ export default {
                     this.AssociatedPublicClose();
                 }
             },
+       
             async getColByTabId() {
                 //获取字段信息
-                // const { data: res } = await getColByTabId({tabId: this.from.id });
+                const { data: res } = await getColByTabId({tabId: this.from.id });
                
-                const { data: res } = await getColByTabId({tabId: '1537614072773054466' });
+                // const { data: res } = await getColByTabId({tabId: '1537614072773054466' });
                 console.log(res);
                 if (res.code === 200) {
                     res.data.forEach((element) => {