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

src/api/exctab/excelmodel.js

@@ -64,6 +64,14 @@ export const excelType = (params) => {
         params
     })
 }
+//清表类型1
+export const excelType1 = (params) => {
+    return request({
+        url: ' api/blade-system/dict/dictionary',
+        method: 'get',
+        params
+    })
+}
 
 //懒加载节点树形结构
 export const wbstree = (params) => {

src/views/exctab/ElementIdentification/index.vue

@@ -677,6 +677,7 @@ import {
   tabLazytree,
   getExcelHtmlCol,
   excelType,
+  excelType1,
   submitExcelRelationWbsTreeAndElement,
   getWbsTypeList,
   getLazytree,
@@ -1254,8 +1255,9 @@ export default {
 
     async excelType() {
       //清表类型
-      const { data: res } = await excelType({ code: "sys_excltab_type" });
-      console.log(res);
+      // const { data: res } = await excelType({ code: "sys_excltab_type" });
+        const { data: res } = await excelType1({ code: "table_type" });
+      console.log(res,'清表类型');
       if (res.code === 200) {
         this.exceltypeData = res.data;
       }

src/views/manager/projectinfo/tree.vue

@@ -1417,7 +1417,7 @@
     >
       <FormulaEdit
         :wbsid="id"
-        :nodeid="curTreeData.id" 
+        :nodeid="curTreeData.id"
         :eleid="formulaCurRow.id"
         :globaltype="formulaCurRow.globaltype"
         :projectid="projectid"
@@ -2503,11 +2503,13 @@ export default {
     },
 
     getTableTypelist() {
+      const type = this.wbsType
       if (this.tableTypelist.length > 1) {
         return;
       }
       getDictionary({
-        code: "table_type",
+        // code: "table_type",
+        code: type === 2 ? "trial_table_type" : "table_type",
       }).then((res) => {
         res.data.data.forEach((element) => {
           element.dictKey = Number(element.dictKey);

src/views/manager/wbsinfo/edit.vue

@@ -2544,11 +2544,13 @@ export default {
     },
 
     getTableTypelist () {
+      const type = this.wbsType
       if (this.tableTypelist.length > 1) {
         return;
       }
       getDictionary({
-        code: 'table_type'
+        // code: "table_type",
+        code: type === 2 ? "trial_table_type" : "table_type",
       }).then((res) => {
         res.data.data.forEach(element => {
           element.dictKey = Number(element.dictKey)