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

gaoluyang

4 天以前 ce13234bf22eeb934807dd28d4ed54c3dbe628da

 src/views/mes/pro/task/modules/schedule-form.vue

@@ -129,7 +129,7 @@
        <TaskList
          :color-code="rp.colorCode"
          :disabled="isReadonly"
          :item-id="workOrder.productId"
          :item-id="rp.outputItemId || workOrder.productId"
          :process-id="rp.processId!"
          :route-id="currentRouteId"
          :work-order-id="workOrder.id!"