From 8e859a4e9d8c8f1b29f6534c2583561a2cd806c2 Mon Sep 17 00:00:00 2001
From: sunliang <593170460@qq.com>
Date: Mon, 13 May 2024 13:59:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=8E=E8=A1=A8=E4=B8=AD?=
 =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E5=A4=9A=E9=80=89=E4=BF=9D=E5=AD=98=E4=B8=8D?=
 =?UTF-8?q?=E4=B8=8A=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CCFlow/CCFlow/WF/CCForm/Dtl2017.htm | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

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 = $('<td align="center" style="vertical-align: middle;" class="My-Handle"></td>');
                         if (o.data().UIVisible == 0)
                             td = $('<td style="display:none"></td>');
@@ -458,7 +460,9 @@
 
                     }
                     else {
-                        tmplate.val(textVal);
+                        if (textVal !="-1") {
+                            tmplate.val(textVal);
+                        }
                     }
 
                     var td = $('<td  style="vertical-align: middle;" class="My-Handle"></td>');
@@ -466,6 +470,10 @@
                         td = $('<td  style="vertical-align: middle;"></td>');
                     if (o.data().UIVisible == 0)
                         td = $('<td style="display:none"></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;
                 }