Merge remote-tracking branch 'origin/master'

zhaowei

昨天 5ec150affc0fc777b2a645a888d377f65501e08b

 src/views/eam/repair/EamReportAccidentsRegisterList.vue

@@ -68,6 +68,11 @@
        <a-switch v-if="text" checked-children="同意" un-checked-children="不同意" :checked="Boolean(text)" disabled/>
      </template>

      <!--使用部门-->
      <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.registerStatus==='PENDING_SUBMIT'">
             <a @click="handleEdit(record)">编辑</a>
@@ -162,6 +167,12 @@
            fixed: 'left'
          },
          {
            title: '使用部门',
            align: 'center',
            scopedSlots: { customRender: 'factoryOrgCode' },
            fixed: 'left'
          },
          {
            title: '登记状态',
            align: 'center',
            dataIndex: 'registerStatus_dictText',