Merge remote-tracking branch 'origin/master'

enterprise-manager-ui/admin/src/assets/mixins/table.js

@@ -222,7 +222,11 @@ export default {
     // 格式化单元格数据
     formatterDate(row, column) {
       //console.log("date:",row,column)
+      if(formatterDate(row, column)){
         return formatterDate(row, column)
+      }else{
+        return '--'
+      }
     },
     // 格式化单元格数据 只要年月日
     formatterDateOnly(row, column) {

enterprise-manager-ui/admin/src/components/tools/FormButtons.vue

@@ -4,7 +4,7 @@
         <slot name="prepend"></slot>
         <slot>
             <el-button v-if="!noSaveBtn" type="primary" @click='$emit("submit")' icon='el-icon-circle-check-outline'>保存</el-button>
-            <el-button v-if="!noCancelBtn" @click="$router.go(-1)" icon='el-icon-circle-close-outline'>取消</el-button>
+            <el-button v-if="!noCancelBtn" @click='$emit("cancel")' icon='el-icon-circle-close-outline'>取消</el-button>
         </slot>
         <slot name="append"></slot>
     </el-form-item>

enterprise-manager-ui/admin/src/views/company/list.vue

@@ -54,9 +54,9 @@
 
                         {label: "联系电话", prop: "contactPhone"},
 
-                        {label: "经营地址", prop: "businessAdress"},
+                        {label: "经营地址", prop: "businessAdress",formatter: this.formatters},
 
-                        {label: "描述", prop: "companyIntroduction"},
+                        {label: "描述", prop: "companyIntroduction",formatter: this.formatters},
 
                         {label: "更新时间", prop: "createTime", formatter: this.formatterDate},
 

enterprise-manager-ui/admin/src/views/feedback/list.vue

@@ -105,22 +105,22 @@
                         {type: "index",label: "序号",width: 50},
 
 
-                        {label: "内容", prop: "content"},
+                        {label: "内容", prop: "content",formatter: this.formatter},
 
-                      {label: "真实姓名", prop: "feedbackName"},
-                      {label: "联系电话", prop: "contactInfo"},
+                      {label: "真实姓名", prop: "feedbackName",formatter: this.formatter},
+                      {label: "联系电话", prop: "contactInfo",formatter: this.formatter},
 
-                      {label: "单位名称", prop: "companyName"},
+                      {label: "单位名称", prop: "companyName",formatter: this.formatter},
 
 
-                      {label: "邮箱地址", prop: "email"},
+                      {label: "邮箱地址", prop: "email",formatter: this.formatter},
 
                       {label: "提交时间", prop: "createTime", formatter: this.formatterDate},
 
 
                         {label: "是否回复 ", prop: "reply",formatter: this.formatter},
 
-                        {label: "回复人", prop: "replyPerson"},
+                        {label: "回复人", prop: "replyPerson",formatter: this.formatter},
 
                         // {label: "反馈类型 ", prop: "feedbackType",formatter: this.formatter},
 

enterprise-manager-ui/admin/src/views/labels/list.vue

@@ -52,7 +52,7 @@
 
                         {label: "标签名称", prop: "labelName"},
 
-                        {label: "标签描述", prop: "labelDesc"},
+                        {label: "标签描述", prop: "labelDesc",formatter: this.formatters},
 
 
                       {label: "标签图标", prop: "labelLogoPath",formatter: (row) => {

enterprise-manager-ui/admin/src/views/position/list.vue

@@ -53,7 +53,7 @@
 
                       {label: "职位名称", prop: "positionName"},
 
-                        {label: "职位编码", prop: "positionCode"},
+                        {label: "职位编码", prop: "positionCode",formatter: this.formatters},
 
                         {
                             label: "操作",

enterprise-manager-ui/admin/src/views/product/list.vue

@@ -126,7 +126,7 @@
 
                         {label: "所属企业", prop: "companyId",formatter: this.formatters},
 
-                        {label: "产品介绍", prop: "productIntroduction" , width: 500},
+                        {label: "产品介绍", prop: "productIntroduction" , width: 500,formatter: this.formatters},
 
                         {label: "发布时间", prop: "publishTime", formatter: this.formatterDate},
 

enterprise-manager-ui/admin/src/views/staff/list.vue

@@ -76,7 +76,7 @@
 
                       {label: "联系电话", prop: "phoneNumber"},
 
-                      {label: "邮件地址", prop: "email"},
+                      {label: "邮件地址", prop: "email",formatter: this.formatters},
 
                         {label: "所属公司", prop: "companyIds",formatter: this.formatters},
 

enterprise-manager-ui/admin/src/views/staff/record/list.vue

@@ -56,9 +56,9 @@
                         {type: "selection", width: 60},
                         {type: "index",label: "序号",width: 50},
 
-                        {label: "被查看员工姓名", prop: "staffName"},
+                        {label: "被查看员工姓名", prop: "staffName", formatter: this.formatter},
 
-                        {label: "查看人名称", prop: "viewName"},
+                        {label: "查看人名称", prop: "viewName", formatter: this.formatter},
 
                         {label: "创建用户", prop: "createUserId", formatter: this.formatter},
                         {