Merge remote-tracking branch 'origin/dev_NEW_pro' into dev_NEW_pro

云

2 天以前 c7ac44a1004dcf791fe7282368f1f657e035c961

 src/components/PIMTable/PIMTable.vue

@@ -21,6 +21,7 @@
            class="lims-table">
    <el-table-column align="center"
                     type="selection"
                     :selectable="selectable"
                     width="55"
                     v-if="isSelection" />
    <el-table-column align="center"
@@ -258,6 +259,10 @@
      type: Boolean,
      default: false,
    },
    selectable: {
      type: Function,
      default: () => true,
    },
    isShowPagination: {
      type: Boolean,
      default: true,