From 8160f59f250ab89b2793eda0b44e358153644393 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期四, 11 十一月 2021 11:03:55 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/SRM-LAYUI
---
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/xmlSRM_Web_BarCodeBillList.aspx.designer.cs | 16
WebSRM/WebSRM.csproj | 9
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/xmlSRM_Web_PoBarCodeBillList.aspx | 30 ++
WebSRM/layuiAdmin.std-v1.2.1/src/views/grf/送货单.grf | 39 ---
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/xmlSRM_Web_PoBarCodeBillList.aspx.designer.cs | 26 ++
WebSRM/layuiAdmin.std-v1.2.1/src/views/grf/供应商协同采购订单.grf | 431 +++++++++++++++++++++++++++++++++++++++
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/HBarPlanPrint.html | 6
WebSRM/App_Data/MssqlReportData.cs | 2
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/xmlSRM_Web_BarCodeBillList.aspx | 19
WebSRM/layuiAdmin.std-v1.2.1/src/views/Baseset/SRM_OpenTmpList.html | 11
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/xmlSRM_Web_PoBarCodeBillList.aspx.cs | 17 +
11 files changed, 551 insertions(+), 55 deletions(-)
diff --git a/WebSRM/App_Data/MssqlReportData.cs b/WebSRM/App_Data/MssqlReportData.cs
index ab6aa13..9f053e5 100644
--- a/WebSRM/App_Data/MssqlReportData.cs
+++ b/WebSRM/App_Data/MssqlReportData.cs
@@ -15,7 +15,7 @@
//SQL Server2000/2005鏁版嵁搴撲笂銆�
//public const string SqlConnStr = "Data Source=(local);Initial Catalog=gridreport;Persist Security Info=True;User ID=sa;Password=;";
- public const string SqlConnStr = "Data Source=10.0.2.9;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
+ public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
//public const string SqlConnStr = "Data Source=.;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
//public string sServer;
diff --git a/WebSRM/WebSRM.csproj b/WebSRM/WebSRM.csproj
index 5425b90..5e18b5d 100644
--- a/WebSRM/WebSRM.csproj
+++ b/WebSRM/WebSRM.csproj
@@ -868,6 +868,7 @@
<Content Include="layuiAdmin.std-v1.2.1\src\views\SRM\SRM_POOrderBillList.html" />
<Content Include="layuiAdmin.std-v1.2.1\src\views\SRM\SRM_BarCodeBill.html" />
<Content Include="layuiAdmin.std-v1.2.1\src\views\SRM\SRM_BarCodeBillList.html" />
+ <Content Include="layuiAdmin.std-v1.2.1\src\views\SRM\xmlSRM_Web_PoBarCodeBillList.aspx" />
<Content Include="layuiAdmin.std-v1.2.1\src\views\SRM\xmlSRM_Web_BarCodeBillList.aspx" />
<Content Include="layuiAdmin.std-v1.2.1\src\views\SRM\xmlSRM_POInStockBill.aspx" />
<Content Include="layuiAdmin.std-v1.2.1\src\views\system\about.html" />
@@ -912,6 +913,7 @@
<Content Include="layuiAdmin.std-v1.2.1\src\views\grf\鐗╂枡鏉＄爜.grf" />
<Content Include="layuiAdmin.std-v1.2.1\src\views\grf\閫佽揣鍗�.grf" />
<Content Include="layuiAdmin.std-v1.2.1\src\views\grf\閫佽揣鍗�%28鏍囩绾�%29.grf" />
+ <Content Include="layuiAdmin.std-v1.2.1\src\views\grf\渚涘簲鍟嗗崗鍚岄噰璐鍗�.grf" />
<None Include="Properties\PublishProfiles\websrm.pubxml" />
<None Include="Scripts\jquery-1.8.2.intellisense.js" />
<Content Include="Scripts\jquery-1.8.2.js" />
@@ -1003,6 +1005,13 @@
<Compile Include="Global.asax.cs">
<DependentUpon>Global.asax</DependentUpon>
</Compile>
+ <Compile Include="layuiAdmin.std-v1.2.1\src\views\SRM\xmlSRM_Web_PoBarCodeBillList.aspx.cs">
+ <DependentUpon>xmlSRM_Web_PoBarCodeBillList.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="layuiAdmin.std-v1.2.1\src\views\SRM\xmlSRM_Web_PoBarCodeBillList.aspx.designer.cs">
+ <DependentUpon>xmlSRM_Web_PoBarCodeBillList.aspx</DependentUpon>
+ </Compile>
<Compile Include="layuiAdmin.std-v1.2.1\src\views\SRM\xmlSRM_Web_BarCodeBillList.aspx.cs">
<DependentUpon>xmlSRM_Web_BarCodeBillList.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/Baseset/SRM_OpenTmpList.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/Baseset/SRM_OpenTmpList.html
index ec3986a..d801239 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/Baseset/SRM_OpenTmpList.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/Baseset/SRM_OpenTmpList.html
@@ -226,15 +226,20 @@
form.on('submit(Select)', function (data) {//閫夋嫨
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- var OpenTmp = data[0].妯℃澘鍚嶇О;
+ var OpenTmp = data[0].妯℃澘鍚嶇О;
+ if (OpenTmp == '渚涘簲鍟嗗崗鍚岄噰璐鍗�') {
+ window.open("../../views/SRM/HBarPlanPrint.html?linterid=" + linterid.toString() + "&Type=HBarCodePrint1&OpenTmp=" + OpenTmp.toString());
+ } else {
+ window.open("../../views/SRM/HBarPlanPrint.html?linterid=" + linterid.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
+ }
//鎵撳紑鎵撳嵃妯℃澘
- window.open("../../views/SRM/HBarPlanPrint.html?linterid=" + linterid.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
+
//鏍规嵁妯″潡鑾峰彇WEBAPI閾炬帴
var url = "";
switch (Type)
{
case "HBarCodePrint":
- url = "UpdateBarcodePrintQty"
+ url = "UpdateBarcodePrintQty"
break;
case "HPOInStockBill":
url = "UpdatePOInStockBillPrintQty"
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/HBarPlanPrint.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/HBarPlanPrint.html
index b5f29a5..7016ce3 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/HBarPlanPrint.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/HBarPlanPrint.html
@@ -63,7 +63,11 @@
case "HBarCodePrint"://鐗╂枡鏉＄爜鎵撳嵃
//CreateDisplayViewerEx("100%", "100%", "../../views/grf/" + OpenTmp + ".grf", "../../views/SRM/xmlSRM_Web_BarCodeBillList.aspx?linterid=" + value, true, "");
CreateDisplayViewerEx("100%", "100%", "../../views/grf/" + OpenTmp + ".grf", "xmlSRM_Web_BarCodeBillList.aspx?linterid=" + value, true, "");
- break;
+ break;
+ case "HBarCodePrint1"://鐗╂枡鏉＄爜鎵撳嵃
+ //CreateDisplayViewerEx("100%", "100%", "../../views/grf/" + OpenTmp + ".grf", "../../views/SRM/xmlSRM_Web_BarCodeBillList.aspx?linterid=" + value, true, "");
+ CreateDisplayViewerEx("100%", "100%", "../../views/grf/" + OpenTmp + ".grf", "xmlSRM_Web_PoBarCodeBillList.aspx?linterid=" + value, true, "");
+ break;
case "HPOInStockBill"://閫佽揣鍗曟墦鍗�
CreateDisplayViewerEx("100%", "100%", "../../views/grf/" + OpenTmp + ".grf", "xmlSRM_POInStockBill.aspx?linterid=" + value, true, "");
break;
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/xmlSRM_Web_BarCodeBillList.aspx b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/xmlSRM_Web_BarCodeBillList.aspx
index e12f315..125725a 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/xmlSRM_Web_BarCodeBillList.aspx
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/xmlSRM_Web_BarCodeBillList.aspx
@@ -7,16 +7,17 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title></title>
<script runat="server">
- protected void Page_Load(object sender, EventArgs e)
- {
- //鈽呯壒鍒彁绀衡槄锛�
- //涓嶅悓鐨勬暟鎹簱搴旇閫夌敤涓嶅悓鐨勬姤琛╔ML鏁版嵁鐢熸垚绫伙紝SQL Server鏁版嵁搴撶敤SqlXMLReportData锛孫racle鏁版嵁搴撶敤OracleXMLReportData
- //OledbXMLReportData閫傚悎浜嶢ccess绛夋湰鍦版暟鎹簱锛屼负浜嗘紨绀烘柟渚匡紝杩欓噷浠嶨rid++Report鐨凙ccess渚嬪瓙鏁版嵁搴撲腑鑾峰彇鎶ヨ〃鏁版嵁
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ //鈽呯壒鍒彁绀衡槄锛�
+ //涓嶅悓鐨勬暟鎹簱搴旇閫夌敤涓嶅悓鐨勬姤琛╔ML鏁版嵁鐢熸垚绫伙紝SQL Server鏁版嵁搴撶敤SqlXMLReportData锛孫racle鏁版嵁搴撶敤OracleXMLReportData
+ //OledbXMLReportData閫傚悎浜嶢ccess绛夋湰鍦版暟鎹簱锛屼负浜嗘紨绀烘柟渚匡紝杩欓噷浠嶨rid++Report鐨凙ccess渚嬪瓙鏁版嵁搴撲腑鑾峰彇鎶ヨ〃鏁版嵁
- //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
- //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
- SqlXMLReportData.GenOneRecordset(this, "select * from h_v_SRM_BarCodeBillList where HItemID in(" + Request.Params["linterid"] + ") order by 鐗╂枡浠ｇ爜");
- }
+ //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
+ //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
+ //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_SRM_BarCodeBillList where HItemID in(" + Request.Params["linterid"] + ") order by 鐗╂枡浠ｇ爜");
+ SqlXMLReportData.GenOneRecordset(this, "select *,'1' as 鍗曚环, 0 as 閲戦 ,0 as 鍚◣鍗曚环 ,GETDATE() as 浜よ揣鏃ユ湡 ,'鍙ら緳' as 涓氬姟鍛�,'' as 璁╂鎺ユ敹,'' as 琛ㄥご澶囨敞 ,getdate() 棰勮鍒拌揣鏃ユ湡,'' as 琛ㄤ綋澶囨敞 from h_v_SRM_BarCodeBillList where HItemID in(" + Request.Params["linterid"] + ") order by 鐗╂枡浠ｇ爜");
+ }
</script>
</head>
<body>
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/xmlSRM_Web_BarCodeBillList.aspx.designer.cs b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/xmlSRM_Web_BarCodeBillList.aspx.designer.cs
index deee6f3..5deb236 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/xmlSRM_Web_BarCodeBillList.aspx.designer.cs
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/xmlSRM_Web_BarCodeBillList.aspx.designer.cs
@@ -2,16 +2,18 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace WebSRM.layuiAdmin.std_v1._2._1.src.views.SRM {
-
-
- public partial class xmlSRM_Web_BarCodeBillList {
-
+namespace WebSRM.layuiAdmin.std_v1._2._1.src.views.SRM
+{
+
+
+ public partial class xmlSRM_Web_BarCodeBillList
+ {
+
/// <summary>
/// form1 鎺т欢銆�
/// </summary>
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/xmlSRM_Web_PoBarCodeBillList.aspx b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/xmlSRM_Web_PoBarCodeBillList.aspx
new file mode 100644
index 0000000..9286f4f
--- /dev/null
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/xmlSRM_Web_PoBarCodeBillList.aspx
@@ -0,0 +1,30 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlSRM_Web_PoBarCodeBillList.aspx.cs" Inherits="WebSRM.layuiAdmin.std_v1._2._1.src.views.SRM.xmlSRM_Web_PoBarCodeBillList" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <title></title>
+ <script runat="server">
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ //鈽呯壒鍒彁绀衡槄锛�
+ //涓嶅悓鐨勬暟鎹簱搴旇閫夌敤涓嶅悓鐨勬姤琛╔ML鏁版嵁鐢熸垚绫伙紝SQL Server鏁版嵁搴撶敤SqlXMLReportData锛孫racle鏁版嵁搴撶敤OracleXMLReportData
+ //OledbXMLReportData閫傚悎浜嶢ccess绛夋湰鍦版暟鎹簱锛屼负浜嗘紨绀烘柟渚匡紝杩欓噷浠嶨rid++Report鐨凙ccess渚嬪瓙鏁版嵁搴撲腑鑾峰彇鎶ヨ〃鏁版嵁
+
+ //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
+ //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
+ //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_SRM_BarCodeBillList where HItemID in(" + Request.Params["linterid"] + ") order by 鐗╂枡浠ｇ爜");
+ SqlXMLReportData.GenOneRecordset(this, "select * from h_v_SRM_BarCodeBillList where HItemID in(" + Request.Params["linterid"] + ") order by 鐗╂枡浠ｇ爜");
+ }
+</script>
+</head>
+<body>
+ <form id="form1" runat="server">
+ <div>
+
+ </div>
+ </form>
+</body>
+</html>
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/xmlSRM_Web_PoBarCodeBillList.aspx.cs b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/xmlSRM_Web_PoBarCodeBillList.aspx.cs
new file mode 100644
index 0000000..4709aaf
--- /dev/null
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/xmlSRM_Web_PoBarCodeBillList.aspx.cs
@@ -0,0 +1,17 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace WebSRM.layuiAdmin.std_v1._2._1.src.views.SRM
+{
+ public partial class xmlSRM_Web_PoBarCodeBillList : System.Web.UI.Page
+ {
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ }
+ }
+}
\ No newline at end of file
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/xmlSRM_Web_PoBarCodeBillList.aspx.designer.cs b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/xmlSRM_Web_PoBarCodeBillList.aspx.designer.cs
new file mode 100644
index 0000000..f4d0ed5
--- /dev/null
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/xmlSRM_Web_PoBarCodeBillList.aspx.designer.cs
@@ -0,0 +1,26 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace WebSRM.layuiAdmin.std_v1._2._1.src.views.SRM
+{
+
+
+ public partial class xmlSRM_Web_PoBarCodeBillList
+ {
+
+ /// <summary>
+ /// form1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+ }
+}
diff --git "a/WebSRM/layuiAdmin.std-v1.2.1/src/views/grf/\344\276\233\345\272\224\345\225\206\345\215\217\345\220\214\351\207\207\350\264\255\350\256\242\345\215\225.grf" "b/WebSRM/layuiAdmin.std-v1.2.1/src/views/grf/\344\276\233\345\272\224\345\225\206\345\215\217\345\220\214\351\207\207\350\264\255\350\256\242\345\215\225.grf"
new file mode 100644
index 0000000..1f43f2f
--- /dev/null
+++ "b/WebSRM/layuiAdmin.std-v1.2.1/src/views/grf/\344\276\233\345\272\224\345\225\206\345\215\217\345\220\214\351\207\207\350\264\255\350\256\242\345\215\225.grf"
@@ -0,0 +1,431 @@
+锘縊bject Report
+ Version='6.0.0.6'
+ Title='浣犵殑鎶ヨ〃鏍囬'
+ PrintAsDesignPaper=F
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ Object Printer
+ Size=256
+ Width=10
+ Height=6
+ LeftMargin=0
+ TopMargin=0
+ RightMargin=0
+ BottomMargin=0
+ End
+ Object DetailGrid
+ CenterView=T
+ ShowColLine=F
+ ShowRowLine=F
+ Object Border
+ Object Pen
+ Width=1.5
+ End
+ End
+ Object Recordset
+ Items Field
+ Item
+ Name='鏉＄爜缂栧彿'
+ End
+ Item
+ Name='杩涙枡鏃ユ湡'
+ Type=DateTime
+ Format='yyyy//MM//dd'
+ DBFieldName='鏃ユ湡'
+ End
+ Item
+ Name='鎵瑰彿'
+ End
+ Item
+ Name='鐗╂枡浠ｇ爜'
+ End
+ Item
+ Name='鐗╂枡鍚嶇О'
+ End
+ Item
+ Name='瑙勬牸鍨嬪彿'
+ End
+ Item
+ Name='鏁伴噺'
+ Type=Currency
+ End
+ Item
+ Name='渚涘簲鍟嗕唬鐮�'
+ End
+ Item
+ Name='渚涘簲鍟�'
+ End
+ Item
+ Name='杞﹂棿'
+ End
+ Item
+ Name='婧愬崟鍗曞彿'
+ End
+ End
+ End
+ Items Column
+ Item
+ Name='Column1'
+ Width=9.73667
+ End
+ End
+ Object ColumnContent
+ Height=5.79438
+ Items ColumnContentCell
+ Item
+ Column='Column1'
+ FreeCell=T
+ Items Control
+ Item
+ Type=FreeGrid
+ Name='FreeGrid1'
+ Left=0.0264583
+ Top=0.0264583
+ Object Border
+ Styles=[DrawLeft|DrawTop|DrawRight|DrawBottom]
+ End
+ ColumnCount=4
+ RowCount=7
+ Items FreeGridColumn
+ Item[1]
+ Width=1.66688
+ End
+ Item[2]
+ Width=4.15396
+ End
+ Item[3]
+ Width=0.978958
+ End
+ Item[4]
+ Width=2.80458
+ End
+ End
+ Items FreeGridRow
+ Item[1]
+ Height=0.740833
+ End
+ Item[2]
+ Height=0.79375
+ End
+ Item[3]
+ Height=0.767292
+ End
+ Item[4]
+ Height=0.899583
+ End
+ Item[5]
+ Height=0.740833
+ End
+ Item[6]
+ Height=0.926042
+ End
+ Item[7]
+ Height=0.740833
+ End
+ End
+ Items FreeGridCell
+ Item[1,1]
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='鐗╂枡缂栫爜'
+ End
+ Item[1,2]
+ FreeCell=T
+ Items Control
+ Item
+ Type=FieldBox
+ Name='FieldBox8'
+ Dock=Fill
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ WordWrap=T
+ DataField='杩涙枡鏃ユ湡'
+ End
+ End
+ End
+ Item[1,3]
+ FreeCell=T
+ Items Control
+ Item
+ Type=Barcode
+ Name='Barcode1'
+ Width=2.98979
+ Height=1.5875
+ BarcodeType=QRCode
+ CaptionPosition=None
+ Text='[#鏉＄爜缂栧彿#]'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox10'
+ Top=1.56104
+ Width=2.99
+ Height=0.77
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ ShrinkFontToFit=T
+ WordWrap=T
+ DataField='鏉＄爜缂栧彿'
+ End
+ End
+ ColSpan=2
+ RowSpan=3
+ End
+ Item[2,1]
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='鐗╂枡鍚嶇О'
+ End
+ Item[2,2]
+ FreeCell=T
+ Items Control
+ Item
+ Type=FieldBox
+ Name='FieldBox9'
+ Dock=Fill
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ WordWrap=T
+ DataField='鎵瑰彿'
+ End
+ End
+ End
+ Item[3,1]
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='瑙勬牸'
+ End
+ Item[3,2]
+ FreeCell=T
+ Items Control
+ Item
+ Type=FieldBox
+ Name='FieldBox7'
+ Dock=Fill
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ WordWrap=T
+ DataField='鐗╂枡浠ｇ爜'
+ End
+ End
+ End
+ Item[4,1]
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='鐢熶骇鏃ユ湡'
+ End
+ Item[4,2]
+ FreeCell=T
+ Items Control
+ Item
+ Type=FieldBox
+ Name='FieldBox6'
+ Dock=Fill
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ WordWrap=T
+ DataField='瑙勬牸鍨嬪彿'
+ End
+ End
+ End
+ Item[4,3]
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='鏁伴噺'
+ End
+ Item[4,4]
+ FreeCell=T
+ Items Control
+ Item
+ Type=FieldBox
+ Name='FieldBox11'
+ Dock=Fill
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='鏁伴噺'
+ End
+ End
+ End
+ Item[5,1]
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='鏈夋晥鏈焅r\n'
+ End
+ Item[5,2]
+ FreeCell=T
+ Items Control
+ Item
+ Type=FieldBox
+ Name='FieldBox4'
+ Dock=Fill
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ WordWrap=T
+ DataField='鐗╂枡鍚嶇О'
+ End
+ End
+ ColSpan=3
+ End
+ Item[6,1]
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='鍖呰鏁�'
+ End
+ Item[6,2]
+ FreeCell=T
+ Items Control
+ Item
+ Type=FieldBox
+ Name='FieldBox2'
+ Width=3.2
+ Height=0.87
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ ShrinkFontToFit=T
+ WordWrap=T
+ DataField='渚涘簲鍟嗕唬鐮�'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox12'
+ Left=3.20146
+ Width=2.99
+ Height=0.87
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ ShrinkFontToFit=T
+ WordWrap=T
+ DataField='渚涘簲鍟�'
+ End
+ End
+ ColSpan=3
+ End
+ Item[7,1]
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Text='鏁伴噺'
+ End
+ Item[7,2]
+ FreeCell=T
+ Items Control
+ Item
+ Type=FieldBox
+ Name='FieldBox13'
+ Dock=Fill
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ ShrinkFontToFit=T
+ WordWrap=T
+ DataField='婧愬崟鍗曞彿'
+ End
+ End
+ ColSpan=3
+ End
+ End
+ End
+ End
+ End
+ End
+ End
+ Object ColumnTitle
+ Height=0
+ Items ColumnTitleCell
+ Item
+ GroupTitle=F
+ Column='Column1'
+ TextAlign=MiddleCenter
+ Text='Column1'
+ End
+ End
+ End
+ End
+ Items ReportHeader
+ Item
+ Name='ReportHeader1'
+ Height=0
+ RepeatOnPage=T
+ End
+ End
+ Items ReportFooter
+ Item
+ Name='ReportFooter1'
+ Height=0
+ End
+ End
+End
diff --git "a/WebSRM/layuiAdmin.std-v1.2.1/src/views/grf/\351\200\201\350\264\247\345\215\225.grf" "b/WebSRM/layuiAdmin.std-v1.2.1/src/views/grf/\351\200\201\350\264\247\345\215\225.grf"
index a706b74..9f79f4f 100644
--- "a/WebSRM/layuiAdmin.std-v1.2.1/src/views/grf/\351\200\201\350\264\247\345\215\225.grf"
+++ "b/WebSRM/layuiAdmin.std-v1.2.1/src/views/grf/\351\200\201\350\264\247\345\215\225.grf"
@@ -19,6 +19,7 @@
Items Field
Item
Name='鍗曟嵁鍙�'
+ DBFieldName='鏉＄爜缂栧彿'
End
Item
Name='鏃ユ湡'
@@ -66,6 +67,7 @@
End
Item
Name='琛屽彿'
+ DBFieldName='婧愬崟瀛怚D'
End
Item
Name='鎵规'
@@ -78,15 +80,18 @@
End
Item
Name='鍚堟牸鏁伴噺'
+ DBFieldName='鏁伴噺'
End
Item
Name='璁″垝璺熻釜鍗曞彿'
End
Item
Name='閫佽揣鍗曞彿'
+ DBFieldName='婧愬崟鍗曞彿'
End
Item
Name='閲囪喘璁㈠崟鍙�'
+ DBFieldName='婧愬崟鍗曞彿'
End
Item
Name='婧愬崟鍗曞彿'
@@ -99,9 +104,6 @@
End
Item
Name='渚涘簲鍟嗕唬鐮�'
- End
- Item
- Name='Field3'
End
Item
Name='琛ㄤ綋澶囨敞'
@@ -608,37 +610,6 @@
End
TextAlign=TopLeft
Text='鐢佃瘽锛�13185687491'
- End
- Item
- Type=PictureBox
- Name='PictureBox1'
- Left=0.396875
- Top=0.211667
- Width=2.80458
- Height=0.582083
- Picture=-2055
-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
End
Item
Type=MemoBox
--
Gitblit v1.9.1