YL
2022-01-15 f30713785d5db5d1b27bb463be41776c929154ea
nothing
4个文件已修改
67 ■■■■■ 已修改文件
WebTM/views/IpadStepIndex.html 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/报工台工序/产量汇报/Sc_ProductReportStepBillList.html 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/生产包装单/Sc_PackUnionBill.html 57 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/IpadStepIndex.html
@@ -725,7 +725,8 @@
                        "HMaker": sessionStorage["HUserName"],    //sessionStorage["HUserName"]
                        "Czybm": sessionStorage["Czybm"],
                        //"HEmpID": "0",    //sessionStorage["HEmpID"]
                        "HSourceBillType": HSourceBillType
                        "HSourceBillType": HSourceBillType,
                        "HProcID": HProcID
                    });
                    //通过索引获取到当前iframe弹出层
WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/²úÁ¿»ã±¨/Sc_ProductReportStepBillList.html
@@ -126,6 +126,7 @@
        var HICMOInterID = ""; //生产订单主ID
        var HICMOEntryID = ""; //生产订单子ID
        var HSourceBillType = ""; //源单类型
        var HProcID = ""; //工序ID
        var SchWhere = ""; //按钮查询参数
        var edit = function (data) {
            workcode = data[0].workcode;
@@ -136,6 +137,7 @@
            HMaker = data[0].HMaker;
            Czybm = data[0].Czybm;
            HSourceBillType = data[0].HSourceBillType;
            HProcID = data[0].HProcID;
        }
        //获取页面跳转参数  //单据编辑状态: 1.无源单新增  Â 2.有源单新增  Â 3.编辑  4.浏览  5.变更
        var params = get_UrlVars();
@@ -205,6 +207,7 @@
                        , { field: 'HICMOBillNo', title: '生产订单号', width: 200 }
                        , { field: 'HICMOInterID', title: '生产订单主ID', width: 200, hide: true }
                        , { field: 'HICMOEntryID', title: '生产订单子ID', width: 200, hide: true }
                        , { field: 'HProcID', title: '工序ID', width: 200, hide: true }
                        , { field: 'HProcNumber', title: '工序编码', width: 200 }
                        , { field: 'HProcName', title: '工序名称', width: 200 }
                        , { field: 'HSourceBillNo', title: '源单单号', width: 200 }
@@ -320,7 +323,7 @@
                        type: "Get",
                        url: GetWEBURL() + "/Sc_MESBeginStepWorkBill/SaveGetMESProductReportBillList", //方法所在页面和方法名
                        async: true,
                        data: { "ScMaxWork": ScMaxWork(), "HSourceBillType": HSourceBillType, "workcode": workcode, "HSourceID": HSourceID, "HICMOInterID": (HICMOInterID == "null" ? 0 : HICMOInterID), "HICMOEntryID": (HICMOEntryID == "null" ? 0 : HICMOEntryID), "HMaker": HMaker, "Czybm": Czybm },
                        data: { "ScMaxWork": ScMaxWork(), "HSourceBillType": HSourceBillType, "workcode": workcode, "HSourceID": HSourceID, "HICMOInterID": (HICMOInterID == "null" ? 0 : HICMOInterID), "HICMOEntryID": (HICMOEntryID == "null" ? 0 : HICMOEntryID), "HMaker": HMaker, "Czybm": Czybm, "HProcID": HProcID },
                        dataType: "json",
                        beforeSend: function () {
                            $('#AskReport').addClass("layui-btn-disabled").attr("disabled", true);
WebTM/views/Éú²ú¹ÜÀí/Éú²ú°ü×°µ¥/Sc_PackUnionBill.html
@@ -35,9 +35,15 @@
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">日期</label>
                                    <label class="layui-form-label">开始日期</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input" id="HDate" style="width:190px;">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">结束日期</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input" id="HDate1" style="width:190px;">
                                    </div>
                                </div>
                                <div class="layui-inline">
@@ -96,6 +102,7 @@
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script>
        var cols_arr = []; //存储表格头的数组
        var table = null;
@@ -122,12 +129,20 @@
            var pageIndex = 1;//当前页码值
            //#region è¿›å…¥é¡µé¢æ—¢åŠ è½½
            //初始化表单插件
            set_InitFrom();
            //初始化界面
            set_ClearBill(sWhere);
            //#endregion
            //#region åˆå§‹åŒ–表单
            function set_InitFrom() {
                laydate.render({
                    elem: '#HDate'
                });
                laydate.render({
                    elem: '#HDate1'
                });
            }
            //#endregion
            //头工具栏事件
            table.on('toolbar(mainTable)', function (obj) {
@@ -176,17 +191,15 @@
                get_FastQuery();
            });
            //初始化表单
            function set_InitFrom() {
                laydate.render({
                    elem: '#HDate'
                });
            }
            //初始化界面
            function set_ClearBill(sWhere) {
                resultTableHead = []; //清空表头列,防止重复渲染
                //初始查询
                get_Display(sWhere);
                //get_Display(sWhere);
                $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
                get_FastQuery();
            }
            //加载网格
            function get_Display(sWhere) {
@@ -194,7 +207,7 @@
                $.ajax({
                    url: GetWEBURL() + '/Sc_PackUnionBill/Get_PackUnionBillList',
                    type: "GET",
                    data: { "sWhere": sWhere, "page": 1, "limit": 10 },
                    data: { "page": 1, "limit": 10, "sWhere": sWhere },
                    datatype: "json",
                    success: function (data1) {
                        console.log(data1);
@@ -209,6 +222,7 @@
            }
            //初始化表格
            function set_InitGrid(sWhere) {
                //填充表格头数组
                var data = resultTableHead;
                cols_arr[0] = [];
@@ -221,22 +235,22 @@
                        switch (data[i].Type) {
                            //int
                            case 'Int32':
                                cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true };
                                cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true, width: 100 };
                                break;
                            //Decimal
                            case 'Decimal':
                                cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true };
                                cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true, width: 200 };
                                break;
                            default:
                                cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', sort: true };
                                cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 };
                        }
                    }
                }
                //填充表格数据
                table.render({
                    elem: '#mainTable',
                    url: GetWEBURL() + '/Sc_PackUnionBill/Get_PackUnionBillList',
                    toolbar: '#toolbarDemo',
                    url: GetWEBURL() + '/Sc_PackUnionBill/Get_PackUnionBillList',
                    title: '组托单列表',
                    cols: cols_arr,    //填充表格头数据,
                    id: 'mainTable', //表格id
@@ -297,6 +311,7 @@
            //快速过滤
            function get_FastQuery() {
                var HDate = $("#HDate").val();//开始日期
                var HDate1 = $("#HDate1").val();//结束日期
                var HBillNo = $("#HBillNo").val(); //单据号
                var HDepartName = $("#HDepartName").val();
                var HMaterNumber = $("#HMaterNumber").val();
@@ -304,6 +319,9 @@
                var HMakerMan = $("#HMakerMan").val();
                if (HDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + HDate + "'";
                }
                if (HDate1) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) <= '" + HDate1 + "'";
                }
                if (HBillNo) {
                    sWhere += " and å•据号 like '%" + HBillNo + "%'";
@@ -320,19 +338,20 @@
                if (HMakerMan) {
                    sWhere += " and åˆ¶å•人 like '%" + HMakerMan + "%'";
                }
                set_ClearBill(sWhere);
                get_Display(sWhere);
                sWhere = "";
            }
            //重置过滤条件
            function set_ClearQuery() {
                $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HBillNo").val("");
                $("#HDepartName").val("");
                $("#HMaterNumber").val("");
                $("#HMaterName").val("");
                $("#HMakerMan").val("");
                sWhere = "";
                get_Display(sWhere);
                sWhere = " ";
                get_FastQuery();
            }
            //刷新
            function set_Refresh() {
WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBillList.html
@@ -223,7 +223,7 @@
            //#region æŸ¥è¯¢
            function get_Display(sWhere) {
                sWhere += " and HPRDORGID=" + sessionStorage["OrganizationID"] + " ";
                //sWhere += " and HPRDORGID=" + sessionStorage["OrganizationID"] + " ";
                var ajaxLoad = layer.load();
                $.ajax({
                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",