Merge remote-tracking branch 'origin/master'

lyh

6 天以前 b1c4b9509b3b84594bbc9a541f308101d3a17140

 src/views/eam/maintenance/EamInspectionOrderList.vue

@@ -40,7 +40,6 @@
    <!-- 操作按钮区域 -->
    <div class="table-operator" v-if="isDisplayOperation">
      <a-button v-has="'eam:inspection:add'" @click="handleAdd" type="primary" icon="plus">新增</a-button>
      <a-button v-if="selectedRowKeys.length == 1" @click="handlePrint" type="primary">查看</a-button>
      <a-dropdown v-if="selectedRowKeys.length > 0">
        <a-menu slot="overlay">
          <a-menu-item key="1" @click="batchZf('ABOLISH')" v-has="'eam:inspection:abolish'">
@@ -172,6 +171,12 @@
            fixed: 'left'
          },
          {
            title: '点检状态',
            align: 'center',
            dataIndex: 'inspectionStatus_dictText',
            fixed: 'left'
          },
          {
            title: '工单号',
            align: 'center',
            dataIndex: 'orderNum'
@@ -203,11 +208,6 @@
            title: '创建方式',
            align: 'center',
            dataIndex: 'creationMethod_dictText'
          },
          {
            title: '点检状态',
            align: 'center',
            dataIndex: 'inspectionStatus_dictText'
          },
          {
            title: '点检人',