diff --git a/SGGL/FineUIPro.Web/AttachFile/OnlineEditing.aspx b/SGGL/FineUIPro.Web/AttachFile/OnlineEditing.aspx
index 0eb3059d..94b12a5a 100644
--- a/SGGL/FineUIPro.Web/AttachFile/OnlineEditing.aspx
+++ b/SGGL/FineUIPro.Web/AttachFile/OnlineEditing.aspx
@@ -102,6 +102,7 @@
xhr.open(method, url, true);
if (method === "POST")
xhr.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
+ xhr.setRequestHeader("token", "<%=UserId%>");
xhr.send(queryString);
xhr.onreadystatechange = function () {
if (xhr.readyState === 4) {
@@ -127,14 +128,13 @@
var host = location.hostname;
ajax({
url: 'https://sggl.sedin.com.cn/sgglapi/api/FileUpload/DownloadDocument',
- type: 'post',
+ type: 'post',
+
data: {
'UrlStr': url,
'PCUrl': '<%=PCUrl%>',
},
- headers: {
- 'token': '<%=UserId%>'
- },
+
dataType: 'json',
async: false,
success: function (json) {
@@ -142,11 +142,11 @@
if (json.code == 1 || json.code == '1') {
alert('保存成功');
} else {
- this.error(json, '保存失败');
+ this.error(json);
}
},
- error: function (json, msg) {
- alert(+msg);
+ error: function (json) {
+ alert(json.message);
}
});
}
diff --git a/SGGL/FineUIPro.Web/File/Fastreport/管道焊口检测委托单NoPic.frx b/SGGL/FineUIPro.Web/File/Fastreport/管道焊口检测委托单NoPic.frx
new file mode 100644
index 00000000..f6f23483
--- /dev/null
+++ b/SGGL/FineUIPro.Web/File/Fastreport/管道焊口检测委托单NoPic.frx
@@ -0,0 +1,344 @@
+
+
+ using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Windows.Forms;
+using System.Drawing;
+using System.Data;
+using FastReport;
+using FastReport.Data;
+using FastReport.Dialog;
+using FastReport.Barcode;
+using FastReport.Table;
+using FastReport.Utils;
+
+namespace FastReport
+{
+ public class ReportScript
+ {
+
+
+ private void Table4_ManualBuild(object sender, EventArgs e)
+ {
+ DataSourceBase rowData = Report.GetDataSource("Table1");
+ // init the data source
+ rowData.Init();
+
+ // print the first table row - it is a header
+ Table4.PrintRow(0);
+ // each PrintRow call must be followed by either PrintColumn or PrintColumns call
+ // to print cells on the row
+ Table4.PrintColumns();
+
+ // now enumerate the data source and print the table body
+
+ // print the table body
+ Table4.PrintRow(1);
+ Table4.PrintColumns();
+ Table4.PrintRow(2);
+ Table4.PrintColumns();
+ Table4.PrintRow(3);
+ Table4.PrintColumns();
+ Table4.PrintRow(4);
+ Table4.PrintColumns();
+ Table4.PrintRow(5);
+ Table4.PrintColumns();
+
+ // go next data source row
+ rowData.Next();
+
+ }
+
+ private void Table5_ManualBuild(object sender, EventArgs e)
+ {
+ Table5.PrintRow(0);
+ Table5.PrintColumns();
+ Table5.PrintRow(1);
+ Table5.PrintColumns();
+ }
+
+
+ private int x;
+ private void Tabel_Data_ManualBuild(object sender, EventArgs e)
+ {
+ DataSourceBase rowData = Report.GetDataSource("Data");
+ // init the data source
+ rowData.Init();
+
+ // print the first table row - it is a header
+ Tabel_Data.PrintRow(0);
+ // each PrintRow call must be followed by either PrintColumn or PrintColumns call
+ // to print cells on the row
+ Tabel_Data.PrintColumns();
+ x=0;
+ // now enumerate the data source and print the table body
+ while (rowData.HasMoreRows)
+ {
+ x++;
+ // print the table body
+ Tabel_Data.PrintRow(1);
+ Tabel_Data.PrintColumns();
+
+ // go next data source row
+ rowData.Next();
+ }
+ }
+ }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/SGGL/FineUIPro.Web/File/Fastreport/管道焊口热处理委托单NoPic.frx b/SGGL/FineUIPro.Web/File/Fastreport/管道焊口热处理委托单NoPic.frx
new file mode 100644
index 00000000..c758bce4
--- /dev/null
+++ b/SGGL/FineUIPro.Web/File/Fastreport/管道焊口热处理委托单NoPic.frx
@@ -0,0 +1,239 @@
+
+
+ using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Windows.Forms;
+using System.Drawing;
+using System.Data;
+using FastReport;
+using FastReport.Data;
+using FastReport.Dialog;
+using FastReport.Barcode;
+using FastReport.Table;
+using FastReport.Utils;
+
+namespace FastReport
+{
+ public class ReportScript
+ {
+
+
+
+ private int x;
+ private void Tabel_Data_ManualBuild(object sender, EventArgs e)
+ {
+ DataSourceBase rowData = Report.GetDataSource("Data");
+ // init the data source
+ rowData.Init();
+
+ // print the first table row - it is a header
+ Tabel_Data.PrintRow(0);
+ // each PrintRow call must be followed by either PrintColumn or PrintColumns call
+ // to print cells on the row
+ Tabel_Data.PrintColumns();
+ x=0;
+ // now enumerate the data source and print the table body
+ while (rowData.HasMoreRows)
+ {
+ x++;
+ // print the table body
+ Tabel_Data.PrintRow(1);
+ Tabel_Data.PrintColumns();
+
+ // go next data source row
+ rowData.Next();
+ }
+ }
+ }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessTrust.aspx b/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessTrust.aspx
index f4f17ca5..dd14adb6 100644
--- a/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessTrust.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessTrust.aspx
@@ -46,6 +46,8 @@
+
+
<%--
@@ -100,6 +102,9 @@
+
+
@@ -154,6 +159,10 @@
EnableMaximize="true" Target="Top" EnableResize="false" runat="server" OnClose="Window1_Close"
IsModal="true" Width="1090px" Height="660px">
+
+