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

pages/import/index.vue

@@ -18,7 +18,7 @@
             <Button type="primary" @click="add">新增</Button>
         </template>
     </DataGrid>
-    <Modal v-model="modal" :title="title" width="1200" :fullscreen="full" footer-hide>
+    <Modal v-model="modal" :title="title" width="1200" :fullscreen="full" :footer-hide="initBtn">
         <component :is="detail" :eid="curId" @on-close="cancel" @on-ok="ok" />
     </Modal>
 </div>
@@ -48,6 +48,7 @@ export default {
             },
             modal: false,
             full: false,
+            initBtn: true,
             title: "新增",
             detail: null,
             curId: 0,
@@ -213,6 +214,7 @@ export default {
         add() {
             this.curId = 0;
             this.full = false;
+            this.initBtn = true;
             this.title = "新增";
             this.detail = () => import("./add");
             this.modal = true;
@@ -227,6 +229,7 @@ export default {
             this.curId = id;
             this.title = "详情";
             this.full = false;
+            this.initBtn = false;
             this.detail = () => import("./detail");
             this.modal = true;
         },
@@ -234,6 +237,7 @@ export default {
             this.curId = id;
             this.title = "编辑";
             this.full = false;
+            this.initBtn = true;
             this.detail = () => import("./edit");
             this.modal = true;
         },
@@ -241,6 +245,7 @@ export default {
             this.curId = row.id;
             this.title = "处理文件：" + row.name;
             this.full = true;
+            this.initBtn = true;
             this.detail = () => import("./process");
             this.modal = true;
         },

pages/produce/orderlist.vue

@@ -102,10 +102,10 @@ export default {
                     op: "mesCode,productName,drawnNumber",
                     value: null,
                 },
-                // status: {
-                //     op: "In",
-                //     value: [12, 14, 5, 7, -1]
-                // }
+                DispatchStatus: {
+                    op: "In",
+                    value: [12, 14, 5, 7, -1]
+                }
             },
             downUrl: fileUrlDown,
             columns: [{