From 79b0a1a4f81ec7750e6deeb02bc9865785b6fee9 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期四, 17 八月 2023 19:52:46 +0800
Subject: [PATCH] bug修复
---
src/views/other/commonDialog/SelectCommonDialog.vue | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/views/other/commonDialog/SelectCommonDialog.vue b/src/views/other/commonDialog/SelectCommonDialog.vue
index 6a8fc71..fcc993e 100644
--- a/src/views/other/commonDialog/SelectCommonDialog.vue
+++ b/src/views/other/commonDialog/SelectCommonDialog.vue
@@ -134,9 +134,9 @@
{ label: "鏈嶅姟鍗曠紪鍙�", prop: "serviceNumber", isClick: true }, // 鏈嶅姟鍗曠紪鍙�
{ label: "涓婚", prop: "subject" }, // 涓婚
{ label: "鏈嶅姟鏂瑰紡", prop: "serviceType_name" }, // 鏈嶅姟鏂瑰紡
- { label: "鏈嶅姟浜哄憳", prop: "serviceManId" }, // 鏈嶅姟浜哄憳
- { label: "浼樺厛绾у埆", prop: "priorityLevelId" }, // 浼樺厛绾у埆
- { label: "澶勭悊鐘舵��", prop: "status" }, // 澶勭悊鐘舵��
+ { label: "鏈嶅姟浜哄憳", prop: "serviceMan_name" }, // 鏈嶅姟浜哄憳
+ { label: "浼樺厛绾у埆", prop: "priorityLevel_name" }, // 浼樺厛绾у埆
+ { label: "澶勭悊鐘舵��", prop: "serviceOrderStatus_name" }, // 澶勭悊鐘舵��
{ label: "瀹㈡埛绛惧悕", prop: "qianming" } // 瀹㈡埛绛惧悕
]
}
@@ -282,14 +282,17 @@
pageSize: 0
}).then((res) => {
if (res.code === 200) {
- if (res.data.list && res.data.list.length > 0) {
- const list = res.data.list.map((item) => {
+ if (res.data.data && res.data.data.length > 0) {
+ const list = res.data.data.map((item) => {
return {
...item,
client_name: item.Client.name,
serviceType_name: item.ServiceType.name,
faultType_name: item.FaultType.name,
- serviceContract_Number: item.ServiceContract.number
+ serviceContract_Number: item.ServiceContract.number,
+ serviceMan_name: item.serviceMan.username,
+ priorityLevel_name: item.PriorityLevel.name,
+ serviceOrderStatus_name: item.ServiceOrderStatus_name
}
})
this.tableList.tableInfomation = list.slice(0, 5) || []
@@ -305,18 +308,15 @@
await getProductList({
productName: "",
productNumber: "",
- page: 0,
- pageSize: 0
+ page: 1,
+ pageSize: 5
}).then((res) => {
- if (res.code === 200) {
- if (res.data.list && res.data.list.length > 0) {
- const list = res.data.list.map((item) => {
+ console.log(res.data)
+ if (res.data.code === 200) {
+ if (res.data.data.data && res.data.data.data.length > 0) {
+ const list = res.data.data.data.map((item) => {
return {
- ...item,
- client_name: item.Client.name,
- serviceType_name: item.ServiceType.name,
- faultType_name: item.FaultType.name,
- serviceContract_Number: item.ServiceContract.number
+ ...item
}
})
this.tableList.tableInfomation = list.slice(0, 5) || []
--
Gitblit v1.8.0