Merge remote-tracking branch 'origin/master'

zhaowei

3 天以前 6e4b54ef350de163e4101558889d043d437e793c

 src/views/eam/base/EamMaintenanceStandardList.vue

@@ -99,7 +99,7 @@

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

        <span slot="action" slot-scope="text, record">
@@ -237,7 +237,7 @@
          },
          {
            title: '使用部门',
            dataIndex: 'factoryOrgCode',
            align: 'center',
            scopedSlots: { customRender: 'factoryOrgCode' },
          },
          {