wtt
2024-08-23 0c430e21840dadc0e924b6588e91009b45ee71d2
bug修改
3个文件已修改
139 ■■■■ 已修改文件
WebTM/Properties/PublishProfiles/JFTM.pubxml.user 30 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/隐藏列设置/Gy_GridView_Hide_New.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/采购管理/询价单/Sup_AskPriceBillEdit.html 107 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -3555,7 +3555,7 @@
      <publishTime>08/22/2024 08:55:57</publishTime>
    </File>
    <File Include="views/基础资料/隐藏列设置/Gy_GridView_Hide_New.html">
      <publishTime>08/22/2024 10:31:52</publishTime>
      <publishTime>08/23/2024 14:32:01</publishTime>
    </File>
    <File Include="views/基础资料/隐藏列设置/Gy_QueryCondition.html">
      <publishTime>04/15/2024 13:00:48</publishTime>
@@ -6423,19 +6423,19 @@
      <publishTime>07/10/2024 16:06:15</publishTime>
    </File>
    <File Include="views/采购管理/付款单/YF_PayMentBill.html">
      <publishTime>08/23/2024 10:22:54</publishTime>
      <publishTime>08/23/2024 15:37:59</publishTime>
    </File>
    <File Include="views/采购管理/付款单/YF_PayMentBillList.html">
      <publishTime>08/23/2024 09:12:12</publishTime>
    </File>
    <File Include="views/采购管理/其他应付单/YF_PayMentOtherBillMain.html">
      <publishTime>05/17/2024 08:07:20</publishTime>
      <publishTime>08/23/2024 15:07:33</publishTime>
    </File>
    <File Include="views/采购管理/其他应付单/YF_PayMentOtherBillMainList.html">
      <publishTime>07/18/2024 16:45:16</publishTime>
    </File>
    <File Include="views/采购管理/其他应付单/YF_PayMentOtherBillMain.html">
      <publishTime>05/17/2024 08:07:20</publishTime>
      <publishTime>08/23/2024 15:07:33</publishTime>
    </File>
    <File Include="views/采购管理/其他应付单/YF_PayMentOtherBillMainList.html">
      <publishTime>07/18/2024 16:45:16</publishTime>
@@ -6444,7 +6444,7 @@
      <publishTime>07/18/2024 15:09:02</publishTime>
    </File>
    <File Include="views/采购管理/应付单/Cg_PayableBill.html">
      <publishTime>08/16/2024 10:30:58</publishTime>
      <publishTime>08/23/2024 13:51:18</publishTime>
    </File>
    <File Include="views/采购管理/应付单/Cg_PayableBillList.html">
      <publishTime>08/23/2024 09:43:25</publishTime>
@@ -6456,31 +6456,31 @@
      <publishTime>07/18/2024 16:14:27</publishTime>
    </File>
    <File Include="views/采购管理/报价单/Sup_QuotePriceBillEdit.html">
      <publishTime>08/13/2024 10:55:19</publishTime>
      <publishTime>08/23/2024 15:03:51</publishTime>
    </File>
    <File Include="views/采购管理/报价单/Sup_QuotePriceBillList.html">
      <publishTime>07/18/2024 16:37:42</publishTime>
    </File>
    <File Include="views/采购管理/收料通知单/Add_Edit_Cg_POInStockBillList.html">
      <publishTime>08/16/2024 10:13:05</publishTime>
      <publishTime>08/23/2024 13:21:42</publishTime>
    </File>
    <File Include="views/采购管理/收料通知单/Cg_POInStockBillList.html">
      <publishTime>08/22/2024 12:21:53</publishTime>
    </File>
    <File Include="views/采购管理/询价单/Sup_AskPriceBillEdit.html">
      <publishTime>08/13/2024 10:47:56</publishTime>
      <publishTime>08/23/2024 15:14:23</publishTime>
    </File>
    <File Include="views/采购管理/询价单/Sup_AskPriceBillList.html">
      <publishTime>07/18/2024 16:31:00</publishTime>
    </File>
    <File Include="views/采购管理/退料通知单/Add_Edit_Cg_POInStockBackBillList.html">
      <publishTime>08/13/2024 10:08:10</publishTime>
      <publishTime>08/23/2024 13:26:08</publishTime>
    </File>
    <File Include="views/采购管理/退料通知单/Cg_POInStockBackBillList.html">
      <publishTime>07/18/2024 15:35:56</publishTime>
    </File>
    <File Include="views/采购管理/采购合同/Add_Edit_Cg_ContractBillList.html">
      <publishTime>08/13/2024 10:45:13</publishTime>
      <publishTime>08/23/2024 14:58:10</publishTime>
    </File>
    <File Include="views/采购管理/采购合同/Cg_ContractBillList.html">
      <publishTime>07/18/2024 16:35:38</publishTime>
@@ -6507,7 +6507,7 @@
      <publishTime>08/15/2024 14:53:43</publishTime>
    </File>
    <File Include="views/采购管理/采购申请单/Cg_PORequestBill.html">
      <publishTime>08/12/2024 11:20:31</publishTime>
      <publishTime>08/23/2024 14:51:02</publishTime>
    </File>
    <File Include="views/采购管理/采购申请单/Cg_PORequestBillList.html">
      <publishTime>07/18/2024 16:08:55</publishTime>
@@ -6519,7 +6519,7 @@
      <publishTime>08/23/2024 13:09:28</publishTime>
    </File>
    <File Include="views/采购管理/采购订单/Cg_POOrderBillList.html">
      <publishTime>08/22/2024 10:39:35</publishTime>
      <publishTime>08/23/2024 14:43:52</publishTime>
    </File>
    <File Include="views/采购管理/采购订单/Cg_POOrderBillList1111.html">
      <publishTime>10/19/2021 16:08:25</publishTime>
@@ -6660,7 +6660,7 @@
      <publishTime>07/18/2024 15:35:56</publishTime>
    </File>
    <File Include="views/采购管理/采购订单/Cg_POOrderBillList.html">
      <publishTime>08/22/2024 10:39:35</publishTime>
      <publishTime>08/23/2024 14:43:52</publishTime>
    </File>
    <File Include="views/销售管理/发货通知单/Xs_SeOutStockBillList.html">
      <publishTime>08/22/2024 09:51:06</publishTime>
@@ -7092,7 +7092,7 @@
      <publishTime>03/07/2024 09:59:11</publishTime>
    </File>
    <File Include="views/验收入库/外购入库/Add_Edit_Kf_POStockInBillList.html">
      <publishTime>08/22/2024 15:00:23</publishTime>
      <publishTime>08/23/2024 13:29:42</publishTime>
    </File>
    <File Include="views/验收入库/外购入库/Kf_POStockInBackBill.html">
      <publishTime>04/15/2024 13:00:49</publishTime>
@@ -7101,7 +7101,7 @@
      <publishTime>07/18/2024 16:02:58</publishTime>
    </File>
    <File Include="views/验收入库/外购入库/Kf_POStockInBackBill_Add_Up.html">
      <publishTime>08/13/2024 10:26:45</publishTime>
      <publishTime>08/23/2024 13:32:37</publishTime>
    </File>
    <File Include="views/验收入库/外购入库/Kf_POStockInBillList.html">
      <publishTime>08/22/2024 10:09:05</publishTime>
WebTM/views/»ù´¡×ÊÁÏ/Òþ²ØÁÐÉèÖÃ/Gy_GridView_Hide_New.html
@@ -301,7 +301,7 @@
                        //数据库查询出的列数据
                        dataCol = data1.data[0].HGridString.split(',');
                    }
                    debugger
                    colNames = colName.split(',');
                    if (data1.data.length != 0 && dataCol.length == colNames.length) {
WebTM/views/²É¹º¹ÜÀí/ѯ¼Ûµ¥/Sup_AskPriceBillEdit.html
@@ -833,7 +833,114 @@
            }
        }
            //#endregion
        //#region åˆ—设置
        //隐藏列设置
        function get_HideColumn() {
            var colName = "";
            for (var i = 1; i < option.cols[0].length - 1; i++) {
                colName += option.cols[0][i]["field"] + ",";
            }
            colName = encodeURI(colName.substring(0, colName.length - 1));//对 URI è¿›è¡Œç¼–码
            layer.open({
                type: 2
                , skin: "layui-layer-rim" //加上边框
                , title: "隐藏列设置"  //标题
                , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                , shift: 2 //弹出动画
                , area: ["50%", "90%"] //窗体大小
                , maxmin: true //设置最大最小按钮是否显示
                , content: ['../../基础资料/隐藏列设置/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
                , btn: ["确定", "取消"]
                , btn1: function (index, laero) {
                    //刷新表格数据
                    DisPlay_HideColumn();
                    //更新表格缓存的数据
                    layer.close(index);//关闭弹窗
                }
            })
        }
        //显示列数据
        function DisPlay_HideColumn() {
            $.ajax({
                url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
                type: "GET",
                async: false,
                data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
                success: function (data1) {
                    if (data1.data.length != 0) {
                        var dataCol = [];//数据库查询出的列数据
                        var titleData = [];//不需要显示的字段 å¯æ‰©å±•
                        dataCol = data1.data[0].HGridString.split(',');
                        for (var i = 0; i < option.cols[0].length - 2; i++) {
                            var dataCols = dataCol[i].split('|');
                            //隐藏列
                            if (dataCols[1] == 1) {
                                option.cols[0][i + 1]["hide"] = true;
                            }
                            //设置内容字体大小
                            if (data1.data[0].HFontSize != 0) {
                                option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
                            } else {
                                option.cols[0][i + 1]["style"] = "font-size:100%";
                            }
                            //设置列宽
                            if (dataCols[3] > 0) {
                                option.cols[0][i + 1]["width"] = dataCols[3];
                            }
                            //显示列
                            if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
                                option.cols[0][i + 1]["hide"] = false;
                            }
                            //字体所在位置(å·¦ å±…中 å³)
                            switch (dataCols[2]) {
                                case "L":
                                    option.cols[0][i + 1]["align"] = "left";
                                    break;
                                case "M":
                                    option.cols[0][i + 1]["align"] = "center";
                                    break;
                                case "R":
                                    option.cols[0][i + 1]["align"] = "right";
                                    break;
                            }
                            //设置表格title属性显示别名
                            if (dataCols[4] != null && dataCols[4] != "") {
                                option.cols[0][i + 1]["title"] = dataCols[4];
                            }
                        }
                        //取消冻结列
                        for (var i = 1; i < option.cols[0].length - 1; i++) {
                            if (option.cols[0][i]["fixed"] != null) {
                                option.cols[0][i]["fixed"] = null;
                            }
                            else {
                                break;
                            }
                        }
                        //冻结列
                        if (data1.data[0].HFixCols != 0) {
                            for (var i = 0; i < data1.data[0].HFixCols; i++) {
                                if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
                                    data1.data[0].HFixCols += 1;
                                }
                                option.cols[0][i + 1]["fixed"] = "left";
                            }
                        }
                        table.render(option);
                    } else {
                        table.render(option);
                    }
                }, error: function () {
                    layer.alert("接口请求失败!", { icon: 5 });
                }
            })
        }
            //#endregion
        //编辑 é¡µé¢èµ‹å€¼
        function RoadBillMain(linterid)//加载表头
        {