Merge remote-tracking branch 'origin/master'

zhaowei

昨天 5ec150affc0fc777b2a645a888d377f65501e08b

 src/views/eam/technical/EamTechnicalStatusEvaluationApplicationList.vue

@@ -53,6 +53,11 @@
    <a-table ref="table" size="middle" bordered rowKey="id" :columns="columns" :dataSource="dataSource"
             :pagination="ipagination" :loading="loading" :scroll="{x:'max-content'}" @change="handleTableChange">

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

        <span slot="action" slot-scope="text, record">
          <template v-if="record.applicationStatus=='WAIT_SUBMIT'">
          <a @click.stop="handleEdit(record)">编辑</a>
@@ -138,6 +143,12 @@
            fixed: 'left'
          },
          {
            title: '使用部门',
            align: 'center',
            scopedSlots: { customRender: 'factoryCode' },
            fixed: 'left'
          },
          {
            title: '申请单状态',
            align: 'center',
            dataIndex: 'applicationStatus_dictText',