Merge branch 'master' into wxw

Administrator

2024-03-05 b506c4535c62c4c5fd7c5b5c0bd7bb8b03390dbd

 Pda/View/AsnSetting/productEnterQuantity.html

@@ -219,7 +219,7 @@
                    </form>
                </div>

                <br>
                <!-- <br> -->

                <div id="" class="cut-line">
                    <img src="/assets/fengexian.png">
@@ -339,6 +339,22 @@

                        </table>

                        <!-- <div id="demodiv" class="layui-form-item layout-input">
                            <label class="layui-form-label" lang>寄存备注：</label>
                            <div class="layui-input-block">
                                <textarea placeholder="请输入内容" id="Demo" name="Demo" class="layui-textarea" ></textarea>
                                
                            </div>
                        </div> -->
                        <!-- 维护备注弹框 -->
                        <div id="demodiv" class="layui-form-item layout-input" style="height: auto;">
                            <label class="layui-form-label">寄存备注：</label>
                            <div class="layui-input-inline" style="width: 365px;height: auto;">
                                <textarea placeholder="请输入内容" id="NoticeDemo" name="NoticeDemo" class="layui-textarea" ></textarea>
                            </div>
                            <br>
                        </div>
                        
                        <table class="layout-tbl-submit" border="" cellspacing="" cellpadding="">
                            <tr>
                                <td style="width: 23%;"></td>
@@ -355,6 +371,11 @@
                </div>

                <br>
                <br>
                <div id="demodiv1">
                    <br><br><br><br><br><br><br>
                </div>
                

                <div id="" class="cut-line">
                    <img src="/assets/fengexian.png">
@@ -409,7 +430,8 @@
            var form = layui.form

            /* 标签切换代码 */

            $('#demodiv').hide();
            $('#demodiv1').hide();
            var xianshiyemian = 0;

            $('#option1').attr("style", "background-color: aqua;width: 45.77%;float: left;text-align: center;"); //选中后颜色
@@ -431,7 +453,8 @@
                    xianshiyemian = 1;
                    $('#content1').hide();
                    $('#option1').attr("style", "background-color: #999;width: 45.77%;float: left;text-align: center;"); //默认颜色

                    
                   
                    $('#content2').show();
                    $('#option2').attr("style", "background-color: aqua;width: 45.77%;float: right;text-align: center;"); //选中后颜色

@@ -652,6 +675,7 @@
            });
            //选中入库单事件-数量
            form.on('select(getbar1)', function (data) {
                updateDemoDiv();
                updateGoodList()
                setOrderGoods();
            });
@@ -758,6 +782,7 @@
                        AsnDetailId: parseInt($("#goodSelect1").val()), //入库单明细ID
                        LotNo: $("#goodSelect1").find("option:selected").text(),  //物料批次
                        SkuQty: parseInt($("#SkuQty").val()), //物料数量
                        Demo: $("#NoticeDemo").val(), //物料数量
                        Origin: "PDA"
                    }

@@ -788,6 +813,35 @@
                return false; //阻止表单跳转。如果需要表单跳转，去掉这段即可。
            });


            // 根据入库单号 获取备注是否显示及备注信息
            function updateDemoDiv() {
                var param = {
                    AsnNo: $("#bar1").val(),
                };
                synData(IP + "/PdaAsn/GetArrivalNotice", param, 'post', function (res) {
                    console.log(res)
                    if (res.code == 0 && res.data != null) { //成功
                        
                        //判断默认选中是否为寄存物料
                        if(res.data[0].Type == "7")
                        {
                            $("textarea[name='NoticeDemo']").val(res.data[0].Demo); //备注
                            $('#demodiv').show();
                            $('#demodiv1').show();
                        }
                        else
                        {
                            $('#demodiv').hide();
                            $('#demodiv1').hide();
                        }
                    }
                    else{
                        $('#demodiv').hide();
                        $('#demodiv1').hide();
                    }
                });
            }

            // 根据入库明细ID 获取详细信息
            function setOrderGoods() {
@@ -825,6 +879,7 @@
                            $("#Standard1").val(res.data.Standard);
                            $("#ImportFactQuantity1").val(res.data.FactQty + "");
                        }
                        else{}
                    });
                }

@@ -914,6 +969,7 @@
                            asnDetails = res.data;
                            for (var i = 0; i < res.data.length; i++) {
                                if (skuNo != '' && skuNo == res.data[i].SkuNo) {
                                   
                                    if (i == 0) {
                                        $("#goodSelect1").append('<option value =' + res.data[i].Id + ' selected>' + res.data[i]
                                            .SkuName);
@@ -947,6 +1003,7 @@
                                $('#goodSelect1').siblings("div.layui-form-select").find('dl').find(sel).addClass('layui-this')
                            }
                        } else {
                           
                        }
                    });
                }