Merge branch 'master' of http://47.104.102.122:3000/lpf/SGGL_SeDin_New

2025-06-18 15:22:01 +08:00
parent a742019dfd ded4928aa9
commit 6be8d160e0
8 changed files with 113 additions and 52 deletions
@@ -16599,7 +16599,7 @@
    </COMReference>
  </ItemGroup>
  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v17.0\WebApplications\Microsoft.WebApplication.targets" />
  <ProjectExtensions>
    <VisualStudio>
      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
@@ -32,8 +32,8 @@
                                <f:Button ID="btnNew" Text="新增" Icon="Add" EnablePostBack="false" Hidden="true"
                                    runat="server">
                                </f:Button>
-                                <f:Button ID="Button1" Text="推送" Icon="Add"  runat="server" OnClick="Button1_Click">
-</f:Button>
+                                <f:button id="Button1" text="推送" icon="Add" runat="server" onclick="Button1_Click">
+                                </f:button>
                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" Icon="FolderUp"
                                    EnableAjax="false" DisableControlBeforePostBack="false">
                                </f:Button>
@@ -348,7 +348,15 @@ namespace FineUIPro.Web.HSSE.CostGoods
                }
                else
                {
-                    string messaage = CostManageService.PushDataToHSE(this.CurrUser.LoginProjectId, costManage.ContractNum);
+                    string messaage = CostManageService.PushDataToHSE(this.CurrUser.LoginProjectId, costManage.ContractNum,costManageId);
+                    if (string.IsNullOrEmpty(messaage))
+                    {
+                        Alert.ShowInTop("推送成功！", MessageBoxIcon.Success);
+                    }
+                    else
+                    {
+                        Alert.ShowInTop(messaage, MessageBoxIcon.Warning);
+                    }

                }

@@ -582,6 +582,8 @@
        // refreshWhenExist： 添加选项卡时，如果选项卡已经存在，是否刷新内部IFrame
        // iconFont： 选项卡图标字体
        function addExampleTab(tabOptions) {
+            debugger;
+
            if (typeof (tabOptions) === 'string') {
                tabOptions = {
                    id: arguments[0],