Forráskód Böngészése

公式 字段回显问题

Administrator 2 éve
szülő
commit
f3fda08889

+ 9 - 3
src/views/manager/projectinfo/editElement/editElement.vue

@@ -257,6 +257,10 @@ export default {
       type:String,
       default:''
     },
+    initTableId:{
+      type:String,
+      default:''
+    },
     pid:{
       type:String,
       default:''
@@ -497,7 +501,8 @@ export default {
           formUploadError(){},
           uploadprogress(){},
           formRemoteMethod(){},
-          formRemoteChange(){}
+          formRemoteChange(){},
+          checkboxGroupChange(){}
         }
       })
       var component = new MyComponent().$mount()
@@ -531,7 +536,8 @@ export default {
           formUploadError(){},
           uploadprogress(){},
           formRemoteMethod(){},
-          formRemoteChange(){}
+          formRemoteChange(){},
+          checkboxGroupChange(){}
         }
       })
       var component = new MyComponent().$mount()
@@ -580,7 +586,7 @@ export default {
       }
     },
     async getElementInfoByTabId () {//获取字段信息
-      const { data: res } = await getElementInfoByTabId({ tabId: this.id })
+      const { data: res } = await getElementInfoByTabId({ tabId: this.initTableId })
       console.log(res);
       if (res.code === 200) {
         this.options = res.data

+ 17 - 26
src/views/manager/projectinfo/tree.vue

@@ -444,7 +444,8 @@
                           scope.row.pkeyId,
                           scope.row.excelId,
                           scope.row.id,
-                          scope.row.initTableName
+                          scope.row.initTableName,
+                          scope.row.initTableId
                         )
                       "
                       >编辑元素</el-link
@@ -551,7 +552,8 @@
                           scope.row.pkeyId,
                           scope.row.excelId,
                           scope.row.id,
-                          scope.row.initTableName
+                          scope.row.initTableName,
+                          scope.row.initTableId
                         )
                       "
                       >编辑元素</el-link
@@ -1408,7 +1410,7 @@
       class="full-dialog"
     >
       <FormulaEdit
-        :nodeid="curTreeData.id" 
+        :nodeid="curTreeData.id"
         :eleid="formulaCurRow.id"
         :globaltype="formulaCurRow.globaltype"
         :projectid="projectid"
@@ -1432,6 +1434,7 @@
         :initTableName="editElementQuery.initTableName"
         :pid="editElementQuery.pid"
         :wbsid="editElementQuery.wbsid"
+        :initTableId="editElementQuery.initTableId"
         :nodeid="editElementQuery.nodeid"
         @hideDialog="editElementVisible = false"
         v-if="editElementVisible"
@@ -1522,6 +1525,7 @@ export default {
         ids: "",
         excelId: "",
         initTableName: "",
+        initTableId:""
       },
       GLExcelData: [], //
       GLExcelProps: {
@@ -1669,9 +1673,10 @@ export default {
         excelId: "",
         id: "",
         initTableName: "",
+        initTableId:"",
         pid: "",
         wbsid: "",
-        nodeid: "",
+        nodeid: ""
       }, //传参
 
       syncBtnLoad: false,
@@ -1964,7 +1969,7 @@ export default {
 
     handleEdit(index, row) {
       this.curEleTable = row;
-      selectFormElements(this.curEleTable.id).then((res) => {
+      selectFormElements(this.curEleTable.initTableId).then((res) => {
         res.data.data.forEach((element) => {
           this.eleReg.exec(element.eAllowDeviation);
           // console.log(RegExp.$1)
@@ -2015,7 +2020,7 @@ export default {
     },
     handleEditFormula(index, row) {
       this.curEleTable = row;
-      selectFormElements(this.curEleTable.id).then((res) => {
+      selectFormElements(this.curEleTable.initTableId).then((res) => {
         this.editEleListFilter = res.data.data;
         this.editEleListAll = [].concat(this.editEleListFilter);
       });
@@ -2032,7 +2037,7 @@ export default {
     saveNewEle(row) {
       row.eAllowDeviation =
         (row.allow ? row.allow : "") + (row.deviation ? row.deviation : "");
-      row.fId = this.curEleTable.id;
+      row.fId = this.curEleTable.initTableId;
       row.initTableName = this.curEleTable.initTableName;
       if (row.eType == 4) {
         row.eLength = 0;
@@ -2127,8 +2132,6 @@ export default {
       this.nodeDetail.mixRatioTestIds = this.toJoin(newarr);
     },
     filterChange() {
-      //console.log(this.$refs)
-      //debugger
       if (this.treeData.length > 0) {
         this.$refs.treeall.filter(this.filterText);
         return;
@@ -2600,7 +2603,8 @@ export default {
             this.GLExcelFrom.id,
             this.GLExcelFrom.excelId,
             this.GLExcelFrom.ids,
-            this.GLExcelFrom.initTableName
+            this.GLExcelFrom.initTableName,
+            this.GLExcelFrom.initTableId
           );
         }
       } else {
@@ -2782,26 +2786,13 @@ export default {
     //#endregion
 
     //#region 编辑元素
-    async rightClick(pkeyId, excelId, id, initTableName) {
+    async rightClick(pkeyId, excelId, id, initTableName,initTableId) {
       await this.getExcelHtml2(pkeyId);
-
-      // this.$router.push({
-      //   path: '/project/editElement',
-      //   query: {
-      //     pkeyId: pkeyId,
-      //     excelId: excelId,
-      //     id: id,
-      //     initTableName,
-      //     pid: this.$route.query.pid,
-      //     wbsid: this.$route.query.wbsid,
-      //     nodeid:this.curTreeData.id,
-      //   }
-      // })
-
       this.editElementQuery.pkeyId = pkeyId;
       this.editElementQuery.excelId = excelId;
       this.editElementQuery.id = id;
       this.editElementQuery.initTableName = initTableName;
+      this.editElementQuery.initTableId = initTableId;
       this.editElementQuery.pid = this.$route.query.pid;
       this.editElementQuery.wbsid = this.$route.query.wbsid;
       this.editElementQuery.nodeid = this.curTreeData.id;
@@ -3080,7 +3071,7 @@ export default {
         path: '/project/independent',
         query: { pid: this.projectid,wbsid:this.$route.query.wbsid }
 
-      
+
       });
     }