物料：表格单选框改为复选框 生产领料单：更改选择物料时访问的弹窗页面，重量根据新的物料重新计算 生产领料单列表：相关操作后的刷新操作由页面刷新变为根据...

duhe

2023-09-22 b0a47811ab80b107e085bc1db575f583b0696922

物料：表格单选框改为复选框
生产领料单：更改选择物料时访问的弹窗页面，重量根据新的物料重新计算
生产领料单列表：相关操作后的刷新操作由页面刷新变为根据过滤条件查询，列设置最后一列不能设置问题修正

 WebTM/Properties/PublishProfiles/JFTM.pubxml.user

@@ -4737,7 +4737,7 @@
      <publishTime>08/16/2021 17:24:30</publishTime>
    </File>
    <File Include="views/领料发货/领料出库/Kf_MateOutBillLEdit.html">
      <publishTime>09/22/2023 14:02:53</publishTime>
      <publishTime>09/22/2023 15:25:25</publishTime>
    </File>
    <File Include="views/领料发货/领料出库/Kf_MateOutBillList.html">
      <publishTime>09/22/2023 14:35:16</publishTime>

 WebTM/views/Baseset/»ù´¡×ÊÁÏ/Gy_MaterialList.html

@@ -59,7 +59,7 @@
               , data: []
              , cellMinWidth: 80 //全局定义常规单元格的最小宽度，layui 2.2.1 æ–°å¢ž
              , cols: [[
                  { type: 'radio' }
                  { type: 'checkbox' }
                , { field: 'HItemID', title: '物料ID', hide: true }
                , { field: 'HNumber', title: '物料代码' }
                , { field: 'HName', title: '物料名称', sort: true }

 WebTM/views/ÁìÁÏ·¢»õ/ÁìÁϳö¿â/Kf_MateOutBillLEdit.html

@@ -1361,7 +1361,7 @@
                                shift: 2,
                                area: ['80%', '80%'],
                                maxmin: true,
                                content: ['../../PublicPage/PartInformation.html', 'yes'],
                                content: ['../../../views/Baseset/基础资料/Gy_MaterialList.html', 'yes'],
                                btn: ['确定', '取消']
                                , btn1: function (index, layero) {

@@ -1394,8 +1394,17 @@

                                        option.data[rowIndex + i].HDesignLife = 0;
                                        option.data[rowIndex + i].HLeaveLife = 0;
                                        option.data[rowIndex + i].HQty = 1;
                                        option.data[rowIndex + i].HMoney = 0;


                                        //根据物料的 ç‰©æ–™å…¬å¼ è®¡ç®— é‡é‡
                                        var HWeight = $("#HWeight").val();
                                        var HWaterQty = $("#HWaterQty").val();
                                        if (option.data[rowIndex + i].HMaterRuleType == "染料") {
                                            option.data[rowIndex + i].HQty = option.data[rowIndex + i].HRate * HWeight;
                                        } else if (option.data[rowIndex + i].HMaterRuleType == "助剂") {
                                            option.data[rowIndex + i].HQty = option.data[rowIndex + i].HRate * HWaterQty;
                                        }
                                    }
                                    table.render(option);


 WebTM/views/ÁìÁÏ·¢»õ/ÁìÁϳö¿â/Kf_MateOutBillList.html

@@ -206,7 +206,7 @@
                    case 'btn-print': get_PrintReport();
                        break;
                    //刷新
                    case 'get_Refresh': set_Refresh();
                    case 'btn-reload': set_Refresh();
                        break;
                    //审核按钮      ï¼ˆ0:审核、1:反审核）
                    case 'btn-Audit':
@@ -546,7 +546,8 @@
                    content: '../领料出库/Kf_MateOutBillLEdit.html?OperationType=1&linterid=&HSouceBillType=0&closeType=1',
                    end: function () {
                        //刷新页面,
                        get_FastQuery(table, option);
                        /*get_FastQuery(table, option);*/
                        $("#btnSearch").trigger('click');
                    },
                    success: function (layero, index) {

@@ -573,7 +574,8 @@
                        , content: '../领料出库/Kf_MateOutBillLEdit.html?OperationType=2&linterid=' + linterid + '&HSouceBillType=0&closeType=1'
                        , resize: false,
                        end: function () {
                            get_FastQuery(table, option);
                            //get_FastQuery(table, option);
                            $("#btnSearch").trigger('click');
                        }
                        , cancel: function () {
                            //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -603,7 +605,8 @@
                        , content: '../领料出库/Kf_MateOutBillLEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=1'
                        , resize: false,
                        end: function () {
                            get_FastQuery(table, option);
                            //get_FastQuery(table, option);
                            $("#btnSearch").trigger('click');
                        }
                        , cancel: function () {
                            //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -670,10 +673,8 @@
                                        var index = layer.getFrameIndex(window.name);
                                        //关闭当前frame
                                        layer.close(index);
                                        //修改为功后刷新界面
                                        window.location.reload();
                                        $("#btnSearch").trigger('click');
                                    });

                                } else {
                                    layer.alert(result.code + result.Message, { icon: 5 });
                                }
@@ -737,7 +738,7 @@

            //#region åˆ·æ–°
            function set_Refresh() {
                $("#btnSearch").click();
                $("#btnSearch").trigger('click');
            }
            //#endregion

@@ -968,7 +969,7 @@
            //#region éšè—åˆ—设置
            function get_HideColumn() {
                var colName = "";
                for (var i = 1; i < option.cols[0].length - 1; i++) {
                for (var i = 1; i < option.cols[0].length; i++) {
                    colName += option.cols[0][i]["title"] + ",";
                }

@@ -1008,7 +1009,7 @@

                            dataCol = data1.data[0].HGridString.split(',');

                            for (var i = 0; i < option.cols[0].length - 2; i++) {
                            for (var i = 0; i < option.cols[0].length - 1; i++) {
                                var dataCols = dataCol[i].split('|');
                                //隐藏列
                                if (dataCols[1] == 1) {