Merge remote-tracking branch 'origin/dev_New' into dev_New

gaoluyang

昨天 2088822f2bca6d93ad3e550a166a9b18332747fd

 src/views/productionManagement/workOrder/index.vue

@@ -233,7 +233,7 @@
    {
      label: "工单类型",
      prop: "workOrderType",
      width: "140",
      width: "80",
    },
    {
      label: "工单编号",