Merge remote-tracking branch 'origin/master'

zhaowei

昨天 5ec150affc0fc777b2a645a888d377f65501e08b

 src/views/eam/maintenance/EamSecondMaintenanceOrderList.vue

@@ -93,6 +93,12 @@
      <a-table ref="table" size="middle" bordered rowKey="id" :columns="columns" :dataSource="dataSource"
               :pagination="ipagination" :loading="loading" class="j-table-force-nowrap" :scroll="{x:'max-content'}"
               :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @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.maintenanceStatus === 'WAIT_MAINTENANCE'">
            <a v-has="'secondMaintenanceOrder:edit'" @click="handleEdit(record)">编辑</a>
@@ -220,6 +226,12 @@
            fixed: 'left'
          },
          {
            title: '使用部门',
            align: 'center',
            scopedSlots: { customRender: 'factoryOrgCode' },
            fixed: 'left'
          },
          {
            title: '保养状态',
            align: 'center',
            dataIndex: 'maintenanceStatus_dictText',