1

wtt

2024-12-17 f678f337c52eeba961db31dcf35f5e0d869c6f08

1

 WebTM/WebTM.csproj.user

@@ -4,7 +4,7 @@
    <NameOfLastUsedPublishProfile>D:\智云迈思\MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\智云迈思\MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ProjectFiles</ProjectView>
    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
    <Use64BitIISExpress />
    <IISExpressSSLPort />

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -7,9 +7,9 @@
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
    var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置
    //var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
    //var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    //var WEBURL = "http://47.96.97.237/API/";          //智云服务器
    var WEBURL = "http://localhost:8082/LuBaoAPI/";   //余思杰本地配置
    /*var WEBURL = "http://localhost:8082/LuBaoAPI/"; */  //余思杰本地配置
    //var WEBURL = "http://localhost:8088/ARAPI/";      //余思杰本地配置(安瑞)
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";  //奥邦
    //var WEBURL = "http://10.1.4.155/API/";            //江丰客户NEW

 WebTM/views/ÁìÁÏ·¢»õ/ÏúÊÛ³ö¿â/Kf_SellOutBill.html

@@ -1873,7 +1873,7 @@
                    , shift: 2                                          //弹出动画
                    , area: ["90%", "90%"]                              //窗体大小
                    , maxmin: true                                      //设置最大最小按钮是否显示
                    , content: ["../../项目管理/工程项目/PM_ProjectBillList.html?openType=2&HOrgID=" + HOrgID, "yes"]
                    , content: ["../../项目管理/工程项目/PM_ProjectBillList.html?openType=2&HOrgID=" + HOrgID + "&HBillSubType=" + HBillSubType, "yes"]
                    , btn: ["确定", "取消"]
                    , btn1: function (index, laero) {
                        //按钮一  çš„回调
@@ -2475,7 +2475,7 @@
                        if (result.code == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            allVal = result.data[0];
                            var data = result.data[0];

                            HBillSubType = data.HBillSubType;
                            //根据客户带出联系人、联系电话
                            getCustomerByCusID(data.HSupID);


 WebTM/views/ÁìÁÏ·¢»õ/ÏúÊÛ³ö¿â/Kf_SellOutBillList.html

@@ -998,11 +998,6 @@
                if (HProjectNumber) {

                    sWhere += " and é¡¹ç›®ç¼–码 like '%" + HProjectNumber + "%'";
                    if (HBillSubType == "工程类") {
                        sWhere += "and é¡¹ç›®å­ç±»åž‹='工程类'"
                    } else if (HBillSubType == "任务类") {
                        sWhere += "and é¡¹ç›®å­ç±»åž‹='任务类'"
                    }
                }
                if (HCusID) {
                    sWhere += " and å®¢æˆ· like '%" + HCusID + "%'";

 WebTM/views/ÑéÊÕÈë¿â/Í⹺Èë¿â/Add_Edit_Kf_POStockInBillList.html

@@ -1161,8 +1161,10 @@
                    },
                    success: function (result) {
                        if (result.code == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ

                            var data = result.data[0];
                            allVal = result.data[0];
                            HBillSubType = data.HBillSubType;
                            form.val("component-form-group", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                "HBillNo": data.单据号
                                , "HDate": formatDate(data.日期)
@@ -1695,7 +1697,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '项目列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../项目管理/工程项目/PM_ProjectBillList.html?Type=2&HOrgID=' + HOrgID, 'yes']
                    , content: ['../../项目管理/工程项目/PM_ProjectBillList.html?Type=2&HOrgID=' + HOrgID + "&HBillSubType=" + HBillSubType, 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面

 WebTM/views/ÑéÊÕÈë¿â/Í⹺Èë¿â/Kf_POStockInBillList.html

@@ -927,11 +927,6 @@
                }
                if (HProjectNumber) {
                    sWhere += " and é¡¹ç›®ä»£ç  like '%" + HProjectNumber + "%'";
                    if (HBillSubType == "工程类") {
                        sWhere += "and é¡¹ç›®å­ç±»åž‹='工程类'"
                    } else if (HBillSubType == "任务类") {
                        sWhere += "and é¡¹ç›®å­ç±»åž‹='任务类'"
                    }
                }
                if (HSupID) {
                    sWhere += " and ä¾›åº”商 like '%" + HSupID + "%'";