From 5039fb11b2831475ad6d32592b4a4d5a03f0bcfa Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期六, 09 十二月 2023 18:13:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin-web/src/views/departmentitem/itemscr/scrappDetails/index.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/admin-web/src/views/departmentitem/itemscr/scrappDetails/index.vue b/admin-web/src/views/departmentitem/itemscr/scrappDetails/index.vue
index cbc6fcd..6916306 100644
--- a/admin-web/src/views/departmentitem/itemscr/scrappDetails/index.vue
+++ b/admin-web/src/views/departmentitem/itemscr/scrappDetails/index.vue
@@ -126,7 +126,7 @@
table: {
showIndex: true, // 鏄惁鏄剧ず搴忓彿
expand: false, // 鏄惁鏄剧ず璇︽儏鏁版嵁
- url: SettingIplatform.apiBaseURL + '/pc/l/wh/form/scrapped/deptListByModel', // 璇锋眰鍦板潃
+ url: SettingIplatform.apiBaseURL + '/pc/l/wh/form/scrapped/deptListByModel2', // 璇锋眰鍦板潃
// 宸ュ叿鏉�
tools: {
columnsCtrl: {
@@ -158,7 +158,7 @@
title: '鎿嶄綔鏃堕棿', field: 'dealTime', align: 'center',
width: 160,
formatter: (row) => {
- return {value: DateFormatter.LongToDateTime(row.createTime)};
+ return {value: DateFormatter.LongToDateTime(row.dealTime)};
},
},
],
--
Gitblit v1.9.1