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

wtt

2025-03-25 12f860b99c61d0dc58a31a237bf8a912bd1da72f

 WebTM/views/ÁìÁÏ·¢»õ/Éú²úÁìÁÏ/Kf_ProductReceiveMaterialBillEdit.html

@@ -930,8 +930,6 @@
                            allVal = result.data[0];
                            var data = result.data[0];
                            HBillSubType = data.HBillSubType;
                            //根据客户带出联系人、联系电话
                            getCustomerByCusID(data.HSupID);

                            form.val("component-form-group", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                "HBillNo": data.单据号
@@ -979,7 +977,7 @@
                                        , "计量单位": result.data[i].计量单位
                                        , "HQtyMust": dealDoubleToFixed(result.data[i].应发数量, 1)
                                        , "HQty": dealDoubleToFixed(result.data[i].数量, 1)
                                        , "HWHID": result.data[i].hwhid
                                        , "HWHID": result.data[i].HWHID
                                        , "发货仓库": result.data[i].发货仓库
                                        , "HRemark": result.data[i].表体备注

@@ -990,20 +988,20 @@
                                        , "HRelationQty": result.data[i].关联数量
                                        , "HRelationMoney": result.data[i].关联金额

                                        , 'HSPID': result.data[i].HSPID
                                        , 'HSPName': result.data[i].仓位
                                        , 'HSPGroupID': result.data[i].HSPGroupID
                                        , "HSPGroupName": result.data[i].仓位组
                                        , 'HSCWHID': result.data[i].HSCWHID
                                        , 'HSCWHName': result.data[i].调出仓库
                                        , 'HSCSPID': result.data[i].HSCSPID
                                        , 'HSCSPName': result.data[i].调出仓位
                                        , 'HBatchNo': result.data[i].批次
                                        //, 'HSPID': result.data[i].HSPID
                                        //, 'HSPName': result.data[i].仓位
                                        //, 'HSPGroupID': result.data[i].HSPGroupID
                                        //, "HSPGroupName": result.data[i].仓位组
                                        //, 'HSCWHID': result.data[i].HSCWHID
                                        //, 'HSCWHName': result.data[i].调出仓库
                                        //, 'HSCSPID': result.data[i].HSCSPID
                                        //, 'HSCSPName': result.data[i].调出仓位
                                        //, 'HBatchNo': result.data[i].批次

                                        , 'HPropertyID': result.data[i].HPropertyID
                                        , 'HPropertyName': result.data[i].辅助属性
                                        , 'HSecUnitID': result.data[i].HSecUnitID
                                        , 'HSecUnitName': result.data[i].辅助计量单位
                                        //, 'HPropertyID': result.data[i].HPropertyID
                                        //, 'HPropertyName': result.data[i].辅助属性
                                        //, 'HSecUnitID': result.data[i].HSecUnitID
                                        //, 'HSecUnitName': result.data[i].辅助计量单位
                                    }
                                )
                            }