From 84f7a7130a11b2b60a85181852db27e2f5392496 Mon Sep 17 00:00:00 2001
From: charles <981744753@qq.com>
Date: 星期五, 26 四月 2024 12:44:09 +0800
Subject: [PATCH] fix:修复新看板首页的bug
---
src/views/newDashboard/index.vue | 44 ++++++++++++++++++++++++++------------------
1 files changed, 26 insertions(+), 18 deletions(-)
diff --git a/src/views/newDashboard/index.vue b/src/views/newDashboard/index.vue
index 62bc29e..375be39 100644
--- a/src/views/newDashboard/index.vue
+++ b/src/views/newDashboard/index.vue
@@ -9,7 +9,7 @@
defineOptions({
name: 'NewDashboardView'
})
-const taskTabsList = [
+const taskTabsList: Array<any> = [
{ label: '寰呰川妫�', value: 1 },
{ label: '宸茶川妫�', value: 3 }
]
@@ -53,6 +53,11 @@
getProjectApi(pageData.value).then(({ code, data }: any) => {
if (code == 200) {
projectList.value = data
+ if (Array.isArray(data) && data.length > 0) {
+ projectIdArray.value[0] = data[0].id
+ queryProduct()
+ queryQualityProcedure()
+ }
}
})
}
@@ -71,9 +76,12 @@
}
//3.鏌ヨ宸ュ簭璐ㄦ鍒楄〃
const queryQualityProcedure = () => {
- const params = { status: activeTaskTab.value, projectId: '', productId: '', ...pageData.value, keyword: '' }
+ const params: any = { status: activeTaskTab.value, projectId: '', productId: '', ...pageData.value, keyword: '' }
if (Array.isArray(projectIdArray.value) && projectIdArray.value.length > 0) {
params.projectId = projectIdArray.value[0] + ''
+ } else {
+ qualityList.value = []
+ return
}
if (Array.isArray(productIdArray.value) && productIdArray.value.length > 0) {
params.productId = productIdArray.value[0] + ''
@@ -103,7 +111,7 @@
//6.鍒濆鍖栭〉闈㈡暟鎹�
const initPage = () => {
queryProject()
- queryQualityProcedure()
+ //queryQualityProcedure()
queryWorker()
}
onMounted(() => {
@@ -193,33 +201,33 @@
</div>
</div>
<div class="table">
- <el-empty v-if="qualityList.length == 0" description="鏆傛棤鏁版嵁" />
+ <!--<el-empty v-if="qualityList.length == 0" description="鏆傛棤鏁版嵁" />-->
<el-table
- v-else
:data="qualityList"
:header-cell-class-name="tableHeaderColor"
row-class-name="row-bg"
style="width: 100%; background: transparent"
border
>
- <el-table-column prop="workOrderId" align="center" label="宸ュ崟鍙�" />
- <el-table-column prop="projectId" align="center" label="椤圭洰鍙�" />
- <el-table-column prop="productId" align="center" label="浜у搧鍙�" />
- <el-table-column prop="productName" align="center" label="浜у搧鍚�" />
- <el-table-column prop="procedureId" align="center" label="宸ュ簭鍙�" />
- <el-table-column prop="procedureName" align="center" label="宸ュ簭鍚嶇О" />
- <el-table-column prop="drawingNumber" align="center" label="鍥惧彿" />
- <el-table-column prop="amount" align="center" label="鍥惧彿" />
- <el-table-column prop="transferAmount" align="center" label="杞Щ鏁伴噺" />
- <el-table-column prop="scrappedAmount" align="center" label="鎶ュ簾鏁伴噺" />
- <el-table-column prop="passAmount" align="center" label="鍚堟牸鏁伴噺" />
- <el-table-column prop="workerName" align="center" label="鍔犲伐鍛�" />
+ <el-table-column fixed prop="procedureName" style="background: gray" align="center" label="浜у搧宸ュ簭" />
+ <el-table-column prop="workOrderId" align="center" label="宸ュ崟缂栧彿" />
+ <el-table-column prop="productName" align="center" label="浜у搧鍚嶇О" />
+ <el-table-column prop="drawingNumber" align="center" label="浜у搧鍥惧彿" />
+ <el-table-column prop="amount" align="center" label="璁″垝鏁�" />
+ <el-table-column prop="transferAmount" align="center" label="杞叆鏁�" />
+ <el-table-column prop="scrappedAmount" align="center" label="鎶ュ簾鏁�" />
+ <el-table-column prop="passAmount" align="center" label="鍚堟牸鏁�" />
+ <el-table-column prop="workerName" align="center" label="鍔犲伐浜哄憳" />
<el-table-column prop="inspectionPeople" align="center" label="璐ㄦ鍛�" />
- <el-table-column align="center" label="鎿嶄綔" width="120px">
+ <el-table-column prop="procedureId" align="center" label="宸ュ簭鍙�" />
+ <el-table-column fixed="right" align="center" label="鎿嶄綔" width="120px">
<template #default="scope">
<BigButton bg-color="#00ff00" @click="checkProduct(scope.row)">璐ㄦ</BigButton>
</template>
</el-table-column>
+ <template #empty>
+ <el-empty description="鏆傛棤鏁版嵁"></el-empty>
+ </template>
</el-table>
</div>
</div>
--
Gitblit v1.8.0