diff --git a/CCFlow/CCFlow/WF/CCForm/Dtl2017.htm b/CCFlow/CCFlow/WF/CCForm/Dtl2017.htm
index 9dff1707..98052ee8 100644
--- a/CCFlow/CCFlow/WF/CCForm/Dtl2017.htm
+++ b/CCFlow/CCFlow/WF/CCForm/Dtl2017.htm
@@ -352,11 +352,12 @@
function newRowParse(insertTr, newRowIndex) {
var threadTh = getUseHeadTh();
+ var isNewRow = true;
$.each(threadTh, function (k, threadThObj) {
if ($(threadThObj).data().colname != undefined) {
var o = $(threadThObj);
- var tmplate = figure_MapAttr_Template(o.data());
+ var tmplate = figure_MapAttr_Template(o.data(), isNewRow);
if (o.data().UIIsInput == 1) {
tmplate.attr('class', "mustInput");
}
@@ -374,6 +375,7 @@
}
});
+
var td = $('
| ');
if (o.data().UIVisible == 0)
td = $(' | ');
@@ -458,7 +460,9 @@
}
else {
- tmplate.val(textVal);
+ if (textVal !="-1") {
+ tmplate.val(textVal);
+ }
}
var td = $(' | ');
@@ -466,6 +470,10 @@
td = $(' | ');
if (o.data().UIVisible == 0)
td = $(' | ');
+
+ //td.text('');
+ $($(insertTr).children('td')[k]).text('');
+
td.append(tmplate);
insertTr.append(td);
if (mapAttr.UIContralType == 6)
@@ -1930,13 +1938,13 @@
}
//升级表单元素 初始化文本框、日期、时间
- function figure_MapAttr_Template(mapAttr) {
+ function figure_MapAttr_Template(mapAttr,isNewRow) {
var eleHtml = '';
if (mapAttr.UIVisible == 1) {//是否显示
var str = '';
- var defValue = ConvertDefVal(workNodeData, mapAttr.DefVal, mapAttr.KeyOfEn);
+ var defValue = ConvertDefVal(workNodeData, mapAttr.DefVal, mapAttr.KeyOfEn,isNewRow);
defValue = GetValByDefVal(defValue, mapAttr);
var isInOneRow = false; //是否占一整行
var islabelIsInEle = false; //
@@ -3570,7 +3578,7 @@
}
//填充默认数据
- function ConvertDefVal(workNodeData, defVal, keyOfEn, myDataType) {
+ function ConvertDefVal(workNodeData, defVal, keyOfEn, myDataType,isNewRow) {
//计算URL传过来的表单参数@TXB_Title=事件测试
var pageParams = getQueryString();
@@ -3586,7 +3594,7 @@
//通过MAINTABLE返回的参数
for (var ele in workNodeData.DBDtl[0]) {
- if (keyOfEn == ele && workNodeData.DBDtl[0][ele] != '') {
+ if (keyOfEn == ele && workNodeData.DBDtl[0][ele] != '' && isNewRow == true) {
result = workNodeData.DBDtl[0][ele];
break;
}