From b0cef59523d65f80602059c8c092d1df57ec1589 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A3=B7=E5=8F=B6?= <14103883+leaf-phos@user.noreply.gitee.com> Date: Thu, 26 Dec 2024 21:15:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/bst/dashboard.js | 9 ++ .../bst/order/components/OrderFlowList.vue | 149 ++++++++++++++++++ .../components/ProdProcessDetail.vue | 137 +++++++--------- src/views/bst/prodProcess/index.vue | 9 +- .../bst/store/components/StoreEditDialog.vue | 2 +- src/views/dashboard/PanelGroup.vue | 134 ++++++++-------- src/views/index.vue | 94 +++-------- src/views/index_v1.vue | 98 ------------ 8 files changed, 307 insertions(+), 325 deletions(-) create mode 100644 src/api/bst/dashboard.js create mode 100644 src/views/bst/order/components/OrderFlowList.vue delete mode 100644 src/views/index_v1.vue diff --git a/src/api/bst/dashboard.js b/src/api/bst/dashboard.js new file mode 100644 index 0000000..da0f951 --- /dev/null +++ b/src/api/bst/dashboard.js @@ -0,0 +1,9 @@ +import request from '@/utils/request' + +// 获取首页数据 +export function getBrief() { + return request({ + url: '/dashboard/brief', + method: 'get' + }) +} \ No newline at end of file diff --git a/src/views/bst/order/components/OrderFlowList.vue b/src/views/bst/order/components/OrderFlowList.vue new file mode 100644 index 0000000..6406156 --- /dev/null +++ b/src/views/bst/order/components/OrderFlowList.vue @@ -0,0 +1,149 @@ + + + + + \ No newline at end of file diff --git a/src/views/bst/prodProcess/components/ProdProcessDetail.vue b/src/views/bst/prodProcess/components/ProdProcessDetail.vue index b3230a4..2aa93d3 100644 --- a/src/views/bst/prodProcess/components/ProdProcessDetail.vue +++ b/src/views/bst/prodProcess/components/ProdProcessDetail.vue @@ -6,44 +6,14 @@ :with-header="false" >
- -
-
-
- - -
-
{{ detail.orderProdName }}
-
-
-
- -
订单图片
-
-
- -
产品图片
-
-
+ +
+ 上报库存
-
- {{ detail.deptName }} + {{ detail.deptName | dv}} 最终工序
- -
-
-
处理方式
-
{{detail.handleWay}}
-
-
-
效果
-
{{detail.effect}}
-
-
-
颜色
-
{{detail.color}}
-
-
-
盖子颜色
-
{{detail.coverColor}}
-
-
-
备注
-
{{detail.remark}}
-
+
订单信息
+
+ + + {{ detail.orderNo | dv}} + + + + {{ detail.orderCustomer | dv}} + {{ detail.orderDate | dv}} + {{ detail.orderDeliveryDate | dv}} + {{ detail.orderMaterial | dv}} + {{ detail.orderRemark | dv}} + {{ detail.orderCreateBy | dv}} + {{ detail.orderCreateTime | dv}} +
- -
- 上报库存 +
产品信息
+
+ + + {{ detail.orderProdName | dv}} + {{ detail.orderProdSpec | dv}} + {{ detail.orderProdMaterialNo | dv}} + {{ detail.handleWay | dv}} + {{ detail.effect | dv}} + {{ detail.color | dv}} + {{ detail.coverColor | dv}} +
+ + + @@ -105,12 +81,14 @@ import { ProgressColors, ProgressFormat } from '@/utils/constants' import OrderLink from '@/components/Business/Order/OrderLink' import BooleanTag from '@/components/BooleanTag' import { getProdProcess } from '@/api/bst/prodProcess' +import StoreEditDialog from '@/views/bst/store/components/StoreEditDialog.vue' export default { name: 'ProdProcessDetail', components: { OrderLink, - BooleanTag + BooleanTag, + StoreEditDialog }, dicts: ['order_status'], props: { @@ -125,6 +103,7 @@ export default { }, data() { return { + showStoreEdit: false, ProgressColors, detail: {}, loading: false, @@ -142,6 +121,9 @@ export default { }, methods: { ProgressFormat, + handleStore() { + this.showStoreEdit = true; + }, onOpen() { this.getDetail(); }, @@ -161,6 +143,18 @@ export default { .process-detail { padding: 16px; background: #fff; + .group-title { + font-size: 16px; + font-weight: bold; + color: #303133; + margin-bottom: 16px; + border-left: 4px solid #409eff; + padding-left: 8px; + } + .header-box { + display: flex; + justify-content: space-between; + } .section { background: #fff; @@ -279,28 +273,9 @@ export default { } .action-area { - padding: 16px 0; - border-top: 1px solid #ebeef5; + padding: 8px 0; display: flex; - justify-content: center; - gap: 16px; - } -} - -// 移动端适配 -@media screen and (max-width: 768px) { - .process-detail { - padding: 12px; - - .section { - padding: 12px; - } - - .header-section { - .images-area { - gap: 12px; - } - } + justify-content: flex-end; } } \ No newline at end of file diff --git a/src/views/bst/prodProcess/index.vue b/src/views/bst/prodProcess/index.vue index e3ede90..3adefe3 100644 --- a/src/views/bst/prodProcess/index.vue +++ b/src/views/bst/prodProcess/index.vue @@ -154,14 +154,14 @@ @@ -198,7 +196,6 @@ import { import { $showColumns } from '@/utils/mixins' import FormCol from '@/components/FormCol/index.vue' import BooleanTag from '@/components/BooleanTag/index.vue' -import StoreEditDialog from '@/views/bst/store/components/StoreEditDialog.vue' import DeptTreeSelect from '@/components/Business/Dept/DeptTreeSelect.vue' import { ProgressColors, ProgressFormat } from '@/utils/constants' import OrderLink from '@/components/Business/Order/OrderLink.vue' @@ -215,7 +212,7 @@ export default { name: "ProdProcess", dicts: ['order_status'], mixins: [$showColumns], - components: { OrderLink, DeptTreeSelect, StoreEditDialog, BooleanTag, FormCol, ProdProcessDetail}, + components: { OrderLink, DeptTreeSelect, BooleanTag, FormCol, ProdProcessDetail}, props: { // 自定义数据 customData: { diff --git a/src/views/bst/store/components/StoreEditDialog.vue b/src/views/bst/store/components/StoreEditDialog.vue index 5703ba9..dba2848 100644 --- a/src/views/bst/store/components/StoreEditDialog.vue +++ b/src/views/bst/store/components/StoreEditDialog.vue @@ -1,5 +1,5 @@