From 20a302f652b92f59a65aed0f702f8696d55ee9e4 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Thu, 21 Nov 2024 15:18:06 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
js/demandPlan/apply_plan_list.js | 11 +++++++++++
js/demandPlan/child/apply_plan_detail.js | 4 ++--
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/js/demandPlan/apply_plan_list.js b/js/demandPlan/apply_plan_list.js
index ebcc6a3..fade224 100644
--- a/js/demandPlan/apply_plan_list.js
+++ b/js/demandPlan/apply_plan_list.js
@@ -134,6 +134,17 @@ function initTable() {
title: "备注",
unresize: true,
align: "center",
+ templet: function (d) {
+ if (d.remark) {
+ if (d.remark.length > 100) {
+ return '' + d.remark.substring(0, 60) + '...'
+ } else {
+ return '' + d.remark + ''
+ }
+ } else {
+ return '';
+ }
+ }
},
{
diff --git a/js/demandPlan/child/apply_plan_detail.js b/js/demandPlan/child/apply_plan_detail.js
index 42942e4..713df75 100644
--- a/js/demandPlan/child/apply_plan_detail.js
+++ b/js/demandPlan/child/apply_plan_detail.js
@@ -101,14 +101,14 @@ function initTable() {
},
},
{
- field: "typeName",
+ field: "type",
width: '15%',
title: "物机类型",
unresize: true,
align: "center",
},
{
- field: "type",
+ field: "typeName",
width: '15%',
title: "物机名称",
unresize: true,