Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0

gaoluyang

2 天以前 16a0780b463a7544497b313c86a0033f5a79b425

Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0

 src/views/mes/process-design/route/modules/product-list.vue

@@ -112,7 +112,7 @@
      <TableAction
        :actions="[
          {
            label: $t('common.edit'),
            label: '配置投料',
            type: 'link',
            ifShow: () => isEditable,
            onClick: handleEdit.bind(null, row),