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

yangle

2023-07-24 7861d012b84104a33099fdd3b96560e1ccbffdf2

 WebTM/views/ÑéÊÕÈë¿â/ÆäËûÈë¿â/Kf_OtherInBill_Fast.html

@@ -959,21 +959,21 @@
                                    }, function () { window.location.reload(); });//新增
                                }
                                else {
                                    layer.msg(data.Message, { icon: 5 });
                                    layer.confirm(data.Message, { icon: 5 });
                                    //灰度提交按钮Saver
                                    document.getElementById("Saver").disabled = false;
                                }
                                layer.closeAll("loading");
                            },
                            error: function (err) {
                                layer.msg("错误:" + err, { icon: 5 });
                                layer.confirm("错误:" + err, { icon: 5 });
                                //灰度提交按钮Saver
                                document.getElementById("Saver").disabled = false;
                            }
                        });
                }
                else {
                    layer.msg("数据不完整，不允许提交:", { icon: 5 });
                    layer.confirm("数据不完整，不允许提交:", { icon: 5 });
                    //灰度提交按钮Saver
                    document.getElementById("Saver").disabled = false;
                }
@@ -1131,11 +1131,13 @@
                                        //, toolbar: '#toolbarDemo'
                                        , defaultToolbar: []
                                        , page: true
                                        , limit: 100
                                        , limit: 3000
                                        , totalRow: true
                                        , where: { HBillID: sInterID, HBillType: '1203', sWhere: '' }
                                        , cols: [[
                                            { type: 'radio' }
                                            , { field: 'HQty', title: '数量', width: 150 }
                                            , { field: 'HQty', title: '重量', width: 150, totalRow: true }
                                            , { field: 'HAuxQty', title: '箱数', width: 150, totalRow: true }
                                            , { field: 'HQtyMust', title: '应收数量', width: 150 }
                                            , { field: 'HMaterNumber', title: '物料代码', width: 150 }
                                            , { field: 'HMaterName', title: '物料名称', width: 150 }
@@ -1152,7 +1154,7 @@
                                        , done: function () {
                                            layer.closeAll("loading");
                                        }
                                    })
                                    })                                    
                                    //清空数量
                                    $("#HQty").val("");
                                }