Ver Fonte

公式 字段回显问题

Administrator há 2 anos atrás
pai
commit
656e6ac982

+ 10 - 0
src/api/exctab/excelmodel.js

@@ -137,6 +137,16 @@ export const saveLinkTab = (params) => {
     })
 }
 
+// 元素关联清表
+export const savelinktableInfo = (params) => {
+  return request({
+    url: ' /api/blade-manager/exceltab/save-link-tableInfo',
+    method: 'get',
+    params
+  })
+}
+
+
 //清表生成html
 export const getExcelHtml = (params) => {
     return request({

+ 8 - 8
src/views/manager/projectinfo/qutediaolog/relation.vue

@@ -1,11 +1,11 @@
 <template>
- 
+
     <el-dialog
         title="关联清表"
         :visible.sync="GLExcel"
         append-to-body
         destroy-on-close
-        
+
         @close="GLExcelMD"
           width="70%"
         >
@@ -81,11 +81,11 @@
         ></EditElement>
         </el-dialog>
         </el-dialog>
-  
+
 </template>
 
 <script>
-import {getList,tabLazytreeAll,saveLinkTab, getExcelHtml,} from "@/api/exctab/excelmodel";
+import {getList, tabLazytreeAll, saveLinkTab, getExcelHtml, savelinktableInfo,} from "@/api/exctab/excelmodel";
 import EditElement from "@/views/manager/projectinfo/editElement/editElement.vue";
 import {findNodeTableByCondition as selectByNodeTable} from "@/api/manager/wbsprivate";
 export default {
@@ -112,7 +112,7 @@ export default {
                 pid: "",
                 wbsid: "",
                 nodeid: "",
-            }, 
+            },
             exceldata: [], //清表模板
             GLExcelData: [], //
             GLExcelLoading: false,
@@ -251,7 +251,7 @@ export default {
                     }
                     console.log(node.id,'node.id');
                     console.log(this.GLExcelFrom.id,'this.GLExcelFrom.id');
-                    const { data: res } = await saveLinkTab({
+                    const { data: res } = await savelinktableInfo({
                     exceTabId: node.id,
                     tabId: this.GLExcelFrom.id,
                     });
@@ -278,7 +278,7 @@ export default {
                     });
                 }
             },
-            
+
     }
 }
 </script>
@@ -289,4 +289,4 @@ export default {
     padding: 20px;
   }
 }
-</style>
+</style>

+ 43 - 38
src/views/manager/wbsinfo/element.vue

@@ -7,10 +7,10 @@
       class="boxswai"
       style="width:26%;padding-left:0px;"
     >
-      <div class="boxnei" style="display: flex;flex-direction: column;"> 
+      <div class="boxnei" style="display: flex;flex-direction: column;">
         <div style="overflow: auto;flex:1">
           <avue-tree :option="treeOption" :data="treeData" @node-click="nodeClick"  ref="avueTree"></avue-tree>
-   
+
         </div>
       </div>
     </div>
@@ -28,7 +28,7 @@
           <div
             class="rightHeader"
             v-show="from.checkd"
-          > 
+          >
           </div>
 
           <el-empty
@@ -41,7 +41,7 @@
             v-if="true"
             style="flex:1;"
           >
-              <avue-crud 
+              <avue-crud
                   ref="crud"
                   :data="loadData"
                   :option="loadOption"
@@ -59,12 +59,12 @@
                             plain
                             @click="handleDelete">删除元素表
                           </el-button>
-                    
+
                         <el-button
                           size="small"
                           type="primary"
                           plain
-                          
+
                           @click="editele"
                         >编辑表单
                         </el-button>
@@ -84,7 +84,7 @@
         </div>
       </div>
     </div>
-   
+
     <!-- 编辑元素表单信息 -->
     <el-dialog
       title="编辑元素表单信息"
@@ -112,7 +112,7 @@
           <el-table-column
             prop="tableType"
             label="表类型"
-           
+
           >
             <template slot-scope="scope">
               <el-select
@@ -441,12 +441,17 @@
       </span>
     </el-dialog>
   </div>
-  
+
 </template>
 
 <script>
 import { detailExcel, excelType,wbstree, getWbsTypeList,} from '@/api/exctab/excelmodel';
-import {updateBatchNodeTableInfo,selectByNodeTable,selectFormElements} from "@/api/manager/wbstree";
+import {
+  updateBatchNodeTableInfo,
+  selectByNodeTable,
+  selectFormElements,
+  selectPrivateFormElements
+} from "@/api/manager/wbstree";
 import {tabTypeLazyTreeAll,delTabInfoAll} from "@/api/manager/wbsprivate";
 import {saveElement, remove as removeElement, updateBatchElements, getTemplate,importWbsElement} from "@/api/manager/wbsformelement";
 import FormulaEdit from "@/views/formula/edit.vue";
@@ -497,21 +502,21 @@ export default {
           delBtn:false,
           addBtn:false,
           menu:true,
-        
+
           dialogClickModal: false,
          column: [
           {
             label: "元素表名称",
             prop: "title",
-            
+
             editDisplay: false,
             addDisplay: false,
-            
+
           },
           {
             label: "元素表类型",
             prop: "tabType",
-           
+
             // search: true,
             rules: [
               {
@@ -538,7 +543,7 @@ export default {
           {
             label: "所属方",
             prop: "tabOwner",
-        
+
 
             editDisplay: false,
             addDisplay: false,
@@ -563,7 +568,7 @@ export default {
             ],
           },
         ],
-       
+
         },
       formelemtfoelemtformrm: {},
       elementloading: false,
@@ -578,7 +583,7 @@ export default {
           id:2
         }
       ],
-    
+
       curEleTable:{},
       eleReg: /(-|>|<|≥|≤|±|【】)?([^≥≤±【】]*)/,
       editEleList:[],
@@ -592,10 +597,10 @@ export default {
       threessW: 400,
       //#endregion
       heightss: '',//
-     
+
       data: [],//清表模板
       filterText:"",//搜索关键字
-     
+
       treeloading:false,
       defaultProps: {
         children: "children",
@@ -654,7 +659,7 @@ export default {
         treeLoad: function (node, resolve) {
           console.log(node);
            const parentId = (node.level === 0) ? 12345678910 : node.data.id;
-         
+
           tabTypeLazyTreeAll({parentId,current:1,size:200}).then(res => {
             resolve(res.data.data.records.map(item => {
               return {
@@ -664,7 +669,7 @@ export default {
             }))
           });
         },
- 
+
       },
       treeData:'',
       projectid:"",
@@ -747,7 +752,7 @@ export default {
       console.log(res,'tabTypeLazyTreeAll');
       if (res.code === 200) {
         return res.data
-        
+
       }
     },
     nodeClick(data,node){
@@ -758,7 +763,7 @@ export default {
                 this.loadData=res.records
                 this.page.total=res.total
               })
-          }   
+          }
         if(data.hasChildren===false&&node.level==2){
           let arr=[]
             arr.push(data)
@@ -770,7 +775,7 @@ export default {
         }
           this.curTreeData=data
           this.treeId=data.id
-      
+
       },
 
 
@@ -813,19 +818,19 @@ export default {
          this.tabTypeLazyTreeAll(this.treeId, this.page.current,this.page.size,this.input3).then((res)=>{
           this.loadData=res.records
           this.page.total=res.total
-          
+
         })
       }else{
-         this.$message.warning("请选选择左侧节点");  
+         this.$message.warning("请选选择左侧节点");
       }
-     
+
     },
     resetChange(item){
       console.log(item);
         this.tabTypeLazyTreeAll(this.treeId, this.page.current,this.page.size).then((res)=>{
           this.loadData=res.records
           this.page.total=res.total
-           
+
         })
     },
     handleDelete () {
@@ -855,7 +860,7 @@ export default {
     },
     //刷新左边树形数据
     refreshTreeData(){
-      const parentId =12345678910 
+      const parentId =12345678910
       tabTypeLazyTreeAll({parentId,current:1,size:200}).then(res => {
         this.treeData=res.data.data.records;
           this.$nextTick(()=>{
@@ -866,13 +871,13 @@ export default {
       });
     },
     //编辑元素表单信息
-   
+
     editElement (row) {
       console.log(row,'row');
       this.curEleTable = row;
       // selectFormElements(this.curEleTable.initTableId).then((res) => {
         this.editEleloading=true
-         selectFormElements(this.curEleTable.id).then((res) => {
+      selectPrivateFormElements(this.curEleTable.id).then((res) => {
            this.editEleloading=false
           res.data.data.forEach((element) => {
           this.eleReg.exec(element.eAllowDeviation);
@@ -899,7 +904,7 @@ export default {
        this.$refs.PublicWbs.show();
       // this.AssociatedPublicTap = true;
     },
-    
+
     saveNewEle (row) {
       if (!row.eName) {
         this.$message({
@@ -1001,7 +1006,7 @@ export default {
     handleEditFormula ( row) {
        console.log(row,'row');
       this.curEleTable = row;
-      selectFormElements(this.curEleTable.id).then((res) => {
+      selectPrivateFormElements(this.curEleTable.id).then((res) => {
 
         this.editEleListFilter = res.data.data;
         this.editEleListAll = [].concat(this.editEleListFilter);
@@ -1065,7 +1070,7 @@ export default {
         })
         this.formDatass=fa
         this.editElementFormTag = true;
-         
+
       }
     },
      getOwnerTypelist() {
@@ -1107,7 +1112,7 @@ export default {
         this.tableTypelist = res.data.data;
       });
     },
- 
+
     editeditElementFormMF () {//保存按钮
       let da = []
       let tag = true
@@ -1117,7 +1122,7 @@ export default {
           tag = false
           return
         } else {
-      
+
           da.push({
             id: val.id,
             nodeName: val.tableName,
@@ -1146,7 +1151,7 @@ export default {
       }
     },
 
-  
+
     async excelType () {//清表类型
       const { data: res } = await excelType({ code: 'sys_excltab_type' })
       console.log(res);
@@ -1158,7 +1163,7 @@ export default {
       }
     },
 
-    
+
     //查看节点下已关联的元素表信息
     searchNodeTables(id) {
       searchNodeTables(id, this.from.id).then((res) => {