haojianlong 5 anni fa
parent
commit
7e4c6a9058

+ 4 - 4
config/prod.env.js

@@ -1,8 +1,8 @@
 'use strict'
 module.exports = {
     NODE_ENV: '"production"',
-    // BASE_URL: '"http://172.16.0.239"', //测试iframe地址
-    // SSO_SERVER: '"http://192.168.20.101:8004"' //测试环境
-    BASE_URL: '"http://mbi.sagacloud.cn"', //线上iframe地址
-    SSO_SERVER: '"http://sso.sagacloud.cn"' //正式环境
+    BASE_URL: '"http://172.16.0.239"', //测试iframe地址
+    SSO_SERVER: '"http://192.168.20.101:8004"' //测试环境
+        // BASE_URL: '"http://mbi.sagacloud.cn"', //线上iframe地址
+        // SSO_SERVER: '"http://sso.sagacloud.cn"'  //正式环境
 }

+ 24 - 16
src/api/scan/request.js

@@ -864,51 +864,59 @@ export function getEquipTableCon(param) {
 }
 
 //设备清单-查询当前设备下的部件分类
-export function getEquipPartsType(param) {
+export function getEquipPartsType(param, success) {
+    let url = `${baseUrl}/equip-component/equip-query/components-count`;
     let data = param;
-    return fetch({ method: 'POST', url: `${baseUrl}/equip-component/equip-query/components-count`, data })
+    http.postJson(url, data, success)
 }
 
 //设备清单-查询当前设备类下的部件分类
-export function getPartsAllType(param) {
+export function getPartsAllType(param, success) {
+    let url = `${baseUrl}/equip-component/equip-query/equip-compon`;
     let data = param;
-    return fetch({ method: 'GET', url: `${baseUrl}/equip-component/equip-query/equip-compon?category=${data.category}&id=${data.id}` })
+    http.getJson(url, data, success)
 }
 
 //all - 查询数据字典 --列表表头
-export function getDataDictionary(param) {
+export function getDataDictionary(param, success) {
+    let url = `${baseUrl}/datacenter/data-dictionary/query`;
     let data = param;
-    return fetch({ method: 'POST', url: `${baseUrl}/datacenter/data-dictionary/query`, data })
+    http.postJson(url, data, success)
 }
 
 //设备清单 - 根据分类查询部件列表内容
-export function getEquipPartsCon(param) {
+export function getEquipPartsCon(param, success) {
+    let url = `${baseUrl}/equip-component/equip-query/components-property`;
     let data = param;
-    return fetch({ method: 'POST', url: `${baseUrl}/equip-component/equip-query/components-property`, data })
+    http.postJson(url, data, success)
 }
 
 //设备清单 - 新增部件
-export function createPart(param) {
+export function createPart(param, success) {
+    let url = `${baseUrl}/datacenter/component/create?projectId=${param.projectId}`;
     let data = param.data;
-    return fetch({ method: 'POST', url: `${baseUrl}/datacenter/component/create?projectId=${param.projectId}`, data })
+    http.postJson(url, data, success)
 }
 
 //设备清单 - 删除部件
-export function deleteParts(param) {
+export function deleteParts(param, success) {
+    let url = `${baseUrl}/datacenter/component/delete?projectId=${param.projectId}`;
     let data = param.data;
-    return fetch({ method: 'POST', url: `${baseUrl}/datacenter/component/delete?projectId=${param.projectId}`, data })
+    http.postJson(url, data, success)
 }
 
 //设备清单 - 更新部件
-export function updateParts(param) {
+export function updateParts(param, success) {
+    let url = `${baseUrl}/datacenter/component/update?projectId=${param.projectId}`;
     let data = param.data;
-    return fetch({ method: 'POST', url: `${baseUrl}/datacenter/component/update?projectId=${param.projectId}`, data })
+    http.postJson(url, data, success)
 }
 
 //创建资产
-export function createPropertyData(param) {
+export function createPropertyData(param, success) {
+    let url = `${baseUrl}/datacenter/property/create?projectId=${param.projectId}`;
     let data = param.data;
-    return fetch({ method: 'POST', url: `${baseUrl}/datacenter/property/create?projectId=${param.projectId}`, data })
+    http.postJson(url, data, success)
 }
 
 //动态数据关联-冲突选择确认

+ 14 - 22
src/components/ledger/handsontables/device.vue

@@ -60,7 +60,7 @@
     <!-- 二维码弹窗 -->
     <qrcode :dialog="dialog" :qrcodeUrl="qrcodeUrl" :addBody="true" ref="qrcode"></qrcode>
     <!-- 型号弹窗 -->
-    <firm :mess="{deviceId: deviceType.code}" ref="firm" @changeFirm="firmChange" :dialog="dialog"></firm>
+    <firm :mess="{deviceId: deviceType.assetType}" ref="firm" @changeFirm="firmChange" :dialog="dialog"></firm>
     <!-- 供应商合同弹窗 -->
     <supply-dialog ref="supply" @change="supplyChange" :id="id" :dialog="dialog"></supply-dialog>
     <!-- 供应商弹窗 -->
@@ -547,7 +547,7 @@ export default {
       let arr = tools.copyArr(list)
       // 如果不是只读状态,添加四大厂商选择
       if (!this.onlyRead) {
-        // arr = showTools.arrToArr(arr)
+        arr = showTools.arrToArr(arr)
       }
       let readArr = ["A1", "A2", "B1", "C5", "D1", "D2", "X", "L", "L1", "L2", "F1", "F2", "M"]
       if (!this.onlyRead) {
@@ -569,7 +569,7 @@ export default {
       let arr = tools.copyArr(list)
       // 如果不是只读状态,添加四大厂商选择
       if (!this.onlyRead) {
-        // arr = showTools.arrToArr(arr)
+        arr = showTools.arrToArr(arr)
       }
       let data = showTools.showTypes(arr, this.onlyRead, this.isWatch, this.allMess)
       data.map(item => {
@@ -607,15 +607,6 @@ export default {
           renderer: tools.lookDetails
         }
       );
-      //   data.splice(1, 0, {
-      //     data: "flowBuild",
-      //     renderer: tools.customDropdownRenderer,
-      //     editor: "chosen",
-      //     chosenOptions: {
-      //       // multiple: true,//多选
-      //       data: this.floorData
-      //     }
-      //   })
       if (!!this.onlyRead) {
         data.map(item => {
           item.readOnly = true
@@ -1114,7 +1105,11 @@ export default {
       }
 
       if (val == "infos.DPManufacturerID") {
-        this.dialog.firm = true;
+        if (!!infos.linkId) {
+          this.dialog.firm = true
+        } else {
+          this.$message("该设备无关联资产")
+        }
       }
 
       if (val == "infos.SupplierContractID") {
@@ -1148,9 +1143,7 @@ export default {
         }
       }
 
-      if (
-        val == "infos.DPSupplierID"
-      ) {
+      if (val == "infos.DPSupplierID") {
         if (!!infos.linkId) {
           this.dialog.supplier = true;
         } else {
@@ -1159,15 +1152,14 @@ export default {
       }
 
       if (val == "infos.DPMaintainerID") {
-        if (!!infos.linkId) {
+        // if (!!infos.linkId) {
           this.dialog.maintainer = true;
-        } else {
-          this.$message("该设备无关联资产")
-        }
+        // } else {
+        //   this.$message("该设备无关联资产")
+        // }
       }
 
-      if (
-        val == "infos.DPInsurerID") {
+      if (val == "infos.DPInsurerID") {
         if (!!infos.linkId) {
           this.dialog.insurer = true;
         } else {

+ 107 - 107
src/utils/handsontable/notShow.js

@@ -1,7 +1,8 @@
 // 不显示的信息点数组
 import text from "@/utils/handsontable/mainText"
 import tools from "@/utils/scan/tools"
-//在编辑模式下并且勾选隐藏自动填充的信息点不显示的字段
+let InputModeArr = ["A1", "A2", "B1", "C5", "D1", "D2", "E1", "L", "L1", "L2", "F1", "F2", "M", "Own"]
+    //在编辑模式下并且勾选隐藏自动填充的信息点不显示的字段
 let noShowArr = [
         "Brand",
         "Specification",
@@ -420,125 +421,124 @@ const showTools = {
             if (item.InfoPointCode == "BIMLocation") {
                 return undefined
             }
-            if (onlyRead || (!!typeArr && typeArr.indexOf(item.InputMode) > -1)) {
-                return undefined
-            }
-            if (item.Visible || !allMess) {
-                //固定不显示的code
-                if (!showTools.cantShow(item.InfoPointCode) && !onlyRead) {
-                    return undefined
-                }
-
-                if (!showTools.isShow(item.InfoPointCode)) {
-                    if (isWatch && !onlyRead) {
+            if (onlyRead || InputModeArr.indexOf(item.InputMode) > -1) {
+                if (item.Visible || !allMess) {
+                    //固定不显示的code
+                    if (!showTools.cantShow(item.InfoPointCode) && !onlyRead) {
                         return undefined
                     }
-                }
 
-                if (item.InfoPointCode == "EquipQRCode" || item.InfoPointCode == "RoomQRCode") {
-                    return {
-                        data: "infos." + item.InfoPointCode,
-                        renderer: text.lookQRCode,
-                        readOnly: true
+                    if (!showTools.isShow(item.InfoPointCode)) {
+                        if (isWatch && !onlyRead) {
+                            return undefined
+                        }
                     }
-                }
 
-                //图片类型
-                if (
-                    item.InfoPointCode == "InstallPic" ||
-                    item.InfoPointCode == "InstallDrawing" ||
-                    item.InfoPointCode == "Nameplate" ||
-                    item.InfoPointCode == "Pic" ||
-                    item.InfoPointCode == "Drawing"
-                ) {
-                    return {
-                        data: "infos." + item.InfoPointCode,
-                        renderer: text.picType,
-                        readOnly: true
+                    if (item.InfoPointCode == "EquipQRCode" || item.InfoPointCode == "RoomQRCode") {
+                        return {
+                            data: "infos." + item.InfoPointCode,
+                            renderer: text.lookQRCode,
+                            readOnly: true
+                        }
                     }
-                }
 
-                //文件类型
-                if (item.InfoPointCode == "InsuranceFile" ||
-                    item.InfoPointCode == "Archive" ||
-                    item.InfoPointCode == "CheckReport") {
-                    return {
-                        data: "infos." + item.InfoPointCode,
-                        renderer: text.fileType,
-                        readOnly: true
+                    //图片类型
+                    if (
+                        item.InfoPointCode == "InstallPic" ||
+                        item.InfoPointCode == "InstallDrawing" ||
+                        item.InfoPointCode == "Nameplate" ||
+                        item.InfoPointCode == "Pic" ||
+                        item.InfoPointCode == "Drawing"
+                    ) {
+                        return {
+                            data: "infos." + item.InfoPointCode,
+                            renderer: text.picType,
+                            readOnly: true
+                        }
                     }
-                }
 
-                if (item.InputMode == "D1") {
-                    return {
-                        data: "infos." + item.InfoPointCode,
-                        renderer: tools.customDropdownRenderer,
-                        editor: "chosen",
-                        chosenOptions: {
-                            // multiple: true,//多选
-                            data: item.DataSource || ""
+                    //文件类型
+                    if (item.InfoPointCode == "InsuranceFile" ||
+                        item.InfoPointCode == "Archive" ||
+                        item.InfoPointCode == "CheckReport") {
+                        return {
+                            data: "infos." + item.InfoPointCode,
+                            renderer: text.fileType,
+                            readOnly: true
                         }
-                    };
-                } else if (item.InputMode == "A1" || item.InputMode == "A2") {
-                    return {
-                        data: "infos." + item.InfoPointCode,
-                        type: "numeric",
-                        numericFormat: {
-                            pattern: "0,0.00"
-                                // culture: 'de-DE' // use this for EUR (German),
-                                // more cultures available on http://numbrojs.com/languages.html
+                    }
+
+                    if (item.InputMode == "D1") {
+                        return {
+                            data: "infos." + item.InfoPointCode,
+                            renderer: tools.customDropdownRenderer,
+                            editor: "chosen",
+                            chosenOptions: {
+                                // multiple: true,//多选
+                                data: item.DataSource || ""
+                            }
+                        };
+                    } else if (item.InputMode == "A1" || item.InputMode == "A2") {
+                        return {
+                            data: "infos." + item.InfoPointCode,
+                            type: "numeric",
+                            numericFormat: {
+                                pattern: "0,0.00"
+                                    // culture: 'de-DE' // use this for EUR (German),
+                                    // more cultures available on http://numbrojs.com/languages.html
+                            }
+                        };
+                    } else if (item.InputMode == "C5") {
+                        return {
+                            data: "infos." + item.InfoPointCode,
+                            type: "date",
+                            dateFormat: "YYYY-MM-DD",
+                            correctFormat: true
+                        };
+                    } else if (
+                        item.InputMode == "B1" ||
+                        item.InputMode == "L" ||
+                        item.InputMode == "L1" ||
+                        item.InputMode == "L2" ||
+                        item.InputMode == "M"
+                    ) {
+                        return {
+                            data: "infos." + item.InfoPointCode
                         }
-                    };
-                } else if (item.InputMode == "C5") {
-                    return {
-                        data: "infos." + item.InfoPointCode,
-                        type: "date",
-                        dateFormat: "YYYY-MM-DD",
-                        correctFormat: true
-                    };
-                } else if (
-                    item.InputMode == "B1" ||
-                    item.InputMode == "L" ||
-                    item.InputMode == "L1" ||
-                    item.InputMode == "L2" ||
-                    item.InputMode == "M"
-                ) {
-                    return {
-                        data: "infos." + item.InfoPointCode
-                    };
-                } else if (
-                    item.InputMode == "X" ||
-                    item.InputMode == "F2"
-                    // item.InputMode == "L1" ||
-                    // item.InputMode == "L2"
-                ) {
-                    //   return undefined
-                    return {
-                        data: "infos." + item.InfoPointCode,
-                        readOnly: true
-                    };
-                } else if (item.InputMode == "D2") {
-                    return {
-                        data: "infos." + item.InfoPointCode,
-                        renderer: tools.customDropdownRenderer,
-                        editor: "chosen",
-                        chosenOptions: {
-                            multiple: true, //多选
-                            data: item.DataSource || ""
+                    } else if (
+                        item.InputMode == "X" ||
+                        item.InputMode == "F2"
+                    ) {
+                        return {
+                            data: "infos." + item.InfoPointCode,
+                            readOnly: true
+                        };
+                    } else if (item.InputMode == "D2") {
+                        return {
+                            data: "infos." + item.InfoPointCode,
+                            renderer: tools.customDropdownRenderer,
+                            editor: "chosen",
+                            chosenOptions: {
+                                multiple: true, //多选
+                                data: item.DataSource || ""
+                            }
+                        };
+                    } else if (item.InputMode == "Own" && !onlyRead) {
+                        return {
+                            data: "infos." + item.InfoPointCode,
+                            renderer: text.idType,
+                        }
+                    } else {
+                        return {
+                            data: "infos." + item.InfoPointCode
                         }
-                    };
-                } else if (item.InputMode == "Own" && !onlyRead) {
-                    return {
-                        data: "infos." + item.InfoPointCode,
-                        renderer: text.idType,
                     }
                 } else {
-                    return undefined;
+                    return undefined
                 }
             } else {
                 return undefined
             }
-
         }).filter(item => item);
         return data
     },
@@ -556,7 +556,7 @@ const showTools = {
             if (item.InfoPointCode == "BIMLocation") {
                 return undefined
             }
-            if (onlyRead || (!!readArr && readArr.indexOf(item.InputMode) > -1)) {
+            if (onlyRead || InputModeArr.indexOf(item.InputMode) > -1) {
                 if (item.Visible || !allMess) {
                     if (!showTools.cantShow(item.InfoPointCode) && !onlyRead && !taizhang) {
                         return undefined
@@ -576,7 +576,7 @@ const showTools = {
                     return undefined
                 }
             } else {
-                return undefined;
+                return undefined
             }
         }).filter(d => d);
         return data
@@ -594,7 +594,7 @@ const showTools = {
             if (item.InfoPointCode == "BIMLocation") {
                 return undefined
             }
-            if (onlyRead || (!!typeArr && typeArr.indexOf(item.InputMode) > -1)) {
+            if (onlyRead || InputModeArr.indexOf(item.InputMode) > -1) {
                 if (item.Visible || !allMess) {
                     //固定不显示的code
                     if (!showTools.cantShow(item.InfoPointCode) && !onlyRead) {
@@ -719,7 +719,7 @@ const showTools = {
             if (item.InfoPointCode == "BIMLocation") {
                 return undefined
             }
-            if (onlyRead || (!!readArr && readArr.indexOf(item.InputMode) > -1)) {
+            if (onlyRead || InputModeArr.indexOf(item.InputMode) > -1) {
                 if (item.Visible || !allMess) {
                     if (!showTools.fixedNoShowField(partsAddNoShow, item.InfoPointCode) && !onlyRead && !taizhang) {
                         return undefined
@@ -758,7 +758,7 @@ const showTools = {
             if (item.Path == "BIMLocation") {
                 return undefined
             }
-            if (onlyRead || (!!typeArr && typeArr.indexOf(item.InputMode) > -1)) {
+            if (onlyRead || InputModeArr.indexOf(item.InputMode) > -1) {
                 if (item.Visible || !allMess) {
                     //固定不显示的code
                     if (!showTools.fixedNoShowField(partsAddNoShow, item.InfoPointCode) && !onlyRead && !taizhang) {

+ 2 - 2
src/views/ledger/cenotelist/cenoteadd/index.vue

@@ -71,8 +71,8 @@ export default {
         PageSize: 500,
         Filters: `type='Shaft'`
       }
-      await getDataDictionary(param).then( res => {
-        this.tableHeader = res.data.Content
+      await getDataDictionary(param, res => {
+        this.tableHeader = res.Content
         this.initTable()
       })
     },

+ 2 - 2
src/views/ledger/cenotelist/index.vue

@@ -128,8 +128,8 @@ export default {
         PageSize: 500,
         Filters: `type='Shaft'`
       }
-      await getDataDictionary(param).then( res => {
-        this.tableHeader = res.data.Content;
+      await getDataDictionary(param, res => {
+        this.tableHeader = res.Content;
         this.getTableData()
       })
     },

+ 14 - 24
src/views/ledger/facility/parts/index.vue

@@ -181,8 +181,8 @@ export default {
         PageNumber: 1,
         PageSize: 50
       };
-      await getEquipPartsType(params).then(res => {
-        this.partsTypeList = res.data.Content;
+      await getEquipPartsType(params, res => {
+        this.partsTypeList = res.Content;
         if (this.partsTypeList.length) {
           this.tabVal = this.partsTypeList[0].Category;
           this.getTableHeader();
@@ -196,14 +196,9 @@ export default {
         PageSize: 500,
         Filters: `type='Equipment' or type='${this.tabVal}'`
       };
-      await getDataDictionary(params).then(res => {
-        let response = res.data;
-        if (response.Result == "success") {
-          this.tableHeader = response.Content;
-          this.getTableData();
-        } else {
-          this.$message.error("请求错误:" + response.Result);
-        }
+      await getDataDictionary(params, res => {
+        this.tableHeader = res.Content;
+        this.getTableData();
       });
     },
     //获取表格数据
@@ -213,19 +208,14 @@ export default {
         PageSize: this.page.PageSize,
         Filters: `category='${this.tabVal}';parentId='${this.deviceId}'`
       };
-      await getEquipPartsCon(params).then(res => {
-        let response = res.data;
-        if (response.Result) {
-          this.tableData = response.Content;
-          this.copyTableData = tools.deepCopy(response.Content);
-          this.page.pageNumber = response.PageNumber;
-          this.page.total = response.Total;
-          if (this.tableData && this.tableData.length) {
-            this.getBatch(response.Content);
-            this.initTable();
-          }
-        } else {
-          this.$message.error("请求错误:" + response.Result);
+      await getEquipPartsCon(params, res => {
+        this.tableData = res.Content;
+        this.copyTableData = tools.deepCopy(res.Content);
+        this.page.pageNumber = res.PageNumber;
+        this.page.total = res.Total;
+        if (this.tableData && this.tableData.length) {
+          this.getBatch(res.Content);
+          this.initTable();
         }
       });
     },
@@ -489,7 +479,7 @@ export default {
     },
     // 删除表格数据
     async deleteTableData(params) {
-      await deleteParts(params).then(res => {
+      await deleteParts(params, res => {
         this.$message.success("删除成功!");
         this.getTypes();
       });

+ 24 - 18
src/views/ledger/facility/partsmanage/addparts/index.vue

@@ -189,14 +189,9 @@ export default {
         PageSize: 500,
         Filters: `type='Equipment' or type='${this.category.Code}'`
       };
-      await getDataDictionary(params).then(res => {
-        let response = res.data;
-        if (response.Result == "success") {
-          this.tableHeader = response.Content;
-          this.initTable();
-        } else {
-          this.$message.error("请求错误:" + response.Result);
-        }
+      await getDataDictionary(params, res => {
+        this.tableHeader = res.Content;
+        this.initTable();
       });
     },
     // 创建部件数据
@@ -228,21 +223,32 @@ export default {
         this.$message.info("存在设备的本地名称为空,请检查")
         return;
       }
-      let params = { projectId: this.projectId }
 
       for (let i = 0; i < newData.length; i++) {
+        let params = { projectId: this.projectId }
         let data = {
           ParentId: this.category.deviceId, //当前设备id
           Category: this.category.Code //当前部件分类
         };
         params.data = Object.assign(data, newData[i]);
-        await createPart(params).then(res => {
-          let response = res.data;
-          if(response.Result=='success'){
-            if(newData[i].Checked){//同时创建资产
-              params.data.EquipmentId = response.Id
-              createPropertyData(params);
-            }
+        if(newData[i].Checked){//同时创建资产
+          await createPropertyData(params, async res => {
+            params.data.PropertyId = res.Id
+            await createPart(params, res=>{
+              if(i==newData.length-1){
+                this.$router.push({
+                  path: "/ledger/partsmanage",
+                  query: {
+                    deviceId: this.category.deviceId,
+                    typeId: this.category.ParentId
+                  }
+                });
+                session.remove("partsAddData")
+              }
+            })
+          })
+        }else{
+          await createPart(params, res=>{
             if(i==newData.length-1){
               this.$router.push({
                 path: "/ledger/partsmanage",
@@ -253,8 +259,8 @@ export default {
               });
               session.remove("partsAddData")
             }
-          }
-        });
+          });
+        }
       }
     },
     // 删除表格行

+ 12 - 18
src/views/ledger/facility/partsmanage/index.vue

@@ -211,8 +211,8 @@ export default {
         category: this.typeId, //设备类型
         id: this.deviceId //设备id
       };
-      await getPartsAllType(params).then(res => {
-        this.partsTypeList = res.data.Content;
+      await getPartsAllType(params, res => {
+        this.partsTypeList = res.Content;
         this.tabVal = this.partsTypeList[0].Code;
         this.activeTab = this.partsTypeList[0];
         this.getTableHeader();
@@ -225,14 +225,9 @@ export default {
         PageSize: 500,
         Filters: `type='Equipment' or type='${this.tabVal}'`
       };
-      await getDataDictionary(params).then(res => {
-        let response = res.data;
-        if (response.Result == "success") {
-          this.tableHeader = response.Content;
-          this.getTableData();
-        } else {
-          this.$message.error("请求错误:" + response.Result);
-        }
+      await getDataDictionary(params, res => {
+        this.tableHeader = res.Content;
+        this.getTableData();
       });
     },
     //获取表格数据
@@ -242,12 +237,11 @@ export default {
         PageSize: this.page.pageSize,
         Filters: `category='${this.tabVal}';parentId='${this.deviceId}'`
       };
-      await getEquipPartsCon(params).then(res => {
-        let response = res.data;
-        this.tableData = response.Content;
-        this.copyTableData = tools.deepCopy(response.Content);
-        this.page.pageNumber = response.PageNumber;
-        this.page.total = response.Total;
+      await getEquipPartsCon(params, res => {
+        this.tableData = res.Content;
+        this.copyTableData = tools.deepCopy(res.Content);
+        this.page.pageNumber = res.PageNumber;
+        this.page.total = res.Total;
         if (this.tableData && this.tableData.length) {
           this.initTable();
         }
@@ -285,11 +279,11 @@ export default {
         // }
         param.data.Content.push(item);
       });
-      await updateParts(param).then(res => {});
+      await updateParts(param, res => {});
     },
     // 删除表格数据
     async deleteTableData(params) {
-      await deleteParts(params).then(res => {
+      await deleteParts(params, res => {
         this.$message.success("删除成功!");
         this.getTypes();
       });

+ 2 - 2
src/views/rent/rentlist/index.vue

@@ -130,8 +130,8 @@ export default {
         PageSize: 500,
         Filters: `type='Tenant'`
       }
-      await getDataDictionary(param).then( res => {
-        this.tableHeader = res.data.Content;
+      await getDataDictionary(param, res => {
+        this.tableHeader = res.Content;
         this.getTableData()
       })
     },

+ 2 - 2
src/views/rent/rentlist/rentadd/index.vue

@@ -72,8 +72,8 @@ export default {
         PageSize: 500,
         Filters: `type='Tenant'`
       }
-      await getDataDictionary(param).then( res => {
-        this.tableHeader = res.data.Content
+      await getDataDictionary(param, res => {
+        this.tableHeader = res.Content
         this.initTable()
       })
     },