diff --git a/src/views/firstOrder/components/recordDialog.vue b/src/views/firstOrder/components/recordDialog.vue index d52e3d2..66f6f49 100644 --- a/src/views/firstOrder/components/recordDialog.vue +++ b/src/views/firstOrder/components/recordDialog.vue @@ -7,8 +7,8 @@ @close="closeDialog" > - - + +
{ this.data = res.data.result.list; this.page.total = res.data.result.total; }) .finally(() => { - this.loading = false; + this.loading = false; }); }, }, diff --git a/src/views/secondOrder/components/approvalProcessDialog.vue b/src/views/secondOrder/components/approvalProcessDialog.vue index b524069..a00a832 100644 --- a/src/views/secondOrder/components/approvalProcessDialog.vue +++ b/src/views/secondOrder/components/approvalProcessDialog.vue @@ -36,21 +36,6 @@ export default { inDialogVisible: false, inDialogTiltle: "审批流程", approvalList: [ - // { - // name: "张三", - // time: "2021-01-01 10:10:10", - // status: "通过", - // }, - // { - // name: "张三1", - // time: "", - // status: "待审核", - // }, - // { - // name: "张三3", - // time: "", - // status: "待审核", - // }, ], }; }, @@ -82,7 +67,7 @@ export default { .teps-con { margin: 0 auto 0; :deep(.el-step) { - margin-bottom: 10px; + margin-bottom: 10px; &:last-child { margin-bottom: 0; } diff --git a/src/views/secondOrder/components/outDialog.vue b/src/views/secondOrder/components/outDialog.vue index 07a8bd1..0689e79 100644 --- a/src/views/secondOrder/components/outDialog.vue +++ b/src/views/secondOrder/components/outDialog.vue @@ -134,7 +134,7 @@
{{ outDateInfo }} 出库信息:
-
+
-
+
{ this.groupNameOptions = res.data.result; }); diff --git a/src/views/secondOrder/components/recordDialog.vue b/src/views/secondOrder/components/recordDialog.vue index 74f4a9e..68b628b 100644 --- a/src/views/secondOrder/components/recordDialog.vue +++ b/src/views/secondOrder/components/recordDialog.vue @@ -8,8 +8,9 @@ > - - + + +
@@ -115,7 +116,7 @@ export default { this.page.currentPage = 1; this.onLoad(this.page, params); done(); - }, + }, searchReset() { this.query = {}; this.onLoad(this.page);