Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-ui into dev

src/views/mes/pro/workorder/indexApply.vue

@@ -350,7 +350,7 @@
       <el-table-column label="单据状态" align="center" prop="status">
         <template slot-scope="scope">
           <dict-tag
-            :options="dict.type.mes_order_status"
+            :options="dict.type.mes_workorder_status"
             :value="scope.row.status"
           />
         </template>
@@ -496,7 +496,7 @@
                 placeholder="请选择单据状态"
               >
                 <el-option
-                  v-for="dict in dict.type.mes_order_status"
+                  v-for="dict in dict.type.mes_workorder_status"
                   :key="dict.value"
                   :label="dict.label"
                   :value="dict.value"
@@ -718,7 +718,11 @@ import { getToken } from "@/utils/auth";
 
 export default {
   name: "Workorder",
-  dicts: ["mes_order_status", "mes_workorder_sourcetype", "mes_workorder_type", "mes_order_status"],
+  dicts: [
+    "mes_workorder_status",
+    "mes_workorder_sourcetype",
+    "mes_workorder_type",
+  ],
   components: {
     Treeselect,
     ItemSelect,