From 7ebf9752b95f98865bf94469b58c5abb302a69dd Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期六, 09 十二月 2023 14:45:45 +0800
Subject: [PATCH] 点击当前工序完成的时增加当前时间和任务详情中实际开始时间对比，如果小于60s增加提示并且不请求接口
---
src/views/dashboard/components/MaterialDetails.vue | 31 +++++++++++++++----------------
1 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/src/views/dashboard/components/MaterialDetails.vue b/src/views/dashboard/components/MaterialDetails.vue
index 1df2fdc..0077c34 100644
--- a/src/views/dashboard/components/MaterialDetails.vue
+++ b/src/views/dashboard/components/MaterialDetails.vue
@@ -3,19 +3,22 @@
<BaseModal v-model="modelData" :wider="true" @close="closeModal">
<template #title>鐗╂枡璇︽儏 </template>
<div class="details-box">
- <div class="details-t">
- <div class="details-t-t">{{ materialObj.form.materialId }}</div>
+ <div v-if="material" class="details-t">
+ <div class="details-t-t">{{ material.materialId }}</div>
<div class="details-t-b">
<div class="details-t-b-l">
- <div class="item">鐗╂枡鍚嶇О锛歿{ materialObj.form.materialName }}</div>
- <div class="item">鏁伴噺锛歿{ materialObj.form.amount }}</div>
- <div class="item">鐗╂枡瑙勬牸锛歿{ materialObj.form.amount }}</div>
- <div class="item">鐗╂枡绫诲瀷锛歿{ materialObj.form.amount }}</div>
+ <div class="item">鐗╂枡鍚嶇О锛歿{ material.materialName }}</div>
+ <div class="item">鏁伴噺锛歿{ material.amount }}</div>
+ <div class="item">鐗╂枡瑙勬牸锛歿{ material.amount }}</div>
+ <div class="item">鐗╂枡绫诲瀷锛歿{ material.amount }}</div>
</div>
- <BigButton class="btn" bg-color="#03d203f0">宸查�佽揪</BigButton>
+ <!-- TODO: 鐗╂枡閫佽揪缂烘帴鍙�-->
+ <BigButton v-if="false" class="btn" bg-color="#03d203f0">宸查�佽揪</BigButton>
</div>
</div>
- <div class="details-b">
+
+ <!-- TODO: 鐗╂枡閫佽揪缂烘帴鍙�-->
+ <div v-if="false" class="details-b">
<div class="details-b-t">杩愯緭璇︽儏</div>
<div class="details-b-b">
@@ -44,11 +47,13 @@
<script setup lang="ts">
import { useVModel } from '@vueuse/core'
import BigButton from '@/views/dashboard/components/BigButton.vue'
-import { ref } from 'vue'
+import type { Material } from '@/api/task'
export interface MaterialDetailsProps {
+ material?: Material
modelValue: boolean
}
const props = withDefaults(defineProps<MaterialDetailsProps>(), {
+ material: undefined,
modelValue: false
})
const emit = defineEmits<{
@@ -59,14 +64,8 @@
function closeModal() {
modelData.value = false
}
+// 鍋囨暟鎹�
const materialObj = {
- form: {
- materialId: '1111',
- materialName: '杈撳叆鍚嶇О',
- amount: 10,
- unit: '涓�',
- date: 10
- },
materialFlow: [
{
label: '宸查�佽揪',
--
Gitblit v1.8.0