Merge remote-tracking branch 'origin/master'

zhaowei

昨天 5ec150affc0fc777b2a645a888d377f65501e08b

 src/views/eam/maintenance/EamInspectionOrderList.vue

@@ -60,13 +60,14 @@
      <!--</a-button>-->
      <!--</a-dropdown>-->

      <a-button type="primary" icon="delete" @click="batchZf('ABOLISH')" v-has="'eam:inspection:abolish'"
                :disabled="selectedRowKeys.length===0">批量作废
      </a-button>

      <a-button type="primary" icon="form" @click="batchLq('UNDER_INSPECTION')" v-has="'eam:inspection:collect'"
                :disabled="selectedRowKeys.length===0">批量领取
      </a-button>
      <a-button type="primary" icon="monitor" @click="handleBatchPrint" :disabled="selectedRowKeys.length===0">批量预览
      </a-button>
      <a-button type="danger" icon="delete" @click="batchZf('ABOLISH')" v-has="'eam:inspection:abolish'"
                :disabled="selectedRowKeys.length===0">批量作废
      </a-button>
    </div>

@@ -82,6 +83,12 @@
               :dataSource="dataSource" :pagination="ipagination" :loading="loading"
               :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" class="j-table-force-nowrap"
               @change="handleTableChange">

        <!--使用部门-->
        <template slot="factoryOrgCode" slot-scope="text,record">
          {{[record.zxfactoryOrgCode_dictText].filter(item=>item).join('/')}}
        </template>

        <span slot="action" slot-scope="text, record">
          <template v-if=" record.inspectionStatus === 'WAIT_INSPECTION'">
            <a @click="handleEdit(record)">编辑</a>
@@ -192,6 +199,12 @@
            fixed: 'left'
          },
          {
            title: '使用部门',
            align: 'center',
            scopedSlots: { customRender: 'factoryOrgCode' },
            fixed: 'left'
          },
          {
            title: '点检状态',
            align: 'center',
            dataIndex: 'inspectionStatus_dictText',