From 9639f75a76e977c4640486604ccef635f971e888 Mon Sep 17 00:00:00 2001
From: jevononlie <728254585@qq.com>
Date: Fri, 10 May 2024 21:24:28 +0800
Subject: [PATCH] unapt
---
mes-ui/uni-app/src/manifest.json | 4 +-
mes-ui/uni-app/src/pages.json | 6 +
.../pages/assembleReport/assembleReport.vue | 187 ++++++++++++++++++
.../pages/index/components/CategoryPanel.vue | 33 +++-
.../pages/index/components/CustomNavbar.vue | 11 +-
mes-ui/uni-app/src/pages/index/index.vue | 7 +
.../src/pages/index/styles/category.scss | 18 +-
.../src/pages/index/styles/category.wxss | 21 +-
mes-ui/uni-app/src/services/assembleReport.ts | 25 +++
.../src/static/images/assembleReport.png | Bin 36832 -> 138555 bytes
mes-ui/uni-app/src/static/images/logo-app.png | Bin 0 -> 20963 bytes
.../src/static/images/productionReport.png | Bin 32707 -> 101404 bytes
.../uni-app/src/static/images/scan-report.png | Bin 0 -> 4772 bytes
.../static/images/unqualifiedNotification.png | Bin 29402 -> 122153 bytes
mes-ui/uni-app/src/utils/index.ts | 58 +++---
.../uni-app/unpackage/res/icons/1024x1024.png | Bin 170603 -> 116085 bytes
.../uni-app/unpackage/res/icons/120x120.png | Bin 8615 -> 5662 bytes
.../uni-app/unpackage/res/icons/144x144.png | Bin 10885 -> 7224 bytes
.../uni-app/unpackage/res/icons/152x152.png | Bin 11631 -> 7802 bytes
.../uni-app/unpackage/res/icons/167x167.png | Bin 12988 -> 8896 bytes
.../uni-app/unpackage/res/icons/180x180.png | Bin 14288 -> 9656 bytes
.../uni-app/unpackage/res/icons/192x192.png | Bin 15681 -> 10805 bytes
mes-ui/uni-app/unpackage/res/icons/20x20.png | Bin 819 -> 638 bytes
mes-ui/uni-app/unpackage/res/icons/29x29.png | Bin 1390 -> 992 bytes
mes-ui/uni-app/unpackage/res/icons/40x40.png | Bin 2214 -> 1431 bytes
mes-ui/uni-app/unpackage/res/icons/58x58.png | Bin 3474 -> 2227 bytes
mes-ui/uni-app/unpackage/res/icons/60x60.png | Bin 3718 -> 2306 bytes
mes-ui/uni-app/unpackage/res/icons/72x72.png | Bin 4582 -> 2880 bytes
mes-ui/uni-app/unpackage/res/icons/76x76.png | Bin 4878 -> 3096 bytes
mes-ui/uni-app/unpackage/res/icons/80x80.png | Bin 5052 -> 3267 bytes
mes-ui/uni-app/unpackage/res/icons/87x87.png | Bin 5756 -> 3656 bytes
mes-ui/uni-app/unpackage/res/icons/96x96.png | Bin 6582 -> 4198 bytes
32 files changed, 311 insertions(+), 59 deletions(-)
create mode 100644 mes-ui/uni-app/src/pages/assembleReport/assembleReport.vue
create mode 100644 mes-ui/uni-app/src/services/assembleReport.ts
create mode 100644 mes-ui/uni-app/src/static/images/logo-app.png
create mode 100644 mes-ui/uni-app/src/static/images/scan-report.png
diff --git a/mes-ui/uni-app/src/manifest.json b/mes-ui/uni-app/src/manifest.json
index b77abb5d..32063981 100644
--- a/mes-ui/uni-app/src/manifest.json
+++ b/mes-ui/uni-app/src/manifest.json
@@ -1,6 +1,6 @@
{
- "name" : "合力机械小程序",
- "appid" : "__UNI__F93316F",
+ "name" : "高效生产",
+ "appid" : "__UNI__C3D5591",
"description" : "",
"versionName" : "1.0.0",
"versionCode" : "100",
diff --git a/mes-ui/uni-app/src/pages.json b/mes-ui/uni-app/src/pages.json
index 9bbb6600..e7660af5 100644
--- a/mes-ui/uni-app/src/pages.json
+++ b/mes-ui/uni-app/src/pages.json
@@ -42,6 +42,12 @@
"navigationBarTitleText": "生产报工"
}
},
+ {
+ "path": "pages/assembleReport/assembleReport",
+ "style": {
+ "navigationBarTitleText": "包装报工"
+ }
+ },
{
"path": "pages/my/my",
"style": {
diff --git a/mes-ui/uni-app/src/pages/assembleReport/assembleReport.vue b/mes-ui/uni-app/src/pages/assembleReport/assembleReport.vue
new file mode 100644
index 00000000..26e640d3
--- /dev/null
+++ b/mes-ui/uni-app/src/pages/assembleReport/assembleReport.vue
@@ -0,0 +1,187 @@
+
+
+
+
+
+
+
+
+
+ {{ index + 1 }}
+ 包装条形码:{{ item.assembleCode}}
+
+
+ 产品编码: {{ item.projectSubCode }}
+ 产品名称: {{ item.projectSubName }}
+ 报工工序: {{ item.procedureName }}
+ 报工数量: {{ item.amount }}
+ 报工人: {{ item.ownerName }}
+
+
+
+
+
+
+
diff --git a/mes-ui/uni-app/src/pages/index/components/CategoryPanel.vue b/mes-ui/uni-app/src/pages/index/components/CategoryPanel.vue
index b5601f47..87cfe2dd 100644
--- a/mes-ui/uni-app/src/pages/index/components/CategoryPanel.vue
+++ b/mes-ui/uni-app/src/pages/index/components/CategoryPanel.vue
@@ -2,18 +2,26 @@
* @Author: 王文杰
* @Date: 2024-03-04 14:13:16
* @LastEditors: jevononlie 728254585@qq.com
- * @LastEditTime: 2024-04-18 14:48:48
+ * @LastEditTime: 2024-05-10 14:47:12
* @FilePath: /app-nx-personal/src/pages/index/components/CategoryPanel.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->