Merge branch 'product' of http://git.mes123.com/zhouyx/mes-ui into product

6615fc1f · 仇晓婷 · 7cd863e9 · 13c49b8f · 6615fc1f · 6615fc1f
Commit 6615fc1f authored Oct 31, 2020 by 仇晓婷
Showing with 818 additions and 813 deletions

excute.vue pages/aps/ai/components/excute.vue +378 -368

excute.vue pages/aps/aps/components/excute.vue +1 -2

orderSupport.vue pages/produce/orderSupport.vue +439 -443

No files found.
--- a/pages/aps/ai/components/excute.vue
+++ b/pages/aps/ai/components/excute.vue
--- a/pages/aps/aps/components/excute.vue
+++ b/pages/aps/aps/components/excute.vue
@@ -211,8 +211,7 @@ export default {
                    title: this.l("equip_type"),
                    align: "left",
                    easy: true,
-                    high: true,
-                    hide: true
+                    high: true
                },
                {
                    key: "first_equip",

--- a/pages/produce/orderSupport.vue
+++ b/pages/produce/orderSupport.vue