From 6b027c18660b828ec7b57ad0e3f4ffca9f4d14d1 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期五, 03 十一月 2023 15:15:24 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/bulletin-board-style1 into wn
---
src/views/dashboard/components/OutputMaterialsList.vue | 65 +++++++-------------------------
1 files changed, 14 insertions(+), 51 deletions(-)
diff --git a/src/views/dashboard/components/OutputMaterialsList.vue b/src/views/dashboard/components/OutputMaterialsList.vue
index 092af0e..9ae2fca 100644
--- a/src/views/dashboard/components/OutputMaterialsList.vue
+++ b/src/views/dashboard/components/OutputMaterialsList.vue
@@ -6,8 +6,8 @@
</div>
<el-scrollbar always class="scroller">
<div class="materials-b">
- <div v-for="item in outputMaterials" :key="item.materialId">
- <InputOutMaterialInfo :item="item" :background="item.background"></InputOutMaterialInfo>
+ <div v-for="item in props.materialList" :key="item.materialId">
+ <InputOutMaterialInfo :material="item" @detail-click="onDetailClick"></InputOutMaterialInfo>
</div>
</div>
</el-scrollbar>
@@ -16,55 +16,18 @@
<script setup lang="ts">
import InputOutMaterialInfo from '@/views/dashboard/components/InputOutMaterialInfo.vue'
import BigButton from '@/views/dashboard/components/BigButton.vue'
-import { toRefs } from 'vue'
-const outputMaterials = [
- {
- materialId: '1111',
- materialName: '杈撳叆鍚嶇О',
- amount: 10,
- unit: '涓�'
- },
- {
- materialId: '2222222222222222',
- materialName: '杈撳叆鍚嶇О2',
- amount: 20,
- unit: '涓�',
- background: '#33ccff'
- },
- {
- materialId: '1111',
- materialName: '杈撳叆鍚嶇О',
- amount: 10,
- unit: '涓�'
- },
- {
- materialId: '2222222222222222',
- materialName: '杈撳叆鍚嶇О2',
- amount: 20,
- unit: '涓�',
- background: '#33ccff'
- },
- {
- materialId: '1111',
- materialName: '杈撳叆鍚嶇О',
- amount: 10,
- unit: '涓�'
- },
- {
- materialId: '2222222222222222',
- materialName: '杈撳叆鍚嶇О2',
- amount: 20,
- unit: '涓�',
- background: '#33ccff'
- },
- {
- materialId: '2222222222222222',
- materialName: '杈撳叆鍚嶇О2',
- amount: 20,
- unit: '涓�',
- background: '#33ccff'
- }
-]
+import type { Material } from '@/api/task'
+
+const props = defineProps<{
+ materialList?: Material[]
+}>()
+const emits = defineEmits<{
+ detailClick: [material: Material]
+}>()
+
+function onDetailClick(material: Material) {
+ emits('detailClick', material)
+}
</script>
<style scoped lang="scss">
--
Gitblit v1.8.0