diff --git a/app/pages.json b/app/pages.json
index 1dfa37f..eb45822 100644
--- a/app/pages.json
+++ b/app/pages.json
@@ -287,7 +287,7 @@
}
},
{
- "path": "wish_menu/index",
+ "path": "day_menu/index",
"style": {
"navigationBarTitleText": "每日菜单",
"navigationBarBackgroundColor": "#FFFFFF",
@@ -298,6 +298,18 @@
// #endif
}
},
+ {
+ "path": "wish_menu/index",
+ "style": {
+ "navigationBarTitleText": "祈愿菜单",
+ "navigationBarBackgroundColor": "#FFFFFF",
+ "navigationBarTextStyle": "black"
+ // #ifdef H5
+ ,
+ "navigationStyle": "custom"
+ // #endif
+ }
+ },
{
"path": "repair/index",
"style": {
diff --git a/app/pages/index/index.vue b/app/pages/index/index.vue
index 9f681fd..f6a6345 100644
--- a/app/pages/index/index.vue
+++ b/app/pages/index/index.vue
@@ -95,7 +95,7 @@
-
+
diff --git a/app/pages/supply_chain/day_menu/index.vue b/app/pages/supply_chain/day_menu/index.vue
new file mode 100644
index 0000000..74e05d3
--- /dev/null
+++ b/app/pages/supply_chain/day_menu/index.vue
@@ -0,0 +1,719 @@
+
+
+
+
+ 前一天
+
+
+ {{ selectedDate }}
+
+
+
+ 后一天
+
+ 默认当天,可切换查看不同日期菜单
+
+
+
+
+
+
+ {{ canteen.label }}
+
+
+
+
+
+
+
+
+
+
+
+ 当日菜单
+
+
+ {{ meal.label }}
+
+
+
+
+ {{ item.itemName || '未命名菜品' }}
+
+ ¥{{ item.itemPrice }}
+
+
+
+
+
+
+ {{ item.likeCount || 0 }}
+
+
+
+ {{ item.dislikeCount || 0 }}
+
+
+
+
+ 暂无{{ meal.label }}菜品
+
+
+
+
+
+
+
+
+
+ ✕
+
+
+ {{ rankingDateRange.startDate && rankingDateRange.endDate ? `${rankingDateRange.startDate} 至 ${rankingDateRange.endDate}` : '选择日期范围' }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ index + 1 }}
+ {{ item.itemName || '未命名菜品' }}
+
+
+
+
+ {{ rankingType === 'like' ? (item.likeCount || 0) : (item.dislikeCount || 0) }}
+
+
+
+ 暂无排行数据
+
+
+
+
+
+
+
diff --git a/app/pages/supply_chain/material_receipt/index.vue b/app/pages/supply_chain/material_receipt/index.vue
index 2441705..e8468bd 100644
--- a/app/pages/supply_chain/material_receipt/index.vue
+++ b/app/pages/supply_chain/material_receipt/index.vue
@@ -28,8 +28,8 @@
- {{ item.cargoName }} ({{ item.cargoSpec }})
- ×
+ {{ item.cargoName }} ({{ item.cargoSpec }}) x {{ item.quantity }}
+ x
@@ -82,14 +82,26 @@
class="material-item"
v-for="material in filteredMaterials"
:key="material.cargoId"
- @click="toggleMaterial(material)"
>
{{ material.cargoName }}
{{ material.cargoSpec }}
-
- ✓
+
+
+ -
+
+ +
+
+
+ ✓
+
@@ -113,7 +125,13 @@
领用单
{{ getStatusText(item) }}
@@ -145,7 +163,7 @@
领用物资
- {{ cargo.cargoName }} ({{ cargo.cargoSpec }}){{ index < item.ckBillCargos.length - 1 ? '、' : '' }}
+ {{ cargo.cargoName }}{{ cargo.cargoSpec ? ` (${cargo.cargoSpec})` : '' }}{{ cargo.cargoWt ? ` x ${parseFloat(cargo.cargoWt).toFixed(2).replace(/\.?0+$/, '')}` : '' }}{{ index < item.ckBillCargos.length - 1 ? '、' : '' }}
@@ -153,8 +171,8 @@
@@ -173,7 +191,7 @@
{{ currentVoucher ? currentVoucher.billNumber : '' }}
-
+