From fe0d8aeaf4d54dbcf9f7d3d75c79f3986e68cb6d Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期三, 08 十一月 2023 16:35:23 +0800
Subject: [PATCH] 销售出库单：列表同一个单据只有第一条记录显示主表内容，其它只显示子表内容
---
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 10 +++++-----
WebTM/views/领料发货/销售出库/Kf_SellOutBillList.html | 38 +++++++++++++++++++++++++++++++++-----
2 files changed, 38 insertions(+), 10 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index a3fc0a4..3840042 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -18,10 +18,10 @@
<publishTime>01/28/2016 14:22:24</publishTime>
</File>
<File Include="bin/WebTM.dll">
- <publishTime>11/08/2023 09:06:02</publishTime>
+ <publishTime>11/08/2023 15:33:13</publishTime>
</File>
<File Include="bin/WebTM.pdb">
- <publishTime>11/08/2023 09:06:02</publishTime>
+ <publishTime>11/08/2023 15:33:13</publishTime>
</File>
<File Include="HtmlPage1.html">
<publishTime>04/11/2023 16:34:42</publishTime>
@@ -4896,10 +4896,10 @@
<publishTime>10/30/2023 18:55:43</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBillList.html">
- <publishTime>11/08/2023 00:27:16</publishTime>
+ <publishTime>11/08/2023 16:27:12</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBillList.html">
- <publishTime>11/08/2023 00:27:16</publishTime>
+ <publishTime>11/08/2023 16:27:12</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_CheckList_New.html">
<publishTime>06/29/2023 15:20:45</publishTime>
@@ -5064,7 +5064,7 @@
<publishTime>04/11/2023 16:34:43</publishTime>
</File>
<File Include="Web.config">
- <publishTime>11/08/2023 09:06:10</publishTime>
+ <publishTime>11/08/2023 15:33:26</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html"
index a4cad54..d1672b9 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html"
@@ -338,12 +338,12 @@
, { field: 'hmanagerid', title: 'hmanagerid', width: 200, hide: true, sort: true }
, { field: '涓荤', title: '涓荤', width: 200, sort: true }
, { field: 'hsecmanagerid', title: 'hsecmanagerid', width: 160, hide: true, sort: true }
- , { field: '鍙戣揣浜�', title: '鍙戣揣浜�', width: 160, sort: true }
+ , { field: '鍙戣揣浜�', title: '鍙戣揣浜�', width: 160, hide: true, sort: true }
, { field: 'hkeeperid', title: 'hkeeperid', width: 160, hide: true, sort: true }
- , { field: '淇濈鍛�', title: '淇濈鍛�', width: 200, sort: true }
+ , { field: '淇濈鍛�', title: '淇濈鍛�', width: 200, hide: true, sort: true }
, { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true, sort: true }
, { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 200, sort: true }
- , { field: '閿�鍞柟寮�', title: '閿�鍞柟寮�', width: 200, sort: true }
+ , { field: '閿�鍞柟寮�', title: '閿�鍞柟寮�', width: 200, hide: true, sort: true }
, { field: 'hsubid', title: 'hsubid', width: 200, hide: true, sort: true }
, { field: 'hmaterid', title: 'hmaterid', width: 200, hide: true, sort: true }
, { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 200, sort: true }
@@ -390,7 +390,35 @@
// data1.data[i]["浣滃簾鏃ユ湡"] = (data1.data[i]["浣滃簾鏃ユ湡"] == null ? "" : Format(new Date(data1.data[i]["浣滃簾鏃ユ湡"]), "yyyy-MM-dd") );
//}
- option.data = data1.data;
+ var result = data1.data;
+ var temp = "";
+ for (var i = 0; i < result.length; i++) {
+ if (temp != result[i]["hmainid"]) {
+ temp = result[i]["hmainid"];
+ } else {
+ result[i].鏃ユ湡 = null;
+ result[i].鍗曟嵁鍙� = "";
+ result[i].绾㈣摑鍗曟爣璁� = "";
+ result[i].hsupid = "";
+ result[i].瀹㈡埛 = "";
+ result[i].HEmpID = "";
+ result[i].涓氬姟鍛� = "";
+ result[i].hmanagerid = "";
+ result[i].涓荤 = "";
+ result[i].hsecmanagerid = "";
+ result[i].鍙戣揣浜� = "";
+ result[i].hkeeperid = "";
+ result[i].淇濈鍛� = "";
+ result[i].HDeptID = "";
+ result[i].閮ㄩ棬 = "";
+ result[i].閿�鍞柟寮� = "";
+ }
+ }
+
+
+
+
+ option.data = result;
table.render(option);
layer.close(ajaxLoad);
@@ -796,7 +824,7 @@
if (data1.data.length != 0) {
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- var titleData = ["hmainid", "hsubid", "HEmpID", "hmanagerid", "hmaterid", "hunitid", "HWHID", "hsupid", "hsecmanagerid","hkeeperid"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["hmainid", "hsupid", "HEmpID", "hmanagerid", "hsecmanagerid", "鍙戣揣浜�", "hkeeperid", "淇濈鍛�", "HDeptID", "閿�鍞柟寮�", "hsubid", "hmaterid","hunitid", "HWHID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
dataCol = data1.data[0].HGridString.split(',');
--
Gitblit v1.9.1