Merge remote-tracking branch 'origin/master'

src/assets/styles/btn.scss

@@ -114,7 +114,7 @@
     border: 1px solid #5BB647!important;
     color: #FFFFFF!important;
   }
-  &.is-disabled,&.is-disabled:hover,&.is-disabled:focus,&.permi-disabled,&.permi-disabled:hover,&.permi-disabled:focus{
+  &.is-disabled.el-button.el-button--default,&.is-disabled.el-button.el-button--default:hover,&.is-disabled.el-button.el-button--default:focus,&.permi-disabled.el-button.el-button--default,&.permi-disabled.el-button.el-button--default:hover,&.permi-disabled.el-button.el-button--default:focus{
     background: #83C374!important;
     color: #FFFFFF!important;
     border: 1px solid #83C374!important;
@@ -197,7 +197,7 @@
     color: #FFFFFF!important;
     border: 1px solid #55A343!important;
   }
-  &.is-disabled,&.is-disabled:hover,&.is-disabled:focus,&.permi-disabled,&.permi-disabled:hover,&.permi-disabled:focus{
+  &.is-disabled.el-button.el-button--default,&.is-disabled.el-button.el-button--default:hover,&.is-disabled.el-button.el-button--default:focus,&.permi-disabled.el-button.el-button--default,&.permi-disabled.el-button.el-button--default:hover,&.permi-disabled.el-button.el-button--default:focus{
     background: #83C374!important;
     color: #FFFFFF!important;
     border: 1px solid #83C374!important;

src/components/InputTips/InputTips.vue

+<template>
+  <el-tooltip :content="text" placement="top-start" :disabled="tipDisabled">
+    <el-input
+      v-model="text"
+      readonly="true"
+      disabled="true"
+      :style="{width: width}"
+      @mouseover.native="inputOnMouseOver($event)"
+    />
+  </el-tooltip>
+</template>
+
+<script>
+export default {
+  name: 'InputTips',
+  props: {
+    // 输入框内容
+    text: {
+      type: String,
+      default: null
+    },
+    // 输入框宽度
+    width: {
+      type: String,
+      default: '100%'
+    }
+  },
+  data() {
+    return {
+      tipContent: null,
+      tipDisabled: false
+    }
+  },
+  watch: {},
+  created() {
+
+  },
+  methods: {
+    inputOnMouseOver(event) {
+      const target = event.target
+      // 判断是否开启tooltip功能
+      if (target.offsetWidth < target.scrollWidth) {
+        this.tipDisabled = false
+      } else {
+        this.tipDisabled = true
+      }
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+::v-deep .el-input__inner {
+  text-overflow: ellipsis
+}
+</style>