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
-->