.env.dev

@@ -13,7 +13,7 @@ VUE_APP_TITLE = MES系统
 
 # 芋道管理系统/开发环境
 # VUE_APP_BASE_API = 'http://100.64.0.26:48082'
-VUE_APP_BASE_API = 'http://192.168.0.33:48082'
+VUE_APP_BASE_API = 'http://10.70.2.2:8080'
 # VUE_APP_BASE_API = 'http://192.168.4.173:48080'
 # VUE_APP_BASE_API = 'http://192.168.2.173:48080'
 # VUE_APP_BASE_API = 'http://192.168.1.49:48082'

.env.prod

@@ -15,7 +15,7 @@ VUE_APP_TITLE = MES系统
 VUE_APP_BASE_API = '/prod-api'
 
 # 积木报表指向地址
-VUE_APP_JIMU_API = 'http://10.70.2.2:8080'
+VUE_APP_JIMU_API = 'http://10.70.2.22:8080'
 
 
 # 根据服务器或域名修改

src/views/base/custom/index.vue

@@ -268,17 +268,25 @@ export default {
           // })
         // } else {
           $('.hiprintEpContainer').empty()
-          console.log(this.modelData);
+          console.log(this.modelData || {});
           hiprint.PrintElementTypeManager.build('.hiprintEpContainer', provider.value)
           $('.hiprint-printTemplate').empty()
           // const templates = this.$ls.get('KEY_TEMPLATES', {})
           const template = provider.value
           // console.log(template)
+          if (this.modelData) {
             hiprintTemplate = new hiprint.PrintTemplate({
-            template: this.modelData != '' ? JSON.parse(this.modelData) : {},
+              template: JSON.parse(this.modelData),
               settingContainer: '#PrintElementOptionSetting',
               paginationContainer: '.hiprint-printPagination'
             })
+          } else {
+            hiprintTemplate = new hiprint.PrintTemplate({
+              template: {},
+              settingContainer: '#PrintElementOptionSetting',
+              paginationContainer: '.hiprint-printPagination'
+            })
+          }
         // }
         hiprintTemplate.design('#hiprint-printTemplate')
         // console.log(hiprintTemplate)

src/views/system/dept/index.vue

@@ -28,6 +28,7 @@
 
     <el-table v-if="refreshTable" v-loading="loading" :data="deptList" row-key="id" :default-expand-all="isExpandAll"
               :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
+      <el-table-column prop="id" label="部门编码" width="260"></el-table-column>
       <el-table-column prop="name" label="部门名称" width="260"></el-table-column>
       <el-table-column prop="leader" label="负责人" :formatter="userNicknameFormat" width="120"/>
       <el-table-column prop="sort" label="排序" width="200"></el-table-column>