From 28711a084415ac3a74c719e9a3b4fffc21a02ee1 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期三, 11 九月 2024 21:06:47 +0800
Subject: [PATCH] 1

---
 WebTM/views/采购管理/采购合同/Add_Edit_Cg_ContractBillList.html |   73 ++++++++++++++++++++----------------
 1 files changed, 40 insertions(+), 33 deletions(-)

diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\345\220\210\345\220\214/Add_Edit_Cg_ContractBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\345\220\210\345\220\214/Add_Edit_Cg_ContractBillList.html"
index b02d07b..cec8419 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\345\220\210\345\220\214/Add_Edit_Cg_ContractBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\345\220\210\345\220\214/Add_Edit_Cg_ContractBillList.html"
@@ -197,25 +197,11 @@
                                     </div>
                                     <div class="layui-row">
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">淇敼浜�</label>
-                                            <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">浣滃簾浜�</label>
-                                            <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HDeleteMan " id="HDeleteMan " style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">鍒跺崟鏃ユ湡</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
                                                 <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
-                                    </div>
-                                    <div class="layui-row">
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">瀹℃牳鏃ユ湡</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
@@ -228,18 +214,32 @@
                                                 <input type="text" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">淇敼浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">浣滃簾浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">淇敼鏃ユ湡</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
                                                 <input type="text" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
-                                        <div class="layui-row">
-                                            <div class="layui-inline">
-                                                <label class="layui-form-label" style="width: 85px;">浣滃簾鏃ユ湡</label>
-                                                <div class="layui-input-block" style="margin-left: 120px;">
-                                                    <input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
-                                                </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">浣滃簾鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
                                     </div>
@@ -809,7 +809,7 @@
                         , { field: 'HMoney', title: '閲戦', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
                         , { field: 'HTaxRate', title: '绋庣巼', width: 100, edit: 'text' }
                         , { field: 'HTaxMoney', title: '绋庨', width: 100, style: 'background-color:#efefef4d;' }
-                        , { field: 'HlineTotal', title: '浠风◣鍚堣', width: 100, edit: 'text' }
+                        , { field: 'HlineTotal', title: '浠风◣鍚堣', width: 100, style: 'background-color:#efefef4d;' }
                         , { field: 'HRemark', title: '澶囨敞', width: 100, edit: 'text' }
                         , { fixed: 'right', field: '鎿嶄綔', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
                     ]]
@@ -879,14 +879,15 @@
                                     , "HSSName": data[0].缁撶畻鏂瑰紡
                                     , "HInnerBillNo": data[0].鍐呴儴鍗曟嵁
                                     , "HRemark": data[0].琛ㄥご澶囨敞
-                                    , "HMaker": data[0].鍒跺崟浜�
-                                    , "HChecker": data[0].瀹℃牳浜�
-                                    , "HCloseMan": data[0].鍏抽棴浜�
-                                    , "HMakeDate": data[0].鍒跺崟鏃ユ湡
-                                    , "HCheckDate": data[0].瀹℃牳鏃ユ湡
-                                    , "HCloseDate": data[0].鍏抽棴鏃ユ湡
-                                    , "HUpDateDate": data[0].淇敼鏃ユ湡
-                                    , "HDeleteDate": data[0].浣滃簾鏃ユ湡
+                                    , "HMaker": data.鍒跺崟浜�
+                                    , "HUpDater": data.淇敼浜�
+                                    , "HChecker": data.瀹℃牳浜�
+                                    , "HCloseMan": data.鍏抽棴浜�
+                                    , "HMakeDate": data.鍒跺崟鏃ユ湡 == null ? "" : Pub_Format(data.鍒跺崟鏃ユ湡, "yyyy-MM-dd hh:mm:ss")
+                                    , "HCheckDate": data.瀹℃牳鏃ユ湡 == null ? "" : Pub_Format(data.瀹℃牳鏃ユ湡, "yyyy-MM-dd hh:mm:ss")
+                                    , "HCloseDate": data.鍏抽棴鏃ユ湡 == null ? "" : Pub_Format(data.鍏抽棴鏃ユ湡, "yyyy-MM-dd hh:mm:ss")
+                                    , "HUpDateDate": data.淇敼鏃ユ湡 == null ? "" : Pub_Format(data.淇敼鏃ユ湡, "yyyy-MM-dd hh:mm:ss")
+                                    , "HDeleteDate": data.浣滃簾鏃ユ湡 == null ? "" : Pub_Format(data.浣滃簾鏃ユ湡, "yyyy-MM-dd hh:mm:ss")
                                     , "HContractDate": formatDate(data[0].鍚堝悓鏃ユ湡)
                                     , "HContractName": data[0].鍚堝悓鍚嶇О
                                 });
@@ -1649,7 +1650,10 @@
                 for (var i = 1; i < option.cols[0].length - 1; i++) {
                     colName += option.cols[0][i]["field"] + ",";
                 }
-
+                var colTitleName = "";
+                for (var i = 1; i < option.cols[0].length - 1; i++) {
+                    colTitleName += option.cols[0][i]["title"] + ",";
+                }
                 colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
                 layer.open({
                     type: 2
@@ -1659,7 +1663,7 @@
                     , shift: 2 //寮瑰嚭鍔ㄧ敾
                     , area: ["50%", "90%"] //绐椾綋澶у皬
                     , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                    , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+                    , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName + '&colTitleName = ' + colTitleName, "yes"]
                     , btn: ["纭畾", "鍙栨秷"]
                     , btn1: function (index, laero) {
                         //鍒锋柊琛ㄦ牸鏁版嵁
@@ -1758,7 +1762,10 @@
                 for (var i = 1; i < option2.cols[0].length - 1; i++) {
                     colName += option2.cols[0][i]["field"] + ",";
                 }
-
+                var colTitleName = "";
+                for (var i = 1; i < option2.cols[0].length - 1; i++) {
+                    colTitleName += option2.cols[0][i]["title"] + ",";
+                }
                 colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
                 layer.open({
                     type: 2
@@ -1768,7 +1775,7 @@
                     , shift: 2 //寮瑰嚭鍔ㄧ敾
                     , area: ["50%", "90%"] //绐椾綋澶у皬
                     , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                    , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName2 + '&colName=' + colName, "yes"]
+                    , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName2 + '&colName=' + colName + '&colTitleName = ' + colTitleName, "yes"]
                     , btn: ["纭畾", "鍙栨秷"]
                     , btn1: function (index, laero) {
                         //鍒锋柊琛ㄦ牸鏁版嵁

--
Gitblit v1.9.1