From 82e27d0cadbddfc73e8b978e778b802dc8e51fa1 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期五, 29 三月 2024 10:51:36 +0800
Subject: [PATCH] 报工入参修改和工序ID修改
---
src/views/dashboard/components/CraftDetailModal.vue | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/views/dashboard/components/CraftDetailModal.vue b/src/views/dashboard/components/CraftDetailModal.vue
index 81e00c0..b81c491 100644
--- a/src/views/dashboard/components/CraftDetailModal.vue
+++ b/src/views/dashboard/components/CraftDetailModal.vue
@@ -4,7 +4,7 @@
<template #title>宸ヨ壓璇︽儏 </template>
<div v-if="craftModel" class="modal-content">
<el-scrollbar always class="scroller">
- <div :class="!craftModel?.isUpdate ? 'modal-t margin_bottom_20' : 'modal-t modal-t-two'">
+ <div :class="craftModel?.isUpdate ? 'modal-t margin_bottom_20' : 'modal-t modal-t-two'">
<div class="modal-t-l">
<div class="modal-t-l-t">{{ craftModel?.procedure }}</div>
<div class="modal-t-l-b">
@@ -13,7 +13,7 @@
</div>
<div class="modal-t-r">宸ヨ壓缂栧彿锛歿{ craftModel?.number }}</div>
</div>
- <div v-if="!craftModel?.isUpdate" class="modal-b">
+ <div v-if="craftModel?.isUpdate" class="modal-b">
<div class="modal-b-t">鏇存柊璁剧疆</div>
<template v-if="isUpdate == 1">
<div class="modal-b-m">
@@ -68,12 +68,12 @@
import { ref, toRefs, watch } from 'vue'
import type { CraftModel } from '@/api/craftModel'
export interface CraftDetailModalProps {
- craftModel?: CraftModel
- activeArr: Array
+ craftModel: CraftModel
+ activeArr: string[]
modelValue: boolean
}
const props = withDefaults(defineProps<CraftDetailModalProps>(), {
- craftModel: undefined,
+ craftModel: Object,
modelValue: false
})
const { craftModel, activeArr, modelValue } = toRefs(props)
@@ -97,22 +97,23 @@
})
function getLoading() {
for (let i in activeArr.value) {
- if (activeArr.value[i] == craftModel.value.number) {
+ if (activeArr.value[i] == craftModel?.value?.number) {
isUpdate.value = 2
loading.value = true
return true
}
}
isUpdate.value = 1
+ loading.value = false
}
function updateProcess() {
isUpdate.value = 2
- if (active.value) {
+ if (loading.value) {
return true
}
// 璇锋眰鏇存柊鎺ュ彛 鑾峰緱鏁版嵁涔嬪悗isLoading.value=false;
- emit('renew', craftModel.value, true)
+ emit('renew', craftModel?.value, true)
}
//TODO: 宸ヨ壓璇︽儏寮圭獥
</script>
--
Gitblit v1.8.0