From 9384f42e1d7e3ad502ea801be0c0d8762a0c3123 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 01 十一月 2021 16:08:19 +0800
Subject: [PATCH] 提交
---
zhengcaioa/zhengcaioa/Views/ExpertTestTopic/Edit.cshtml | 7 ++++++-
zhengcaioa/zhengcaioa/Views/ExpertTestTopic/Index.cshtml | 12 ++++++------
zhengcaioa/Services/ExpertTestTopicService.cs | 10 +++++++++-
3 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/zhengcaioa/Services/ExpertTestTopicService.cs b/zhengcaioa/Services/ExpertTestTopicService.cs
index d98cbc3..3748593 100644
--- a/zhengcaioa/Services/ExpertTestTopicService.cs
+++ b/zhengcaioa/Services/ExpertTestTopicService.cs
@@ -353,7 +353,15 @@
jiexi +=(falv!=null? "銆�" + falv.Comments + "銆�" : "") + " " + quer.Fatiao + " " + quer.Jiexi + " </br>" ;
}
- lian.Jiexi = jiexi + lian.Jiexi + " </br>";
+ if (string.IsNullOrEmpty(lian.Jiexi))
+ {
+ lian.Jiexi = jiexi;
+ }
+ else
+ {
+ lian.Jiexi = jiexi + lian.Jiexi + " </br>";
+ }
+
}
data.LoadData(searchEntity, lianlist);
diff --git a/zhengcaioa/zhengcaioa/Views/ExpertTestTopic/Edit.cshtml b/zhengcaioa/zhengcaioa/Views/ExpertTestTopic/Edit.cshtml
index c5b99fe..19f6841 100644
--- a/zhengcaioa/zhengcaioa/Views/ExpertTestTopic/Edit.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/ExpertTestTopic/Edit.cshtml
@@ -929,10 +929,15 @@
var index = parent.layer.getFrameIndex(window.name);
parent.layer.isRefresh = true;
parent.layer.closeAll('loading');
- parent.layer.close(index);
+ //parent.layer.close(index);
return false;
}
+ $(window).unload(function () {
+ _pageAutoClose();
+
+ });
+
function addBtn(obj) {
var oTr = document.createElement('div');
diff --git a/zhengcaioa/zhengcaioa/Views/ExpertTestTopic/Index.cshtml b/zhengcaioa/zhengcaioa/Views/ExpertTestTopic/Index.cshtml
index b9efc2e..a186666 100644
--- a/zhengcaioa/zhengcaioa/Views/ExpertTestTopic/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/ExpertTestTopic/Index.cshtml
@@ -16,18 +16,18 @@
dataCol = [
{ label: 'id', name: 'Id', labtype: 'txt', hidden: true },
{
- label: '棰樺瀷', name: 'TopictypeName', labtype: 'txt', hidden: false, width: 40
+ label: '棰樺瀷', name: 'TopictypeName', labtype: 'txt', hidden: false, width: 30
},
{
label: '鐭ヨ瘑鐐�', name: 'ZhishitypeName', labtype: 'txt', hidden: false, width: 40
},
- { label: '鍖哄煙', name: 'AreaName', labtype: 'txt', hidden: false, width: 40 },
+ { label: '鍖哄煙', name: 'AreaName', labtype: 'txt', hidden: false, width: 30 },
{ label: '璇曢', name: 'Topic', labtype: 'txt', hidden: false, width: 300 },
- { label: '绛旀', name: 'Anwsers', labtype: 'txt', hidden: false, width: 40 },
- { label: '閲嶇偣鏍囨敞', name: 'ZhongdianName', labtype: 'txt', hidden: false, width: 40 },
- { label: '瀹℃牳', name: 'ShenpiStatusName', labtype: 'txt', hidden: false, width: 40 },
- { label: '绛旀瀵瑰簲鐨勬硶鏉�', name: 'Jiexi', labtype: 'txt', hidden: false, width: 300 },
+ { label: '绛旀', name: 'Anwsers', labtype: 'txt', hidden: false, width: 30 },
+ { label: '閲嶇偣鏍囨敞', name: 'ZhongdianName', labtype: 'txt', hidden: false, width: 30 },
+ //{ label: '瀹℃牳', name: 'ShenpiStatusName', labtype: 'txt', hidden: false, width: 40 },
+ { label: '绛旀瀵瑰簲鐨勬硶鏉�', name: 'Jiexi', labtype: 'txt', hidden: false, width: 340 },
{
--
Gitblit v1.9.1