采购流程的测试并完善功能； 采购订单-》收料通知单-》采购入库单-》应付单 （注意： 源单类型的下拉框 需要 根据数据库 表动态加载， 关联数量 要准...

zrg

2024-04-24 90f155cfa6f7cb94c5b9dca64a4c4cbd100d7681

采购流程的测试并完善功能； 采购订单-》收料通知单-》采购入库单-》应付单 （注意： 源单类型的下拉框 需要 根据数据库 表动态加载， 关联数量 要准确 ， 审核 且 未关闭 未行关闭的行 才能下推 ，关联数量超额后，要 反写 关闭 源单 ）

 WebTM/views/²Ö´æ¹ÜÀí/·Ö²½Ê½µ÷Èëµ¥/Fb_StepFoldinBillEdit.html

@@ -990,7 +990,7 @@
                                , "HSecManagerName": data.验收
                                , "HKeeperID": data.HKeeperID
                                , "HKeeperName": data.保管员
                                , "HSourceBillType": data.单据类型
                                //, "HSourceBillType": data.单据类型
                            });



 WebTM/views/²É¹º¹ÜÀí/Ó¦¸¶µ¥/Cg_PayableBill.html

@@ -77,10 +77,13 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label">源单类型</label>
                                            <div class="layui-input-inline">
                                                <select name="BillType" id="BillType" lay-filter="BillType" style="width: 180px; ">
                                                <select name="BillType" id="BillType" lay-verify="BillType">
                                                    <!--动态渲染源单类型-->
                                                </select>
                                                <!--<select name="BillType" id="BillType" lay-filter="BillType" style="width: 180px; ">
                                                    <option style="color:blue;" selected="selected" value="1102">采购订单</option>
                                                    <option style="color:blue;" value="1201">采购入库单</option>
                                                </select>
                                                </select>-->
                                            </div>
                                        </div>
                                        <div class="layui-inline">
@@ -108,9 +111,9 @@
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">采购员</label>
                                            <label class="layui-form-label">业务员</label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HEmpName" id="HEmpName" " class="layui-input" value="" style="background-color:#efefef4d;" readonly>
                                                <input type="text" name="HEmpName" id="HEmpName"  class="layui-input" value="" style="background-color:#efefef4d;" readonly>
                                                <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
                                                <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -180,7 +183,7 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label">付款日期<label style="color:red"> * </label></label>
                                            <div class="layui-input-block">
                                                <input type="date" class="layui-input" lay-verify="HPayDate" name="HPayDate" id="HPayDate" style="width:190px;">
                                                <input type="date" class="layui-input" lay-verify="HReceiveDate" name="HReceiveDate" id="HReceiveDate" style="width:190px;">
                                            </div>
                                        </div>
                                    </div>
@@ -379,6 +382,12 @@
            //初始化子表
            set_InitGrid();

            //初始化组织
            Organ();

            //初始化 èŽ·å–源单类型
            HSourceBillType();

            //#region åˆ¤æ–­æ“ä½œç±»åž‹å¹¶åˆå§‹åŒ–界面
            if (OperationType == 1) {                                                   //无源单新增
               /* $("#HItemID").val(0);*/
@@ -411,8 +420,9 @@

            DisPlay_HideColumn();

            //初始化组织
            Organ();
            

            

            //#endregion

@@ -508,7 +518,7 @@
            });
            //#endregion

            //#region é€‰æ‹©é‡‡è´­å‘˜æŒ‰é’®
            //#region é€‰æ‹©ä¸šåŠ¡å‘˜æŒ‰é’®
            form.on('submit(HEmpList)', function () {
                get_checkEmp();
            });
@@ -711,10 +721,7 @@
                                Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
                            }
                            $("#HOrgID").append(Organization);
                            if (OperationType == 1 || OperationType == 4) {
                                HOrgIDBar = sessionStorage["OrganizationID"];
                            }
                            $("#HOrgID").val(HOrgIDBar);
                            $("#HOrgID").val(sessionStorage["OrganizationID"])
                            form.render('select');
                        }
                        layer.closeAll("loading");
@@ -781,13 +788,13 @@
            }
            //#endregion

            //#region é€‰æ‹©é‡‡è´­å‘˜
            //#region é€‰æ‹©ä¸šåŠ¡å‘˜
            function get_checkEmp() {
                layer.open({
                    type: 2//弹窗类型
                    , skin: 'layui-layer-rim' //加上边框
                    , area: ['90%', '90%']//大小
                    , title: '采购员列表'//标题
                    , title: '业务员列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../Baseset/基础资料/Gy_EmployeeList.html?Type=HEmp', 'yes']
                })
@@ -867,6 +874,30 @@
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                })
            }
            //#endregion

            //#region èŽ·å–源单类型
            function HSourceBillType() {
                var HName = '应付单';
                //获取登录页组织列
                $.ajax({
                    type: "get",
                    async: false,
                    data: { "HName": HName, "Num": 2 },       //0蓝单 1红单 2不分红蓝单
                    url: GetWEBURL() + "/Web/GetHSourceBillType",
                    success: function (result) {
                        var HSourceBillTypes = "";
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data;
                            for (var i = 0; i < data.length; i++) {
                                HSourceBillTypes += '<option  style="color:blue;" value="' + data[i].HSourceBillType + '">' + data[i].HSourceBillTypeName + '</option>';
                            }
                            $("#BillType").append(HSourceBillTypes);
                            form.render('select');
                        }
                    }
                })
            }
            //#endregion
@@ -1024,7 +1055,7 @@
                var value = obj.value //得到修改后的值
                    , data = obj.data //得到所在行所有键值
                    , field = obj.field; //得到字段
                //#endregion
               

                switch (field) {
                    case "HQty":                                         //数量
@@ -1183,7 +1214,7 @@
                    default:
                }
            });
            //#endregion
          //#endregion
            //#endregion
            //#endregion

@@ -1227,7 +1258,7 @@
                                , "HSSName": data.结算方式
                                , "HPSStyleID": data.HPSStyleID
                                , "HPSStyleName": data.采购方式
                                , "HPayDate": formatDate(data.付款日期)
                                , "HReceiveDate": formatDate(data.付款日期)
                                , "HRemark": data.表头备注
                                , "HExplanation": data.摘要
                                , "HInnerBillNo": data.内部单据号
@@ -1346,7 +1377,7 @@
                        , "HMangerID": dataArray[0].HManagerID
                        , "HMangerName": dataArray[0].主管
                        , "HEmpID": dataArray[0].HEmpID
                        , "HEmpName": dataArray[0].采购员
                        , "HEmpName": dataArray[0].业务员
                        , "HSupID": dataArray[0].HSupID
                        , "HSupName": dataArray[0].供应商
                        , "HCurID": dataArray[0].HCurID
@@ -1427,7 +1458,7 @@
                        , "HManagerID": dataArray[0].hmanagerid
                        , "HMangerName": dataArray[0].主管
                        , "HEmpID": dataArray[0].HEmpID
                        , "HEmpName": dataArray[0].采购员
                        , "HEmpName": dataArray[0].业务员
                        , "HSupID": dataArray[0].HSupID
                        , "HSupName": dataArray[0].供应商
                        , "HCurID": dataArray[0].HCurID
@@ -1442,7 +1473,7 @@
                    for (var i = 0; i < dataArray.length; i++) {
                        rowdata.push(
                            {
                                "HMaterID": dataArray[i].hmaterid
                                "HMaterID": dataArray[i].HMaterID
                                , "物料代码": dataArray[i].物料代码
                                , "物料名称": dataArray[i].物料名称
                                , "规格型号": dataArray[i].规格型号
@@ -2134,7 +2165,7 @@

                    , "HDeptID": dataArray[0].HDeptID
                    , "HDeptName": dataArray[0].部门
                    , "HMangerID": dataArray[0].hmanagerid
                    , "HMangerID": dataArray[0].hmanagerid == null ? "0" : dataArray[0].hmanagerid
                    , "HMangerName": dataArray[0].主管
                    , "HEmpID": dataArray[0].HEmpID
                    , "HEmpName": dataArray[0].业务员
@@ -2154,13 +2185,13 @@
                for (var i = 0; i < dataArray.length; i++) {
                    rowdata.push(
                        {
                            "HMaterID": dataArray[i].hmaterid
                            "HMaterID": dataArray[i].HMaterID
                            , "物料代码": dataArray[i].物料代码
                            , "物料名称": dataArray[i].物料名称
                            , "规格型号": dataArray[i].规格型号
                            , "HUnitID": dataArray[i].hunitid
                            , "HUnitID": dataArray[i].HUnitID
                            , "计量单位": dataArray[i].计量单位
                            , "HQty": dealDoubleToFixed(dataArray[i].数量-dataArray[i].关联数量, 1)
                            , "HQty": dealDoubleToFixed(dataArray[i].实收数量-dataArray[i].关联数量, 1)
                            , "HPrice": dealDoubleToFixed(dataArray[i].单价, 3)
                            , 'HDiscountRate': "0"                                                     //
                            , 'HRelTaxPrice': "0"

 WebTM/views/²É¹º¹ÜÀí/ÊÕÁÏ֪ͨµ¥/Add_Edit_Cg_POInStockBillList.html

@@ -1114,7 +1114,7 @@
                    success: function (data) {
                        if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            layer.msg(data.Message, { icon: 1 });
                            $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
                            $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
                            //保存后浏览
                            //ReRoadBillMain();
                        }

 WebTM/views/ÁìÁÏ·¢»õ/·Ö²½Ê½µ÷³öµ¥/Fb_StepFoldOutBillEdit.html

@@ -710,15 +710,19 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                                  , end: function () {
                                    obj.update({
                                     "HMaterID" :OptionData.HMaterID
                                        ,"物料代码" : OptionData.物料代码
                                       , "物料名称" :OptionData.物料名称
                                        ,"规格型号" : OptionData.规格型号
                                        ,"HUnitID" :OptionData.HUnitID
                                        ,"计量单位" : OptionData.计量单位名称
                                })
                                , end: function () {
                                    if (OptionData.length>0) {
                                        obj.update({
                                            "HMaterID": OptionData.HItemID
                                            , "物料代码": OptionData.物料代码
                                            , "物料名称": OptionData.物料名称
                                            , "规格型号": OptionData.规格型号
                                            , "HUnitID": OptionData.HUnitID
                                            , "计量单位": OptionData.计量单位名称
                                        })
                                        OptionData = [];
                                    }
                                   
                                }
                            })
                        }
@@ -749,11 +753,15 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                               , end: function () {
                                obj.update({
                                    "HUnitID": OptionData.HItemID
                                    , "计量单位": OptionData.计量单位名称
                                })
                                , end: function () {
                                    if (OptionData.length > 0) {
                                        obj.update({
                                            "HUnitID": OptionData.HItemID
                                            , "计量单位": OptionData.计量单位名称
                                        })
                                        OptionData = [];
                                    }
                                
                            }
                            })
                        }
@@ -784,12 +792,16 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                         , end: function () {
                                obj.update({
                                    "HSecUnitID": OptionData.HItemID
                                    , "辅助计量单位": OptionData.辅助属性名称
                                })
                            }
                                , end: function () {
                                    if (OptionData.length > 0) {
                                        obj.update({
                                            "HSecUnitID": OptionData.HItemID
                                            , "辅助计量单位": OptionData.辅助属性名称
                                        })
                                        OptionData = [];
                                    }
                                
                                 }
                            })
                        }
                        //调入仓库
@@ -819,11 +831,15 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                             , end: function () {
                                    obj.update({
                                        "HWHID": OptionData.HItemID
                                        , "调入仓库": OptionData.仓库名称
                                    })
                                , end: function () {
                                    if (OptionData.length > 0) {
                                        obj.update({
                                            "HWHID": OptionData.HItemID
                                            , "调入仓库": OptionData.仓库名称
                                        })
                                        OptionData = [];
                                    }
                                   
                                }
                            })
                        }
@@ -854,11 +870,16 @@
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                                 , end: function () {
                                obj.update({
                                    "HSCWHID": OptionData.HItemID
                                    , "调出仓库": OptionData.仓库名称
                                })
                                , end: function () {
                                    if (OptionData.length > 0) {
                                        obj.update({
                                            "HSCWHID": OptionData.HItemID
                                            , "调出仓库": OptionData.仓库名称
                                        })
                                        OptionData = [];
                                    }

                                
                            }
                            })
                        }

 WebTM/views/ÁìÁÏ·¢»õ/·Ö²½Ê½µ÷³öµ¥/Fb_StepFoldOutBillList.html

@@ -266,6 +266,8 @@
                        , { field: '日期', title: '日期', width: 125, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.日期, 'yyyy-MM-dd')}}</div>", sort: true }
                        , { field: '单据号', title: '单据号', width: 195, sort: true }
                        , { field: '单据类型', title: '单据类型', width: 110, sort: true, hide: true }
                        , { field: '状态', title: '状态', width: 195, sort: true }
                        , { field: '行状态', title: '行状态', width: 195, sort: true }
                        , { field: '物料代码', title: '物料代码', width: 110, sort: true }
                        , { field: '物料名称', title: '物料名称', width: 110, sort: true }
                        //, { field: '仓库代码', title: '仓库代码', width: 125, sort: true }