e

2 months ago · 417546bb82
parent 578afa61bc
commit 417546bb82
8 changed files with 1228 additions and 3 deletions
--- a/TradeManage/HuoWu/HW_GoodsAddForTM.aspx
+++ b/TradeManage/HuoWu/HW_GoodsAddForTM.aspx
@ -44,7 +44,14 @@
        var XPId = 0;
        var GoodsModel = null;
        var Title = "货物信息";
-          var UserId = "<%=Session["UserId"]%>";
+        var UserId = "<%=Session["UserId"]%>";
+        var TemuChengBen = {
+            JinJia: "0",
+            YunFei: "0",
+            TouCheng: "0",
+            HuoWuShuiFei: "0",
+            YuGuJiaGe: "0",
+        }
        var WindowLoadModel = new WindowLoad();
        $(document).ready(function () {
            WindowLoadModel.ApplicationPath = "../";
@ -95,7 +102,8 @@
                GetUrl();
                 GetUrl2();
                GetPostNum();
-               GetFedexModel();
+                 GetFedexModel();
+                 GetTemuFee();

            }
             //else
@ -651,6 +659,74 @@

        
        }
+
+        //获取temu成本预估
+        function GetTemuFee() {
+            var param = {
+                GoodsId: GoodsId
+            }
+            $.ajax({
+                url: "../DD_OrderServiceNew.asmx/GetListTemuChengBen",
+                data: Sys.Serialization.JavaScriptSerializer.serialize(param),
+                success: function (data) {
+                    var JinJia = (GoodsModel.InPrice / usdfeerate).toFixed(2)
+                    var TouCheng = (GoodsModel.Solid * 130).toFixed(2)
+                    var HuoWuShuiFei = (GoodsModel.Solid * 130).toFixed(2)
+                    var YuGuJiaGe = Number(JinJia) + Number(TouCheng) + Number(HuoWuShuiFei)
+                    TemuChengBen = {
+                        JinJia: JinJia,
+                        YunFei: "0",
+                        TouCheng: TouCheng,
+                        HuoWuShuiFei: HuoWuShuiFei,
+                        YuGuJiaGe: YuGuJiaGe.toFixed(2),
+                    }
+                    if (data.d.DataSource && data.d.DataSource.length) {
+                        TemuChengBen = data.d.DataSource[0]
+                    }
+                    $("#txt_temu_JinJia").val(TemuChengBen.JinJia)
+                    $("#txt_temu_YunFei").val(TemuChengBen.YunFei)
+                    $("#txt_temu_TouCheng").val(TemuChengBen.TouCheng)
+                    $("#txt_temu_HuoWuShuiFei").val(TemuChengBen.HuoWuShuiFei)
+                    $('#txt_temu_YuGuJiaGe').text(TemuChengBen.YuGuJiaGe + '$')
+                }
+            });
+            
+        }
+
+        //计算并保存temu成本预估
+        function SaveTemuFee() {
+            var JinJia = $("#txt_temu_JinJia").val()
+            var YunFei = $("#txt_temu_YunFei").val()
+            var TouCheng = $("#txt_temu_TouCheng").val()
+            var HuoWuShuiFei = $("#txt_temu_HuoWuShuiFei").val()
+            if (!JinJia || !YunFei || !TouCheng || !HuoWuShuiFei) {
+                alert("请把信息填写完整");
+                return;
+            }
+            var YuGuJiaGe = Number(JinJia) + Number(YunFei) + Number(TouCheng) + Number(HuoWuShuiFei)
+            $('#txt_temu_YuGuJiaGe').text(YuGuJiaGe+'$')
+            var param = {
+                Model: {
+                    ID: TemuChengBen.ID,
+                    GoodsId: GoodsId,
+                    JinJia: JinJia,
+                    YunFei: YunFei,
+                    TouCheng: TouCheng,
+                    HuoWuShuiFei: HuoWuShuiFei,
+                    YuGuJiaGe: YuGuJiaGe,
+                }
+            }
+            $.ajax({
+                url: "../DD_OrderServiceNew.asmx/Save_TemuChengBen",
+                data: Sys.Serialization.JavaScriptSerializer.serialize(param),
+
+                success: function (data) {
+                    WindowLoadModel.Hide();
+                    GetFedexModel();
+                }
+            });
+        }
+
        function SumYGFee()
        {
        if(GoodsModel!=null)
@ -4776,6 +4852,19 @@ function selectE(p,c) {
                    type="button" value="计算" />
                        </td>
                    </tr>
+                    <tr>
+                        <td class="f1">
+                            temu成本预估：
+                        </td>
+                        <td colspan="3" align="center">
+                            进价：<input id="txt_temu_JinJia" min='0' max='1000000' type="text" style="width: 80px;" class="editTextbox" value="0" />
+                            +运费：<input id="txt_temu_YunFei" min='0' max='1000000' type="text" style="width: 80px;" class="editTextbox" value="0" />
+                            +货物税费：<input id="txt_temu_HuoWuShuiFei" min='0' max='1000000' type="text" style="width: 80px;" class="editTextbox" value="0" />
+                            +头程：<input id="txt_temu_TouCheng" min='0' max='1000000' type="text" style="width: 80px;" class="editTextbox" value="0" />
+                            =预计价格：<a style='color: Red' id="txt_temu_YuGuJiaGe">0$</a>&nbsp;&nbsp;
+                            <input class="btnClass btnClassSave" onclick="SaveTemuFee();" type="button" value="计算并保存" />
+                        </td>
+                    </tr>
                </table>
            </td>
        </tr>
--- a/TradeManage/HuoWu/HW_GoodsDetailList2.aspx
+++ b/TradeManage/HuoWu/HW_GoodsDetailList2.aspx
@ -1162,6 +1162,10 @@
                col.CellTemplate = "<span>{Bind SubsidyFee}</span>";
                Array.add(datagrid1.Columns, col);
                col = new nblf.ui.DataGridColumn();
+                col.HeaderText = "temu成本";
+                col.CellTemplate = "<span>{Bind YuGuJiaGe}</span>";
+                Array.add(datagrid1.Columns, col);
+                col = new nblf.ui.DataGridColumn();
                col.HeaderText = "建议售价$";
                col.CellTemplate = "<span>{Bind JYPrice}</span>";
                // col.SortExpression = "InPrice";
--- a/TradeManage/Web.config
+++ b/TradeManage/Web.config
@ -67,7 +67,8 @@
  <appSettings>
    <!--<add key="ConnectionString" value="server=60.12.218.120;database=erp;uid=KJERP;pwd=KJERP123456"/>-->
    <!--<add key="ConnectionString" value="server=101.37.88.86;database=erp;uid=sa;pwd=erp@yeyuan123456New"/>-->
-    <add key="ConnectionString" value="server=.;database=ERPYY;uid=sa;pwd=hz123456"/>
+    <!--<add key="ConnectionString" value="server=.;database=ERPYY;uid=sa;pwd=hz123456"/>-->
+	 <add key="ConnectionString" value="server=192.168.1.16;database=newerpbak_cwk;uid=erpadmin;pwd=erp@12345;TrustServerCertificate=True;" />
    <add key="Alibaba_Appkey" value="4777502"/>
    <add key="Alibaba_DeveKey" value="QQEkGZe0G93"/>
    <add key="Amazon_AccessKeyId" value="AKIAJU3WI7WL7IZQZNYA"/>
--- a/TradeManageNew/DingDan/DT_SecondHand2.aspx
+++ b/TradeManageNew/DingDan/DT_SecondHand2.aspx
--- a/TradeManageNew/DingDan/DT_SecondHand2.aspx.cs
+++ b/TradeManageNew/DingDan/DT_SecondHand2.aspx.cs
@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace TradeManageNew.DingDan
+{
+    public partial class DT_SecondHand2 : System.Web.UI.Page
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+
+        }
+    }
+}
--- a/TradeManageNew/DingDan/DT_SecondHand2.aspx.designer.cs
+++ b/TradeManageNew/DingDan/DT_SecondHand2.aspx.designer.cs
@ -0,0 +1,26 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace TradeManageNew.DingDan
+{
+
+
+    public partial class DT_SecondHand2
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+    }
+}
--- a/TradeManageNew/TradeManageNew.csproj
+++ b/TradeManageNew/TradeManageNew.csproj
@ -1377,6 +1377,7 @@
    <Content Include="DingDan\DT_OrderReturn.aspx" />
    <Content Include="DingDan\DT_OrderReturnImport.aspx" />
    <Content Include="DingDan\DT_SecondHand.aspx" />
+    <Content Include="DingDan\DT_SecondHand2.aspx" />
    <Content Include="DingDan\FedexFee2.aspx" />
    <Content Include="DingDan\FedexFee2.html" />
    <Content Include="DingDan\OrderReturnTrackingId.aspx" />
@ -2552,6 +2553,13 @@
    <Compile Include="DingDan\DT_SecondHand.aspx.designer.cs">
      <DependentUpon>DT_SecondHand.aspx</DependentUpon>
    </Compile>
+    <Compile Include="DingDan\DT_SecondHand2.aspx.cs">
+      <DependentUpon>DT_SecondHand2.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="DingDan\DT_SecondHand2.aspx.designer.cs">
+      <DependentUpon>DT_SecondHand2.aspx</DependentUpon>
+    </Compile>
    <Compile Include="DingDan\FedexFee2.aspx.cs">
      <DependentUpon>FedexFee2.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
--- a/TradeManageNew/Web.config
+++ b/TradeManageNew/Web.config
@ -155,4 +155,14 @@
      </dependentAssembly>
    </assemblyBinding>
  </runtime>
+	<system.webServer>
+		<httpProtocol>
+			<customHeaders>
+				<add name="Access-Control-Allow-Origin" value="http://localhost:7001" />
+				<add name="Access-Control-Allow-Headers" value="*" />
+				<add name="Access-Control-Allow-Methods" value="GET, POST, PUT, DELETE, OPTIONS" />
+				<add name="Access-Control-Allow-Credentials" value="true" />
+			</customHeaders>
+		</httpProtocol>
+	</system.webServer>
 </configuration>