From c8cf9f8ba577ce75e8723ff2d4218fffae349c47 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期二, 14 十一月 2023 15:11:09 +0800
Subject: [PATCH] fix: 修复工序步骤条当前工序展示错误的问题
---
src/views/dashboard/index.vue | 61 ++++++++++++++++++++++++++++--
1 files changed, 56 insertions(+), 5 deletions(-)
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 49b5c8e..f4cff31 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -16,7 +16,7 @@
</el-tab-pane>
<el-tab-pane label="宸ヨ壓淇℃伅" name="宸ヨ壓淇℃伅">
<div style="height: 300px">
- <el-scrollbar always style="height: 100%">
+ <el-scrollbar always class="scroller" style="height: 100%">
<div
v-infinite-scroll="craftModelStore.loadMore"
infinite-scroll-delay="500"
@@ -26,8 +26,11 @@
<ProcessInfo
v-for="item in craftModelStore.craftModelList"
:key="item.ID"
+ :task="activeTask"
+ :active-arr="activeArr"
:craft-model="item"
@detail="openCraftModelDetailModal"
+ @update="updateCraft"
></ProcessInfo>
</div>
<div class="craft-loaded-tip">
@@ -35,7 +38,7 @@
<Loading />
</el-icon>
- <div v-if="!craftModelStore.hasMore">鍔犺浇瀹屾垚</div>
+ <div v-if="!craftModelStore.hasMore && craftModelStore.craftModelList.length > 6">鍔犺浇瀹屾垚</div>
</div>
</el-scrollbar>
</div>
@@ -80,13 +83,21 @@
<BigButton class="btn" bg-color="red">绾㈢伅鍛煎彨</BigButton>
</template>
</DashboardLayout>
- <CraftDetailModal v-model="showCraftModelDetail" @close="showCraftModelDetail = false"></CraftDetailModal>
+ <CraftDetailModal
+ v-model="showCraftModelDetail"
+ :active-arr="activeArr"
+ :craft-model="currentCraftModelInfo"
+ @renew="updateCraft"
+ @close="showCraftModelDetail = false"
+ ></CraftDetailModal>
<MaterialDetails v-model="showMaterialDetail" :material="currentMaterialInfo"></MaterialDetails>
</template>
<script setup lang="ts">
import { computed, ref } from 'vue'
import ChannelCollapse from '@/views/dashboard/components/ChannelCollapse.vue'
-import type { Task, Material } from '@/api/task'
+
+import type { Worker, Order, Task, Material } from '@/api/task'
+import type { CraftModel } from '@/api/craftModel'
import PersonInfo from '@/views/dashboard/components/PersonInfo.vue'
import ProcessInfo from '@/views/dashboard/components/ProcessInfo.vue'
import ColorInfo from '@/views/dashboard/components/ColorInfo.vue'
@@ -110,6 +121,8 @@
import { useCraftModelStore } from '@/stores/craftModel'
import CraftDetailModal from '@/views/dashboard/components/CraftDetailModal.vue'
import MaterialDetails from '@/views/dashboard/components/MaterialDetails.vue'
+
+import { updateCraftParams } from '@/api'
import { Loading } from '@element-plus/icons-vue'
defineOptions({
@@ -170,8 +183,43 @@
craftModelStore.getCraftModelList()
const showCraftModelDetail = ref(false)
-function openCraftModelDetailModal() {
+// 褰撳墠瑕佸睍绀虹殑宸ヨ壓璇︽儏
+const currentCraftModelInfo = ref<CraftModel>()
+const activeArr = ref<string[]>([])
+function openCraftModelDetailModal(craftModel: CraftModel) {
+ currentCraftModelInfo.value = craftModel
showCraftModelDetail.value = true
+}
+// 鏇存柊宸ヨ壓
+function updateCraft(craftModel: CraftModel) {
+ if (activeTask?.value?.Procedure?.ID) {
+ activeArr.value.push(craftModel.number)
+ updateCraftParams({ procedureId: activeTask!.value.Procedure.ID }).then(
+ (res) => {
+ if (res.code == 200) {
+ editActive(craftModel)
+ ElMessage({
+ message: '鏇存柊鎴愬姛锛�',
+ type: 'success'
+ })
+ craftModelStore.getCraftModelList()
+ }
+ },
+ (err) => {
+ console.error(err, '----err')
+ setTimeout(() => {
+ editActive(craftModel)
+ }, 300)
+ }
+ )
+ }
+}
+function editActive(craftModel: CraftModel) {
+ for (let i in activeArr.value) {
+ if (activeArr.value[i] == craftModel.number) {
+ activeArr.value.splice(Number(i), 1)
+ }
+ }
}
// 鏄惁灞曠ず鐗╂枡璇︽儏寮圭獥
@@ -243,4 +291,7 @@
align-items: center;
justify-content: center;
}
+.scroller {
+ padding: 4px 16px;
+}
</style>
--
Gitblit v1.8.0