Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

zrg

2024-05-28 9ed06659f63a988a5cfb3a2afb36d95b60c4a5b0

Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

 WebTM/Properties/PublishProfiles/JFTM.pubxml

@@ -10,7 +10,7 @@
    <LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration>
    <LastUsedPlatform>Any CPU</LastUsedPlatform>
    <PublishProvider>FileSystem</PublishProvider>
    <PublishUrl>D:\网站发布\智云MESWMS\LAYUI</PublishUrl>
    <PublishUrl>G:\issWeb\网站发布\LAYUI</PublishUrl>
    <WebPublishMethod>FileSystem</WebPublishMethod>
    <SiteUrlToLaunchAfterPublish />
  </PropertyGroup>

 WebTM/Properties/PublishProfiles/JFTM.pubxml.user

Diff too large

 WebTM/WebTM.csproj

@@ -391,12 +391,16 @@
    <Content Include="views\车间管理\防错验证\Qc_PreventErrMouldCheckBill.html" />
    <Content Include="views\车间管理\防错验证\Qc_PreventErrMouldCheckBillList.html" />
    <Content Include="views\车间管理\报表分析\Kf_PressurizedWaterNoOutReport.html" />
    <Content Include="views\采购管理\采购合同\Add_Edit_Cg_ContractBillList.html" />
    <Content Include="views\采购管理\采购合同\Cg_ContractBillList.html" />
    <Content Include="views\采购管理\采购报表\Cg_POOrderReceiveDaySumReport.html" />
    <Content Include="views\采购管理\采购报表\Cg_POOrderReceiveSumReport.html" />
    <Content Include="views\采购管理\采购报表\Cg_POOrderBillSumReport.html" />
    <Content Include="views\采购管理\采购报表\Cg_POInStockBillSumReport.html" />
    <Content Include="views\采购管理\采购报表\Cg_POMaterialPriceReport.html" />
    <Content Include="views\采购管理\采购报表\Cg_POOrderBillProcessSumReport.html" />
    <Content Include="views\销售管理\销售合同\Add_Edit_Xs_ContractBillList.html" />
    <Content Include="views\销售管理\销售合同\Xs_ContractBillList.html" />
    <Content Include="views\项目管理\基础建模\Add_Edit_Gy_TaskClass.html" />
    <Content Include="views\项目管理\基础建模\Add_Edit_Gy_ProjectClass.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_ColorClass.html" />

 WebTM/WebTM.csproj.user

@@ -2,7 +2,7 @@
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\智云迈思\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ProjectFiles</ProjectView>
    <ProjectView>ShowAllFiles</ProjectView>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
    <Use64BitIISExpress />

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -8,8 +8,8 @@
    //var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置
    //var WEBURL = "http://localhost:81/API/";    //王彬本地配置
    /*var WEBURL = "http://localhost:8083/API/";  //陈雯静本地配置*/
    //var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
    var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    /*var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置*/
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //余思杰本地配置
    //var WEBURL = "http://localhost:8088/ARAPI/";    //余思杰本地配置(安瑞)
    //var WEBURL = "http://10.1.4.155/API/";   //江丰客户NEW

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_Currency.html

@@ -382,9 +382,21 @@
                $("#HCurName", window.parent.document).val(data.货币名称);
                $("#HExRate", window.parent.document).val(data.汇率);
                var index = parent.layer.getFrameIndex(window.name);
                parent.GetGyCur(obj.data);
                parent.layer.close(index);
            });
            //#endregion
            table.on('sort(mainTable)', function (obj) { //注：sort æ˜¯å·¥å…·æ¡äº‹ä»¶åï¼Œtest æ˜¯ table åŽŸå§‹å®¹å™¨çš„属性 lay-filter="对应的值"
                table.reload('mainTable', {
                    initSort: obj //记录初始排序，如果不设的话，将无法标记表头的排序状态。 layui 2.1.1 æ–°å¢žå‚æ•°
                    , where: { //请求参数（注意：这里面的参数可任意定义，并非下面固定的格式）
                        field: obj.field //排序字段   åœ¨æŽ¥å£ä½œä¸ºå‚数字段  field order
                        , order: obj.type //排序方式   åœ¨æŽ¥å£ä½œä¸ºå‚数字段  field order
                    }
                });
                option.data = layui.table.cache["mainTable"];
                table.render(option);
            });

            //代码回车方法
            $('#HNumber').on('keydown', function (event) {

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_Unit.html

@@ -389,7 +389,17 @@
                parent.layer.close(index);
            });
            //#endregion

            table.on('sort(mainTable)', function (obj) { //注：sort æ˜¯å·¥å…·æ¡äº‹ä»¶åï¼Œtest æ˜¯ table åŽŸå§‹å®¹å™¨çš„属性 lay-filter="对应的值"
                table.reload('mainTable', {
                    initSort: obj //记录初始排序，如果不设的话，将无法标记表头的排序状态。 layui 2.1.1 æ–°å¢žå‚æ•°
                    , where: { //请求参数（注意：这里面的参数可任意定义，并非下面固定的格式）
                        field: obj.field //排序字段   åœ¨æŽ¥å£ä½œä¸ºå‚数字段  field order
                        , order: obj.type //排序方式   åœ¨æŽ¥å£ä½œä¸ºå‚数字段  field order
                    }
                });
                option.data = layui.table.cache["mainTable"];
                table.render(option);
            });

        
         function btnrowDouble(obj) {

 WebTM/views/²É¹º¹ÜÀí/ÍËÁÏ֪ͨµ¥/Add_Edit_Cg_POInStockBackBillList.html

@@ -1030,7 +1030,20 @@
                    layer.msg("请选择主管！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }

                //子表数据检验简单表单验证
                //后续可用多个数组存储列名扩展
                for (var i = 0; i < option.data.length; i++) {
                    if (typeof option.data[i] !== 'object' || option.data[i] === null || Array.isArray(option.data[i])) {
                        continue; // è·³è¿‡éžå¯¹è±¡é¡¹ï¼ˆå¦‚空数组）  
                    }
                    var rowData = option.data[i];
                    for (var col of Object.keys(rowData)) {
                        if (rowData[col] == "0" && col != "LAY_TABLE_INDEX") {
                            layer.msg("第" + (i + 1) + "行：" + col + "不能为0！");
                            return;
                        }
                    }
                }
                var num = [];
                for (var i = 0; i < table.cache["mainTable"].length; i++) {
                    if (table.cache["mainTable"][i] != "") {

 WebTM/views/²É¹º¹ÜÀí/²É¹ººÏͬ/Add_Edit_Cg_ContractBillList.html

@@ -902,7 +902,7 @@

            //#region ä¿å­˜æ–¹æ³•
            function set_SaveBill(data) {

                //表单数据检验
                if ($("#HCurID").val() == 0) {
                    layer.msg("请选择币别！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
@@ -927,6 +927,28 @@
                    layer.msg("请选择结算方式！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                //子表数据简单检验
                //后续可用多个数组存储列名来扩展
                for (var i = 0; i < option.data.length; i++) {
                    if (typeof option.data[i] !== 'object' || option.data[i] === null || Array.isArray(option.data[i])) {
                        continue; // è·³è¿‡éžå¯¹è±¡é¡¹ï¼ˆå¦‚空数组）  
                    }
                    var rowData = option.data[i];
                    var rowData2 = option2.data[i];
                    for (var col of Object.keys(rowData)) {
                        if (rowData[col] == "0" && col !="LAY_TABLE_INDEX") {
                            layer.msg("第" + (i + 1) + "行：" + col + "不能为0！");
                            return;
                        }
                    }
                    for (var col of Object.keys(rowData2)) {
                        if (rowData2[col] == "0" && col != "LAY_TABLE_INDEX") {
                            layer.msg("第" + (i + 1) + "行：" + col + "不能为0！");
                            return;
                        }
                    }
                }

                //物料明细
                var num = [];
                for (var i = 0; i < table.cache["mainTable"].length; i++) {
@@ -1071,21 +1093,20 @@
                                    OptionData = checkStatus.data[0];
                                    //更新表格缓存的数据
                                    obj.update({
                                        "HUnitID": checkStatus.data[0].HItemID
                                        , "计量单位": checkStatus.data[0].计量单位名称
                                        "HUnitID": OptionData.HItemID
                                        , "计量单位": OptionData.计量单位名称
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                                , end: function () {
                                    obj.update({
                                        "HUnitID": OptionData.HItemID
                                        , "计量单位": OptionData.计量单位名称
                                        "HUnitID": OptionData[0].HItemID
                                        , "计量单位": OptionData[0].计量单位名称
                                    })
                                }
                            })
                        }
                        //货币(TODO æœ‰bug在弹出框排序以后确定，选中元素还是原来位置的（需要在货币资料与计量单位资料中设置排序代码如物料页面）)
                        //TODO ä¸Žè´§å¸å’Œè®¡é‡å•ä½åŽŸé¡µé¢éœ€è¦è®¾ç½®åŒå‡»äº‹ä»¶
                        //货币
                        if (obj.event == "HCurID") {
                            layer.open({
                                type: 2//弹窗类型
@@ -1356,7 +1377,8 @@

        //双击返回计量单位
        function GetUnitValue(data) {
            OptionData = data
            OptionData = data;
            
        }

        //双击返回物料

 WebTM/views/²É¹º¹ÜÀí/²É¹º¶©µ¥/Cg_POOrderBillEdit.html

@@ -992,7 +992,20 @@
                    layer.msg("请选择结算方式！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }

                //子表数据检验简单表单验证
                //后续可用多个数组存储列名扩展
                for (var i = 0; i < option.data.length; i++) {
                    if (typeof option.data[i] !== 'object' || option.data[i] === null || Array.isArray(option.data[i])) {
                        continue; // è·³è¿‡éžå¯¹è±¡é¡¹ï¼ˆå¦‚空数组）  
                    }
                    var rowData = option.data[i];
                    for (var col of Object.keys(rowData)) {
                        if (rowData[col] == "0" && col != "LAY_TABLE_INDEX") {
                            layer.msg("第" + (i + 1) + "行：" + col + "不能为0！");
                            return;
                        }
                    }
                }
                var num = [];
                for (var i = 0; i < table.cache["mainTable"].length; i++) {
                    if (table.cache["mainTable"][i] != "") {

 WebTM/views/²É¹º¹ÜÀí/²É¹º¶©µ¥/Cg_POOrderBillList.html

@@ -410,6 +410,8 @@
                        break;
                };
            });
            //表格点击事件
            

            //重新同步按钮
            form.on('submit(btnResCnz)', function (data) {
@@ -421,6 +423,30 @@
                set_ClearQuery();
            });

            table.on('tool(mainTable)' , function (obj) {
                var data = obj.data;
                if (obj.event == '单据号') {
                    var linterid = data.hmainid.toString();
                    //if (AllowLoadData(sSubStr) != false) {//非空验证
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '编辑' + HPageTitle
                        , closeBtn: 1
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: './Cg_POOrderBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=1'
                        , resize: false,
                        end: function () {
                            get_FastQuery(table, option);
                        }
                        , cancel: function () {
                            //$(".layui-btn").removeClass("layui-btn-disabled");
                        }
                    })
                }
            });
            //获取组织
            function Organ() {
                //获取登录页组织列
@@ -504,7 +530,7 @@
                    $('#HEndDate').prop('disabled', false);
                }
            });

            //#endregion

            //#region æ­¤é¡µé¢æ‰€æœ‰æ–¹æ³•
            function set_ClearBill() {
@@ -553,7 +579,7 @@
                        { type: 'checkbox', fixed: 'left', totalRowText: '合计' }
                        ,{ field: 'hmainid', title: 'hmainid', sort: true, hide: true }
                        , { field: '日期', title: '日期', width: 120, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.日期, 'yyyy-MM-dd')}}</div>" }
                        , { field: '单据号', title: '单据号', width: 150}
                        , { field: '单据号', title: '单据号', width: 150, }
                        , { field: '状态', title: '状态', width: 100, sort: true }
                        , { field: 'HBillType', title: 'HBillType', hide: true, sort: true }
                        , { field: '行状态', title: '行状态', width: 125, sort: true }
@@ -660,6 +686,7 @@
                //        m["width"] = colWidth[x];
                //    });
                //}

            }
            //加载网格
            function get_Display(sWhere) {
@@ -670,7 +697,7 @@
                    data: { "sWhere": sWhere  , "user": sessionStorage["HUserName"]},
                    success: function (data1) {
                        if (data1.count == 1) {
                            var data = [];
                            var data = [];//列字段数据
                            var col = [];
                            var totalArray = ["数量", "关联数量", "未关联数量", "打印条码数量", "未打印条码数量","实收数量","金额"];
                            //给空的数组赋值
@@ -684,9 +711,11 @@
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else if ($.inArray(data[i].name, totalArray) > -1) {
                                else if ($.inArray(data[i].name, totalArray) > -1) { //计算列
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
                                } else {
                                } else if (data[i].name == '单据号') {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event:'单据号' });
                                }else {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':

 WebTM/views/ÏúÊÛ¹ÜÀí/ÏúÊÛºÏͬ/Add_Edit_Xs_ContractBillList.html

@@ -1081,8 +1081,7 @@
                                }
                            })
                        }
                        //货币(TODO æœ‰bug在弹出框排序以后确定，选中元素还是原来位置的（需要在货币资料与计量单位资料中设置排序代码如物料页面）)
                        //TODO ä¸Žè´§å¸å’Œè®¡é‡å•ä½åŽŸé¡µé¢éœ€è¦è®¾ç½®åŒå‡»äº‹ä»¶
                        //货币
                        if (obj.event == "HCurID") {
                            layer.open({
                                type: 2//弹窗类型

 WebTM/views/ÏúÊÛ¹ÜÀí/ÏúÊÛºÏͬ/Xs_ContractBillList.html

@@ -572,7 +572,7 @@
                    //逻辑删除方法
                    layer.confirm("确认要删除吗，删除后不能恢复", { title: "删除确认" }, function (index) {

                        if (data[0].审核人 == null || data[0].审核人 == '' ) {
                        if (data[0].状态 == "创建" ) {
                            $.ajax({
                                type: "GET",
                                url: GetWEBURL() + "/Xs_ContractBill/DeltetXs_ContractBill", //方法所在页面和方法名

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

@@ -1744,6 +1744,8 @@
                            }
                            })
                        }
                        obj.event = "";
                        return false;
                    }
                })
            }

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

@@ -1474,6 +1474,8 @@
                            }
                            })
                        }
                        obj.event = "";
                        return false;
                    }
                })
            }